Mercurial > octave
changeset 24226:dc85329e6778
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 | b8cb5a05955e |
children | 0da1bdfbfacb |
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 Fri Nov 10 14:54:36 2017 -0500 +++ b/libgui/src/octave-dock-widget.cc Sun Nov 12 22:10:46 2017 +0100 @@ -281,17 +281,17 @@ = settings->value ("DockWidgets/widget_title_3d",50).toInt (); QColor default_var = QColor (0,0,0); - m_fg_color = settings->value ("Dockwidgets/title_fg_color", + m_fg_color = settings->value ("DockWidgets/title_fg_color", default_var).value<QColor> (); default_var = QColor (0,0,0); - m_fg_color_active = settings->value ("Dockwidgets/title_fg_color_active", + m_fg_color_active = settings->value ("DockWidgets/title_fg_color_active", default_var).value<QColor> (); default_var = QColor (255,255,255); - m_bg_color = settings->value ("Dockwidgets/title_bg_color", + m_bg_color = settings->value ("DockWidgets/title_bg_color", default_var).value<QColor> (); default_var = QColor (192,192,192); - m_bg_color_active = settings->value ("Dockwidgets/title_bg_color_active", + m_bg_color_active = settings->value ("DockWidgets/title_bg_color_active", default_var).value<QColor> (); int r, g, b;
--- a/libgui/src/settings-dialog.cc Fri Nov 10 14:54:36 2017 -0500 +++ b/libgui/src/settings-dialog.cc Sun Nov 12 22:10:46 2017 +0100 @@ -322,7 +322,7 @@ // custom title bar of dock widget QVariant default_var = QColor (255, 255, 255); - QColor bg_color = settings->value ("Dockwidgets/title_bg_color", default_var).value<QColor> (); + QColor bg_color = settings->value ("DockWidgets/title_bg_color", default_var).value<QColor> (); m_widget_title_bg_color = new color_picker (bg_color); m_widget_title_bg_color->setEnabled (false); ui->layout_widget_bgtitle->addWidget (m_widget_title_bg_color, 0); @@ -331,7 +331,7 @@ m_widget_title_bg_color, SLOT (setEnabled (bool))); default_var = QColor (192, 192, 192); - QColor bg_color_active = settings->value ("Dockwidgets/title_bg_color_active", default_var).value<QColor> (); + QColor bg_color_active = settings->value ("DockWidgets/title_bg_color_active", default_var).value<QColor> (); m_widget_title_bg_color_active = new color_picker (bg_color_active); m_widget_title_bg_color_active->setEnabled (false); ui->layout_widget_bgtitle_active->addWidget (m_widget_title_bg_color_active, 0); @@ -340,7 +340,7 @@ m_widget_title_bg_color_active, SLOT (setEnabled (bool))); default_var = QColor (0, 0, 0); - QColor fg_color = settings->value ("Dockwidgets/title_fg_color", default_var).value<QColor> (); + QColor fg_color = settings->value ("DockWidgets/title_fg_color", default_var).value<QColor> (); m_widget_title_fg_color = new color_picker (fg_color); m_widget_title_fg_color->setEnabled (false); ui->layout_widget_fgtitle->addWidget (m_widget_title_fg_color, 0); @@ -349,7 +349,7 @@ m_widget_title_fg_color, SLOT (setEnabled (bool))); default_var = QColor (0, 0, 0); - QColor fg_color_active = settings->value ("Dockwidgets/title_fg_color_active", default_var).value<QColor> (); + QColor fg_color_active = settings->value ("DockWidgets/title_fg_color_active", default_var).value<QColor> (); m_widget_title_fg_color_active = new color_picker (fg_color_active); m_widget_title_fg_color_active->setEnabled (false); ui->layout_widget_fgtitle_active->addWidget (m_widget_title_fg_color_active, 0); @@ -737,10 +737,10 @@ // dock widget title bar settings->setValue ("DockWidgets/widget_title_custom_style", ui->cb_widget_custom_style->isChecked ()); settings->setValue ("DockWidgets/widget_title_3d", ui->sb_3d_title->value ()); - settings->setValue ("Dockwidgets/title_bg_color", m_widget_title_bg_color->color ()); - settings->setValue ("Dockwidgets/title_bg_color_active", m_widget_title_bg_color_active->color ()); - settings->setValue ("Dockwidgets/title_fg_color", m_widget_title_fg_color->color ()); - settings->setValue ("Dockwidgets/title_fg_color_active", m_widget_title_fg_color_active->color ()); + settings->setValue ("DockWidgets/title_bg_color", m_widget_title_bg_color->color ()); + settings->setValue ("DockWidgets/title_bg_color_active", m_widget_title_bg_color_active->color ()); + settings->setValue ("DockWidgets/title_fg_color", m_widget_title_fg_color->color ()); + settings->setValue ("DockWidgets/title_fg_color_active", m_widget_title_fg_color_active->color ()); // icon size int icon_size = 0;