summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-10-28 01:31:32 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-10-28 01:31:32 (GMT)
commitcb96099e126f50aaa9c8806c58892d0a62ded2b9 (patch)
tree68b95845130bdd74f72bbd242b539887f719c73f /tools
parent1fafb913bfb1e8657598e7c9ce0b52e08d044732 (diff)
downloadQt-cb96099e126f50aaa9c8806c58892d0a62ded2b9.zip
Qt-cb96099e126f50aaa9c8806c58892d0a62ded2b9.tar.gz
Qt-cb96099e126f50aaa9c8806c58892d0a62ded2b9.tar.bz2
Add 800x480 to the qvfb configuration dialog
800x480 is an increasingly common screen size on embedded devices, and specifying it via Custom sizes is annoying. Reviewed-by: Sarah Smith
Diffstat (limited to 'tools')
-rw-r--r--tools/qvfb/config.ui9
-rw-r--r--tools/qvfb/qvfb.cpp3
2 files changed, 11 insertions, 1 deletions
diff --git a/tools/qvfb/config.ui b/tools/qvfb/config.ui
index ad9c39e..b74bef7 100644
--- a/tools/qvfb/config.ui
+++ b/tools/qvfb/config.ui
@@ -47,7 +47,7 @@
<x>0</x>
<y>0</y>
<width>600</width>
- <height>665</height>
+ <height>690</height>
</rect>
</property>
<property name="windowTitle">
@@ -118,6 +118,13 @@
</widget>
</item>
<item>
+ <widget class="QRadioButton" name="size_800_480">
+ <property name="text">
+ <string>800x480</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QRadioButton" name="size_800_600">
<property name="text">
<string>800x600</string>
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index 59e8dae..09692b7 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -669,6 +669,8 @@ void QVFb::configure()
w=320; h=240;
} else if ( config->size_640_480->isChecked() ) {
w=640; h=480;
+ } else if ( config->size_800_480->isChecked() ) {
+ w=800; h=480;
} else if ( config->size_800_600->isChecked() ) {
w=800; h=600;
} else if ( config->size_1024_768->isChecked() ) {
@@ -748,6 +750,7 @@ void QVFb::chooseSize(const QSize& sz)
config->size_240_320->setChecked(sz == QSize(240,320));
config->size_320_240->setChecked(sz == QSize(320,240));
config->size_640_480->setChecked(sz == QSize(640,480));
+ config->size_800_480->setChecked(sz == QSize(800,480));
config->size_800_600->setChecked(sz == QSize(800,600));
config->size_1024_768->setChecked(sz == QSize(1024,768));
}