Changeset 628500a5d6 in tspsg

Timestamp:

Mar 31, 2013, 9:25:38 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.4.170-beta2-bb10

Children:

c039ebbe82

Parents:

ccdffe3a5f

git-author:

Oleksii Serdiuk <contacts@…> (03/31/13 21:25:38)

git-committer:

Oleksii Serdiuk <contacts@…> (03/31/13 21:46:09)

Message:

UI fixes:

• made graph smaller;
• made font smaller;
• made output text color black;
• start editing table cells on single tap;
• don't show keyboard in about dialog.

Location:

src

Files:

• defaults.h (modified) (2 diffs)
• mainwindow.cpp (modified) (5 diffs)

src/defaults.h

@@ -87 +87 @@
 #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
+#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 +108 @@
 #ifdef Q_WS_S60
 #   define DEF_FONT_SIZE 8
+#elif defined(Q_OS_BLACKBERRY)
+#   define DEF_FONT_SIZE 7
 #else
 #   define DEF_FONT_SIZE 10
 #endif // Q_WS_S60
 //! Default text color
-#define DEF_TEXT_COLOR QPalette().color(QPalette::Text)
+#ifdef Q_OS_BLACKBERRY
+#   define DEF_TEXT_COLOR Qt::black
+#else
+#   define DEF_TEXT_COLOR QPalette().color(QPalette::Text)
+#endif
 //! Default selected candidate color
 #define DEF_SELECTED_COLOR QColor(0x008000)

src/mainwindow.cpp

@@ -56 +56 @@
     setupUi();
     setAcceptDrops(true);
+
+#ifdef Q_OS_BLACKBERRY
+    taskView->setEditTriggers(QAbstractItemView::AllEditTriggers);
+#endif
 
     initDocStyleSheet();
@@ -630 +634 @@
     txtAbout->moveCursor(QTextCursor::Start);
     txtAbout->setFrameShape(QFrame::NoFrame);
+#ifdef Q_OS_BLACKBERRY
+    txtAbout->setAttribute(Qt::WA_InputMethodEnabled, false);
+#endif
 
 //      txtCredits->setWordWrapMode(QTextOption::NoWrap);
@@ -636 +643 @@
     txtCredits->moveCursor(QTextCursor::Start);
     txtCredits->setFrameShape(QFrame::NoFrame);
+#ifdef Q_OS_BLACKBERRY
+    txtCredits->setAttribute(Qt::WA_InputMethodEnabled, false);
+#endif
 
     txtLicense->setWordWrapMode(QTextOption::NoWrap);
@@ -642 +652 @@
     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));
@@ -743 +756 @@
     pd.setCancelButton(cancel);
     pd.setMaximum(n);
+    pd.setAutoClose(false);
     pd.setAutoReset(false);
     pd.setLabelText(tr("Calculating optimal route..."));