Changeset 561 for trunk/tools/qvfb/qvfb.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qvfb/qvfb.cpp (modified) (13 diffs)

trunk/tools/qvfb/qvfb.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -42 +42 @@
 #include "qvfb.h"
 #include "qvfbview.h"
+#include "qvfbhdr.h"
 #ifdef Q_WS_X11
 #include "qvfbx11view.h"
@@ -135 +136 @@
 static bool copyButtonConfiguration(const QString &prefix, int displayId)
 {
-    const QString destDir = QString(QLatin1String("/tmp/qtembedded-%1/")).arg(displayId);
+    const QString destDir = QT_VFB_DATADIR(displayId).append("/");
     const QFileInfo src(prefix + QLatin1String("defaultbuttons.conf"));
     const QFileInfo dst(destDir + QLatin1String("defaultbuttons.conf"));
@@ -218 +219 @@
     rateDlg = 0;
     refreshRate = 30;
-#if QT_VERSION >= 0x030000
-    // When compiling with Qt 3 we need to create the menu first to
-    // avoid scroll bars in the main window
+    // Create the menu first to avoid scroll bars in the main window
     createMenu( menuBar() );
     init( display_id, w, h, d, r, skin );
     enableCursor( true );
-#else
-    init( display_id, w, h, d, r, skin );
-    createMenu( menuBar() );
-#endif
 }
 
@@ -355 +350 @@
         view->setContentsMargins( 0, 0, 0, 0 );
         setCentralWidget(scroller);
-#if QT_VERSION >= 0x030000
         ph += 2;                                        // avoid scrollbar
-#endif
         scroller->show();
         // delete defaultbuttons.conf if it was left behind...
-        unlink(QFileInfo(QString("/tmp/qtembedded-%1/defaultbuttons.conf").arg(view->displayId())).absoluteFilePath().toLatin1().constData());
+        unlink(QFileInfo(QT_VFB_DATADIR(view->displayId()).append("/defaultbuttons.conf")).absoluteFilePath().toLatin1().constData());
         if (secondaryView)
-            unlink(QFileInfo(QString("/tmp/qtembedded-%1/defaultbuttons.conf").arg(view->displayId()+1)).absoluteFilePath().toLatin1().constData());
+            unlink(QFileInfo(QT_VFB_DATADIR(view->displayId() + 1).append("/defaultbuttons.conf")).absoluteFilePath().toLatin1().constData());
     }
     view->setRate(refreshRate);
@@ -644 +637 @@
     config->lcdScreen->setChecked(view->lcdScreenEmulation());
     chooseDepth(view->displayDepth(), view->displayFormat());
+    config->rgbSwapped->setChecked(view->rgbSwapped());
     connect(config->skin, SIGNAL(activated(int)), this, SLOT(skinConfigChosen(int)));
     if ( view->gammaRed() == view->gammaGreen() && view->gammaGreen() == view->gammaBlue() ) {
@@ -676 +670 @@
         } 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;
@@ -687 +683 @@
         if ( config->depth_1->isChecked() )
             d=1;
+        else if ( config->depth_2gray->isChecked() )
+            d=2;
         else if ( config->depth_4gray->isChecked() )
             d=4;
@@ -717 +715 @@
         view->setViewFormat(displayFormat);
         view->setTouchscreenEmulation( config->touchScreen->isChecked() );
+        if (view->rgbSwapped() != config->rgbSwapped->isChecked()) {
+            //### the windowTitle logic is inside init(), and init isn't always invoked
+            QString caption = windowTitle();
+            if (!config->rgbSwapped->isChecked())
+                caption.replace(QLatin1String(" BGR"), QString());
+            else
+                caption.append(QLatin1String(" BGR"));
+            setWindowTitle(caption);
+            view->setRgbSwapped(config->rgbSwapped->isChecked());
+        }
         bool lcdEmulation = config->lcdScreen->isChecked();
         view->setLcdScreenEmulation( lcdEmulation );
@@ -743 +751 @@
     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));
@@ -750 +759 @@
 {
     config->depth_1->setChecked(depth==1);
+    config->depth_2gray->setChecked(depth==2);
     config->depth_4gray->setChecked(depth==4);
     config->depth_8->setChecked(depth==8);