Mercurial > octave-nkf
changeset 16410:f62163bed4dc
gui: always show file names in file dock widget
* files-dockwidget.cc(constructor): do not hide any columns, this is done in
notice_settings
* files-dockwidget.cc(notice_settings: always show file names, only other
columns can be hidden by the settings
* settings-dialog.cc(constructor,write_settings): remove reading and writing
the setting for showing the file name
* settings-dialog.ui: remove the check box for showing file names
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Tue, 02 Apr 2013 19:43:52 +0200 |
| parents | c31139d6fb3b |
| children | 5be43435bd5b |
| files | libgui/src/files-dockwidget.cc libgui/src/settings-dialog.cc libgui/src/settings-dialog.ui |
| diffstat | 3 files changed, 2 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/files-dockwidget.cc Tue Apr 02 19:32:24 2013 +0200 +++ b/libgui/src/files-dockwidget.cc Tue Apr 02 19:43:52 2013 +0200 @@ -78,9 +78,6 @@ _file_tree_view->setSortingEnabled (true); _file_tree_view->setAlternatingRowColors (true); _file_tree_view->setAnimated (true); - _file_tree_view->setColumnHidden (1, true); - _file_tree_view->setColumnHidden (2, true); - _file_tree_view->setColumnHidden (3, true); _file_tree_view->setStatusTip (tr ("Doubleclick a file to open it.")); // get sort column and order as well as cloumn state (order and width) @@ -190,8 +187,8 @@ QSettings *settings = resource_manager::get_settings (); // FIXME -- what should happen if settings is 0? - - _file_tree_view->setColumnHidden (0, !settings->value ("showFilenames",true).toBool ()); + // file names are always shown, other columns can be hidden by settings + _file_tree_view->setColumnHidden (0, false); _file_tree_view->setColumnHidden (1, !settings->value ("showFileSize",false).toBool ()); _file_tree_view->setColumnHidden (2, !settings->value ("showFileType",false).toBool ()); _file_tree_view->setColumnHidden (3, !settings->value ("showLastModified",false).toBool ());
--- a/libgui/src/settings-dialog.cc Tue Apr 02 19:32:24 2013 +0200 +++ b/libgui/src/settings-dialog.cc Tue Apr 02 19:43:52 2013 +0200 @@ -85,7 +85,6 @@ ui->editor_restoreSession->setChecked (settings->value ("editor/restoreSession",true).toBool ()); ui->terminal_fontName->setCurrentFont (QFont (settings->value ("terminal/fontName","Courier New").toString()) ); ui->terminal_fontSize->setValue (settings->value ("terminal/fontSize",10).toInt ()); - ui->showFilenames->setChecked (settings->value ("showFilenames",true).toBool()); ui->showFileSize->setChecked (settings->value ("showFileSize",false).toBool()); ui->showFileType->setChecked (settings->value ("showFileType",false).toBool()); ui->showLastModified->setChecked (settings->value ("showLastModified",false).toBool()); @@ -256,7 +255,6 @@ settings->setValue ("editor/restoreSession", ui->editor_restoreSession->isChecked ()); settings->setValue ("terminal/fontSize", ui->terminal_fontSize->value()); settings->setValue ("terminal/fontName", ui->terminal_fontName->currentFont().family()); - settings->setValue ("showFilenames", ui->showFilenames->isChecked ()); settings->setValue ("showFileSize", ui->showFileSize->isChecked ()); settings->setValue ("showFileType", ui->showFileType->isChecked ()); settings->setValue ("showLastModified", ui->showLastModified->isChecked ());
--- a/libgui/src/settings-dialog.ui Tue Apr 02 19:32:24 2013 +0200 +++ b/libgui/src/settings-dialog.ui Tue Apr 02 19:43:52 2013 +0200 @@ -403,13 +403,6 @@ </attribute> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="QCheckBox" name="showFilenames"> - <property name="text"> - <string>Show filenames</string> - </property> - </widget> - </item> - <item> <widget class="QCheckBox" name="showFileSize"> <property name="text"> <string>Show file size</string>