Mercurial > octave-dspies

diff libgui/src/settings-dialog.cc @ 15914:85f9aca30c76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui: reorganized handling of different icons for dock widgets * main-window.cc(notice-settings): icon set is stored with its short name instead of a number; if no valid value is read from the settings, no special icons are set for the widgets * settings-dialog.cc(settings_dialog): changes for short names of icons; set radio buttom of no special icon per default (if settings value is not value) if value from settings file is invalid; * settings-dialog.cc(write_changes settings): changes for short names of icons * resource-manager.h: remove enum declaration for icon sets
author Torsten <ttl@justmail.de>
date Tue, 08 Jan 2013 21:35:12 +0100
parents b081fbe80174
children 22ab4fe661d7
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc	Sun Jan 06 21:52:29 2013 -0800
+++ b/libgui/src/settings-dialog.cc	Tue Jan 08 21:35:12 2013 +0100
@@ -38,10 +38,12 @@
 
   // FIXME -- what should happen if settings is 0?
 
-  int widget_icon_set = settings->value ("DockWidgets/widget_icon_set",0).toInt ();
-  ui->general_icon_octave-> setChecked (NO_ICON_SET == widget_icon_set);
-  ui->general_icon_graphic-> setChecked (GRAPHIC_ICON_SET == widget_icon_set);
-  ui->general_icon_letter-> setChecked (LETTER_ICON_SET == widget_icon_set);
+  QString widget_icon_set =
+      settings->value ("DockWidgets/widget_icon_set","NONE").toString ();
+  ui->general_icon_octave-> setChecked (true);  // the default (if invalid set)
+  ui->general_icon_octave-> setChecked (widget_icon_set == "NONE");
+  ui->general_icon_graphic-> setChecked (widget_icon_set == "GRAPHIC");
+  ui->general_icon_letter-> setChecked (widget_icon_set == "LETTER");
 
   ui->useCustomFileEditor->setChecked (settings->value ("useCustomFileEditor").toBool ());
   ui->customFileEditor->setText (settings->value ("customFileEditor").toString ());
@@ -105,11 +107,11 @@
 
   // FIXME -- what should happen if settings is 0?
 
-  int widget_icon_set = NO_ICON_SET;
+  QString widget_icon_set = "NONE";
   if (ui->general_icon_letter->isChecked ())
-    widget_icon_set = LETTER_ICON_SET;
+    widget_icon_set = "LETTER";
   else if (ui->general_icon_graphic->isChecked ())
-    widget_icon_set = GRAPHIC_ICON_SET;
+    widget_icon_set = "GRAPHIC";
   settings->setValue ("DockWidgets/widget_icon_set",widget_icon_set);
   settings->setValue ("useCustomFileEditor", ui->useCustomFileEditor->isChecked ());
   settings->setValue ("customFileEditor", ui->customFileEditor->text ());