Mercurial > octave
changeset 23936:c4683bc64ecc
remove obsolete settings for toolbar size in the variable editor
* settings-dialog.cc (settings_dialog, write_changed_settings): remove reading
and writing the settings for the var. editors toolbar size
* settings-dialog.ui: remove the spin box for the toolbar size, disable
auto fit combo box when auto fit is disabled
* variable-editor.cc (notice_settings): do not use toolbar size
| author | Torsten <mttl@mailbox.org> |
|---|---|
| date | Thu, 24 Aug 2017 19:24:09 +0200 |
| parents | 2ae8efbafb58 |
| children | d260f54d7dde |
| files | libgui/src/settings-dialog.cc libgui/src/settings-dialog.ui libgui/src/variable-editor.cc |
| diffstat | 3 files changed, 32 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc Wed Aug 23 16:33:21 2017 -0700 +++ b/libgui/src/settings-dialog.cc Thu Aug 24 19:24:09 2017 +0200 @@ -601,7 +601,6 @@ ui->varedit_fontSize->setValue(settings->value("variable_editor/font_size",QVariant(10)).toInt()); ui->varedit_useTerminalFont->setChecked(settings->value("variable_editor/use_terminal_font",false).toBool()); ui->varedit_alternate->setChecked(settings->value("variable_editor/alternate_rows",QVariant(false)).toBool()); - ui->varedit_toolbarSize->setValue(settings->value("variable_editor/toolbar_size",24).toInt()); // variable editor colors read_varedit_colors(settings); @@ -1067,7 +1066,6 @@ settings->setValue("variable_editor/alternate_rows",ui->varedit_alternate->isChecked()); settings->setValue("variable_editor/font_name",ui->varedit_font->currentFont().family()); settings->setValue("variable_editor/font_size",ui->varedit_fontSize->value()); - settings->setValue("variable_editor/toolbar_size",ui->varedit_toolbarSize->value()); write_varedit_colors(settings); // shortcuts
--- a/libgui/src/settings-dialog.ui Wed Aug 23 16:33:21 2017 -0700 +++ b/libgui/src/settings-dialog.ui Thu Aug 24 19:24:09 2017 +0200 @@ -32,7 +32,7 @@ </size> </property> <property name="currentIndex"> - <number>0</number> + <number>8</number> </property> <widget class="QWidget" name="tab_general"> <property name="enabled"> @@ -2672,8 +2672,8 @@ <rect> <x>0</x> <y>0</y> - <width>678</width> - <height>384</height> + <width>658</width> + <height>573</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_vesc_manual"> @@ -2723,19 +2723,6 @@ </property> </widget> </item> - <item row="2" column="6"> - <spacer name="horizontalSpacer_18"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> <item row="0" column="5"> <widget class="QCheckBox" name="varedit_useTerminalFont"> <property name="text"> @@ -2798,6 +2785,9 @@ </item> <item row="1" column="3" colspan="2"> <widget class="QComboBox" name="varedit_autofitType"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="currentIndex"> <number>0</number> </property> @@ -2813,31 +2803,18 @@ </item> </widget> </item> - <item row="1" column="5"> - <widget class="QLabel" name="label_28"> - <property name="text"> - <string>Toolbar Size</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <item row="2" column="6"> + <spacer name="horizontalSpacer_18"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - </widget> - </item> - <item row="1" column="6"> - <widget class="QSpinBox" name="varedit_toolbarSize"> - <property name="minimum"> - <number>8</number> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> </property> - <property name="maximum"> - <number>64</number> - </property> - <property name="singleStep"> - <number>8</number> - </property> - <property name="value"> - <number>32</number> - </property> - </widget> + </spacer> </item> </layout> </item> @@ -3452,5 +3429,21 @@ </hint> </hints> </connection> + <connection> + <sender>varedit_autoFitColumnWidth</sender> + <signal>toggled(bool)</signal> + <receiver>varedit_autofitType</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>334</x> + <y>98</y> + </hint> + <hint type="destinationlabel"> + <x>429</x> + <y>98</y> + </hint> + </hints> + </connection> </connections> </ui>
--- a/libgui/src/variable-editor.cc Wed Aug 23 16:33:21 2017 -0700 +++ b/libgui/src/variable-editor.cc Thu Aug 24 19:24:09 2017 +0200 @@ -1108,9 +1108,6 @@ table_colors.replace (i,setting_color); } update_colors(); - 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 ();