Changeset 150 in tspsg-svn for trunk

Timestamp:

Dec 21, 2010, 2:28:51 PM (14 years ago)

Author:

laleppa

Message:

• Translucency effect is now available on all desktop platforms. No check for its support by window system is made at this moment. Blur is only available in Windows Vista or higher.

Location:

trunk/src

Files:

• globals.cpp (modified) (2 diffs)
• globals.h (modified) (3 diffs)
• mainwindow.cpp (modified) (7 diffs)
• qtwin.cpp (modified) (2 diffs)
• settingsdialog.cpp (modified) (6 diffs)
• settingsdialog.h (modified) (1 diff)

trunk/src/globals.cpp

@@ -24 +24 @@
 #include "globals.h"
 
-#ifdef Q_WS_WIN32
+#ifndef HANDHELD
 void toggleStyle(QWidget *widget, bool enable)
 {
@@ -33 +33 @@
     }
 }
-#endif // Q_WS_WIN32
+#endif // HANDHELD

trunk/src/globals.h

@@ -59 +59 @@
 // TSPSolver
 #include "tspsolver.h"
-#ifdef Q_WS_WIN32
-    // Vista/7 Eyecandy
+#ifndef HANDHELD
+    // Eyecandy
 #   include "qtwin.h"
-#endif // Q_WS_WIN32
+#endif // HANDHELD
 
 // DEFINES
@@ -129 +129 @@
 }
 
-#ifdef Q_WS_WIN32
+#ifndef HANDHELD
 /*!
  * \brief Enables or disables a mask for the \a widget.
@@ -138 +138 @@
  */
 void toggleStyle(QWidget *widget, bool enable);
-#endif // Q_WS_WIN32
+#endif // HANDHELD
 
 #ifndef DOXYGEN_EXCLUDE

trunk/src/mainwindow.cpp

@@ -25 +25 @@
 
 #ifdef Q_WS_WIN32
-    #include "shobjidl.h"
+#   include "shobjidl.h"
 #endif
 
@@ -396 +396 @@
         if (untitled)
             setFileName();
-#ifdef Q_WS_WIN32
+#ifndef HANDHELD
         if (QtWin::isCompositionEnabled() && settings->value("UseTranslucency", DEF_USE_TRANSLUCENCY).toBool())  {
             toggleStyle(labelVariant, true);
@@ -610 +610 @@
     connect(bb, SIGNAL(accepted()), dlg, SLOT(accept()));
 
-#ifdef Q_WS_WIN32
-    // Adding some eyecandy in Vista and 7 :-)
+#ifndef HANDHELD
+    // Adding some eyecandy
     if (QtWin::isCompositionEnabled())  {
         QtWin::enableBlurBehindWindow(dlg, true);
     }
-#endif // Q_WS_WIN32
+#endif // HANDHELD
 
     dlg->resize(450, 350);
@@ -1030 +1030 @@
 void MainWindow::solverRoutePartFound(int n)
 {
-#ifdef Q_WS_WIN32
     tl->SetProgressValue(winId(), n, spinCities->value() * 2);
-#else
-    Q_UNUSED(n);
-#endif // Q_WS_WIN32
 }
 #endif // Q_WS_WIN32
@@ -1661 +1657 @@
     retranslateUi(false);
 
-#ifdef Q_WS_WIN32
-    // Adding some eyecandy in Vista and 7 :-)
+#ifndef HANDHELD
+    // Adding some eyecandy
     if (QtWin::isCompositionEnabled() && settings->value("UseTranslucency", DEF_USE_TRANSLUCENCY).toBool())  {
         toggleTranclucency(true);
     }
-#endif // Q_WS_WIN32
+#endif // HANDHELD
 }
 
@@ -1682 +1678 @@
 void MainWindow::toggleTranclucency(bool enable)
 {
-#ifdef Q_WS_WIN32
+#ifndef HANDHELD
     toggleStyle(labelVariant, enable);
     toggleStyle(labelCities, enable);
@@ -1690 +1686 @@
 #else
     Q_UNUSED(enable);
-#endif // Q_WS_WIN32
+#endif // HANDHELD
 }
 

trunk/src/qtwin.cpp

@@ -103 +103 @@
             return isEnabled;
     }
-#endif
     return false;
+#elif !defined(HANDHELD)
+    //! \todo TODO: Check for trsnsparency support in other OSes.
+    return true;
+#else
+    return false;
+#endif
 }
 
@@ -125 +130 @@
         bb.dwFlags = DWM_BB_ENABLE;
         bb.hRgnBlur = NULL;
+#endif
         widget->setAttribute(Qt::WA_TranslucentBackground, enable);
         widget->setAttribute(Qt::WA_NoSystemBackground, enable);
+#ifdef Q_WS_WIN
         hr = pDwmEnableBlurBehindWindow(widget->winId(), &bb);
         if (SUCCEEDED(hr)) {

trunk/src/settingsdialog.cpp

@@ -142 +142 @@
 QVBoxLayout *vbox; // Layout helper
 
-#ifdef Q_WS_WIN32
+#ifndef HANDHELD
     if (QtWin::isCompositionEnabled()) {
         cbUseTranslucency = new QCheckBox(bgWhite);
@@ -152 +152 @@
         cbUseTranslucency->setCursor(QCursor(Qt::PointingHandCursor));
     }
-#endif // Q_WS_WIN32
+#endif // HANDHELD
 
     cbSaveState = new QCheckBox(bgWhite);
@@ -198 +198 @@
     box = static_cast<QBoxLayout *>(tabGeneral->layout());
     box->insertWidget(box->indexOf(cbUseNativeDialogs) + 1, cbSaveState);
-#ifdef Q_WS_WIN32
+#ifndef HANDHELD
     if (QtWin::isCompositionEnabled())
         box->insertWidget(box->indexOf(cbUseNativeDialogs) + 1, cbUseTranslucency);
-#endif // Q_WS_WIN32
+#endif // HANDHELD
 
     // Inserting label for hints to the bottom part (with grey bg)
@@ -234 +234 @@
     cbSaveLastUsed->setChecked(settings->value("SaveLastUsed", DEF_SAVE_LAST_USED).toBool());
     cbUseNativeDialogs->setChecked(settings->value("UseNativeDialogs", DEF_USE_NATIVE_DIALOGS).toBool());
-#ifdef Q_WS_WIN32
+#ifndef HANDHELD
     if (QtWin::isCompositionEnabled())
         cbUseTranslucency->setChecked(settings->value("UseTranslucency", DEF_USE_TRANSLUCENCY).toBool());
-#endif // Q_WS_WIN32
+#endif // HANDHELD
 #ifndef HANDHELD
     cbSaveState->setChecked(settings->value("SavePos", DEF_SAVEPOS).toBool());
@@ -353 +353 @@
     settings->setValue("SaveLastUsed", cbSaveLastUsed->isChecked());
     settings->setValue("UseNativeDialogs", cbUseNativeDialogs->isChecked());
-#ifdef Q_WS_WIN32
+#ifndef HANDHELD
     if (QtWin::isCompositionEnabled()) {
 bool old = settings->value("UseTranslucency", DEF_USE_TRANSLUCENCY).toBool();
@@ -362 +362 @@
         settings->setValue("UseTranslucency", cbUseTranslucency->isChecked());
     }
-#endif // Q_WS_WIN32
-#ifndef HANDHELD
     settings->setValue("SavePos", cbSaveState->isChecked());
 #endif // HANDHELD

trunk/src/settingsdialog.h

@@ -56 +56 @@
     QSettings *settings;
     QHBoxLayout *layoutCitiesLimit;
-#ifdef Q_WS_WIN32
+#ifndef HANDHELD
     QCheckBox *cbUseTranslucency;
-#endif // Q_WS_WIN32
+#endif // HANDHELD
     QCheckBox *cbCheck4Updates;
     QSpinBox *spinUpdateCheckInterval;