Mercurial > octave
view libgui/src/module.mk @ 23385:41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
* external-editor-interface.cc/h: new class with an interface for an external
editor, which is used by preference or if qscintilla is not available;
(external_editor_interface): ctor, connect a signal for opening the settings;
(external_editor): check for an external editor being set in the settings;
(call_custom_editor): call the custom editor;
(request_open_file, request_open_file, handle_edit_file_request):
slots for the various ways for opening a file
* file-editor-interface.h: moved request_new_function and
removed request_open_file into the main window
* file-editor.cc: include external-editor-interface.h;
(file_editor): file encoding tracked in main window;
(request_new_function): moved into main window;
(request_open_file (void)): moved to main window;
(request_open_files): moved to main window;
(handle_combo_enc_current_index): moved to main window;
(restore_create_file_setting): moved into main window;
(request_new_script): moved into main window;
(restore_create_file_setting): moved into main window;
(call_custom_editor): use external_editor_interface;
(handle_edit_mfile_request): moved into main window;
(construct): moved some signal connection into the main window;
(add_file_editor_tab): update signal connection to moved slots;
* file-editor.h: moved request_new_function, handle_edit_mfile_request,
request_open_file (void), request_open_files, handle_combo_enc_current_index,
and class variable _file_encodinginto the main window;
* main-window.cc (main_window): initialize _file_encoding to empty string,
set external editor interface and store active editor for connecting signals;
(~main_window): delete external_editor_interface;
(edit_mfile): directly use slot handle_edit_mfile_request moved here;
(handle_edit_mfile_request): moved from editor to here;
(request_new_function): moved from editor to here;
(request_open_file): moved from file editor to here;
(set_file_encoding): moved from file editor to here, old name was
handle_combo_enc_current_index;
(request_open_files): moved from file editor to here;
(restore_create_file_setting): moved from editor to here;
(construct_octave_qt_link): connect signals to slots in editor or external
editor interface;
(construct_file_menu): connect signals to slots in editor or external
editor interface, slot for opening files now in main window
(construct_new_menu): connect signals to slots in editor, external
editor interface, or to slots moved here;
* main-window.h: update signals according to moved slots, namely
request_new_function, request_new_script, handle_edit_mfile_request,
restore_create_file_setting, moved request_open_file, set_file_encoding,
request_open_files, and class variable _file_encoding to here
* module.mk: added new files external-editor-interface.cc/h
author | Torsten <mttl@mailbox.org> |
---|---|
date | Tue, 11 Apr 2017 08:00:23 +0200 |
parents | c319e6d737f2 |
children | 58d56f52d50a |
line wrap: on
line source
octave_gui_ICONS = \ libgui/src/icons/applications-system.png \ libgui/src/icons/bp-next.png \ libgui/src/icons/bp-prev.png \ libgui/src/icons/bp-rm-all.png \ libgui/src/icons/bp-toggle.png \ libgui/src/icons/db-cont.png \ libgui/src/icons/db-step-in.png \ libgui/src/icons/db-step-out.png \ libgui/src/icons/db-step.png \ libgui/src/icons/db-stop.png \ libgui/src/icons/document-new.png \ libgui/src/icons/document-open.png \ libgui/src/icons/document-print.png \ libgui/src/icons/document-save.png \ libgui/src/icons/document-save-as.png \ libgui/src/icons/edit-copy.png \ libgui/src/icons/edit-cut.png \ libgui/src/icons/edit-delete.png \ libgui/src/icons/edit-find.png \ libgui/src/icons/edit-find-replace.png \ libgui/src/icons/edit-paste.png \ libgui/src/icons/edit-redo.png \ libgui/src/icons/edit-undo.png \ libgui/src/icons/folder.png \ libgui/src/icons/folder-new.png \ libgui/src/icons/go-first.png \ libgui/src/icons/go-last.png \ libgui/src/icons/go-up.png \ libgui/src/icons/graphic_logo_DocumentationDockWidget.png \ libgui/src/icons/graphic_logo_FileEditor.png \ libgui/src/icons/graphic_logo_FilesDockWidget.png \ libgui/src/icons/graphic_logo_HistoryDockWidget.png \ libgui/src/icons/graphic_logo_NewsDockWidget.png \ libgui/src/icons/graphic_logo_TerminalDockWidget.png \ libgui/src/icons/graphic_logo_WorkspaceView.png \ libgui/src/icons/graphic_logo_ReleaseWidget.png \ libgui/src/icons/graphic_logo_DocumentationDockWidget.svg \ libgui/src/icons/graphic_logo_FileEditor.svg \ libgui/src/icons/graphic_logo_FilesDockWidget.svg \ libgui/src/icons/graphic_logo_HistoryDockWidget.svg \ libgui/src/icons/graphic_logo_NewsDockWidget.svg \ libgui/src/icons/graphic_logo_TerminalDockWidget.svg \ libgui/src/icons/graphic_logo_WorkspaceView.svg \ libgui/src/icons/graphic_logo_ReleaseWidget.svg \ libgui/src/icons/icons_license \ libgui/src/icons/letter_logo_DocumentationDockWidget.png \ libgui/src/icons/letter_logo_FileEditor.png \ libgui/src/icons/letter_logo_FilesDockWidget.png \ libgui/src/icons/letter_logo_HistoryDockWidget.png \ libgui/src/icons/letter_logo_NewsDockWidget.png \ libgui/src/icons/letter_logo_TerminalDockWidget.png \ libgui/src/icons/letter_logo_WorkspaceView.png \ libgui/src/icons/letter_logo_ReleaseWidget.png \ libgui/src/icons/letter_logo_DocumentationDockWidget.svg \ libgui/src/icons/letter_logo_FileEditor.svg \ libgui/src/icons/letter_logo_FilesDockWidget.svg \ libgui/src/icons/letter_logo_HistoryDockWidget.svg \ libgui/src/icons/letter_logo_NewsDockWidget.svg \ libgui/src/icons/letter_logo_TerminalDockWidget.svg \ libgui/src/icons/letter_logo_WorkspaceView.svg \ libgui/src/icons/letter_logo_ReleaseWidget.svg \ libgui/src/icons/logo.png \ libgui/src/icons/preferences-system.png \ libgui/src/icons/system-run.png \ libgui/src/icons/user-home.png \ libgui/src/icons/view-refresh.png \ libgui/src/icons/widget-close.png \ libgui/src/icons/widget-dock.png \ libgui/src/icons/widget-undock.png \ libgui/src/icons/widget-close-light.png \ libgui/src/icons/widget-dock-light.png \ libgui/src/icons/widget-undock-light.png \ libgui/src/icons/zoom-in.png \ libgui/src/icons/zoom-out.png octave_gui_MOC = if AMCOND_HAVE_QSCINTILLA OCTAVE_GUI_SRC_M_EDITOR_MOC = \ libgui/src/m-editor/moc-file-editor-interface.cc \ libgui/src/m-editor/moc-file-editor-tab.cc \ libgui/src/m-editor/moc-file-editor.cc \ libgui/src/m-editor/moc-find-dialog.cc \ libgui/src/m-editor/moc-octave-qscintilla.cc \ libgui/src/m-editor/moc-octave-txt-lexer.cc \ libgui/src/m-editor/moc-marker.cc $(OCTAVE_GUI_SRC_M_EDITOR_MOC): | libgui/src/m-editor/$(octave_dirstamp) octave_gui_MOC += \ $(OCTAVE_GUI_SRC_M_EDITOR_MOC) DIRSTAMP_FILES += \ libgui/src/m-editor/$(octave_dirstamp) endif OCTAVE_GUI_SRC_MOC = \ libgui/src/moc-external-editor-interface.cc \ libgui/src/moc-dialog.cc \ libgui/src/moc-documentation-dock-widget.cc \ libgui/src/moc-files-dock-widget.cc \ libgui/src/moc-history-dock-widget.cc \ libgui/src/moc-main-window.cc \ libgui/src/moc-octave-cmd.cc \ libgui/src/moc-octave-qt-link.cc \ libgui/src/moc-settings-dialog.cc \ libgui/src/moc-terminal-dock-widget.cc \ libgui/src/moc-color-picker.cc \ libgui/src/moc-resource-manager.cc \ libgui/src/moc-shortcut-manager.cc \ libgui/src/moc-welcome-wizard.cc \ libgui/src/moc-workspace-model.cc \ libgui/src/moc-workspace-view.cc \ libgui/src/moc-find-files-dialog.cc \ libgui/src/moc-find-files-model.cc \ libgui/src/qtinfo/moc-parser.cc \ libgui/src/qtinfo/moc-webinfo.cc \ libgui/src/moc-octave-dock-widget.cc octave_gui_MOC += \ $(OCTAVE_GUI_SRC_MOC) \ $(OCTAVE_GUI_EDITOR_MOC) octave_gui_RC = libgui/src/qrc-resource.cc $(octave_gui_RC): | libgui/src/$(octave_dirstamp) DIRSTAMP_FILES += \ libgui/src/$(octave_dirstamp) octave_gui_UI = \ libgui/src/settings-dialog.ui octave_gui_UI_H = $(patsubst libgui/src/%.ui, libgui/src/ui-%.h, $(octave_gui_UI)) $(octave_gui_UI_H): | libgui/src/$(octave_dirstamp) BUILT_SOURCES += $(octave_gui_UI_H) noinst_HEADERS += \ libgui/src/dialog.h \ libgui/src/octave-dock-widget.h \ libgui/src/documentation-dock-widget.h \ libgui/src/external-editor-interface.h \ libgui/src/files-dock-widget.h \ libgui/src/history-dock-widget.h \ libgui/src/liboctgui-build-info.h \ libgui/src/m-editor/file-editor-interface.h \ libgui/src/m-editor/file-editor-tab.h \ libgui/src/m-editor/file-editor.h \ libgui/src/m-editor/find-dialog.h \ libgui/src/m-editor/octave-qscintilla.h \ libgui/src/m-editor/octave-txt-lexer.h \ libgui/src/m-editor/marker.h \ libgui/src/main-window.h \ libgui/src/octave-gui.h \ libgui/src/octave-cmd.h \ libgui/src/octave-qt-link.h \ libgui/src/qtinfo/parser.h \ libgui/src/qtinfo/webinfo.h \ libgui/src/resource-manager.h \ libgui/src/settings-dialog.h \ libgui/src/shortcut-manager.h \ libgui/src/thread-manager.h \ libgui/src/terminal-dock-widget.h \ libgui/src/color-picker.h \ libgui/src/welcome-wizard.h \ libgui/src/find-files-dialog.h \ libgui/src/find-files-model.h \ libgui/src/workspace-model.h \ libgui/src/workspace-view.h libgui_src_libgui_src_la_SOURCES = \ libgui/src/dialog.cc \ libgui/src/documentation-dock-widget.cc \ libgui/src/external-editor-interface.cc \ libgui/src/files-dock-widget.cc \ libgui/src/history-dock-widget.cc \ libgui/src/m-editor/file-editor-tab.cc \ libgui/src/m-editor/file-editor.cc \ libgui/src/m-editor/find-dialog.cc \ libgui/src/m-editor/octave-qscintilla.cc \ libgui/src/m-editor/octave-txt-lexer.cc \ libgui/src/m-editor/marker.cc \ libgui/src/main-window.cc \ libgui/src/octave-cmd.cc \ libgui/src/octave-dock-widget.cc \ libgui/src/octave-gui.cc \ libgui/src/octave-qt-link.cc \ libgui/src/qtinfo/parser.cc \ libgui/src/qtinfo/webinfo.cc \ libgui/src/resource-manager.cc \ libgui/src/settings-dialog.cc \ libgui/src/shortcut-manager.cc \ libgui/src/thread-manager.cc \ libgui/src/terminal-dock-widget.cc \ libgui/src/color-picker.cc \ libgui/src/welcome-wizard.cc \ libgui/src/find-files-dialog.cc \ libgui/src/find-files-model.cc \ libgui/src/workspace-model.cc \ libgui/src/workspace-view.cc nodist_libgui_src_libgui_src_la_SOURCES = \ libgui/src/liboctgui-build-info.cc \ $(octave_gui_MOC) \ $(octave_gui_RC) libgui_src_libgui_src_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(FT2_CPPFLAGS) \ $(FONTCONFIG_CPPFLAGS) \ @OCTGUI_DLL_DEFS@ \ @QT_CPPFLAGS@ \ -I$(srcdir)/libgui/qterminal/libqterminal \ -Ilibgui/src -I$(srcdir)/libgui/src \ -I$(srcdir)/libgui/src/m-editor \ -I$(srcdir)/libgui/src/qtinfo \ -I$(srcdir)/libgui/graphics \ -I$(srcdir)/liboctave/cruft/misc \ -I$(srcdir)/liboctave/array \ -Iliboctave/numeric -I$(srcdir)/liboctave/numeric \ -Iliboctave/operators -I$(srcdir)/liboctave/operators \ -I$(srcdir)/liboctave/system \ -I$(srcdir)/liboctave/util \ -Ilibinterp -I$(srcdir)/libinterp \ -Ilibinterp/parse-tree -I$(srcdir)/libinterp/parse-tree \ -Ilibinterp/corefcn -I$(srcdir)/libinterp/corefcn \ -I$(srcdir)/libinterp/octave-value \ -I$(srcdir)/liboctave/wrappers libgui_src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) libgui_src_libgui_src_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) noinst_LTLIBRARIES += libgui/src/libgui-src.la libgui_EXTRA_DIST += \ libgui/src/liboctgui-build-info.in.cc \ libgui/src/resource.qrc \ $(octave_gui_UI) \ $(octave_gui_ICONS) libgui_CLEANFILES += \ $(octave_gui_MOC) \ $(octave_gui_UI_H) \ $(octave_gui_RC) \ libgui/src/liboctgui-build-info.cc libgui/src/liboctgui-build-info.cc: libgui/src/liboctgui-build-info.in.cc HG-ID | libgui/src/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SED) \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \ -e "s|%OCTAVE_HG_ID%|$(HG_ID_VAR)|" $< > $@-t && \ $(simple_move_if_change_rule)