Mercurial > octave
diff libgui/src/m-editor/file-editor.cc @ 26058:ecd86b8b8979
use constants for icon size preferences instead of hard coded numbers
* gui-preferences.h: define constants for icons size preferences key and
default value as well as array with possible icon sizes
* documentation.cc (notice_settings): use constants for preferences key and
default value, get index for array with possible sizes from preferences
value and set icons size accordingly
* files-dock-widget.cc (notice_settings): dito
* file-editor.cc (notice_settings): dito
* main-window.cc (notice_settings): dito
* variable-editor.cc (notice_settings): dito
| author | Torsten <mttl@mailbox.org> |
|---|---|
| date | Sun, 11 Nov 2018 13:22:37 +0100 |
| parents | a7511a1489b8 |
| children | 13d11afc8122 |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.cc Sat Nov 10 22:00:38 2018 -0800 +++ b/libgui/src/m-editor/file-editor.cc Sun Nov 11 13:22:37 2018 +0100 @@ -1060,16 +1060,13 @@ void file_editor::notice_settings (const QSettings *settings) { - int icon_size_settings = settings->value ("toolbar_icon_size",0).toInt (); + int size_idx = settings->value (global_icon_size.key, + global_icon_size.def).toInt (); + size_idx = (size_idx > 0) - (size_idx < 0) + 1; // Make valid index from 0 to 2 + QStyle *st = style (); - int icon_size = st->pixelMetric (QStyle::PM_ToolBarIconSize); - - if (icon_size_settings == 1) - icon_size = st->pixelMetric (QStyle::PM_LargeIconSize); - else if (icon_size_settings == -1) - icon_size = st->pixelMetric (QStyle::PM_SmallIconSize); - - m_tool_bar->setIconSize (QSize (icon_size,icon_size)); + int icon_size = st->pixelMetric (global_icon_sizes[size_idx]); + m_tool_bar->setIconSize (QSize (icon_size, icon_size)); int tab_width_min = settings->value ("editor/notebook_tab_width_min", 160) .toInt ();