Mercurial > octave
changeset 26135:a332d83cc659
fix use of icon size preferences
* gui-preferences.h: fix sorting of the icon sizes in the defined array
* settings-dialog.cc (settings_dialog): use constants defined in
gui-preferences.h instead of hard coded numbers;
(write_changed_settings): compute preference value directly from the
state of the checkboxes
| author | Torsten <mttl@mailbox.org> |
|---|---|
| date | Sun, 25 Nov 2018 18:56:04 +0100 |
| parents | 3a38afebf949 |
| children | e238e07da6c9 |
| files | libgui/src/gui-preferences.h libgui/src/settings-dialog.cc |
| diffstat | 2 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/gui-preferences.h Sun Nov 25 18:39:32 2018 +0100 +++ b/libgui/src/gui-preferences.h Sun Nov 25 18:56:04 2018 +0100 @@ -57,10 +57,9 @@ const QStyle::PixelMetric global_icon_sizes[3] = { QStyle::PM_SmallIconSize, - QStyle::PM_LargeIconSize, - QStyle::PM_ToolBarIconSize + QStyle::PM_ToolBarIconSize, + QStyle::PM_LargeIconSize }; - const gui_pref global_icon_size ("toolbar_icon_size", QVariant (0));
--- a/libgui/src/settings-dialog.cc Sun Nov 25 18:39:32 2018 +0100 +++ b/libgui/src/settings-dialog.cc Sun Nov 25 18:56:04 2018 +0100 @@ -129,10 +129,10 @@ icon_size_group->addButton (icon_size_small); icon_size_group->addButton (icon_size_normal); icon_size_group->addButton (icon_size_large); - int icon_size = settings->value ("toolbar_icon_size", 0).toInt (); + int icon_size = settings->value (global_icon_size.key, global_icon_size.def).toInt (); icon_size_normal->setChecked (true); // the default - icon_size_small->setChecked (icon_size == -1); - icon_size_large->setChecked (icon_size == 1); + icon_size_small->setChecked (icon_size < 0); + icon_size_large->setChecked (icon_size > 0); // which icon has to be selected QButtonGroup *icon_group = new QButtonGroup (this); @@ -815,12 +815,8 @@ settings->setValue ("DockWidgets/title_fg_color_active", m_widget_title_fg_color_active->color ()); // icon size - int icon_size = 0; - if (icon_size_small->isChecked ()) - icon_size = -1; - else if (icon_size_large->isChecked ()) - icon_size = 1; - settings->setValue ("toolbar_icon_size", icon_size); + int icon_size = icon_size_large->isChecked () - icon_size_small->isChecked (); + settings->setValue (global_icon_size.key, icon_size); // native file dialogs settings->setValue ("use_native_file_dialogs", cb_use_native_file_dialogs->isChecked ());