diff libgui/src/m-editor/file-editor.h @ 16457:10edb6f1ae98

improve encapsulation of file editor window object * file-editor-interface.h (file_editor_interface::connect_visibility_changed): New function. * file-editor.h, file-editor.cc (file_editor::handle_visibility, file_editor::focus, file_editor::connect_visibility_changed): New functions. (file_editor::construct): Connect main_window::new_file_signal to file_editor::new_file. * main-window.cc (main_window::editor_window): Rename from _file_editor. Change all uses. (create_default_editor): New static function. (main_window::main_window): Use it to initialize editor_window. (main_window::new_file_signal, main_window::open_file_signal): New signals. (main_window::new_file, main_window::open_file): Emit signals instead of calling file_editor functions directly. (main_window::focus_editor, main_window::handle_editor_visible): Delete. (main_window::connect_visibility_changed): Call editor_window->connect_visibility_changed. (main_window::construct): Don't create _file_editor. (main_window::construct_file_menu): Connect _open_action::triggered to editor_window::request_open_file instead of main_window::open_file. Connect _new_script_action::triggered to editor_window::request_new_file instead of main_window::new_file. (main_window::construct_new_menu): Connect editor_action::triggered to editor_window::focus instead of main_window::focus_editor.
author John W. Eaton <jwe@octave.org>
date Sun, 07 Apr 2013 05:45:23 -0400
parents 744ff2fe11ce
children c1e90c7cfd30
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.h	Sun Apr 07 04:39:35 2013 -0400
+++ b/libgui/src/m-editor/file-editor.h	Sun Apr 07 05:45:23 2013 -0400
@@ -47,9 +47,13 @@
 {
   Q_OBJECT
 
-  public:
+public:
+
   file_editor (QWidget *p);
   ~file_editor ();
+
+  void connect_visibility_changed (void);
+
   void loadFile (const QString& fileName);
 
   QMenu *           get_mru_menu ( ) { return _mru_file_menu; }
@@ -96,6 +100,9 @@
   void fetab_set_focus (const QWidget* ID);
 
 public slots:
+  void focus (void);
+  void handle_visibility (bool visible);
+
   void request_new_file (const QString& commands);
   void request_open_file ();
   void request_mru_open_file ();