Changeset 159 in tspsg-svn for trunk

Timestamp:

Apr 9, 2011, 2:53:25 AM (14 years ago)

Author:

laleppa

Message:

• Solution graph on Symbian is visually larger than on Windows Mobile. Added a hack that makes it about the same size on both platforms.
• Fixed bug #6 (Bug: Actions in Options Menu).

Location:

trunk/src

Files:

• main.cpp (modified) (1 diff)
• mainwindow.cpp (modified) (5 diffs)
• mainwindow.h (modified) (1 diff)

trunk/src/main.cpp

@@ -77 +77 @@
 
 MainWindow mainwindow;
+#ifdef Q_WS_S60
+    //! \hack HACK: A workaround to hide Actions menu item in Symbian.
+QWidgetList widgets = QApplication::allWidgets();
+QWidget *w = 0;
+    foreach(w, widgets) {
+        w->setContextMenuPolicy(Qt::NoContextMenu);
+    }
+#endif
+
 #ifdef HANDHELD
     mainwindow.showMaximized();

trunk/src/mainwindow.cpp

@@ -492 +492 @@
     about += QString("%1: <b>%2</b> (%3)<br>").arg(tr("Qt library"), QT_VERSION_STR, tr("static"));
 #endif // STATIC_BUILD
+    about.append(QString("%1: <b>%2x%3</b><br>").arg("Logical DPI").arg(logicalDpiX()).arg(logicalDpiY()));
     about += tr("Buid <b>%1</b>, built on <b>%2</b> at <b>%3</b> with <b>%4</b> compiler.").arg(BUILD_NUMBER).arg(__DATE__).arg(__TIME__).arg(COMPILER) + "<br>";
     about += QString("%1: <b>%2</b><br>").arg(tr("Algorithm"), CTSPSolver::getVersionId());
@@ -1126 +1127 @@
     else
         r = logicalDpiX() / 2.54;
+#ifdef Q_WS_S60
+        /*! \hack HACK: Solution graph on Symbian is visually larger than on
+     *   Windows Mobile. This coefficient makes it about the same size.
+     */
+    r /= 1.3;
+#endif
+
 qreal x, y;
     if (step != NULL)
@@ -1496 +1504 @@
     actionHelpAbout->setStatusTip(tr("About %1").arg(QCoreApplication::applicationName()));
 #endif // QT_NO_STATUSTIP
+
+#ifdef Q_WS_S60
+    actionRightSoftKey->setText(tr("E&xit"));
+#endif
 }
 
@@ -1599 +1611 @@
 #if defined(HANDHELD) && !defined(Q_WS_MAEMO_5)
 #ifdef Q_WS_S60
-    toolBarMain->setIconSize(QSize(logicalDpiX() / 5, logicalDpiY() / 5));
+    toolBarMain->setIconSize(QSize(logicalDpiX() / 5.2, logicalDpiY() / 5.2));
 #else
     toolBarMain->setIconSize(QSize(logicalDpiX() / 4, logicalDpiY() / 4));
@@ -1678 +1690 @@
 #endif // HANDHELD
 
+#ifdef Q_WS_S60
+    // Replace Exit on the right soft key with our own exit action.
+    // This makes it translatable.
+    actionRightSoftKey = new QAction(this);
+    actionRightSoftKey->setSoftKeyRole(QAction::NegativeSoftKey);
+    connect(actionRightSoftKey, SIGNAL(triggered()), SLOT(close()));
+    addAction(actionRightSoftKey);
+#endif
+
     retranslateUi(false);
 

trunk/src/mainwindow.h

@@ -112 +112 @@
 #endif // QT_NO_PRINTER
     QAction *actionHelpCheck4Updates;
+#ifdef Q_WS_S60
+    QAction *actionRightSoftKey;
+#endif
     QSettings *settings;
     CTSPModel *tspmodel;