Changeset 7ed8b57eea in tspsg

Timestamp:

Aug 31, 2013, 11:52:34 PM (11 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

2a5e50e0a9

Parents:

1241232377

Message:

[BB10] UI fixes:

• added proxy style and stylesheet to fix some UI issues on BlackBerry?;
• removed style selection option because most styles have UI issues and removed About Qt menu item because About Qt dialog is too big;
• load bigger (128x128) icons on BlackBerry? 10;
• removed printing related items from menu as there's no printer;
• made dialogs to be shown maximized;
• made solution graph smaller;
• made font smaller;
• made output text color black;
• start editing table cells on single tap;
• don't show keyboard in about dialog.

Cherry-picks from
aa64ad40827cde0a444cd8198b0f3457aa191f8f
95b0ef73dcb4517ac2ae08867494204bbe8d7ea6
ccdffe3a5f84f12fba2e2f19ab249c31f1fcf35d
628500a5d687889823197e476953859d529af4f0

Files:

• src/bb10proxystyle.cpp (added)
• src/bb10proxystyle.h (added)
• src/defaults.h (modified) (2 diffs)
• src/globals.h (modified) (1 diff)
• src/main.cpp (modified) (3 diffs)
• src/mainwindow.cpp (modified) (17 diffs)
• src/mainwindow.h (modified) (2 diffs)
• src/settingsdialog.cpp (modified) (1 diff)
• tspsg.pri (modified) (2 diffs)
• tspsg.pro (modified) (1 diff)

src/defaults.h

@@ -86 +86 @@
 //! Default for "Embed solution graph into HTML"
 #define DEF_EMBED_GRAPH_INTO_HTML false
-//! Default solution graph size in centimeters (HQ size is this size * HQ_FACTOR)
-#define DEF_GRAPH_WIDTH 4.5
+/*!
+ * \def DEF_GRAPH_WIDTH
+ * \brief Default solution graph size in centimeters (HQ size is this size * HQ_FACTOR)
+ */
+#ifdef Q_OS_BLACKBERRY
+#   define DEF_GRAPH_WIDTH 2.5
+#else
+#   define DEF_GRAPH_WIDTH 4.5
+#endif
 //! Default for "Show solution steps' matrices for every solution step"
 #define DEF_SHOW_MATRIX true
@@ -104 +111 @@
 #ifdef Q_OS_SYMBIAN
 #   define DEF_FONT_SIZE 8
+#elif defined(Q_OS_BLACKBERRY)
+#   define DEF_FONT_SIZE 7
 #else
 #   define DEF_FONT_SIZE 10
 #endif // Q_OS_SYMBIAN
-//! Default solution text color
-#define DEF_TEXT_COLOR QApplication::palette().color(QPalette::Text)
+/*!
+ * \def DEF_TEXT_COLOR
+ * \brief Default solution text color
+ */
+#ifdef Q_OS_BLACKBERRY
+#   define DEF_TEXT_COLOR Qt::black
+#else
+#   define DEF_TEXT_COLOR QApplication::palette().color(QPalette::Text)
+#endif
 //! Default selected candidate color
 #define DEF_SELECTED_COLOR "#008000"

src/globals.h

@@ -120 +120 @@
 #ifndef DOXYGEN_EXCLUDE
 
-#ifdef HANDHELD
+#if defined(HANDHELD) && !defined(Q_OS_BLACKBERRY)
 #   define ICON_SIZE "48x48"
 #   define ICON_FORMAT "png"

src/main.cpp

@@ -23 +23 @@
 
 #include "mainwindow.h"
+#include "version.h"
+
+#ifdef Q_OS_BLACKBERRY
+#   include "bb10proxystyle.h"
+#endif // Q_OS_BLACKBERRY
 
 #include <QDateTime>
@@ -28 +33 @@
 #include <QTextCodec>
 #include <QTranslator>
-#include "version.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(4,6,0)
@@ -64 +68 @@
     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

@@ -149 +149 @@
     setAcceptDrops(true);
 
+#ifdef Q_OS_BLACKBERRY
+    taskView->setEditTriggers(QAbstractItemView::AllEditTriggers);
+#endif
+
     initDocStyleSheet();
 
@@ -182 +186 @@
     connect(actionFileSaveAsTask, SIGNAL(triggered()), SLOT(actionFileSaveAsTaskTriggered()));
     connect(actionFileSaveAsSolution, SIGNAL(triggered()), SLOT(actionFileSaveAsSolutionTriggered()));
-#ifndef QT_NO_PRINTER
+#ifndef QT_NO_PRINTDIALOG
     connect(actionFilePrintPreview, SIGNAL(triggered()), SLOT(actionFilePrintPreviewTriggered()));
     connect(actionFilePageSetup, SIGNAL(triggered()), SLOT(actionFilePageSetupTriggered()));
@@ -483 +487 @@
 }
 
-#ifndef QT_NO_PRINTER
+#ifndef QT_NO_PRINTDIALOG
 void MainWindow::actionFilePrintPreviewTriggered()
 {
@@ -541 +545 @@
     QApplication::restoreOverrideCursor();
 }
-#endif // QT_NO_PRINTER
+#endif // QT_NO_PRINTDIALOG
 
 void MainWindow::actionSettingsPreferencesTriggered()
@@ -744 +748 @@
     txtAbout->moveCursor(QTextCursor::Start);
     txtAbout->setFrameShape(QFrame::NoFrame);
+#ifdef Q_OS_BLACKBERRY
+    txtAbout->setAttribute(Qt::WA_InputMethodEnabled, false);
+#endif
 
 //      txtCredits->setWordWrapMode(QTextOption::NoWrap);
@@ -750 +757 @@
     txtCredits->moveCursor(QTextCursor::Start);
     txtCredits->setFrameShape(QFrame::NoFrame);
+#ifdef Q_OS_BLACKBERRY
+    txtCredits->setAttribute(Qt::WA_InputMethodEnabled, false);
+#endif
 
     txtLicense->setWordWrapMode(QTextOption::NoWrap);
@@ -756 +766 @@
     txtLicense->moveCursor(QTextCursor::Start);
     txtLicense->setFrameShape(QFrame::NoFrame);
+#ifdef Q_OS_BLACKBERRY
+    txtLicense->setAttribute(Qt::WA_InputMethodEnabled, false);
+#endif
 
     bb->button(QDialogButtonBox::Ok)->setCursor(QCursor(Qt::PointingHandCursor));
@@ -807 +820 @@
 #ifndef HANDHELD
     dlg->resize(450, 350);
-#elif defined(Q_OS_SYMBIAN)
+#elif defined(Q_OS_SYMBIAN) || defined(Q_OS_BLACKBERRY)
     dlg->setWindowState(Qt::WindowMaximized);
 #endif
@@ -857 +870 @@
     pd.setCancelButton(cancel);
     pd.setMaximum(n);
+    pd.setAutoClose(false);
     pd.setAutoReset(false);
     pd.setLabelText(tr("Calculating optimal route..."));
@@ -1737 +1751 @@
         Ui_MainWindow::retranslateUi(this);
 
+#ifdef Q_OS_BLACKBERRY
+    menuSettings->removeAction(menuSettingsStyle->menuAction());
+#else
     loadStyleList();
+#endif
     loadToolbarList();
 
-#ifndef QT_NO_PRINTER
+#ifndef QT_NO_PRINTDIALOG
     actionFilePrintPreview->setText(tr("P&rint Preview..."));
 #ifndef QT_NO_TOOLTIP
@@ -1764 +1782 @@
     actionFilePrint->setStatusTip(tr("Print current solution results"));
 #endif // QT_NO_STATUSTIP
+#ifndef QT_NO_SHORTCUT
     actionFilePrint->setShortcut(tr("Ctrl+P"));
-#endif // QT_NO_PRINTER
+#endif // QT_NO_SHORTCUT
+#endif // QT_NO_PRINTDIALOG
 
 #ifndef QT_NO_STATUSTIP
@@ -1846 +1866 @@
     actionFileOpen->setIcon(GET_ICON("document-open"));
     actionFileSave->setIcon(GET_ICON("document-save"));
-#ifndef HANDHELD
+#if !defined(HANDHELD) || defined(Q_OS_BLACKBERRY)
     menuFileSaveAs->setIcon(GET_ICON("document-save-as"));
 #endif
     actionFileExit->setIcon(GET_ICON("application-exit"));
     // Settings Menu
-#ifndef HANDHELD
+#if !defined(HANDHELD) || defined(Q_OS_BLACKBERRY)
     menuSettingsLanguage->setIcon(GET_ICON("preferences-desktop-locale"));
 #if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
@@ -1862 +1882 @@
     actionSettingsPreferences->setIcon(GET_ICON("preferences-system"));
     // Help Menu
-#ifndef HANDHELD
+#if !defined(HANDHELD) || defined(Q_OS_BLACKBERRY)
     actionHelpContents->setIcon(GET_ICON("help-contents"));
     actionHelpContextual->setIcon(GET_ICON("help-contextual"));
@@ -1868 +1888 @@
     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 // Q_OS_BLACKBERRY
 #if QT_VERSION < QT_VERSION_CHECK(5,0,0)
     actionHelpAboutQt->setIcon(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"));
-#else
+#else // QT_VERSION < QT_VERSION_CHECK(5,0,0)
     actionHelpAboutQt->setIcon(QIcon(":/qt-project.org/qmessagebox/images/qtlogo-64.png"));
 #endif // QT_VERSION < QT_VERSION_CHECK(5,0,0)
+#endif // Q_OS_BLACKBERRY
 #endif // HANDHELD
     // Buttons
@@ -1922 +1948 @@
     solutionText->setWordWrapMode(QTextOption::WordWrap);
 
-#ifndef QT_NO_PRINTER
+#ifndef QT_NO_PRINTDIALOG
     actionFilePrintPreview = new QAction(this);
     actionFilePrintPreview->setObjectName("actionFilePrintPreview");
@@ -1948 +1974 @@
 
     toolBarMain->insertAction(actionSettingsPreferences, actionFilePrint);
-#endif // QT_NO_PRINTER
+#endif // QT_NO_PRINTDIALOG
 
     groupSettingsLanguageList = new QActionGroup(this);
@@ -2021 +2047 @@
     actionFileSaveAsSolution->setEnabled(enable);
     solutionText->setEnabled(enable);
-#ifndef QT_NO_PRINTER
+#ifndef QT_NO_PRINTDIALOG
     actionFilePrint->setEnabled(enable);
     actionFilePrintPreview->setEnabled(enable);
-#endif // QT_NO_PRINTER
+#endif // QT_NO_PRINTDIALOG
 }
 

src/mainwindow.h

@@ -71 +71 @@
     void actionFileSaveAsTaskTriggered();
     void actionFileSaveAsSolutionTriggered();
-#ifndef QT_NO_PRINTER
+#ifndef QT_NO_PRINTDIALOG
     void actionFilePrintPreviewTriggered();
     void actionFilePageSetupTriggered();
     void actionFilePrintTriggered();
-#endif // QT_NO_PRINTER
+#endif // QT_NO_PRINTDIALOG
     void actionSettingsPreferencesTriggered();
     void actionSettingsLanguageAutodetectTriggered(bool checked);
@@ -118 +118 @@
 #ifndef QT_NO_PRINTER
     QPrinter *printer;
+#ifndef QT_NO_PRINTDIALOG
     QAction *actionFilePrintPreview;
     QAction *actionFilePageSetup;
     QAction *actionFilePrint;
+#endif // QT_NO_PRINTDIALOG
 #endif // QT_NO_PRINTER
     QAction *actionHelpCheck4Updates;

src/settingsdialog.cpp

@@ -546 +546 @@
 void SettingsDialog::buttonFontClicked()
 {
-bool ok;
-QFont font = QFontDialog::getFont(&ok, this->font, this);
-    if (ok && (this->font != font)) {
-        this->font = font;
-        QFont f = font;
-        f.setPointSize(labelFontExample->font().pointSize());
-        labelFontExample->setFont(f);
-        labelFontExample->setText(font.family());
-        _fontChanged = true;
-    }
+    QFont newFont;
+#ifdef Q_OS_BLACKBERRY
+    QFontDialog fd(font, this);
+    fd.setWindowState(Qt::WindowMaximized);
+    if ((fd.exec() != QDialog::Accepted) || (fd.selectedFont() == font))
+        return;
+    newFont = fd.selectedFont();
+#else
+    bool ok;
+    newFont = QFontDialog::getFont(&ok, font, this);
+    if (!ok || (font == newFont))
+        return;
+#endif
+    font = newFont;
+    QFont f = font;
+    f.setPointSize(labelFontExample->font().pointSize());
+    labelFontExample->setFont(f);
+    labelFontExample->setText(font.family());
+    _fontChanged = true;
 }
 

tspsg.pri

@@ -32 +32 @@
     src/qtwin.cpp
 
+blackberry {
+    HEADERS += src/bb10proxystyle.h
+    SOURCES += src/bb10proxystyle.cpp
+}
+
 #Forms
 FORMS += ui/mainwindow.ui \
@@ -40 +45 @@
     l10n/l10n.qrc
 
-handheld {
+blackberry {
+    RESOURCES += resources/desktop.qrc
+} else:handheld {
     RESOURCES += resources/handheld.qrc
 } else {

tspsg.pro

@@ -23 +23 @@
 wincewm*|symbian|maemo*|simulator|blackberry {
     CONFIG += handheld
+}
+blackberry {
+#    DEFINES += QT_NO_SHORTCUT
+    DEFINES += QT_NO_PRINTDIALOG
+    DEFINES += QT_NO_PRINTPREVIEWDIALOG
 }