Mercurial > octave

changeset 24280:bda0c5b38bda stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
consistent case of settings keys in the settings file (important for qt5) * settings_dialog (settings_dialog, write_changed_settings): change Dockwidgets into DockWidgets * octave-dock-widget.cc (handle_settings): change Dockwidgets into DockWidgets
author Torsten <mttl@mailbox.org>
date Sun, 12 Nov 2017 22:10:46 +0100
parents 4746bd294c54
children a669809df612
files libgui/src/octave-dock-widget.cc libgui/src/settings-dialog.cc
diffstat 2 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/octave-dock-widget.cc	Thu Nov 16 18:01:18 2017 -0800
+++ b/libgui/src/octave-dock-widget.cc	Sun Nov 12 22:10:46 2017 +0100
@@ -431,17 +431,17 @@
     = settings->value ("DockWidgets/widget_title_3d",50).toInt ();
 
   QColor default_var = QColor (0,0,0);
-  _fg_color = settings->value ("Dockwidgets/title_fg_color",
+  _fg_color = settings->value ("DockWidgets/title_fg_color",
                                default_var).value<QColor> ();
   default_var = QColor (0,0,0);
-  _fg_color_active = settings->value ("Dockwidgets/title_fg_color_active",
+  _fg_color_active = settings->value ("DockWidgets/title_fg_color_active",
                                       default_var).value<QColor> ();
 
   default_var = QColor (255,255,255);
-  _bg_color = settings->value ("Dockwidgets/title_bg_color",
+  _bg_color = settings->value ("DockWidgets/title_bg_color",
                                default_var).value<QColor> ();
   default_var = QColor (192,192,192);
-  _bg_color_active = settings->value ("Dockwidgets/title_bg_color_active",
+  _bg_color_active = settings->value ("DockWidgets/title_bg_color_active",
                                       default_var).value<QColor> ();
 
   int r, g, b;
--- a/libgui/src/settings-dialog.cc	Thu Nov 16 18:01:18 2017 -0800
+++ b/libgui/src/settings-dialog.cc	Sun Nov 12 22:10:46 2017 +0100
@@ -320,7 +320,7 @@
 
   // custom title bar of dock widget
   QVariant default_var = QColor (255,255,255);
-  QColor bg_color = settings->value ("Dockwidgets/title_bg_color",
+  QColor bg_color = settings->value ("DockWidgets/title_bg_color",
                                      default_var).value<QColor> ();
   _widget_title_bg_color = new color_picker (bg_color);
   _widget_title_bg_color->setEnabled (false);
@@ -329,7 +329,7 @@
            _widget_title_bg_color, SLOT (setEnabled (bool)));
 
   default_var = QColor (192,192,192);
-  QColor bg_color_active = settings->value ("Dockwidgets/title_bg_color_active",
+  QColor bg_color_active = settings->value ("DockWidgets/title_bg_color_active",
                                             default_var).value<QColor> ();
   _widget_title_bg_color_active = new color_picker (bg_color_active);
   _widget_title_bg_color_active->setEnabled (false);
@@ -338,7 +338,7 @@
            _widget_title_bg_color_active, SLOT (setEnabled (bool)));
 
   default_var = QColor (0,0,0);
-  QColor fg_color = settings->value ("Dockwidgets/title_fg_color",
+  QColor fg_color = settings->value ("DockWidgets/title_fg_color",
                                      default_var).value<QColor> ();
   _widget_title_fg_color = new color_picker (fg_color);
   _widget_title_fg_color->setEnabled (false);
@@ -347,7 +347,7 @@
            _widget_title_fg_color, SLOT (setEnabled (bool)));
 
   default_var = QColor (0,0,0);
-  QColor fg_color_active = settings->value ("Dockwidgets/title_fg_color_active",
+  QColor fg_color_active = settings->value ("DockWidgets/title_fg_color_active",
                                             default_var).value<QColor> ();
   _widget_title_fg_color_active = new color_picker (fg_color_active);
   _widget_title_fg_color_active->setEnabled (false);
@@ -742,13 +742,13 @@
                       ui->cb_widget_custom_style->isChecked ());
   settings->setValue ("DockWidgets/widget_title_3d",
                       ui->sb_3d_title->value ());
-  settings->setValue ("Dockwidgets/title_bg_color",
+  settings->setValue ("DockWidgets/title_bg_color",
                       _widget_title_bg_color->color ());
-  settings->setValue ("Dockwidgets/title_bg_color_active",
+  settings->setValue ("DockWidgets/title_bg_color_active",
                       _widget_title_bg_color_active->color ());
-  settings->setValue ("Dockwidgets/title_fg_color",
+  settings->setValue ("DockWidgets/title_fg_color",
                       _widget_title_fg_color->color ());
-  settings->setValue ("Dockwidgets/title_fg_color_active",
+  settings->setValue ("DockWidgets/title_fg_color_active",
                       _widget_title_fg_color_active->color ());
 
   // icon size