Changeset 47c811cc09 in tspsg for src

Timestamp:

Oct 13, 2012, 9:02:50 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

b96b44b6b7

Parents:

07e43cf61a

Message:

Added a way to change maximum number of cities without recompiling.

Added Tweaks/MaxNumCitites? setting to tspsg.ini. The maximum number of
cities limit can be controlled by setting it.

Location:

src

Files:

• mainwindow.cpp (modified) (2 diffs)
• settingsdialog.cpp (modified) (2 diffs)
• tspmodel.cpp (modified) (1 diff)

src/mainwindow.cpp

@@ -129 +129 @@
 {
     settings = initSettings(this);
+
+    // Sanity check
+    int m = settings->value("Tweaks/MaxNumCities", MAX_NUM_CITIES).toInt();
+    if (m < 3)
+        settings->setValue("Tweaks/MaxNumCities", 3);
 
     if (settings->contains("Style")) {
@@ -1966 +1971 @@
         actionHelpCheck4Updates = NULL;
 
-    spinCities->setMaximum(MAX_NUM_CITIES);
+    spinCities->setMaximum(settings->value("Tweaks/MaxNumCities", MAX_NUM_CITIES).toInt());
 
 #ifndef HANDHELD

src/settingsdialog.cpp

@@ -323 +323 @@
     spinCitiesLimit->setEnabled(cbShowMatrix->isChecked() && cbCitiesLimit->isChecked());
     spinCitiesLimit->setValue(settings->value("ShowMatrixLimit", DEF_SHOW_MATRIX_LIMIT).toInt());
-    spinCitiesLimit->setMaximum(MAX_NUM_CITIES);
+    settings->endGroup();
+    spinCitiesLimit->setMaximum(settings->value("Tweaks/MaxNumCities", MAX_NUM_CITIES).toInt());
+    settings->beginGroup("Output");
     cbScrollToEnd->setChecked(settings->value("ScrollToEnd", DEF_SCROLL_TO_END).toBool());
 
@@ -386 +388 @@
 {
     if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
-        if (QMessageBox::question(this, tr("Settings Reset"), tr("Do you really want to <b>reset all application settings to their defaults</b>?"), QMessageBox::RestoreDefaults | QMessageBox::Cancel) == QMessageBox::RestoreDefaults) {
+        if (QMessageBox::question(this, tr("Settings Reset"),
+                                  tr("Do you really want to <b>reset all application settings"
+                                     " to their defaults</b>?<br>"
+                                     "Please, note that \"Tweaks\" section won't be reset."),
+                                  QMessageBox::RestoreDefaults | QMessageBox::Cancel)
+                == QMessageBox::RestoreDefaults) {
             _fontChanged = (font != QFont(DEF_FONT_FACE, DEF_FONT_SIZE));
             _colorChanged = (textColor != DEF_TEXT_COLOR);
+            // Saving Tweaks section as we don't reset it
+            settings->beginGroup("Tweaks");
+            QHash<QString, QVariant> values;
+            foreach (const QString &key, settings->childKeys()) {
+                values.insert(key, settings->value(key));
+            }
+            settings->endGroup();
             settings->remove("");
             settings->setValue("SettingsReset", true);
+            if (!values.empty()) {
+                settings->beginGroup("Tweaks");
+                foreach (const QString &key, values.keys()) {
+                    settings->setValue(key, values.value(key));
+                }
+                settings->endGroup();
+            }
             QDialog::accept();
             QMessageBox::information(this->parentWidget(), tr("Settings Reset"), tr("All settings where successfully reset to their defaults.\nIt is recommended to restart the application now."));

src/tspmodel.cpp

@@ -432 +432 @@
         return false;
     }
-    if (size > MAX_NUM_CITIES) {
-        QApplication::restoreOverrideCursor();
-        QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
-        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
-            + tr("The task contains more cities (%1) than this version of %3 supports (%2).\n"
-                 "You might be using an old version of the application or the file could be corrupted.")
-                 .arg(size).arg(MAX_NUM_CITIES).arg(QApplication::applicationName()));
+    if (size > settings->value("Tweaks/MaxNumCities", MAX_NUM_CITIES).toInt()) {
+        QApplication::restoreOverrideCursor();
+        QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
+        if (settings->contains("Tweaks/MaxNumCities")) {
+            QMessageBox::critical(
+                        QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
+                        + tr("Your Tweaks/MaxNumCities setting in tspsg.ini is currently set to %1"
+                             " but the task you're trying to load contains %2 cities.\n"
+                             "Please, set Tweaks/MaxNumCities setting to at least %2"
+                             " to be able to load this task.")
+                        .arg(settings->value("Tweaks/MaxNumCities").toInt()).arg(size));
+        } else {
+            QMessageBox::critical(
+                        QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
+                        + tr("The maximum number of cities this version of %1 supports is %2"
+                             " but the task you're trying to load contains %3.\n"
+                             "You might be using an old version of the application or the file"
+                             " could be corrupted.")
+                        .arg(QApplication::applicationName()).arg(MAX_NUM_CITIES).arg(size));
+        }
         QApplication::restoreOverrideCursor();
         return false;