Mercurial > hg > octave-lyh

comparison libgui/src/files-dockwidget.cc @ 16413:28136851099a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove _terminal pointer from main_window, it is contained by other Qt object * main-window.cc, main-window.h (main_window::_terminal): Delete member variable. (main_window::get_terminal_view, main_window::get_history_dock_widget, main_window::get_files_dock_widget, main_window::is_closing): Delete unused functions. (main_window::notice_settings): New argument settings. (main_window::handle_command_double_clicked): Don't sent terminal a command here. (main_window::process_settings_dialog_request): New argument, settings. (main_window::read_settings): New argument, settings. Produce debug message if settings is nul. (main_window::write_settings): Produce debug message if settings is nul. (main_window::construct): Make _terminal a local variable and rename to terminal. Change all uses. * QTerminal.cc: New file. (QTerminal::relay_command): New slot. * QTerminal.h (QTerminal::notice_settings, QTerminal::notice_settings): New slots. * QTerminal: Delete. * files_dockwidget.cc, files_dockwidget.h (files_dock_widget::notice_settings): New argument, settings. * file_editor_tab.cc, file_editor_tab.h (file_editor_tab::notice_settings): Changed the slot to accept QSettings pointer rather than retrieve from resource_manager. (file_editor_tabl::file_editor_tab, file_editor_tab::update_lexer): Check that settings is not null before using. * file_editor.cc, file_editor.h (file_editor::notice_settings, file_editor::fetab_settings_changed): New argument, settings. (file_editor::update_lexer, file_editor::file_editor_tab): Check that settings is not null before using. * qterminal-module.mk (qterminal_libqterminal_la_SOURCES): Add QTerminal.cc to the list.
author Daniel J Sebald <daniel.sebald@ieee.org>
date Wed, 03 Apr 2013 00:10:56 -0400
parents f62163bed4dc
children 919796a440c6
comparison
equal deleted inserted replaced
16412:61989cde13ae 16413:28136851099a
180 } 180 }
181 } 181 }
182 } 182 }
183 183
184 void 184 void
185 files_dock_widget::notice_settings () 185 files_dock_widget::notice_settings (const QSettings *settings)
186 { 186 {
187 QSettings *settings = resource_manager::get_settings (); 187 // Qsettings pointer is checked before emitting.
188 188
189 // FIXME -- what should happen if settings is 0?
190 // file names are always shown, other columns can be hidden by settings 189 // file names are always shown, other columns can be hidden by settings
191 _file_tree_view->setColumnHidden (0, false); 190 _file_tree_view->setColumnHidden (0, false);
192 _file_tree_view->setColumnHidden (1, !settings->value ("showFileSize",false).toBool ()); 191 _file_tree_view->setColumnHidden (1, !settings->value ("showFileSize",false).toBool ());
193 _file_tree_view->setColumnHidden (2, !settings->value ("showFileType",false).toBool ()); 192 _file_tree_view->setColumnHidden (2, !settings->value ("showFileType",false).toBool ());
194 _file_tree_view->setColumnHidden (3, !settings->value ("showLastModified",false).toBool ()); 193 _file_tree_view->setColumnHidden (3, !settings->value ("showLastModified",false).toBool ());