Changeset 143 in tspsg-svn

Timestamp:

Oct 13, 2010, 10:25:51 PM (14 years ago)

Author:

laleppa

Message:

Some small tweaks...

Location:

trunk

Files:

• src/globals.h (modified) (1 diff)
• src/mainwindow.cpp (modified) (3 diffs)
• src/settingsdialog.cpp (modified) (3 diffs)
• src/settingsdialog.h (modified) (1 diff)
• tspsg.pro (modified) (1 diff)

trunk/src/globals.h

@@ -34 +34 @@
         #error You are using Qt version < 4.5 but minimum required version is 4.5.0. Compilation aborted.
 #endif
-#ifdef QT_NO_SVG
+#if defined(Q_WS_WINCE_WM) || defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
+        //! This is defined on handheld devices (e.g., Windows Mobile, Symbian).
+        #define HANDHELD
+        #define QT_NO_STATUSTIP
+#endif
+#include <QtGui>
+#if defined(QT_NO_SVG) && !defined(NOSVG)
         #define NOSVG
 #endif
-#include <QtGui>
 #if !defined(NOSVG)
         #include <QtSvg>
 #endif // NOSVG
-
-#if defined(Q_WS_WINCE_WM) || defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
-        //! This is defined on handheld devices (e.g., Windows Mobile, Symbian).
-        #define HANDHELD
-#endif
 
 #ifndef HANDHELD

trunk/src/mainwindow.cpp

@@ -1244 +1244 @@
         foreach (language, langlist) {
                 a = menuSettingsLanguage->addAction(language.at(2));
+#ifndef QT_NO_STATUSTIP
                 a->setStatusTip(language.at(3));
+#endif
 #if QT_VERSION >= 0x040600
                 a->setIcon(QIcon::fromTheme(QString("flag-%1").arg(language.at(1)), QIcon(QString(":/images/icons/l10n/flag-%1.png").arg(language.at(1)))));
@@ -1335 +1337 @@
                 a = menuSettingsStyle->addAction(style);
                 a->setData(false);
+#ifndef QT_NO_STATUSTIP
                 a->setStatusTip(tr("Set application style to %1").arg(style));
+#endif
                 a->setCheckable(true);
                 a->setActionGroup(groupSettingsStyleList);
@@ -1440 +1444 @@
 #ifndef QT_NO_STATUSTIP
         actionFilePrintPreview->setStatusTip(tr("Preview current solution results before printing"));
-#endif // QT_NO_STATUSTIP
-#ifndef QT_NO_STATUSTIP
         actionFileExit->setStatusTip(tr("Exit %1").arg(QCoreApplication::applicationName()));
 #endif // QT_NO_STATUSTIP

trunk/src/settingsdialog.cpp

@@ -38 +38 @@
 
         buttonBox->button(QDialogButtonBox::Ok)->setIcon(GET_ICON("dialog-ok"));
+#ifndef QT_NO_STATUSTIP
         buttonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Save new preferences"));
+#endif
         buttonBox->button(QDialogButtonBox::Ok)->setCursor(QCursor(Qt::PointingHandCursor));
         buttonBox->button(QDialogButtonBox::Cancel)->setIcon(GET_ICON("dialog-cancel"));
+#ifndef QT_NO_STATUSTIP
         buttonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Close without saving preferences"));
+#endif
         buttonBox->button(QDialogButtonBox::Cancel)->setCursor(QCursor(Qt::PointingHandCursor));
 
@@ -219 +223 @@
         connect(buttonColor, SIGNAL(clicked()), SLOT(buttonColorClicked()));
         setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint);
-#ifndef HANDHELD
+#if !defined(QT_NO_STATUSTIP) && !defined(HANDHELD)
         // Setting initial text of dialog hint label to own status tip text.
         labelHint->setText(labelHint->statusTip());
@@ -459 +463 @@
 }
 
-#ifndef HANDHELD
+#if !defined(QT_NO_STATUSTIP) && !defined(HANDHELD)
 bool SettingsDialog::event(QEvent *ev)
 {

trunk/src/settingsdialog.h

@@ -72 +72 @@
         QLabel *labelHint;
 
+#ifndef QT_NO_STATUSTIP
         bool event(QEvent *ev);
+#endif // QT_NO_STATUSTIP
 #endif // Q_WS_WINCE_WM
 

trunk/tspsg.pro

@@ -47 +47 @@
 #REVISION = 100
 REVISION = $$system(svnversion)
-REVISION = $$replace(REVISION,":","")
-REVISION = $$replace(REVISION,"M","")
+isEmpty(REVISION)|eval(REVISION=="exported") {
+        REVISION = 0
+} else {
+        REVISION = $$replace(REVISION,":","")
+        REVISION = $$replace(REVISION,"M","")
+}
 win32-msvc*|wincewm* {
         VERSION = $$sprintf("%1.%2",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR)