Mercurial > octave

changeset 23933:4be7a254f752

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix some icon issues of the variable edtor * variable-editor.cc (construct_tool_bar): insert correct icon for the pull down menu; (notice_settings): read and set the icon size from the settings file
author Torsten <mttl@mailbox.org>
date Wed, 23 Aug 2017 22:18:00 +0200
parents ab5780d54869
children fe780a4b89c1
files libgui/src/variable-editor.cc
diffstat 1 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/variable-editor.cc	Wed Aug 23 21:48:03 2017 +0200
+++ b/libgui/src/variable-editor.cc	Wed Aug 23 22:18:00 2017 +0200
@@ -132,7 +132,7 @@
 
   QToolButton *plot_tool_button = new QToolButton (tool_bar);
   plot_tool_button->setText (tr ("Plot"));
-  plot_tool_button->setIcon (resource_manager::icon("logo"));//QIcon (":/actions/icons/gear.png")); // TODO
+  plot_tool_button->setIcon (resource_manager::icon ("applications-system"));
 
   plot_tool_button->setPopupMode (QToolButton::InstantPopup);
 
@@ -1111,6 +1111,18 @@
   int toolsize = settings->value("variable_editor/toolbar_size",QVariant(0)).toInt();
   if (toolsize > 0)
       tool_bar->setIconSize(QSize(toolsize,toolsize));
+
+  // Icon size in the toolbar
+  int icon_size_settings = settings->value ("toolbar_icon_size",0).toInt ();
+  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);
+
+  tool_bar->setIconSize (QSize (icon_size,icon_size));
 }
 
 /// Also updates the font