Changeset 1757eb594b in tspsg for src/settingsdialog.cpp

Timestamp:

Jan 12, 2010, 3:11:24 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:

fcd8c1e4c1

Parents:

64f288c0f8

Message:

+ Added Fractional accuracy (in decimail places) to settings.
+ Created defaults.h file. Moved all default defines there.

• Replaced all double types with qreal.
• Replaced all calls to trUtf8() with tr() as we use setCodecForTr() to set UTF-8 encoding as default and tr() is enough.
• Replaced all 2009 with 2010 in copyrights.
• Fixed an error when loading .zkt file with less than 5 cities.

File:

• src/settingsdialog.cpp (modified) (8 diffs)

src/settingsdialog.cpp

@@ -1 +1 @@
 /*
  *  TSPSG: TSP Solver and Generator
- *  Copyright (C) 2007-2009 Lёppa <contacts[at]oleksii[dot]name>
+ *  Copyright (C) 2007-2010 Lёppa <contacts[at]oleksii[dot]name>
  *
  *  $Id$
@@ -34 +34 @@
 {
         setupUi(this);
-        // Laying out elements
-/*      layoutCitiesLimit = new QHBoxLayout();
-        layoutCitiesLimit->setMargin(0);
-        layoutCitiesLimit->setSpacing(0);
-        layoutCitiesLimit->addSpacing(10);
-        layoutCitiesLimit->addWidget(cbCitiesLimit);
-        layoutCitiesLimit->addWidget(spinCitiesLimit);
-        layoutCitiesLimit->addStretch();
-*/
+
         buttonBox->button(QDialogButtonBox::Save)->setIcon(QIcon(":/images/icons/button_ok.png"));
-        buttonBox->button(QDialogButtonBox::Save)->setStatusTip(trUtf8("Save new preferences"));
+        buttonBox->button(QDialogButtonBox::Save)->setStatusTip(tr("Save new preferences"));
         buttonBox->button(QDialogButtonBox::Save)->setCursor(QCursor(Qt::PointingHandCursor));
         buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":/images/icons/button_cancel.png"));
-        buttonBox->button(QDialogButtonBox::Cancel)->setStatusTip(trUtf8("Close without saving preferences"));
+        buttonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Close without saving preferences"));
         buttonBox->button(QDialogButtonBox::Cancel)->setCursor(QCursor(Qt::PointingHandCursor));
 
@@ -80 +72 @@
         cbSaveState->setObjectName("cbSaveState");
 #ifndef QT_NO_STATUSTIP
-        cbSaveState->setStatusTip(trUtf8("Restore main window state and position on application restart"));
+        cbSaveState->setStatusTip(tr("Restore main window state and position on application restart"));
 #endif // QT_NO_STATUSTIP
-        cbSaveState->setText(trUtf8("Save main window state and position"));
+        cbSaveState->setText(tr("Save main window state and position"));
         cbSaveState->setCursor(QCursor(Qt::PointingHandCursor));
 
@@ -105 +97 @@
         labelHint->setWordWrap(true);
 #ifndef QT_NO_STATUSTIP
-        labelHint->setStatusTip(trUtf8("Hover mouse pointer over dialog elements to get additional help"));
+        labelHint->setStatusTip(tr("Hover mouse pointer over dialog elements to get additional help"));
 #endif // QT_NO_STATUSTIP
 
@@ -121 +113 @@
 
         vbox1 = static_cast<QVBoxLayout *>(tabGeneral->layout());
-        vbox1->insertWidget(vbox2->indexOf(cbUseNativeDialogs) + 1, cbSaveState);
+        vbox1->insertWidget(vbox1->indexOf(cbUseNativeDialogs) + 1, cbSaveState);
 
         // Bottom part (with grey bg)
@@ -152 +144 @@
         settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, "TSPSG", "tspsg", this);
 
-        spinRandMin->setMaximum(MAX_RAND_VALUE);
-        spinRandMin->setValue(settings->value("MinCost",DEF_RAND_MIN).toInt());
-        spinRandMax->setMaximum(MAX_RAND_VALUE);
-        spinRandMax->setValue(settings->value("MaxCost",DEF_RAND_MAX).toInt());
-        cbFractionalRandom->setChecked(settings->value("FractionalRandom", DEF_FRACTIONAL_RANDOM).toBool());
         cbAutosize->setChecked(settings->value("Autosize", DEF_AUTOSIZE).toBool());
         cbUseNativeDialogs->setChecked(settings->value("UseNativeDialogs", DEF_USE_NATIVE_DIALOGS).toBool());
@@ -162 +149 @@
         cbSaveState->setChecked(settings->value("SavePos", DEF_SAVEPOS).toBool());
 #endif // Q_OS_WINCE
+
+        settings->beginGroup("Task");
+        spinFractionalAccuracy->setValue(settings->value("FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt());
+        spinRandMin->setMaximum(MAX_RAND_VALUE);
+        spinRandMin->setValue(settings->value("RandMin",DEF_RAND_MIN).toInt());
+        spinRandMax->setMaximum(MAX_RAND_VALUE);
+        spinRandMax->setValue(settings->value("RandMax",DEF_RAND_MAX).toInt());
+        cbFractionalRandom->setChecked(settings->value("FractionalRandom", DEF_FRACTIONAL_RANDOM).toBool());
+        settings->endGroup();
 
         settings->beginGroup("Output");
@@ -206 +202 @@
         settings->setValue("UseNativeDialogs", cbUseNativeDialogs->isChecked());
         settings->setValue("Autosize", cbAutosize->isChecked());
-        settings->setValue("MinCost", spinRandMin->value());
-        settings->setValue("MaxCost", spinRandMax->value());
+
+        settings->beginGroup("Task");
+        settings->setValue("FractionalAccuracy", spinFractionalAccuracy->value());
+        settings->setValue("RandMin", spinRandMin->value());
+        settings->setValue("RandMax", spinRandMax->value());
         settings->setValue("FractionalRandom", cbFractionalRandom->isChecked());
+        settings->endGroup();
 
         settings->beginGroup("Output");