Mercurial > octave
annotate libgui/src/module.mk @ 16402:7fa90eb41240
gui: individually configurable styles of the editor lexers
* color-picker.cc/.h: new class for a simple color picker
* libgui/src/module.mk: added color-picker.cc/.h
* file-editor-tab.cc(update_lexer): read config of the lexer from settings file
* file-editor-tab(notice_settings): editor font not directly configured from
the settings file but via the lexer settings in update_lexer
* lexer-octave-gui.cc(constructor): inherits from QsciLexerOctave instaead of
QsciLexer, code cleanup
* lexer-octave-gui.cc(language,lexer,defaultFont,defaultColor,description):
removed, original methods used and configured via settings
* lexer-octave-gui.h: removed functions language,lexer,defaultFont,defaultColor,
description and enum; using methods of octave lexer instead
* settings-dialog.cc(constructor): editor font not configured from settings,
defining lexers for supported languages and reading their actual settings
from the settings file (via read_lexer_settings)
* settings-dialog.cc(read_lexer_settings): new function for reading the lexers
settings from settings file and creating the tabs with interactive elements
for configuring these settings
* settings-dialog.cc(write_changed_settings): remove settings for editor font,
defining lexers for supported languages and writing the settings from the
dialog into the settings file (via write_lexer_settings)
* settings-dialog.cc(write_lexer_settings): new funciton for getting the new
lexer settings from the interactive elements and write them into the settings
file
* settings-dialog.h: new functiond read_lexer_settings, write_lexer_settings
* settings-dialog.ui: new tab for the editor styles which contents is
dynamically created in settings_dialog ()
author | Torsten <ttl@justmail.de> |
---|---|
date | Sun, 31 Mar 2013 23:56:11 +0200 |
parents | c22a6cecaedd |
children | 70032fc70bee |
rev | line source |
---|---|
15362 | 1 EXTRA_DIST += \ |
2 src/module.mk \ | |
3 src/resource.qrc \ | |
4 $(octave_gui_UI) \ | |
5 $(octave_gui_ICONS) | |
6 | |
7 octave_gui_ICONS = \ | |
8 src/icons/arrow_right.png \ | |
9 src/icons/artsbuilderexecute.png \ | |
10 src/icons/bookmark.png \ | |
11 src/icons/bp_next.png \ | |
12 src/icons/bp_prev.png \ | |
13 src/icons/bp_rm_all.png \ | |
14 src/icons/bp_toggle.png \ | |
15 src/icons/chat.png \ | |
16 src/icons/configure.png \ | |
17 src/icons/db_cont.png \ | |
18 src/icons/db_step_in.png \ | |
19 src/icons/db_step_out.png \ | |
20 src/icons/db_step.png \ | |
21 src/icons/db_stop.png \ | |
22 src/icons/editcopy.png \ | |
23 src/icons/editcut.png \ | |
24 src/icons/editpaste.png \ | |
25 src/icons/filenew.png \ | |
26 src/icons/fileopen.png \ | |
27 src/icons/filesaveas.png \ | |
28 src/icons/filesave.png \ | |
29 src/icons/find.png \ | |
15793
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
30 src/icons/graphic_logo_DocumentationDockWidget.png \ |
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
31 src/icons/graphic_logo_FileEditor.png \ |
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
32 src/icons/graphic_logo_FilesDockWidget.png \ |
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
33 src/icons/graphic_logo_HistoryDockWidget.png \ |
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
34 src/icons/graphic_logo_TerminalDockWidget.png \ |
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
35 src/icons/graphic_logo_WorkspaceView.png \ |
15362 | 36 src/icons/help_index.png \ |
37 src/icons/icons_license \ | |
38 src/icons/jabber_protocol.png \ | |
15793
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
39 src/icons/letter_logo_DocumentationDockWidget.png \ |
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
40 src/icons/letter_logo_FileEditor.png \ |
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
41 src/icons/letter_logo_FilesDockWidget.png \ |
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
42 src/icons/letter_logo_HistoryDockWidget.png \ |
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
43 src/icons/letter_logo_TerminalDockWidget.png \ |
06832c90ae7d
build: Include new gui icons in distribution tarball.
Rik <rik@octave.org>
parents:
15596
diff
changeset
|
44 src/icons/letter_logo_WorkspaceView.png \ |
15362 | 45 src/icons/logo.png \ |
46 src/icons/question.png \ | |
47 src/icons/redled.png \ | |
48 src/icons/redo.png \ | |
49 src/icons/search.png \ | |
50 src/icons/star.png \ | |
51 src/icons/stop.png \ | |
52 src/icons/terminal.png \ | |
53 src/icons/undo.png \ | |
54 src/icons/up.png \ | |
55 src/icons/zoom-in.png \ | |
56 src/icons/zoom-out.png | |
57 | |
16291
c22a6cecaedd
build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents:
16057
diff
changeset
|
58 octave_gui_MOC = |
c22a6cecaedd
build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents:
16057
diff
changeset
|
59 |
c22a6cecaedd
build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents:
16057
diff
changeset
|
60 if AMCOND_HAVE_QSCINTILLA |
c22a6cecaedd
build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents:
16057
diff
changeset
|
61 octave_gui_MOC += \ |
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
62 src/m-editor/moc-file-editor-interface.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
63 src/m-editor/moc-file-editor-tab.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
64 src/m-editor/moc-file-editor.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
65 src/m-editor/moc-find-dialog.cc \ |
16291
c22a6cecaedd
build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents:
16057
diff
changeset
|
66 src/m-editor/moc-lexer-octave-gui.cc |
c22a6cecaedd
build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents:
16057
diff
changeset
|
67 endif |
c22a6cecaedd
build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents:
16057
diff
changeset
|
68 |
c22a6cecaedd
build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents:
16057
diff
changeset
|
69 octave_gui_MOC += \ |
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
70 src/moc-documentation-dockwidget.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
71 src/moc-files-dockwidget.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
72 src/moc-history-dockwidget.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
73 src/moc-main-window.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
74 src/moc-octave-qt-event-listener.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
75 src/moc-settings-dialog.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
76 src/moc-terminal-dockwidget.cc \ |
16402
7fa90eb41240
gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
16291
diff
changeset
|
77 src/moc-color-picker.cc \ |
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
78 src/moc-welcome-wizard.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
79 src/moc-workspace-model.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
80 src/moc-workspace-view.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
81 src/octave-adapter/moc-octave-main-thread.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
82 src/qtinfo/moc-parser.cc \ |
16057
c3057d80cf91
Created common octave_dock_widget class
Richard Crozier <richard.crozier@yahoo.co.uk>
parents:
15793
diff
changeset
|
83 src/qtinfo/moc-webinfo.cc \ |
c3057d80cf91
Created common octave_dock_widget class
Richard Crozier <richard.crozier@yahoo.co.uk>
parents:
15793
diff
changeset
|
84 src/moc-octave-dock-widget.cc |
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
85 |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
86 octave_gui_RC = src/qrc-resource.cc |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
87 |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
88 octave_gui_UI = \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
89 src/settings-dialog.ui \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
90 src/welcome-wizard.ui |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
91 |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
92 octave_gui_UI_H = $(patsubst src/%.ui, src/ui-%.h, $(octave_gui_UI)) |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
93 |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
94 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
|
95 |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
96 noinst_HEADERS += \ |
16057
c3057d80cf91
Created common octave_dock_widget class
Richard Crozier <richard.crozier@yahoo.co.uk>
parents:
15793
diff
changeset
|
97 src/octave-dock-widget.h \ |
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
98 src/documentation-dockwidget.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
99 src/files-dockwidget.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
100 src/history-dockwidget.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
101 src/m-editor/file-editor-interface.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
102 src/m-editor/file-editor-tab.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
103 src/m-editor/file-editor.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
104 src/m-editor/find-dialog.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
105 src/m-editor/lexer-octave-gui.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
106 src/main-window.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
107 src/octave-adapter/octave-event-listener.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
108 src/octave-adapter/octave-link.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
109 src/octave-adapter/octave-main-thread.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
110 src/octave-gui.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
111 src/octave-qt-event-listener.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
112 src/qtinfo/parser.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
113 src/qtinfo/webinfo.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
114 src/resource-manager.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
115 src/settings-dialog.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
116 src/symbol-information.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
117 src/terminal-dockwidget.h \ |
16402
7fa90eb41240
gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
16291
diff
changeset
|
118 src/color-picker.h \ |
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
119 src/welcome-wizard.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
120 src/workspace-model.h \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
121 src/workspace-view.h |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
122 |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
123 src_libgui_src_la_SOURCES = \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
124 src/documentation-dockwidget.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
125 src/files-dockwidget.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
126 src/history-dockwidget.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
127 src/m-editor/file-editor-tab.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
128 src/m-editor/file-editor.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
129 src/m-editor/find-dialog.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
130 src/m-editor/lexer-octave-gui.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
131 src/main-window.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
132 src/octave-adapter/octave-link.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
133 src/octave-adapter/octave-main-thread.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
134 src/octave-gui.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
135 src/octave-qt-event-listener.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
136 src/qtinfo/parser.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
137 src/qtinfo/webinfo.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
138 src/resource-manager.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
139 src/settings-dialog.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
140 src/symbol-information.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
141 src/terminal-dockwidget.cc \ |
16402
7fa90eb41240
gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
16291
diff
changeset
|
142 src/color-picker.cc \ |
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
143 src/welcome-wizard.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
144 src/workspace-model.cc \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
145 src/workspace-view.cc |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
146 |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
147 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
148 |
15391 | 149 src_libgui_src_la_CPPFLAGS = \ |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
150 $(AM_CPPFLAGS) \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
151 @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
|
152 @QT_CPPFLAGS@ \ |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
153 -I$(srcdir)/qterminal/libqterminal \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
154 -Isrc -I$(srcdir)/src \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
155 -I$(srcdir)/src/m-editor \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
156 -I$(srcdir)/src/octave-adapter \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
157 -I$(srcdir)/src/qtinfo \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
158 -I$(top_srcdir)/liboctave/cruft/misc \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
159 -I$(top_srcdir)/liboctave/array \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
160 -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
161 -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
162 -I$(top_srcdir)/liboctave/system \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
163 -I$(top_srcdir)/liboctave/util \ |
15404
f52a62a6db3a
eliminate copy and paste copyright info in GUI about info box
John W. Eaton <jwe@octave.org>
parents:
15402
diff
changeset
|
164 -I$(top_builddir)/libinterp -I$(top_srcdir)/libinterp \ |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
165 -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
166 -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
167 -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
168 -I$(top_srcdir)/libinterp/octave-value |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
169 |
15391 | 170 src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
171 |
15391 | 172 src_libgui_src_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
173 |
15362 | 174 noinst_LTLIBRARIES += src/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
|
175 |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
176 CLEANFILES += \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
177 $(octave_gui_MOC) \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
178 $(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
|
179 $(octave_gui_RC) |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
180 |