Changeset aa64ad4082 in tspsg

Timestamp:

Mar 31, 2013, 2:18:22 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.4.170-beta2-bb10

Children:

95b0ef73dc

Parents:

0edec5a2ae

git-author:

Oleksii Serdiuk <contacts@…> (03/31/13 14:18:22)

git-committer:

Oleksii Serdiuk <contacts@…> (03/31/13 15:41:08)

Message:

Added proxy style and stylesheet to fix some UI issues on BlackBerry?.

Also, removed style selection option because most styles have UI issues
and removed About Qt menu item because About Qt dialog is too big.

Files:

• src/bb10proxystyle.cpp (added)
• src/bb10proxystyle.h (added)
• src/main.cpp (modified) (2 diffs)
• src/mainwindow.cpp (modified) (2 diffs)
• tspsg.pri (modified) (1 diff)

src/main.cpp

@@ -23 +23 @@
 
 #include "mainwindow.h"
+#ifdef Q_OS_BLACKBERRY
+#   include "bb10proxystyle.h"
+#endif // Q_OS_BLACKBERRY
+
 #if QT_VERSION < 0x040600
 #   ifdef Q_CC_MSVC
@@ -55 +59 @@
     app.setApplicationName("TSP Solver and Generator");
     app.setApplicationVersion(BUILD_VERSION);
+
+#ifdef Q_OS_BLACKBERRY
+    QApplication::setStartDragDistance(42);
+    QApplication::setStyle(new BB10ProxyStyle);
+    app.setStyleSheet(CSS_FIX);
+#endif // Q_OS_BLACKBERRY
 
     // Seeding random number generator

src/mainwindow.cpp

@@ -1542 +1542 @@
         Ui_MainWindow::retranslateUi(this);
 
+#ifdef Q_OS_BLACKBERRY
+    menuSettings->removeAction(menuSettingsStyle->menuAction());
+#else
     loadStyleList();
+#endif
     loadToolbarList();
 
@@ -1669 +1673 @@
     actionHelpReportBug->setIcon(GET_ICON("tools-report-bug"));
     actionHelpAbout->setIcon(GET_ICON("help-about"));
+#ifdef Q_OS_BLACKBERRY
+    // Qt about dialog is too big for the screen
+    // and it's impossible to close it.
+    menuHelp->removeAction(actionHelpAboutQt);
+#else
     actionHelpAboutQt->setIcon(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"));
+#endif
 #endif
     // Buttons

tspsg.pri

@@ -31 +31 @@
     src/tspsolver.cpp \
     src/qtwin.cpp
+
+blackberry {
+    HEADERS += src/bb10proxystyle.h
+    SOURCES += src/bb10proxystyle.cpp
+}
 
 #Forms