annotate libgui/src/module.mk @ 29503:3bfec185c9e2

experimental command window widget with server loop This changeset provides a new experimental proof-of-concept cross-platform command window. It is intended to demonstrate how communication between the GUI command window and the Octave interpreter can work when the GUI is completely responsible for user input instead of having the interpreter wait for input inside readline. This initial implementation uses a simple text box for input and a separate text edit area for output. This design is not intended to be the final arrangement, but was easy to implement for demonstration purposes. These changes also make it possible to run the command-line version of Octave in a similar client-server mode with a function gathering input in one thread and the Octave intepreter running in another. The new command window is not intended to provide a general-purpose terminal window. So running something like "system ('emacs')" will not bring up an instance of Emacs running in the command window. This also means that it will no longer be possible to use an external output pager such as "less" in the command window. OTOH, it is also no longer necessary to fork and exec a separate process on some Unixy systems when Octave starts solely to give up the controlling terminal so that "less" will function properly. With the new terminal window, it is now possible to start Octave in command line mode and later open the GUI desktop window and then return to the command line when the GUI window is closed. Some things that need to be finished: * Merge the input and output windows so that command input and output are interleaved as they are in a normal command window. * Provide real readline command editing in the GUI command window and at the client-server CLI prompt. We can use the readline callback interface for the GUI and the normal readline interface for the CLI. With this design, the command widget and the CLI front end hold a copy of the command history. They do not need to communicate with the interpreter to navigate the command history. * Create interpreter_event messages for handling user input so that the interpreter can ask the GUI to gather user input for functions like "input". * Consider passing results back to the command widget as octave_value objects and allowing the command widget to format and display them instead of passing formatted text from the interpreter to the command widget. * Provide an output pager feature for the GUI command window? Maybe this feature is not necessary since we have scroll bars in the GUI and we can also have the GUI ask the user whether to display output if it is large. ChangeLog: * options-usage.h (usage_string, octave_print_verbose_usage_and_exit): Include --experimental-terminal-widget in list of options. (EXPERIMENTAL_TERMINAL_WIDGET_OPTION): New macro. (long_opts): Include "experimental-terminal-widget" in the list. * octave.h, octave.cc (cmdline_options::cmdline_options): Handle EXPERIMENTAL_TERMINAL_WIDGET_OPTION. (cmdline_options::m_experimental_terminal_widget): New data member. (application::experimental_terminal_widget, cmdline_options::experimental_terminal_widget interpreter::experimental_terminal_widget): New functions. * main.in.cc (fork_and_exec): New static variable. (main): Don't fork and exec if argv includes --experimental-terminal-widget. * interpreter-qobject.h, interpreter-qobject.cc (interpreter_qobject::pause, interpreter_qobject::stop, interpreter_qobject::resume): New functions. (interpreter_qobject::execute): Don't set prompt strings here if using the new terminal widget. If using the new terminal widget, call interpreter::shutdown and emit the shutdown_finished signal after interpreter::execute returns. (interpreter_qobject::shutdown): Don't do anything if using the new terminal widget. * main-window.h, main-window.cc (main_window::handle_octave_ready): Set interpreter prompt strings here if using the new terminal widget. (main_window::close_gui_signal): New signal. (main_window::closeEvent): If using new terminal widget and shutdown is confirmed, simply emit close_gui_signal. (main_window::construct_octave_qt_link): If using new terminal widget, connect qt_interpreter_events::interpreter_output_signal to the terminal_dock_widget::interpreter_output slot and the qt_interpreter_events::update_prompt_signal to the terminal_dock_widget::update_prompt slot. * octave-qobject.h, octave-qobject.cc (base_qobject::interpreter_pause, base_qobject::interpreter_stop, base_qobject::interpreter_resume): New functions. (base_qobject::base_qobject): If using new terminal widget: Don't connect interpreter_qobject::execution_finished signal to octave_qobject::handle_interpreter_execution_finished slot Don't connect octave_qobject::request_interpreter_shutdown signal to the interpreter_qobject::shutdown slot. Do connect the qt_interpreter_events::start_gui_signal signal to the octave_qobject::start_gui slot and simply reload settings and call qt_application::setQuitOnLastWindowClosed. There is no need to create the main window here. (base_qobject::exec): If using new terminal widget, wait for main thread to finish after qt_application::exec returns. (base_qojbect::experimental_terminal_widget, base_qobject::gui_running): New functions. (base_qojbect::start_gui, base_qojbect::close_gui, base_qojbect::interpreter_pause, base_qojbect::interpreter_stop, base_qojbect::interpreter_resume): New slots. (base_qojbect::handle_interpreter_execution_finished): Do nothing if using new terminal widget. * qt-application.cc (qt_application::start_gui_p): Return dummy value if using new terminal widget. * qt-interpreter-events.h, qt-interpreter-events.cc (qt_interpreter_events::start_gui, qt_interpreter_events::close_gui, qt_interpreter_events::interpreter_output, qt_interpreter_events::display_exception, qt_interpreter_events::update_prompt): New functions. (qt_interpreter_events::start_gui_signal, qt_interpreter_events::close_gui_signal, qt_interpreter_events::update_prompt_signal, qt_interpreter_events::interpreter_output_signal): New signals. * command-widget.h, command-widget.cc: New files. * libgui/src/module.mk: Update. * terminal-dock-widget.h, terminal-dock-widget.cc (terminal_dock_widget::m_experimental_terminal_widget): New data member. (terminal_dock_widget::terminal_dock_widget): Optionally create and use new terminal widget. If using new terminal widget, connect command_widget::interpreter_event signals to terminal_dock_widget::interpreter_event signals. (terminal_dock_widget::interpreter_output, terminal_dock_widget::update_prompt): New slots. (terminal_dock_widget::update_prompt_signal, terminal_dock_widget::interpreter_output_signal): New signals. * event-manager.h, event-manager.cc (Fdesktop): New function. (interpreter_events::start_gui, interpreter_events::close_gui, interpreter_events::update_prompt): New virtual functions. (interpreter_events::confirm_shutdown): Return true. (event_manager::start_gui, event_manager::close_gui, event_manager::update_prompt): New functions. * interpreter.h, interpreter.cc (interpreter::initialize): If using new terminal widget, only display startup message if not initially starting GUI. (class cli_input_reader): New class. (interpreter::experimental_terminal_widget, interpreter::get_line_and_eval): New functions. (interpreter::execute): If using new terminal widget, start GUI or command line reader and then enter server loop. * pt-eval.cc (tree_evaluator::server_loop): Reset parser at top of loop. also catch exit exception.
author John W. Eaton <jwe@octave.org>
date Thu, 25 Mar 2021 23:06:40 -0400
parents b03104e38964
children 5b7e721844df
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15362
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 octave_gui_ICONS = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
2 %reldir%/icons/applications-system.png \
29331
3cbc3f96028c build: Include new file "bookmark-new.png" in tarball.
Markus Mützel <markus.muetzel@gmx.de>
parents: 29330
diff changeset
3 %reldir%/icons/bookmark-new.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
4 %reldir%/icons/bottom_left_corner.png \
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
5 %reldir%/icons/bottom_right_corner.png \
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
6 %reldir%/icons/bottom_side.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
7 %reldir%/icons/bp-next.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
8 %reldir%/icons/bp-prev.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
9 %reldir%/icons/bp-rm-all.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
10 %reldir%/icons/bp-toggle.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
11 %reldir%/icons/circle.png \
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
12 %reldir%/icons/cross.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
13 %reldir%/icons/db-cont.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
14 %reldir%/icons/db-step-in.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
15 %reldir%/icons/db-step-out.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
16 %reldir%/icons/db-step.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
17 %reldir%/icons/db-stop.png \
25921
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 25617
diff changeset
18 %reldir%/icons/dialog-error.png \
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 25617
diff changeset
19 %reldir%/icons/dialog-information.png \
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 25617
diff changeset
20 %reldir%/icons/dialog-warning.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
21 %reldir%/icons/document-new.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
22 %reldir%/icons/document-open.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
23 %reldir%/icons/document-print.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
24 %reldir%/icons/document-save.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
25 %reldir%/icons/document-save-as.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
26 %reldir%/icons/edit-copy.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
27 %reldir%/icons/edit-cut.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
28 %reldir%/icons/edit-delete.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
29 %reldir%/icons/edit-find.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
30 %reldir%/icons/edit-find-replace.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
31 %reldir%/icons/edit-paste.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
32 %reldir%/icons/edit-redo.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
33 %reldir%/icons/edit-undo.png \
26869
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
34 %reldir%/icons/figure-axes.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
35 %reldir%/icons/figure-grid.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
36 %reldir%/icons/figure-pan.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
37 %reldir%/icons/figure-rotate.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
38 %reldir%/icons/figure-text.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
39 %reldir%/icons/figure-zoom-in.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
40 %reldir%/icons/figure-zoom-original.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
41 %reldir%/icons/figure-zoom-out.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
42 %reldir%/icons/fleur.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
43 %reldir%/icons/folder.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
44 %reldir%/icons/folder-new.png \
25244
f9fe8cf64e09 Add go-down icon to GUI icon set (bug #53639).
Rik <rik@octave.org>
parents: 25042
diff changeset
45 %reldir%/icons/go-down.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
46 %reldir%/icons/go-first.png \
26139
198902f24ef6 add missing icon files for doc browser history toolbar (bug #54938)
Torsten <mttl@mailbox.org>
parents: 26017
diff changeset
47 %reldir%/icons/go-home.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
48 %reldir%/icons/go-last.png \
26139
198902f24ef6 add missing icon files for doc browser history toolbar (bug #54938)
Torsten <mttl@mailbox.org>
parents: 26017
diff changeset
49 %reldir%/icons/go-next.png \
198902f24ef6 add missing icon files for doc browser history toolbar (bug #54938)
Torsten <mttl@mailbox.org>
parents: 26017
diff changeset
50 %reldir%/icons/go-previous.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
51 %reldir%/icons/go-up.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
52 %reldir%/icons/graphic_logo_DocumentationDockWidget.png \
29396
b03104e38964 add separate icon for qt figure windows
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29331
diff changeset
53 %reldir%/icons/graphic_logo_Figure.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
54 %reldir%/icons/graphic_logo_FileEditor.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
55 %reldir%/icons/graphic_logo_FilesDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
56 %reldir%/icons/graphic_logo_HistoryDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
57 %reldir%/icons/graphic_logo_NewsDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
58 %reldir%/icons/graphic_logo_TerminalDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
59 %reldir%/icons/graphic_logo_WorkspaceView.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
60 %reldir%/icons/graphic_logo_ReleaseWidget.png \
24830
5bcda4f98997 Create an icon for the variable editor (bug #53260)
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 24679
diff changeset
61 %reldir%/icons/graphic_logo_VariableEditor.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
62 %reldir%/icons/graphic_logo_DocumentationDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
63 %reldir%/icons/graphic_logo_FileEditor.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
64 %reldir%/icons/graphic_logo_FilesDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
65 %reldir%/icons/graphic_logo_HistoryDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
66 %reldir%/icons/graphic_logo_NewsDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
67 %reldir%/icons/graphic_logo_TerminalDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
68 %reldir%/icons/graphic_logo_WorkspaceView.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
69 %reldir%/icons/graphic_logo_ReleaseWidget.svg \
24830
5bcda4f98997 Create an icon for the variable editor (bug #53260)
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 24679
diff changeset
70 %reldir%/icons/graphic_logo_VariableEditor.svg \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
71 %reldir%/icons/hand2.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
72 %reldir%/icons/icons_license \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
73 %reldir%/icons/left_side.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
74 %reldir%/icons/letter_logo_DocumentationDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
75 %reldir%/icons/letter_logo_FileEditor.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
76 %reldir%/icons/letter_logo_FilesDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
77 %reldir%/icons/letter_logo_HistoryDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
78 %reldir%/icons/letter_logo_NewsDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
79 %reldir%/icons/letter_logo_TerminalDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
80 %reldir%/icons/letter_logo_WorkspaceView.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
81 %reldir%/icons/letter_logo_ReleaseWidget.png \
24830
5bcda4f98997 Create an icon for the variable editor (bug #53260)
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 24679
diff changeset
82 %reldir%/icons/letter_logo_VariableEditor.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
83 %reldir%/icons/letter_logo_DocumentationDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
84 %reldir%/icons/letter_logo_FileEditor.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
85 %reldir%/icons/letter_logo_FilesDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
86 %reldir%/icons/letter_logo_HistoryDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
87 %reldir%/icons/letter_logo_NewsDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
88 %reldir%/icons/letter_logo_TerminalDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
89 %reldir%/icons/letter_logo_WorkspaceView.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
90 %reldir%/icons/letter_logo_ReleaseWidget.svg \
24830
5bcda4f98997 Create an icon for the variable editor (bug #53260)
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 24679
diff changeset
91 %reldir%/icons/letter_logo_VariableEditor.svg \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
92 %reldir%/icons/logo.png \
24135
bdd4a8476c39 new icon for the plot menu in the variable editor
Alexander Wilms <alexanderw>, Torsten <mttl@mailbox.org>
parents: 24061
diff changeset
93 %reldir%/icons/plot-xy-curve.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
94 %reldir%/icons/preferences-system.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
95 %reldir%/icons/right_side.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
96 %reldir%/icons/system-run.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
97 %reldir%/icons/top_left_corner.png \
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
98 %reldir%/icons/top_right_corner.png \
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
99 %reldir%/icons/top_side.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
100 %reldir%/icons/user-home.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
101 %reldir%/icons/view-refresh.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
102 %reldir%/icons/widget-close.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
103 %reldir%/icons/widget-dock.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
104 %reldir%/icons/widget-undock.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
105 %reldir%/icons/widget-close-light.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
106 %reldir%/icons/widget-dock-light.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
107 %reldir%/icons/widget-undock-light.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
108 %reldir%/icons/zoom-in.png \
26017
390d59717711 adding a toolbar with common browse tools to the doc browser (bug 54938)
Torsten <mttl@mailbox.org>
parents: 25931
diff changeset
109 %reldir%/icons/zoom-original.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
110 %reldir%/icons/zoom-out.png
15362
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
111
16291
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
112 octave_gui_MOC =
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
113
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
114 if AMCOND_HAVE_QSCINTILLA
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
115
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
116 OCTAVE_GUI_SRC_M_EDITOR_MOC = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
117 %reldir%/m-editor/moc-file-editor-interface.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
118 %reldir%/m-editor/moc-file-editor-tab.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
119 %reldir%/m-editor/moc-file-editor.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
120 %reldir%/m-editor/moc-find-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
121 %reldir%/m-editor/moc-octave-qscintilla.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
122 %reldir%/m-editor/moc-octave-txt-lexer.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
123 %reldir%/m-editor/moc-marker.cc
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
124
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
125 $(OCTAVE_GUI_SRC_M_EDITOR_MOC): | %reldir%/m-editor/$(octave_dirstamp)
16291
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
126
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
127 octave_gui_MOC += \
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
128 $(OCTAVE_GUI_SRC_M_EDITOR_MOC)
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
129
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
130 DIRSTAMP_FILES += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
131 %reldir%/m-editor/$(octave_dirstamp)
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
132
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
133 endif
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
134
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
135 OCTAVE_GUI_SRC_MOC = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
136 %reldir%/moc-external-editor-interface.cc \
29503
3bfec185c9e2 experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents: 29396
diff changeset
137 %reldir%/moc-command-widget.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
138 %reldir%/moc-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
139 %reldir%/moc-documentation-dock-widget.cc \
25042
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006)
Torsten <mttl@mailbox.org>
parents: 24830
diff changeset
140 %reldir%/moc-documentation.cc \
29330
b92614cfdfed add bookmark functionality to the documentation browser (bug #54938)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29220
diff changeset
141 %reldir%/moc-documentation-bookmarks.cc \
25398
a78e5b8d5ee7 provide shortcuts for closing widgets of the variable editor (bug #53002)
Torsten <mttl@mailbox.org>
parents: 25397
diff changeset
142 %reldir%/moc-dw-main-window.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
143 %reldir%/moc-files-dock-widget.cc \
27611
0495b64288f7 use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents: 27583
diff changeset
144 %reldir%/moc-gui-settings.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
145 %reldir%/moc-history-dock-widget.cc \
27196
d993642352d0 rename octave_interpreter object in GUI
John W. Eaton <jwe@octave.org>
parents: 27193
diff changeset
146 %reldir%/moc-interpreter-qobject.cc \
29061
8a425e771aa7 use a led like indicator for the prfiler state
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28566
diff changeset
147 %reldir%/moc-led-indicator.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
148 %reldir%/moc-main-window.cc \
27193
01e73e1664ff move news reader widget to separate file
John W. Eaton <jwe@octave.org>
parents: 27099
diff changeset
149 %reldir%/moc-news-reader.cc \
27197
b8c0d5ad024f refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents: 27196
diff changeset
150 %reldir%/moc-octave-qobject.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
151 %reldir%/moc-settings-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
152 %reldir%/moc-terminal-dock-widget.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
153 %reldir%/moc-color-picker.cc \
24679
a3e67a9e7be5 move derived tab bar from editor and doc viewer into separate file
Torsten <mttl@mailbox.org>
parents: 24475
diff changeset
154 %reldir%/moc-tab-bar.cc \
27263
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27255
diff changeset
155 %reldir%/moc-qt-interpreter-events.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
156 %reldir%/moc-resource-manager.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
157 %reldir%/moc-shortcut-manager.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
158 %reldir%/moc-welcome-wizard.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
159 %reldir%/moc-workspace-model.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
160 %reldir%/moc-workspace-view.cc \
23927
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
161 %reldir%/moc-variable-editor.cc \
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
162 %reldir%/moc-variable-editor-model.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
163 %reldir%/moc-find-files-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
164 %reldir%/moc-find-files-model.cc \
27298
1805f8586179 new gui dialog for modifying octaves load path (bug #43549)
JunWang <jstzwj@aliyun.com>
parents: 27287
diff changeset
165 %reldir%/moc-octave-dock-widget.cc \
1805f8586179 new gui dialog for modifying octaves load path (bug #43549)
JunWang <jstzwj@aliyun.com>
parents: 27287
diff changeset
166 %reldir%/moc-set-path-dialog.cc \
1805f8586179 new gui dialog for modifying octaves load path (bug #43549)
JunWang <jstzwj@aliyun.com>
parents: 27287
diff changeset
167 %reldir%/moc-set-path-model.cc
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
168
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
169 octave_gui_MOC += \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
170 $(OCTAVE_GUI_SRC_MOC) \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
171 $(OCTAVE_GUI_EDITOR_MOC)
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
172
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
173 octave_gui_RC = %reldir%/qrc-resource.cc
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
174
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
175 $(octave_gui_RC): | %reldir%/$(octave_dirstamp)
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
176
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
177 DIRSTAMP_FILES += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
178 %reldir%/$(octave_dirstamp)
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
179
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
180 octave_gui_UI = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
181 %reldir%/settings-dialog.ui
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
182
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
183 octave_gui_UI_H = $(patsubst %reldir%/%.ui, %reldir%/ui-%.h, $(octave_gui_UI))
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
184
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
185 $(octave_gui_UI_H): | %reldir%/$(octave_dirstamp)
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
186
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
187 BUILT_SOURCES += $(octave_gui_UI_H)
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
188
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
189 noinst_HEADERS += \
29503
3bfec185c9e2 experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents: 29396
diff changeset
190 %reldir%/command-widget.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
191 %reldir%/dialog.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
192 %reldir%/octave-dock-widget.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
193 %reldir%/documentation-dock-widget.h \
25042
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006)
Torsten <mttl@mailbox.org>
parents: 24830
diff changeset
194 %reldir%/documentation.h \
29330
b92614cfdfed add bookmark functionality to the documentation browser (bug #54938)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29220
diff changeset
195 %reldir%/documentation-bookmarks.h \
25398
a78e5b8d5ee7 provide shortcuts for closing widgets of the variable editor (bug #53002)
Torsten <mttl@mailbox.org>
parents: 25397
diff changeset
196 %reldir%/dw-main-window.h \
27560
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27298
diff changeset
197 %reldir%/gui-preferences-all.h \
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27298
diff changeset
198 %reldir%/gui-preferences-cs.h \
29330
b92614cfdfed add bookmark functionality to the documentation browser (bug #54938)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29220
diff changeset
199 %reldir%/gui-preferences-dc.h \
27665
a1271c5b621a replace preference literals by symbolic constants for dock widgets
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27646
diff changeset
200 %reldir%/gui-preferences-dw.h \
27560
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27298
diff changeset
201 %reldir%/gui-preferences-ed.h \
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27298
diff changeset
202 %reldir%/gui-preferences-fb.h \
27851
315440604e40 build: Include new file gui-preferences-ff.h in the build system.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27697
diff changeset
203 %reldir%/gui-preferences-ff.h \
27560
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27298
diff changeset
204 %reldir%/gui-preferences-global.h \
27869
4bf0ae46d2c3 build: Include new gui-preferences headers in the build system.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27851
diff changeset
205 %reldir%/gui-preferences-gp.h \
27615
83c1d4f75a36 use symbolic constants for preferences key/default in history viewer
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27613
diff changeset
206 %reldir%/gui-preferences-hw.h \
27560
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27298
diff changeset
207 %reldir%/gui-preferences-mw.h \
27613
deb8877f2c34 use symbolic constants for preferences key and default values in news reader
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27611
diff changeset
208 %reldir%/gui-preferences-nr.h \
27560
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27298
diff changeset
209 %reldir%/gui-preferences-pd.h \
27583
315c35e6037c use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27560
diff changeset
210 %reldir%/gui-preferences-sc.h \
27869
4bf0ae46d2c3 build: Include new gui-preferences headers in the build system.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27851
diff changeset
211 %reldir%/gui-preferences-sd.h \
27560
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27298
diff changeset
212 %reldir%/gui-preferences-ve.h \
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27298
diff changeset
213 %reldir%/gui-preferences-ws.h \
25617
44d638d5eea5 reorganize constants for preferences keys and default values
Torsten <mttl@mailbox.org>
parents: 25614
diff changeset
214 %reldir%/gui-preferences.h \
27611
0495b64288f7 use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents: 27583
diff changeset
215 %reldir%/gui-settings.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
216 %reldir%/external-editor-interface.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
217 %reldir%/files-dock-widget.h \
27697
5e8891dceec7 backout changesets cdb681adc85a and b3401292e101 (bug #56952)
John W. Eaton <jwe@octave.org>
parents: 27694
diff changeset
218 %reldir%/graphics-init.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
219 %reldir%/history-dock-widget.h \
27196
d993642352d0 rename octave_interpreter object in GUI
John W. Eaton <jwe@octave.org>
parents: 27193
diff changeset
220 %reldir%/interpreter-qobject.h \
29061
8a425e771aa7 use a led like indicator for the prfiler state
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28566
diff changeset
221 %reldir%/led-indicator.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
222 %reldir%/m-editor/file-editor-interface.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
223 %reldir%/m-editor/file-editor-tab.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
224 %reldir%/m-editor/file-editor.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
225 %reldir%/m-editor/find-dialog.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
226 %reldir%/m-editor/octave-qscintilla.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
227 %reldir%/m-editor/octave-txt-lexer.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
228 %reldir%/m-editor/marker.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
229 %reldir%/main-window.h \
27193
01e73e1664ff move news reader widget to separate file
John W. Eaton <jwe@octave.org>
parents: 27099
diff changeset
230 %reldir%/news-reader.h \
27197
b8c0d5ad024f refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents: 27196
diff changeset
231 %reldir%/octave-qobject.h \
b8c0d5ad024f refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents: 27196
diff changeset
232 %reldir%/qt-application.h \
27263
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27255
diff changeset
233 %reldir%/qt-interpreter-events.h \
28566
20ee8aa92897 avoid QList deprecated function warnings
John W. Eaton <jwe@octave.org>
parents: 27869
diff changeset
234 %reldir%/qt-utils.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
235 %reldir%/resource-manager.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
236 %reldir%/settings-dialog.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
237 %reldir%/shortcut-manager.h \
24679
a3e67a9e7be5 move derived tab bar from editor and doc viewer into separate file
Torsten <mttl@mailbox.org>
parents: 24475
diff changeset
238 %reldir%/tab-bar.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
239 %reldir%/terminal-dock-widget.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
240 %reldir%/color-picker.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
241 %reldir%/welcome-wizard.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
242 %reldir%/find-files-dialog.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
243 %reldir%/find-files-model.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
244 %reldir%/workspace-model.h \
23927
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
245 %reldir%/workspace-view.h \
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
246 %reldir%/variable-editor.h \
27298
1805f8586179 new gui dialog for modifying octaves load path (bug #43549)
JunWang <jstzwj@aliyun.com>
parents: 27287
diff changeset
247 %reldir%/variable-editor-model.h \
1805f8586179 new gui dialog for modifying octaves load path (bug #43549)
JunWang <jstzwj@aliyun.com>
parents: 27287
diff changeset
248 %reldir%/set-path-dialog.h \
29220
ab8aa1bb3c2f add gui utilities with first function for color interpolation
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29061
diff changeset
249 %reldir%/set-path-model.h \
ab8aa1bb3c2f add gui utilities with first function for color interpolation
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29061
diff changeset
250 %reldir%/gui-utils.h
27298
1805f8586179 new gui dialog for modifying octaves load path (bug #43549)
JunWang <jstzwj@aliyun.com>
parents: 27287
diff changeset
251
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
252
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
253 %canon_reldir%_%canon_reldir%_la_SOURCES = \
29503
3bfec185c9e2 experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents: 29396
diff changeset
254 %reldir%/command-widget.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
255 %reldir%/dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
256 %reldir%/documentation-dock-widget.cc \
25042
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006)
Torsten <mttl@mailbox.org>
parents: 24830
diff changeset
257 %reldir%/documentation.cc \
29330
b92614cfdfed add bookmark functionality to the documentation browser (bug #54938)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29220
diff changeset
258 %reldir%/documentation-bookmarks.cc \
25398
a78e5b8d5ee7 provide shortcuts for closing widgets of the variable editor (bug #53002)
Torsten <mttl@mailbox.org>
parents: 25397
diff changeset
259 %reldir%/dw-main-window.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
260 %reldir%/external-editor-interface.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
261 %reldir%/files-dock-widget.cc \
27697
5e8891dceec7 backout changesets cdb681adc85a and b3401292e101 (bug #56952)
John W. Eaton <jwe@octave.org>
parents: 27694
diff changeset
262 %reldir%/graphics-init.cc \
27611
0495b64288f7 use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents: 27583
diff changeset
263 %reldir%/gui-settings.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
264 %reldir%/history-dock-widget.cc \
27196
d993642352d0 rename octave_interpreter object in GUI
John W. Eaton <jwe@octave.org>
parents: 27193
diff changeset
265 %reldir%/interpreter-qobject.cc \
29061
8a425e771aa7 use a led like indicator for the prfiler state
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28566
diff changeset
266 %reldir%/led-indicator.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
267 %reldir%/m-editor/file-editor-tab.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
268 %reldir%/m-editor/file-editor.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
269 %reldir%/m-editor/find-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
270 %reldir%/m-editor/octave-qscintilla.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
271 %reldir%/m-editor/octave-txt-lexer.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
272 %reldir%/m-editor/marker.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
273 %reldir%/main-window.cc \
27193
01e73e1664ff move news reader widget to separate file
John W. Eaton <jwe@octave.org>
parents: 27099
diff changeset
274 %reldir%/news-reader.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
275 %reldir%/octave-dock-widget.cc \
27197
b8c0d5ad024f refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents: 27196
diff changeset
276 %reldir%/octave-qobject.cc \
27263
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27255
diff changeset
277 %reldir%/qt-interpreter-events.cc \
27197
b8c0d5ad024f refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents: 27196
diff changeset
278 %reldir%/qt-application.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
279 %reldir%/resource-manager.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
280 %reldir%/settings-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
281 %reldir%/shortcut-manager.cc \
24679
a3e67a9e7be5 move derived tab bar from editor and doc viewer into separate file
Torsten <mttl@mailbox.org>
parents: 24475
diff changeset
282 %reldir%/tab-bar.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
283 %reldir%/terminal-dock-widget.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
284 %reldir%/color-picker.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
285 %reldir%/welcome-wizard.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
286 %reldir%/find-files-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
287 %reldir%/find-files-model.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
288 %reldir%/workspace-model.cc \
23927
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
289 %reldir%/workspace-view.cc \
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
290 %reldir%/variable-editor.cc \
27298
1805f8586179 new gui dialog for modifying octaves load path (bug #43549)
JunWang <jstzwj@aliyun.com>
parents: 27287
diff changeset
291 %reldir%/variable-editor-model.cc \
1805f8586179 new gui dialog for modifying octaves load path (bug #43549)
JunWang <jstzwj@aliyun.com>
parents: 27287
diff changeset
292 %reldir%/set-path-dialog.cc \
29220
ab8aa1bb3c2f add gui utilities with first function for color interpolation
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29061
diff changeset
293 %reldir%/set-path-model.cc \
ab8aa1bb3c2f add gui utilities with first function for color interpolation
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29061
diff changeset
294 %reldir%/gui-utils.cc
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
295
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
296 nodist_%canon_reldir%_%canon_reldir%_la_SOURCES = \
21608
80258bb3a14b store hg id info in libgui and main exe and check for consistency (bug #45659)
John W. Eaton <jwe@octave.org>
parents: 21290
diff changeset
297 $(octave_gui_MOC) \
80258bb3a14b store hg id info in libgui and main exe and check for consistency (bug #45659)
John W. Eaton <jwe@octave.org>
parents: 21290
diff changeset
298 $(octave_gui_RC)
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
299
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
300 %canon_reldir%_%canon_reldir%_la_CPPFLAGS = \
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
301 $(AM_CPPFLAGS) \
19277
18a3eaf7bdf0 make --with-PKG-includedir and --with-PKG-libdir configure options work again
John W. Eaton <jwe@octave.org>
parents: 18611
diff changeset
302 $(FT2_CPPFLAGS) \
18498
2e7cad6f180c Initial integration of QtHandles.
John W. Eaton <jwe@octave.org>
parents: 18269
diff changeset
303 $(FONTCONFIG_CPPFLAGS) \
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
304 @OCTGUI_DLL_DEFS@ \
15596
5f031158c693 Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15404
diff changeset
305 @QT_CPPFLAGS@ \
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
306 -I$(srcdir)/libgui/qterminal/libqterminal \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
307 -Ilibgui/src -I$(srcdir)/libgui/src \
27646
2ff12b707f60 integrate Qt graphics toolkit in Qt interpreter object
John W. Eaton <jwe@octave.org>
parents: 27615
diff changeset
308 -Ilibgui/graphics -I$(srcdir)/libgui/graphics \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
309 -I$(srcdir)/%reldir%/m-editor \
25397
2cf750f5cb7d make version info accessible in liboctave
John W. Eaton <jwe@octave.org>
parents: 25275
diff changeset
310 -Iliboctave \
21290
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
311 -I$(srcdir)/liboctave/array \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
312 -Iliboctave/numeric -I$(srcdir)/liboctave/numeric \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
313 -Iliboctave/operators -I$(srcdir)/liboctave/operators \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
314 -I$(srcdir)/liboctave/system \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
315 -I$(srcdir)/liboctave/util \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
316 -Ilibinterp -I$(srcdir)/libinterp \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
317 -Ilibinterp/parse-tree -I$(srcdir)/libinterp/parse-tree \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
318 -Ilibinterp/corefcn -I$(srcdir)/libinterp/corefcn \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
319 -I$(srcdir)/libinterp/octave-value \
21941
1d23b75cbcd1 hide signal.h from C++ sources
John W. Eaton <jwe@octave.org>
parents: 21608
diff changeset
320 -I$(srcdir)/liboctave/wrappers
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
321
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
322 noinst_LTLIBRARIES += %reldir%/libgui-src.la
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
323
20366
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20326
diff changeset
324 libgui_EXTRA_DIST += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
325 %reldir%/resource.qrc \
20366
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20326
diff changeset
326 $(octave_gui_UI) \
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20326
diff changeset
327 $(octave_gui_ICONS)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20326
diff changeset
328
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20326
diff changeset
329 libgui_CLEANFILES += \
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
330 $(octave_gui_MOC) \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
331 $(octave_gui_UI_H) \
23427
48fd5980e29a Refactor and normalize generated build info source files
Mike Miller <mtmiller@octave.org>
parents: 23426
diff changeset
332 $(octave_gui_RC)