Mercurial > octave-libgccjit
view libgui/src/module.mk @ 18611:086093fbdc1a gui-release
first implementation of a shortcut manager (bug #41217)
* file-editor.cc (set_shortcuts): use shortcut-manager to set some shortcuts
* main_window.cc (set_global_shortcuts): use shortcut-manager to set some
shortcuts;
(construct_file_menu): all actions as class variables;
(construct_edit_menu): all actions as class variables;
* main_window.h: actions as class variables
* module.mk: new files shortcut_manager.cc, shortcut_manager.h
* octave-gui.cc (octave_start_gui): initialize the shortcut_manager
* settings-dialog.cc (constructor): call shortcut-manager for shortcut table
(write_changed_settings): call shortcut-manager for writing shortcuts
* settings-dialog.ui: new tab with a tree widget for the shortcuts
* shortcut_manager.cc (constructor, destructor): new class;
(instance_ok): checks if instance is valid, creates a new one otherwise;
(do_init_data): initialize the list with all shortcut's data;
(init): internal function for initializing the data list;
(do_fill_treewidget): fills the tree widget in the settings dialog;
(do_write_shortcuts): writes shortcuts from settings dialog into file;
(do_set_shortcut): setting the shortcut for an action;
(handle_double_clicked): slot for double clicking into the tree widget;
(shortcut_dialog): dialog for entering a new shortcut;
(shortcut_dialog_finished): processing the dialog's result;
(shortcut_dialog_set_default): setting the shortcut to it's default;
(enter_shortcut::enter_shortcut): new class derived from QLineEdit;
(enter_shortcut::handle_direct_shortcut): switch between normal editing and
directly entering a shortcut;
(enter_shortcut::keyPressEvent): event handler filtering the shortcuts;
* shortcut_manager.h (init_data): static function calling do_init_data;
(write_shortcuts): static function calling do_write_shortcuts;
(fill_treewidget): static function calling do_fill_treewidget;
(set_shortcut): static function calling do_set_shortcut;
author | Torsten <ttl@justmail.de> |
---|---|
date | Tue, 01 Apr 2014 21:29:48 +0200 |
parents | 554be77a60fb |
children |
line wrap: on
line source
EXTRA_DIST += \ src/module.mk \ src/resource.qrc \ $(octave_gui_UI) \ $(octave_gui_ICONS) octave_gui_ICONS = \ src/icons/arrow_right.png \ src/icons/arrow_left.png \ src/icons/arrow_up.png \ src/icons/arrow_down.png \ src/icons/artsbuilderexecute.png \ src/icons/bookmark.png \ src/icons/bp_next.png \ src/icons/bp_prev.png \ src/icons/bp_rm_all.png \ src/icons/bp_toggle.png \ src/icons/configure.png \ src/icons/db_cont.png \ src/icons/db_step_in.png \ src/icons/db_step_out.png \ src/icons/db_step.png \ src/icons/db_stop.png \ src/icons/editcopy.png \ src/icons/editcut.png \ src/icons/editdelete.png \ src/icons/editpaste.png \ src/icons/fileclose.png \ src/icons/filenew.png \ src/icons/fileopen.png \ src/icons/fileprint.png \ src/icons/filesaveas.png \ src/icons/filesave.png \ src/icons/find.png \ src/icons/findf.png \ src/icons/gear.png \ src/icons/folder_documents.png \ src/icons/folder_new.png \ src/icons/folder.png \ src/icons/graphic_logo_DocumentationDockWidget.png \ src/icons/graphic_logo_FileEditor.png \ src/icons/graphic_logo_FilesDockWidget.png \ src/icons/graphic_logo_HistoryDockWidget.png \ src/icons/graphic_logo_NewsDockWidget.png \ src/icons/graphic_logo_TerminalDockWidget.png \ src/icons/graphic_logo_WorkspaceView.png \ src/icons/graphic_logo_ReleaseWidget.png \ src/icons/home.png \ src/icons/icons_license \ src/icons/letter_logo_DocumentationDockWidget.png \ src/icons/letter_logo_FileEditor.png \ src/icons/letter_logo_FilesDockWidget.png \ src/icons/letter_logo_HistoryDockWidget.png \ src/icons/letter_logo_NewsDockWidget.png \ src/icons/letter_logo_TerminalDockWidget.png \ src/icons/letter_logo_WorkspaceView.png \ src/icons/letter_logo_ReleaseWidget.png \ src/icons/logo.png \ src/icons/ok.png \ src/icons/redled.png \ src/icons/redo.png \ src/icons/reload.png \ src/icons/search.png \ src/icons/undo.png \ src/icons/up.png \ src/icons/warning.png \ src/icons/widget-close.png \ src/icons/widget-dock.png \ src/icons/widget-undock.png \ src/icons/widget-close-light.png \ src/icons/widget-dock-light.png \ src/icons/widget-undock-light.png \ src/icons/zoom-in.png \ src/icons/zoom-out.png octave_gui_MOC = if AMCOND_HAVE_QSCINTILLA octave_gui_MOC += \ src/m-editor/moc-file-editor-interface.cc \ src/m-editor/moc-file-editor-tab.cc \ src/m-editor/moc-file-editor.cc \ src/m-editor/moc-find-dialog.cc \ src/m-editor/moc-octave-qscintilla.cc endif octave_gui_MOC += \ src/moc-dialog.cc \ src/moc-documentation-dock-widget.cc \ src/moc-files-dock-widget.cc \ src/moc-history-dock-widget.cc \ src/moc-main-window.cc \ src/moc-octave-interpreter.cc \ src/moc-octave-qt-link.cc \ src/moc-settings-dialog.cc \ src/moc-terminal-dock-widget.cc \ src/moc-color-picker.cc \ src/moc-resource-manager.cc \ src/moc-shortcut-manager.cc \ src/moc-welcome-wizard.cc \ src/moc-workspace-model.cc \ src/moc-workspace-view.cc \ src/moc-find-files-dialog.cc \ src/moc-find-files-model.cc \ src/qtinfo/moc-parser.cc \ src/qtinfo/moc-webinfo.cc \ src/moc-octave-dock-widget.cc octave_gui_RC = src/qrc-resource.cc octave_gui_UI = \ src/settings-dialog.ui octave_gui_UI_H = $(patsubst src/%.ui, src/ui-%.h, $(octave_gui_UI)) BUILT_SOURCES += $(octave_gui_UI_H) noinst_HEADERS += \ src/dialog.h \ src/octave-dock-widget.h \ src/documentation-dock-widget.h \ src/files-dock-widget.h \ src/history-dock-widget.h \ src/m-editor/file-editor-interface.h \ src/m-editor/file-editor-tab.h \ src/m-editor/file-editor.h \ src/m-editor/find-dialog.h \ src/m-editor/octave-qscintilla.h \ src/main-window.h \ src/octave-gui.h \ src/octave-interpreter.h \ src/octave-qt-link.h \ src/qtinfo/parser.h \ src/qtinfo/webinfo.h \ src/resource-manager.h \ src/settings-dialog.h \ src/shortcut-manager.h \ src/thread-manager.h \ src/terminal-dock-widget.h \ src/color-picker.h \ src/welcome-wizard.h \ src/find-files-dialog.h \ src/find-files-model.h \ src/workspace-model.h \ src/workspace-view.h src_libgui_src_la_SOURCES = \ src/dialog.cc \ src/documentation-dock-widget.cc \ src/files-dock-widget.cc \ src/history-dock-widget.cc \ src/m-editor/file-editor-tab.cc \ src/m-editor/file-editor.cc \ src/m-editor/find-dialog.cc \ src/m-editor/octave-qscintilla.cc \ src/main-window.cc \ src/octave-dock-widget.cc \ src/octave-gui.cc \ src/octave-interpreter.cc \ src/octave-qt-link.cc \ src/qtinfo/parser.cc \ src/qtinfo/webinfo.cc \ src/resource-manager.cc \ src/settings-dialog.cc \ src/shortcut-manager.cc \ src/thread-manager.cc \ src/terminal-dock-widget.cc \ src/color-picker.cc \ src/welcome-wizard.cc \ src/find-files-dialog.cc \ src/find-files-model.cc \ src/workspace-model.cc \ src/workspace-view.cc nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) src_libgui_src_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(FT2_CFLAGS) \ $(FONTCONFIG_CPPFLAGS) \ @OCTGUI_DLL_DEFS@ \ @QT_CPPFLAGS@ \ -I$(srcdir)/qterminal/libqterminal \ -Isrc -I$(srcdir)/src \ -I$(srcdir)/src/m-editor \ -I$(srcdir)/src/qtinfo \ -I$(srcdir)/graphics \ -I$(top_srcdir)/liboctave/cruft/misc \ -I$(top_srcdir)/liboctave/array \ -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \ -I$(top_srcdir)/liboctave/system \ -I$(top_srcdir)/liboctave/util \ -I$(top_builddir)/libinterp -I$(top_srcdir)/libinterp \ -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \ -I$(top_builddir)/libinterp/corefcn -I$(top_srcdir)/libinterp/corefcn \ -I$(top_srcdir)/libinterp/octave-value \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) src_libgui_src_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) noinst_LTLIBRARIES += src/libgui-src.la CLEANFILES += \ $(octave_gui_MOC) \ $(octave_gui_UI_H) \ $(octave_gui_RC)