Mercurial > octave-nkf
changeset 16611:999400bebe5e
move more common code from dock widgets into octave-dock-widget.h
* terminal-dock-widget.cc, file-editor.cc, files-dock-widget.cc,
workspace-view.cc (constructor): remove connectiong changed_settings signal
* files-dock-widget.cc/.h, file-editor.h: do not include QSettings here
* octave-dock-widget.h(constructor): connect changed_settings signal
* octave-dock-widget.h: include QSettings, empty virtual slot notice-settings
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Sat, 04 May 2013 23:37:27 +0200 |
| parents | a1f613e5066d |
| children | dae674adf045 |
| files | libgui/src/files-dock-widget.cc libgui/src/files-dock-widget.h libgui/src/m-editor/file-editor.cc libgui/src/m-editor/file-editor.h libgui/src/octave-dock-widget.h libgui/src/terminal-dock-widget.cc libgui/src/workspace-view.cc |
| diffstat | 7 files changed, 9 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/files-dock-widget.cc Sat May 04 09:37:28 2013 +0200 +++ b/libgui/src/files-dock-widget.cc Sat May 04 23:37:27 2013 +0200 @@ -30,7 +30,6 @@ #include <QApplication> #include <QFileInfo> #include <QCompleter> -#include <QSettings> #include <QProcess> #include <QDebug> #include <QHeaderView> @@ -63,9 +62,6 @@ connect (this, SIGNAL (displayed_directory_changed (const QString&)), parent (), SLOT (set_current_working_directory (const QString&))); - connect (parent (), SIGNAL (settings_changed (const QSettings *)), - this, SLOT (notice_settings (const QSettings *))); - // Create a toolbar _navigation_tool_bar = new QToolBar ("", container); _navigation_tool_bar->setAllowedAreas (Qt::TopToolBarArea);
--- a/libgui/src/files-dock-widget.h Sat May 04 09:37:28 2013 +0200 +++ b/libgui/src/files-dock-widget.h Sat May 04 23:37:27 2013 +0200 @@ -34,7 +34,6 @@ #include <QVBoxLayout> #include <QAction> #include <QTreeView> -#include <QSettings> #include <QComboBox> #include "octave-dock-widget.h"
--- a/libgui/src/m-editor/file-editor.cc Sat May 04 09:37:28 2013 +0200 +++ b/libgui/src/m-editor/file-editor.cc Sat May 04 23:37:27 2013 +0200 @@ -906,9 +906,6 @@ editor_widget->setLayout (vbox_layout); setWidget (editor_widget); - connect (parent (), SIGNAL (settings_changed (const QSettings *)), - this, SLOT (notice_settings (const QSettings *))); - connect (parent (), SIGNAL (new_file_signal (const QString&)), this, SLOT (request_new_file (const QString&)));
--- a/libgui/src/m-editor/file-editor.h Sat May 04 09:37:28 2013 +0200 +++ b/libgui/src/m-editor/file-editor.h Sat May 04 23:37:27 2013 +0200 @@ -29,7 +29,6 @@ #include <QStatusBar> #include <QCloseEvent> #include <QTabWidget> -#include <QSettings> #include <map>
--- a/libgui/src/octave-dock-widget.h Sat May 04 09:37:28 2013 +0200 +++ b/libgui/src/octave-dock-widget.h Sat May 04 23:37:27 2013 +0200 @@ -24,6 +24,7 @@ #define octave_dock_widget_h 1 #include <QDockWidget> +#include <QSettings> class octave_dock_widget : public QDockWidget { @@ -39,6 +40,9 @@ connect (this, SIGNAL (topLevelChanged (bool)), this, SLOT (top_level_changed (bool))); + + connect (p, SIGNAL (settings_changed (const QSettings*)), + this, SLOT (notice_settings (const QSettings*))); } virtual ~octave_dock_widget () { } @@ -49,6 +53,7 @@ this, SLOT (handle_visibility (bool))); } + signals: /** Custom signal that tells whether a user has clicked away @@ -82,6 +87,10 @@ focus (); } + virtual void notice_settings (const QSettings*) + { + } + protected slots: /** Slot to steer changing visibility from outside. */
--- a/libgui/src/terminal-dock-widget.cc Sat May 04 09:37:28 2013 +0200 +++ b/libgui/src/terminal-dock-widget.cc Sat May 04 23:37:27 2013 +0200 @@ -38,9 +38,6 @@ setWindowTitle (tr ("Command Window")); setWidget (terminal); - connect (parent (), SIGNAL (settings_changed (const QSettings *)), - this, SLOT (notice_settings (const QSettings *))); - connect (this, SIGNAL (visibilityChanged (bool)), this, SLOT (handle_visibility (bool)));
--- a/libgui/src/workspace-view.cc Sat May 04 09:37:28 2013 +0200 +++ b/libgui/src/workspace-view.cc Sat May 04 23:37:27 2013 +0200 @@ -78,9 +78,6 @@ connect (this, SIGNAL (command_requested (const QString&)), p, SLOT (execute_command_in_terminal (const QString&))); - connect (parent (), SIGNAL (settings_changed (const QSettings *)), - this, SLOT (notice_settings (const QSettings *))); - } workspace_view::~workspace_view (void)