Changeset 88a59e4d65 in tspsg

Timestamp:

Oct 5, 2010, 9:44:54 PM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

9adbc413c7

Parents:

97e90f9be6

git-author:

Oleksii Serdiuk <contacts@…> (10/05/10 21:44:54)

git-committer:

Oleksii Serdiuk <contacts@…> (06/29/12 19:45:58)

Message:

+ Added Online Support... and Report a Bug... menu entries.

• Some insignificant adjustments to the code.

Files:

• install.pri (modified) (1 diff)
• resources/desktop.qrc (modified) (2 diffs)
• resources/icons/128x128/applications-internet.png (added)
• resources/icons/128x128/tools-report-bug.png (added)
• src/mainwindow.cpp (modified) (22 diffs)
• src/mainwindow.h (modified) (1 diff)
• ui/mainwindow.ui (modified) (3 diffs)

install.pri

@@ -35 +35 @@
 #       l10n.path = $$PREFIX/share/TSPSG/l10n
         docs.path = $$PREFIX/share/doc/TSPSG-$$VERSION
-        apps.files = resources/tspsg.desktop
-        apps.path = $$PREFIX/share/applications/
+        desktop.files = resources/tspsg.desktop
+        desktop.path = $$PREFIX/share/applications
         icon.files = resources/tspsg.png
         icon.path = $$PREFIX/share/pixmaps
-        INSTALLS += apps icon
+        INSTALLS += desktop icon
 }
 

resources/desktop.qrc

@@ -5 +5 @@
         <file>icons/l10n/flag-ua.png</file>
         <file>icons/128x128/application-exit.png</file>
+        <file>icons/128x128/applications-internet.png</file>
         <file>icons/128x128/configure-toolbars.png</file>
         <file>icons/128x128/dialog-cancel.png</file>
@@ -24 +25 @@
         <file>icons/128x128/preferences-desktop-theme.png</file>
         <file>icons/128x128/preferences-system.png</file>
+        <file>icons/128x128/tools-report-bug.png</file>
         <file>icons/128x128/qtlogo.png</file>
         <file>icons/128x128/roll.png</file>

src/mainwindow.cpp

@@ -87 +87 @@
         connect(actionSettingsStyleSystem, SIGNAL(triggered(bool)), SLOT(actionSettingsStyleSystemTriggered(bool)));
         connect(groupSettingsStyleList, SIGNAL(triggered(QAction*)), SLOT(groupSettingsStyleListTriggered(QAction*)));
+        connect(actionHelpOnlineSupport, SIGNAL(triggered()), SLOT(actionHelpOnlineSupportTriggered()));
+        connect(actionHelpReportBug, SIGNAL(triggered()), SLOT(actionHelpReportBugTriggered()));
         connect(actionHelpAboutQt, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
         connect(actionHelpAbout, SIGNAL(triggered()), SLOT(actionHelpAboutTriggered()));
@@ -288 +290 @@
                         svg.setFileName(fi.path() + "/" + img);
                         svg.setTitle(tr("Solution Graph"));
-                        svg.setDescription(tr("Generated with %1").arg(QApplication::applicationName()));
+                        svg.setDescription(tr("Generated with %1").arg(QCoreApplication::applicationName()));
 QPainter p;
                         p.begin(&svg);
@@ -304 +306 @@
                         if (pic.supportsOption(QImageIOHandler::Description)) {
                                 pic.setText("Title", "Solution Graph");
-                                pic.setText("Software", QApplication::applicationName());
+                                pic.setText("Software", QCoreApplication::applicationName());
                         }
                         if (format == "png")
@@ -365 +367 @@
         if (checked) {
                 settings->remove("Language");
-                QMessageBox::information(this, tr("Language change"), tr("Language will be autodetected on the next %1 start.").arg(QApplication::applicationName()));
+                QMessageBox::information(this, tr("Language change"), tr("Language will be autodetected on the next %1 start.").arg(QCoreApplication::applicationName()));
         } else
                 settings->setValue("Language", groupSettingsLanguageList->checkedAction()->data().toString());
@@ -404 +406 @@
         if (checked) {
                 settings->remove("Style");
-                QMessageBox::information(this, tr("Style Change"), tr("To apply the default style you need to restart %1.").arg(QApplication::applicationName()));
+                QMessageBox::information(this, tr("Style Change"), tr("To apply the default style you need to restart %1.").arg(QCoreApplication::applicationName()));
         } else {
                 settings->setValue("Style", groupSettingsStyleList->checkedAction()->text());
@@ -452 +454 @@
 
 QString title;
-        title += QString("<b>%1</b><br>").arg(QApplication::applicationName());
-        title += QString("%1: <b>%2</b><br>").arg(tr("Version"), QApplication::applicationVersion());
+        title += QString("<b>%1</b><br>").arg(QCoreApplication::applicationName());
+        title += QString("%1: <b>%2</b><br>").arg(tr("Version"), QCoreApplication::applicationVersion());
 #ifndef HANDHELD
-        title += QString("<b>&copy; 2007-%1 <a href=\"http://%2/\">%3</a></b><br>").arg(QDate::currentDate().toString("yyyy"), QApplication::organizationDomain(), QApplication::organizationName());
+        title += QString("<b>&copy; 2007-%1 <a href=\"http://%2/\">%3</a></b><br>").arg(QDate::currentDate().toString("yyyy"), QCoreApplication::organizationDomain(), QCoreApplication::organizationName());
 #endif // HANDHELD
         title += QString("<b><a href=\"http://tspsg.info/\">http://tspsg.info/</a></b>");
@@ -505 +507 @@
         f.open(QIODevice::ReadOnly);
 
-QString translation = QApplication::translate("--------", "AUTHORS %1", "Please, provide translator credits here. %1 will be replaced with VERSION");
+QString translation = QCoreApplication::translate("--------", "AUTHORS %1", "Please, provide translator credits here. %1 will be replaced with VERSION");
         if ((translation != "AUTHORS %1") && (translation.contains("%1"))) {
-QString about = QApplication::translate("--------", "VERSION", "Please, provide your translation version here.");
+QString about = QCoreApplication::translate("--------", "VERSION", "Please, provide your translation version here.");
                 if (about != "VERSION")
                         translation = translation.arg(about);
@@ -516 +518 @@
         *lblTitle = new QLabel(dlg);
 #ifdef HANDHELD
-QLabel *lblSubTitle = new QLabel(QString("<b>&copy; 2007-%1 <a href=\"http://%2/\">%3</a></b>").arg(QDate::currentDate().toString("yyyy"), QApplication::organizationDomain(), QApplication::organizationName()), dlg);
+QLabel *lblSubTitle = new QLabel(QString("<b>&copy; 2007-%1 <a href=\"http://%2/\">%3</a></b>").arg(QDate::currentDate().toString("yyyy"), QCoreApplication::organizationDomain(), QCoreApplication::organizationName()), dlg);
 #endif // HANDHELD
 QTabWidget *tabs = new QTabWidget(dlg);
@@ -596 +598 @@
 
         dlg->setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
-        dlg->setWindowTitle(tr("About %1").arg(QApplication::applicationName()));
+        dlg->setWindowTitle(tr("About %1").arg(QCoreApplication::applicationName()));
         dlg->setWindowIcon(GET_ICON("help-about"));
         dlg->setLayout(vb);
@@ -654 +656 @@
 QPushButton *cancel = new QPushButton(&pd);
         cancel->setIcon(GET_ICON("dialog-cancel"));
-        cancel->setText(QApplication::translate("QProgressDialog", "Cancel", "No need to translate this. This translation will be taken from Qt translation files."));
+        cancel->setText(QCoreApplication::translate("QProgressDialog", "Cancel", "No need to translate this. This translation will be taken from Qt translation files."));
         pd.setCancelButton(cancel);
         pd.setMaximum(n);
@@ -713 +715 @@
                         tl->SetProgressState(winId(), TBPF_INDETERMINATE);
 #endif
-                QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+                QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 
 #ifndef QT_NO_CONCURRENT
 QFuture<void> f = QtConcurrent::run(&solver, &CTSPSolver::cleanup, false);
                 while (!f.isFinished()) {
-                        QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+                        QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
                 }
 #else
@@ -795 +797 @@
                         pd.setCancelButton(NULL);
                         pd.show();
-                        QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+                        QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 #ifdef Q_WS_WIN32
                         if (tl != NULL)
@@ -803 +805 @@
 QFuture<void> f = QtConcurrent::run(&solver, &CTSPSolver::cleanup, false);
                         while (!f.isFinished()) {
-                                QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+                                QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
                         }
 #else
@@ -927 +929 @@
         pd.setMaximum(0);
         pd.setCancelButton(NULL);
-        QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+        QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 #ifdef Q_WS_WIN32
         if (tl != NULL)
@@ -935 +937 @@
 QFuture<void> f = QtConcurrent::run(&solver, &CTSPSolver::cleanup, false);
         while (!f.isFinished()) {
-                QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+                QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
         }
 #else
@@ -1389 +1391 @@
                                 cur.insertText(isInteger(matrix.at(r).at(c)) ? QString("%1").arg(matrix.at(r).at(c)) : QString("%1").arg(matrix.at(r).at(c), 0, 'f', settings->value("Task/FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt()));
                 }
-                QApplication::processEvents();
+                QCoreApplication::processEvents();
         }
         cur.movePosition(QTextCursor::End);
@@ -1417 +1419 @@
                         }
                 }
-                QApplication::processEvents();
+                QCoreApplication::processEvents();
         }
 
@@ -1438 +1440 @@
 #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
 
@@ -1457 +1462 @@
 #endif // HANDHELD
 
+#ifndef QT_NO_STATUSTIP
+        actionHelpReportBug->setStatusTip(tr("Report about a bug in %1").arg(QCoreApplication::applicationName()));
+#endif // QT_NO_STATUSTIP
         if (actionHelpCheck4Updates != NULL) {
                 actionHelpCheck4Updates->setText(tr("Check for &Updates..."));
 #ifndef QT_NO_STATUSTIP
-                actionHelpCheck4Updates->setStatusTip(tr("Check for %1 updates").arg(QApplication::applicationName()));
+                actionHelpCheck4Updates->setStatusTip(tr("Check for %1 updates").arg(QCoreApplication::applicationName()));
 #endif // QT_NO_STATUSTIP
         }
+#ifndef QT_NO_STATUSTIP
+        actionHelpAbout->setStatusTip(tr("About %1").arg(QCoreApplication::applicationName()));
+#endif // QT_NO_STATUSTIP
 }
 
@@ -1497 +1508 @@
 {
         this->fileName = fileName;
-        setWindowTitle(QString("%1[*] - %2").arg(QFileInfo(fileName).completeBaseName()).arg(QApplication::applicationName()));
+        setWindowTitle(QString("%1[*] - %2").arg(QFileInfo(fileName).completeBaseName()).arg(QCoreApplication::applicationName()));
 }
 
@@ -1527 +1538 @@
         actionHelpContents->setIcon(GET_ICON("help-contents"));
         actionHelpContextual->setIcon(GET_ICON("help-contextual"));
+        actionHelpOnlineSupport->setIcon(GET_ICON("applications-internet"));
+        actionHelpReportBug->setIcon(GET_ICON("tools-report-bug"));
         actionHelpAbout->setIcon(GET_ICON("help-about"));
         actionHelpAboutQt->setIcon(QIcon(":/images/icons/"ICON_SIZE"/qtlogo."ICON_FORMAT));
@@ -1672 +1685 @@
 #endif // Q_WS_WIN32
 }
+
+void MainWindow::actionHelpOnlineSupportTriggered()
+{
+        QDesktopServices::openUrl(QUrl("http://tspsg.info/goto/support"));
+}
+
+void MainWindow::actionHelpReportBugTriggered()
+{
+        QDesktopServices::openUrl(QUrl("http://tspsg.info/goto/bugtracker"));
+}

src/mainwindow.h

@@ -74 +74 @@
         void actionSettingsToolbarsConfigureTriggered();
 #endif // HANDHELD
+        void actionHelpOnlineSupportTriggered();
+        void actionHelpReportBugTriggered();
         void actionHelpCheck4UpdatesTriggered();
         void actionHelpAboutTriggered();

ui/mainwindow.ui

@@ -299 +299 @@
     <addaction name="actionHelpContextual"/>
     <addaction name="separator"/>
+    <addaction name="actionHelpOnlineSupport"/>
+    <addaction name="actionHelpReportBug"/>
+    <addaction name="separator"/>
     <addaction name="actionHelpAboutQt"/>
     <addaction name="actionHelpAbout"/>
@@ -409 +412 @@
     <string>&amp;About TSPSG...</string>
    </property>
-   <property name="statusTip">
-    <string>About application</string>
-   </property>
   </action>
   <action name="actionFileExit">
    <property name="text">
     <string>E&amp;xit</string>
-   </property>
-   <property name="statusTip">
-    <string>Exit application</string>
    </property>
   </action>
@@ -503 +500 @@
    <property name="statusTip">
     <string>Automatically choose the most appropriate style</string>
+   </property>
+  </action>
+  <action name="actionHelpOnlineSupport">
+   <property name="text">
+    <string>Online &amp;Support...</string>
+   </property>
+   <property name="statusTip">
+    <string>Get support online</string>
+   </property>
+  </action>
+  <action name="actionHelpReportBug">
+   <property name="text">
+    <string>Report a &amp;Bug...</string>
    </property>
   </action>