Mercurial > octave-nkf

comparison libgui/src/m-editor/file-editor.h @ 15848:424edeca3c66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Redo portions of file editor to use more signals/slots rather than casting. * file-editor-tab.cc, file-editor-tab.h (file_editor_tab::~file_editor_tab): Add. Delete lexer to prevent memory leak. Delete _edit_area to prevent memory leak. (file_editor_tab::conditional_close): Add. Simple slot that uses QWidget pointer as unique ID, not for function call. (file_editor_tab::file_name_query): Add. Simple slot that signals file name to whomever is connected. (file_editor_tab::find, file_editor_tab : public QWidget): Removed use of exec() and keep a pointer to the find_dialog as a member. Toggle hide()/show() via a connected slot to toggle visibility as desired. * file-editor.cc, file-editor.h, file-editor-tab.cc file-editor-tab.h (file_editor : public file_editor_interface, file_editor_tab : public QWidget, file_editor_tab::file_editor_tab, file_editor_tab::closeEvent, file_editor_tab::load_file, file_editor_tab::new_file, file_editor_tab::run_file): Remove _file_editor pointer member from file_editor_tab and rid file_editor::get_main_window from file_editor. There should be no need for such information about higher-level hierarchy inside lower-level objects. (file_editor::request_open_file, file_editor_tab::open_file): Move QFileDialog to file_editor::request_open_file and delete file_editor_tab::open_file since most of the remaining functionality is in file_editor_tab::load_file. (file_editor::active_editor_tab): Deleted. (file_editor::fetab_change_request, file_editor_tab::change_editor_state): Added to initiate a request for the editor tab to change focus. (file_editor_tab::editor_state_changed): Added arguments to pass the copy status and the directory path so that editor doesn't have to call functions for such information. (file_editor::handle_editor_state_changed): Add copying directory of the file_editor_tab to the current editing directory. (file_editor::check_conflict_save, file_editor_tab::editor_check_conflict_save, file_editor_tab::save_file_as, file_editor_tab::handle_save_file_as_answer): Moved a portion of the save-file-as dialog mechanism to the file_editor where all file names can be obtained to check for conflict with already open files. The new signal indicates to the editor that a name check be done, and in turn the editor signals the tab to save the file. * main-window.cc, file-editor.cc, file-editor.h, file-editor-interface.h (file_editor::terminal, file_editor : public file_editor_interface, file_editor_interface : public QDockWidget): Since file_editor_tab no longer looks up to main_window, remove _main_window and _terminal from file_editor and file_editor_interface, as well as file_editor::terminal. * file-editor-tab.cc (file_editor_tab::file_has_changed): Make the dialog boxes non-modal and use slots to handle user answers. (file_editor_tab::closeEvent): Remove portion that accesses upper hierarchy member functions, can find better approaches. (file_editor_tab::file_editor_tab): Make there no parent for QsciScintilla so that window modality can be set to individual editor. * file-editor-tab.cc, file-editor.cc (file_editor_tab::load_file): Use show() member rather than exec() and set modality to window so that rest of application may function. Return a QString with message rather than a boolean. * file-editor-tab.cc, (file_editor_tab::file_has_changed): Remove static variable alreadyAsking. Multiple file_editor_tabs are using this code so do not want to block recognition of multiple file having changed on disk (bug #37406). Instead, simply stop tracking via the file watcher. (file_editor_tab::save_file, file_editor_tab::save_file_as, file_editor_tab::handle_save_file_as_answer, file_editor_tab::handle_save_file_as_answer_close): Added a remove_on_success variable. Changed the QFileDialog to WindowModal and created slots to handle file selected signal and finished signal. Signal/slot connects vary based upon remove_on_success setting. (file_editor_tab::check_file_modified): Changed the QFileDialog to NonModal and attach some slots. Editor tab can't be parent in case deleted, so use read-only state of the editor area. * file-editor-tab.h (file_editor_tab : public QWidget): New signals for file_editor for tab and file name management. (file_editor_tab::get_file_name): Delete. * file-editor.h (file_editor : public file_editor_interface): Make QStringList sessionFileNames a member of file_editor so that it can retain data between file_editor_tab signals. Also can be used for checking precense of filenames and prevent opening multiple copies (bug #36869) Added signals for file editor tabs--settings_changed, fetab_close_request, and query_file_name. Three new slots for tab and file name management. * file-editor-interface.h, file-editor.h (file_editor_interface::add_file_editor_tab, file_editor::add_file_editor_tab): Made the text name for the tab an input variable. * file-editor.cc (file_editor::~file_editor): Replace dynamic_cast with simple signal querying all file editor tabs for file names which end up in savedSessionTabs. (file_editor::handle_file_name_changed): Dynamic cast not necessary since QObject and QWidget are compatible. (file_editor::handle_tab_close_request): Replace dynamic_cast with signal to request file_editor_tab with associated tabID tag should close. (file_editor::handle_tab_remove_request): Rename of handle_tab_close_request. Instead of dynamic cast, loop through pointers comparing QWidget* to QObject*, if same tag remove tab via index and also delete which fixes a memory leak. (file_editor::handle_add_filename_to_list): Simple slot that uses append() of the list member functions. (file_editor::notice_settings): Rather than dynamic cast, emit signal for the file_editor_tabs. (file_editor::add_file_editor_tab): New variety of connections for improved flow. (file_editor::request_open_file): Given error messages are made WindowModal, the tab shouldn't be delete if file open is not successful. The file_editor_tab takes care of that. (file_editor::request_open_file): Added check and message box for the requested file already open in editor. For the non-interactive overloaded version, open a message dialog box to tell the user file not found, e.g., could not find file in the settings when launched. (file_editor::request_open_file): Inquire file names and update list before checking for existence of files. Supply empty title to editor tab then have file_editor_tab update name. * file-editor-tab.h, file-editor-tab.cc, file-editor.cc (file_editor_tab::run_file): New signal process_octave_code. (file_editor::add_file_editor_tab): Connect signal process_octave_code to file_editor's parent's slot handle_command_double_clicked.
author Daniel J Sebald <daniel.sebald@ieee.org>
date Sun, 23 Dec 2012 14:33:48 -0600
parents bbbb89cc338f
children feba9ff6e6a8
comparison
equal deleted inserted replaced
15847:13d1e9bfa362 15848:424edeca3c66
28 #include <QMenuBar> 28 #include <QMenuBar>
29 #include <QStatusBar> 29 #include <QStatusBar>
30 #include <QCloseEvent> 30 #include <QCloseEvent>
31 #include <QTabWidget> 31 #include <QTabWidget>
32 32
33 #include "main-window.h"
34 #include "file-editor-interface.h" 33 #include "file-editor-interface.h"
35 #include "file-editor-tab.h" 34 #include "file-editor-tab.h"
36 35
37 const char UNNAMED_FILE[] = "<unnamed>"; 36 const char UNNAMED_FILE[] = "<unnamed>";
38 const char SAVE_FILE_FILTER[] = "Octave Files (*.m);;All Files (*.*)"; 37 const char SAVE_FILE_FILTER[] = "Octave Files (*.m);;All Files (*.*)";
46 class file_editor : public file_editor_interface 45 class file_editor : public file_editor_interface
47 { 46 {
48 Q_OBJECT 47 Q_OBJECT
49 48
50 public: 49 public:
51 file_editor (QTerminal *terminal, main_window *m); 50 file_editor (QWidget *p);
52 ~file_editor (); 51 ~file_editor ();
53 void loadFile (const QString& fileName); 52 void loadFile (const QString& fileName);
54
55 QTerminal * terminal ();
56 main_window * get_main_window ();
57 53
58 QMenu * debug_menu (); 54 QMenu * debug_menu ();
59 QToolBar * toolbar (); 55 QToolBar * toolbar ();
60 56
61 void handle_entered_debug_mode (); 57 void handle_entered_debug_mode ();
62 void handle_quit_debug_mode (); 58 void handle_quit_debug_mode ();
63 59
60 signals:
61 void fetab_settings_changed ();
62 void fetab_close_request (const QWidget* ID);
63 void fetab_change_request (const QWidget* ID);
64 void fetab_file_name_query (const QWidget* ID);
65 // Save is a ping-pong type of communication
66 void fetab_save_file (const QWidget* ID, const QString& fileName, bool remove_on_success);
67 // No fetab_open, functionality in editor
68 // No fetab_new, functionality in editor
69 void fetab_undo (const QWidget* ID);
70 void fetab_redo (const QWidget* ID);
71 void fetab_copy (const QWidget* ID);
72 void fetab_cut (const QWidget* ID);
73 void fetab_paste (const QWidget* ID);
74 void fetab_save_file (const QWidget* ID);
75 void fetab_save_file_as (const QWidget* ID);
76 void fetab_run_file (const QWidget* ID);
77 void fetab_toggle_bookmark (const QWidget* ID);
78 void fetab_next_bookmark (const QWidget* ID);
79 void fetab_previous_bookmark (const QWidget* ID);
80 void fetab_remove_bookmark (const QWidget* ID);
81 void fetab_toggle_breakpoint (const QWidget* ID);
82 void fetab_next_breakpoint (const QWidget* ID);
83 void fetab_previous_breakpoint (const QWidget* ID);
84 void fetab_remove_all_breakpoints (const QWidget* ID);
85 void fetab_comment_selected_text (const QWidget* ID);
86 void fetab_uncomment_selected_text (const QWidget* ID);
87 void fetab_find (const QWidget* ID);
88
64 public slots: 89 public slots:
65 void request_new_file (); 90 void request_new_file ();
66 void request_open_file (); 91 void request_open_file ();
67 void request_open_file (const QString& fileName, bool silent = false);
68 92
69 void request_undo (); 93 void request_undo ();
70 void request_redo (); 94 void request_redo ();
71 void request_copy (); 95 void request_copy ();
72 void request_cut (); 96 void request_cut ();
88 void request_uncomment_selected_text (); 112 void request_uncomment_selected_text ();
89 void request_find (); 113 void request_find ();
90 114
91 void handle_file_name_changed (const QString& fileName); 115 void handle_file_name_changed (const QString& fileName);
92 void handle_tab_close_request (int index); 116 void handle_tab_close_request (int index);
93 void handle_tab_close_request (); 117 void handle_tab_remove_request ();
118 void handle_add_filename_to_list (const QString& fileName);
94 void active_tab_changed (int index); 119 void active_tab_changed (int index);
95 void handle_editor_state_changed (); 120 void handle_editor_state_changed (bool enableCopy, const QString& fileName);
121 void check_conflict_save (const QString& fileName, bool remove_on_success);
122
96 /** Slot when floating property changes */ 123 /** Slot when floating property changes */
97 void top_level_changed (bool floating); 124 void top_level_changed (bool floating);
98 125
99 /** Tells the editor to react on changed settings. */ 126 /** Tells the editor to react on changed settings. */
100 void notice_settings (); 127 void notice_settings ();
101 128
129 private slots:
130 void request_open_file (const QString& fileName);
131
102 private: 132 private:
103 void construct (); 133 void construct ();
104 void add_file_editor_tab(file_editor_tab *f); 134 void add_file_editor_tab(file_editor_tab *f, const QString &fn);
105 file_editor_tab *active_editor_tab(); 135 void save_file_as (QWidget *fetabID = 0);
136
137 QStringList fetFileNames;
138 QString ced;
106 139
107 QMenuBar * _menu_bar; 140 QMenuBar * _menu_bar;
108 QToolBar * _tool_bar; 141 QToolBar * _tool_bar;
109 QMenu * _debug_menu; 142 QMenu * _debug_menu;
110 QAction * _copy_action; 143 QAction * _copy_action;