Changeset 139 in tspsg-svn for trunk/src/mainwindow.cpp
- Timestamp:
- Sep 29, 2010, 11:21:46 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/mainwindow.cpp
r138 r139 81 81 #endif // HANDHELD 82 82 connect(actionSettingsPreferences, SIGNAL(triggered()), SLOT(actionSettingsPreferencesTriggered())); 83 #ifdef Q_OS_WIN32 84 connect(actionHelpCheck4Updates, SIGNAL(triggered()), SLOT(actionHelpCheck4UpdatesTriggered())); 85 #endif // Q_OS_WIN32 83 if (actionHelpCheck4Updates != NULL) 84 connect(actionHelpCheck4Updates, SIGNAL(triggered()), SLOT(actionHelpCheck4UpdatesTriggered())); 86 85 connect(actionSettingsLanguageAutodetect, SIGNAL(triggered(bool)), SLOT(actionSettingsLanguageAutodetectTriggered(bool))); 87 86 connect(groupSettingsLanguageList, SIGNAL(triggered(QAction *)), SLOT(groupSettingsLanguageListTriggered(QAction *))); … … 123 122 } 124 123 setWindowModified(false); 124 125 if ((actionHelpCheck4Updates != NULL) 126 && (settings->value("Check4Updates/Enabled", DEF_CHECK_FOR_UPDATES).toBool()) 127 && (QDate(qvariant_cast<QDate>(settings->value("Check4Updates/LastAttempt"))).daysTo(QDate::currentDate()) >= settings->value("Check4Updates/Interval", DEF_UPDATE_CHECK_INTERVAL).toInt())) { 128 check4Updates(true); 129 } 125 130 } 126 131 … … 430 435 #endif // HANDHELD 431 436 432 #ifdef Q_OS_WIN32433 437 void MainWindow::actionHelpCheck4UpdatesTriggered() 434 438 { … … 438 442 } 439 443 440 QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); 441 QProcess::execute("updater/Update.exe -name=\"TSPSG: TSP Solver and Generator\" -check=\"freeupdate\""); 442 QApplication::restoreOverrideCursor(); 443 } 444 #endif // Q_OS_WIN32 444 check4Updates(); 445 } 445 446 446 447 void MainWindow::actionHelpAboutTriggered() … … 1040 1041 } 1041 1042 1043 void MainWindow::check4Updates(bool silent) 1044 { 1045 #ifdef Q_OS_WIN32 1046 if (silent) 1047 QProcess::startDetached("updater/Update.exe -name=\"TSPSG: TSP Solver and Generator\" -check=\"freeupdate\" -silentcheck"); 1048 else { 1049 QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); 1050 QProcess::execute("updater/Update.exe -name=\"TSPSG: TSP Solver and Generator\" -check=\"freeupdate\""); 1051 QApplication::restoreOverrideCursor(); 1052 } 1053 #endif 1054 settings->setValue("Check4Updates/LastAttempt", QDate::currentDate().toString(Qt::ISODate)); 1055 } 1056 1042 1057 void MainWindow::closeEvent(QCloseEvent *ev) 1043 1058 { … … 1141 1156 ev->accept(); 1142 1157 } 1143 }1144 1145 bool MainWindow::hasUpdater() const1146 {1147 #ifdef Q_OS_WIN321148 return QFile::exists("updater/Update.exe");1149 #else // Q_OS_WIN321150 return false;1151 #endif // Q_OS_WIN321152 1158 } 1153 1159 … … 1444 1450 #endif // HANDHELD 1445 1451 1446 #ifdef Q_OS_WIN32 1447 actionHelpCheck4Updates->setText(tr("Check for &Updates..."));1452 if (actionHelpCheck4Updates != NULL) { 1453 actionHelpCheck4Updates->setText(tr("Check for &Updates...")); 1448 1454 #ifndef QT_NO_STATUSTIP 1449 actionHelpCheck4Updates->setStatusTip(tr("Check for %1 updates").arg(QApplication::applicationName()));1455 actionHelpCheck4Updates->setStatusTip(tr("Check for %1 updates").arg(QApplication::applicationName())); 1450 1456 #endif // QT_NO_STATUSTIP 1451 #endif // Q_OS_WIN32 1457 } 1452 1458 } 1453 1459 … … 1593 1599 #endif // HANDHELD 1594 1600 1595 #ifdef Q_OS_WIN32 1596 actionHelpCheck4Updates = new QAction(this); 1597 actionHelpCheck4Updates->setIcon(GET_ICON("system-software-update")); 1598 actionHelpCheck4Updates->setEnabled(hasUpdater()); 1599 menuHelp->insertAction(actionHelpAboutQt, actionHelpCheck4Updates); 1600 menuHelp->insertSeparator(actionHelpAboutQt); 1601 #endif // Q_OS_WIN32 1601 if (hasUpdater()) { 1602 actionHelpCheck4Updates = new QAction(this); 1603 actionHelpCheck4Updates->setIcon(GET_ICON("system-software-update")); 1604 actionHelpCheck4Updates->setEnabled(hasUpdater()); 1605 menuHelp->insertAction(actionHelpAboutQt, actionHelpCheck4Updates); 1606 menuHelp->insertSeparator(actionHelpAboutQt); 1607 } else 1608 actionHelpCheck4Updates = NULL; 1602 1609 1603 1610 spinCities->setMaximum(MAX_NUM_CITIES);
Note: See TracChangeset
for help on using the changeset viewer.