Changeset 139 in tspsg-svn

Timestamp:

Sep 29, 2010, 11:21:46 PM (14 years ago)

Author:

laleppa

Message:

+ Automatically check for updates at the given interval functionality (Windows only at this moment).

Location:

trunk

Files:

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

trunk/src/defaults.h

@@ -42 +42 @@
  * \brief Default for "Use native file dialog".
  */
-#ifdef Q_OS_WINCE
+#ifdef Q_OS_WINCE_WM
         #define DEF_USE_NATIVE_DIALOGS false
 #else
@@ -51 +51 @@
 //! Default for "Use translucency effects in Vista/7"
 #define DEF_USE_TRANSLUCENCY true
+//! Default for "Check for updates"
+#define DEF_CHECK_FOR_UPDATES false
+//! Default update check interval (in days)
+#define DEF_UPDATE_CHECK_INTERVAL 30
 
 //////// TASK

trunk/src/globals.h

@@ -114 +114 @@
 }
 
+/*!
+ * \brief Checks whether the updater app is installed/available.
+ * \return \c true if updater app is available, oherwise \c false.
+ * \note The updater app is only available under Windows at this moment.
+ *  On other systems this function always returns \c false.
+ */
+inline bool hasUpdater()
+{
+#ifdef Q_OS_WIN32
+        return QFile::exists("updater/Update.exe");
+#else // Q_OS_WIN32
+        return false;
+#endif // Q_OS_WIN32
+}
+
 #ifdef Q_OS_WIN32
 /*!

trunk/src/main.cpp

@@ -37 +37 @@
 //              Q_IMPORT_PLUGIN(qsvgicon)
 //      #endif
-//      Q_IMPORT_PLUGIN(qjpeg)
-//      Q_IMPORT_PLUGIN(qtiff)
 //#endif
 

trunk/src/mainwindow.cpp

@@ -81 +81 @@
 #endif // HANDHELD
         connect(actionSettingsPreferences, SIGNAL(triggered()), SLOT(actionSettingsPreferencesTriggered()));
-#ifdef Q_OS_WIN32
-        connect(actionHelpCheck4Updates, SIGNAL(triggered()), SLOT(actionHelpCheck4UpdatesTriggered()));
-#endif // Q_OS_WIN32
+        if (actionHelpCheck4Updates != NULL)
+                connect(actionHelpCheck4Updates, SIGNAL(triggered()), SLOT(actionHelpCheck4UpdatesTriggered()));
         connect(actionSettingsLanguageAutodetect, SIGNAL(triggered(bool)), SLOT(actionSettingsLanguageAutodetectTriggered(bool)));
         connect(groupSettingsLanguageList, SIGNAL(triggered(QAction *)), SLOT(groupSettingsLanguageListTriggered(QAction *)));
@@ -123 +122 @@
         }
         setWindowModified(false);
+
+        if ((actionHelpCheck4Updates != NULL)
+                && (settings->value("Check4Updates/Enabled", DEF_CHECK_FOR_UPDATES).toBool())
+                && (QDate(qvariant_cast<QDate>(settings->value("Check4Updates/LastAttempt"))).daysTo(QDate::currentDate()) >= settings->value("Check4Updates/Interval", DEF_UPDATE_CHECK_INTERVAL).toInt())) {
+                check4Updates(true);
+        }
 }
 
@@ -430 +435 @@
 #endif // HANDHELD
 
-#ifdef Q_OS_WIN32
 void MainWindow::actionHelpCheck4UpdatesTriggered()
 {
@@ -438 +442 @@
         }
 
-        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-        QProcess::execute("updater/Update.exe -name=\"TSPSG: TSP Solver and Generator\" -check=\"freeupdate\"");
-        QApplication::restoreOverrideCursor();
-}
-#endif // Q_OS_WIN32
+        check4Updates();
+}
 
 void MainWindow::actionHelpAboutTriggered()
@@ -1040 +1041 @@
 }
 
+void MainWindow::check4Updates(bool silent)
+{
+#ifdef Q_OS_WIN32
+        if (silent)
+                QProcess::startDetached("updater/Update.exe -name=\"TSPSG: TSP Solver and Generator\" -check=\"freeupdate\" -silentcheck");
+        else {
+                QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+                QProcess::execute("updater/Update.exe -name=\"TSPSG: TSP Solver and Generator\" -check=\"freeupdate\"");
+                QApplication::restoreOverrideCursor();
+        }
+#endif
+        settings->setValue("Check4Updates/LastAttempt", QDate::currentDate().toString(Qt::ISODate));
+}
+
 void MainWindow::closeEvent(QCloseEvent *ev)
 {
@@ -1141 +1156 @@
                 ev->accept();
         }
-}
-
-bool MainWindow::hasUpdater() const
-{
-#ifdef Q_OS_WIN32
-        return QFile::exists("updater/Update.exe");
-#else // Q_OS_WIN32
-        return false;
-#endif // Q_OS_WIN32
 }
 
@@ -1444 +1450 @@
 #endif // HANDHELD
 
-#ifdef Q_OS_WIN32
-        actionHelpCheck4Updates->setText(tr("Check for &Updates..."));
+        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(QApplication::applicationName()));
 #endif // QT_NO_STATUSTIP
-#endif // Q_OS_WIN32
+        }
 }
 
@@ -1593 +1599 @@
 #endif // HANDHELD
 
-#ifdef Q_OS_WIN32
-        actionHelpCheck4Updates = new QAction(this);
-        actionHelpCheck4Updates->setIcon(GET_ICON("system-software-update"));
-        actionHelpCheck4Updates->setEnabled(hasUpdater());
-        menuHelp->insertAction(actionHelpAboutQt, actionHelpCheck4Updates);
-        menuHelp->insertSeparator(actionHelpAboutQt);
-#endif // Q_OS_WIN32
+        if (hasUpdater()) {
+                actionHelpCheck4Updates = new QAction(this);
+                actionHelpCheck4Updates->setIcon(GET_ICON("system-software-update"));
+                actionHelpCheck4Updates->setEnabled(hasUpdater());
+                menuHelp->insertAction(actionHelpAboutQt, actionHelpCheck4Updates);
+                menuHelp->insertSeparator(actionHelpAboutQt);
+        } else
+                actionHelpCheck4Updates = NULL;
 
         spinCities->setMaximum(MAX_NUM_CITIES);

trunk/src/mainwindow.h

@@ -74 +74 @@
         void actionSettingsToolbarsConfigureTriggered();
 #endif // HANDHELD
-#ifdef Q_OS_WIN32
         void actionHelpCheck4UpdatesTriggered();
-#endif // Q_OS_WIN32
         void actionHelpAboutTriggered();
 // Buttons
@@ -111 +109 @@
         QAction *actionFilePrint;
 #endif // QT_NO_PRINTER
-#ifdef Q_OS_WIN32
         QAction *actionHelpCheck4Updates;
-#endif // Q_OS_WIN32
         QSettings *settings;
         CTSPModel *tspmodel;
@@ -136 +132 @@
                 fmt_altlist;
 
+        void check4Updates(bool silent = false);
         void closeEvent(QCloseEvent *ev);
         void dragEnterEvent(QDragEnterEvent *ev);
         void drawNode(QPainter &pic, int nstep, bool left = false, SStep *step = NULL);
         void dropEvent(QDropEvent *ev);
-        bool hasUpdater() const;
         void initDocStyleSheet();
         void loadLangList();

trunk/src/settingsdialog.cpp

@@ -72 +72 @@
         connect(cbShowGraph, SIGNAL(toggled(bool)), cbHQGraph, SLOT(setEnabled(bool)));
 #endif
+
+        if (hasUpdater()) {
+                cbCheck4Updates = new QCheckBox(bgWhite);
+                cbCheck4Updates->setObjectName("cbCheck4Updates");
+#ifndef QT_NO_STATUSTIP
+                cbCheck4Updates->setStatusTip(tr("Automatically check for updates at the given interval"));
+#endif // QT_NO_STATUSTIP
+                cbCheck4Updates->setText(tr("Check for updates every"));
+                cbCheck4Updates->setCursor(QCursor(Qt::PointingHandCursor));
+
+                spinUpdateCheckInterval = new QSpinBox(bgWhite);
+                spinUpdateCheckInterval->setObjectName("spinUpdateCheckInterval");
+#ifndef QT_NO_STATUSTIP
+                spinUpdateCheckInterval->setStatusTip(tr("Minimal interval at which to check for updates"));
+#endif // QT_NO_STATUSTIP
+                spinUpdateCheckInterval->setSuffix(tr(" days", "Don't forget a space at the beginning!"));
+                spinUpdateCheckInterval->setRange(1, 365);
+                spinUpdateCheckInterval->setCursor(QCursor(Qt::PointingHandCursor));
+
+                connect(cbCheck4Updates, SIGNAL(toggled(bool)), spinUpdateCheckInterval, SLOT(setEnabled(bool)));
+
+                box = static_cast<QBoxLayout *>(tabGeneral->layout());
+                hbox1 = new QHBoxLayout();
+                hbox1->setSpacing(0);
+                hbox1->addWidget(cbCheck4Updates);
+                hbox1->addWidget(spinUpdateCheckInterval);
+                hbox1->addStretch();
+                box->insertLayout(box->indexOf(cbUseNativeDialogs) + 1, hbox1);
+        } else
+                cbCheck4Updates = NULL;
 
 #ifdef HANDHELD
@@ -209 +239 @@
         cbSaveState->setChecked(settings->value("SavePos", DEF_SAVEPOS).toBool());
 #endif // HANDHELD
+        if (cbCheck4Updates != NULL) {
+                settings->beginGroup("Check4Updates");
+                cbCheck4Updates->setChecked(settings->value("Enabled", DEF_CHECK_FOR_UPDATES).toBool());
+                spinUpdateCheckInterval->setValue(settings->value("Interval", DEF_UPDATE_CHECK_INTERVAL).toInt());
+                settings->endGroup();
+                spinUpdateCheckInterval->setEnabled(cbCheck4Updates->isChecked());
+        }
 
         settings->beginGroup("Task");
@@ -231 +268 @@
         comboGraphImageFormat->addItem("svg");
 #endif // NOSVG && QT_VERSION >= 0x040500
-// We create a whitelist of formats, supported by the most popular web browsers according to
-//  http://en.wikipedia.org/wiki/Comparison_of_web_browsers#Image_format_support
-//  + TIFF format (there are plugins to support it).
+        // We create whitelist of formats, supported by the most popular web browsers according to
+        //  http://en.wikipedia.org/wiki/Comparison_of_web_browsers#Image_format_support
+        //  + TIFF format (there are plugins to support it).
 QStringList whitelist;
         whitelist << "bmp" << "jpeg" << "png" << "tiff" << "xbm";
@@ -327 +364 @@
         settings->setValue("SavePos", cbSaveState->isChecked());
 #endif // HANDHELD
+        if (cbCheck4Updates != NULL) {
+                settings->beginGroup("Check4Updates");
+                settings->setValue("Enabled", cbCheck4Updates->isChecked());
+                if (cbCheck4Updates->isChecked())
+                        settings->setValue("Interval", spinUpdateCheckInterval->value());
+                settings->endGroup();
+        }
 
         settings->beginGroup("Task");

trunk/src/settingsdialog.h

@@ -59 +59 @@
         QCheckBox *cbUseTranslucency;
 #endif // Q_OS_WIN32
+        QCheckBox *cbCheck4Updates;
+        QSpinBox *spinUpdateCheckInterval;
 #ifndef QT_NO_PRINTER
         QCheckBox *cbHQGraph;

trunk/tspsg.pri

@@ -4 +4 @@
 #  Copyright (C) 2007-2010 Lёppa <contacts[at]oleksii[dot]name>
 #
-#  $Id$
-#  $URL$
+#  $Id: tspsg.pri 137 2010-09-15 14:57:37Z laleppa $
+#  $URL: https://svn.tspsg.info/svnroot/tspsg/trunk/tspsg.pri $
 #
 #  This file is part of TSPSG.
@@ -46 +46 @@
 }
 
+win* {
+        RC_FILE = resources/tspsg.rc
+}
+
 #Translations
 CODECFORTR = UTF-8
@@ -60 +64 @@
         HEADERS += src/_.h
 }
+

trunk/tspsg.pro

@@ -20 +20 @@
 
 # QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk
+
+# Version information
+QMAKE_TARGET_COMPANY = Oleksii "Lёppa" Serdiuk
+QMAKE_TARGET_PRODUCT = TSP Solver and Generator
+QMAKE_TARGET_DESCRIPTION = TSPSG: TSP Solver and Generator
+QMAKE_TARGET_COPYRIGHT = Copyright © 2007-2010 Oleksii "Lёppa" Serdiuk <contacts[at]oleksii[dot]name>
 
 # Versioning
@@ -64 +70 @@
         # We "embed" SVG icon, JPEG and TIFF support on static build
         DEFINES += STATIC_BUILD
-#       QTPLUGIN += qjpeg qtiff
 #       !nosvg:QTPLUGIN += qsvgicon
 }