Changeset 162 in tspsg-svn for trunk/src/settingsdialog.cpp

Timestamp:

Apr 14, 2011, 9:30:23 PM (14 years ago)

Author:

laleppa

Message:

• NEW: Solution graph size can now be controlled using Output/GraphWidth? setting in tspsg.ini (see ticket:8). Value is in centimeters.
• NEW: Support for embedded base64 encoded images when saving solution as HTML (closed ticket:4).
• Renamed Output/ShowGraph? setting to Output/GenerateGraph?.
• Made some other small tweaks and fixes.
• FIX: Solution graph is still exported to HTML when graph generation is disabled (fixed bug:9).

File:

• trunk/src/settingsdialog.cpp (modified) (7 diffs)

trunk/src/settingsdialog.cpp

@@ -76 +76 @@
     hbox->addSpacing(10);
     hbox->addWidget(cbHQGraph);
-    box->insertLayout(box->indexOf(cbShowGraph) + 1, hbox);
-    connect(cbShowGraph, SIGNAL(toggled(bool)), cbHQGraph, SLOT(setEnabled(bool)));
+    box->insertLayout(box->indexOf(cbGenerateGraph) + 2, hbox);
+    connect(cbGenerateGraph, SIGNAL(toggled(bool)), cbHQGraph, SLOT(setEnabled(bool)));
 #endif
 
@@ -147 +147 @@
         cbUseTranslucency->setObjectName("cbUseTranslucency");
 #ifndef QT_NO_STATUSTIP
-        cbUseTranslucency->setStatusTip(tr("Use translucent effect on the Main Window under Windows Vista and 7"));
+        cbUseTranslucency->setStatusTip(tr("Make Main Window background translucent"));
 #endif // QT_NO_STATUSTIP
         cbUseTranslucency->setText(tr("Use translucency effects"));
@@ -174 +174 @@
     labelHint->setObjectName("labelHint");
     labelHint->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
-//      labelHint->setMinimumSize(QSize(190,28));
-    labelHint->setMinimumSize(QSize(0,28));
-    labelHint->setMaximumSize(QSize(QWIDGETSIZE_MAX,28));
+    labelHint->setMinimumSize(QSize(250, 28));
+    labelHint->setMaximumSize(QSize(QWIDGETSIZE_MAX, 28));
     labelHint->setTextFormat(Qt::PlainText);
 //      labelHint->setAlignment(Qt::AlignLeft | Qt::AlignTop);
@@ -260 +259 @@
 
     settings->beginGroup("Output");
-    cbShowGraph->setChecked(settings->value("ShowGraph", DEF_SHOW_GRAPH).toBool());
+    cbGenerateGraph->setChecked(settings->value("GenerateGraph", DEF_GENERATE_GRAPH).toBool());
 
 #ifndef QT_NO_PRINTER
-    cbHQGraph->setEnabled(cbShowGraph->isChecked());
-    cbHQGraph->setChecked(settings->value("HQGraph", DEF_HQ_GRAPH && cbShowGraph->isChecked()).toBool());
+    cbHQGraph->setEnabled(cbGenerateGraph->isChecked());
+    cbHQGraph->setChecked(settings->value("HQGraph", DEF_HQ_GRAPH).toBool());
 #endif
 
@@ -283 +282 @@
     if (comboGraphImageFormat->currentIndex() < 0)
         comboGraphImageFormat->setCurrentIndex(comboGraphImageFormat->findText(DEF_GRAPH_IMAGE_FORMAT, Qt::MatchFixedString));
-    labelGraphImageFormat->setEnabled(cbShowGraph->isChecked());
-    comboGraphImageFormat->setEnabled(cbShowGraph->isChecked());
+    labelGraphImageFormat->setEnabled(cbGenerateGraph->isChecked());
+    comboGraphImageFormat->setEnabled(cbGenerateGraph->isChecked());
+    cbEmbedGraphIntoHTML->setChecked(settings->value("EmbedGraphIntoHTML", DEF_EMBED_GRAPH_INTO_HTML).toBool());
+    cbEmbedGraphIntoHTML->setEnabled(cbGenerateGraph->isChecked());
 
     cbShowMatrix->setChecked(settings->value("ShowMatrix", DEF_SHOW_MATRIX).toBool());
@@ -326 +327 @@
  * \brief Indicates whether and how the translucency setting was changed
  * \retval -1 the translucency was \em disabled.
- * \retval  0 the translucency was <em>not changed</em>.
+ * \retval  0 the translucency <em>didn't change</em>.
  * \retval  1 the translucency was \em enabled.
  */
@@ -381 +382 @@
 
     settings->beginGroup("Output");
-    settings->setValue("ShowGraph", cbShowGraph->isChecked());
+    settings->setValue("GenerateGraph", cbGenerateGraph->isChecked());
+    if (cbGenerateGraph->isChecked()) {
 #ifndef QT_NO_PRINTER
-    settings->setValue("HQGraph", cbShowGraph->isChecked() && cbHQGraph->isChecked());
+        settings->setValue("HQGraph", cbHQGraph->isChecked());
 #endif
-    if (cbShowGraph->isChecked()) {
-        if (comboGraphImageFormat->currentIndex() >= 0)
-            settings->setValue("GraphImageFormat", comboGraphImageFormat->currentText());
-        else
-            settings->setValue("GraphImageFormat", DEF_GRAPH_IMAGE_FORMAT);
+        if (cbGenerateGraph->isChecked()) {
+            if (comboGraphImageFormat->currentIndex() >= 0)
+                settings->setValue("GraphImageFormat", comboGraphImageFormat->currentText());
+            else
+                settings->setValue("GraphImageFormat", DEF_GRAPH_IMAGE_FORMAT);
+        }
+        settings->setValue("EmbedGraphIntoHTML", cbEmbedGraphIntoHTML->isChecked());
     }
     settings->setValue("ShowMatrix", cbShowMatrix->isChecked());