Mercurial > octave-nkf
changeset 18294:01646e48a650 gui-release
fix duplicate of settings string
* settings-dialog.ui: change editor_tab_with into editor_notebook_tab_width
* settings-dialog.cc (ctor, write_changed_settings):
change editor_tab_with into editor_notebook_tab_width and
editor/tab_width into editor/notebook_tab_width
* file-editor.cc (notice_settings):
change editor/tab_width into editor/notebook_tab_width
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Thu, 16 Jan 2014 23:04:58 +0100 |
| parents | c6e5466d74fe |
| children | 6736fc9bce24 |
| files | libgui/src/m-editor/file-editor.cc libgui/src/settings-dialog.cc libgui/src/settings-dialog.ui |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.cc Thu Jan 16 16:26:56 2014 -0500 +++ b/libgui/src/m-editor/file-editor.cc Thu Jan 16 23:04:58 2014 +0100 @@ -843,7 +843,7 @@ int icon_size = settings->value ("toolbar_icon_size", 16).toInt (); _tool_bar->setIconSize (QSize (icon_size, icon_size)); - int tab_width = settings->value ("editor/tab_width", 300).toInt (); + int tab_width = settings->value ("editor/notebook_tab_width", 300).toInt (); QString style_sheet = QString ("QTabBar::tab {max-height: 4ex; " "max-width: %1px; text-align: right }"). arg (tab_width);
--- a/libgui/src/settings-dialog.cc Thu Jan 16 16:26:56 2014 -0500 +++ b/libgui/src/settings-dialog.cc Thu Jan 16 23:04:58 2014 +0100 @@ -162,8 +162,8 @@ settings->value ("editor/tab_width", 2).toInt ()); ui->editor_longWindowTitle->setChecked ( settings->value ("editor/longWindowTitle",false).toBool ()); - ui->editor_tab_width->setValue ( - settings->value ("editor/tab_width", 300).toInt ()); + ui->editor_notebook_tab_width->setValue ( + settings->value ("editor/notebook_tab_width", 300).toInt ()); ui->editor_restoreSession->setChecked ( settings->value ("editor/restoreSession", true).toBool ()); ui->editor_create_new_file->setChecked ( @@ -541,8 +541,8 @@ ui->editor_tab_width_spinbox->value ()); settings->setValue ("editor/longWindowTitle", ui->editor_longWindowTitle->isChecked ()); - settings->setValue ("editor/tab_width", - ui->editor_tab_width->value ()); + settings->setValue ("editor/notebook_tab_width", + ui->editor_notebook_tab_width->value ()); settings->setValue ("editor/restoreSession", ui->editor_restoreSession->isChecked ()); settings->setValue ("editor/create_new_file",
--- a/libgui/src/settings-dialog.ui Thu Jan 16 16:26:56 2014 -0500 +++ b/libgui/src/settings-dialog.ui Thu Jan 16 23:04:58 2014 +0100 @@ -449,7 +449,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="QSpinBox" name="editor_tab_width"> + <widget class="QSpinBox" name="editor_notebook_tab_width"> <property name="minimum"> <number>100</number> </property>