Mercurial > octave
annotate libgui/src/octave-qobject.cc @ 31616:726d2628752c
eliminate unused default_settings variable from resource manager
* resource-manager.h, resource-manager.cc
(resource_manager::m_default_settings):
Delete member variable, accessor function, and all uses.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 02 Dec 2022 10:10:19 -0500 |
parents | 59c9da7c43d6 |
children | 0645ea65ca6b |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 //////////////////////////////////////////////////////////////////////// |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 // |
30564
796f54d4ddbf
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
30398
diff
changeset
|
3 // Copyright (C) 2011-2022 The Octave Project Developers |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 // See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 // distribution or <https://octave.org/copyright/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 // This file is part of Octave. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
9 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
10 // Octave is free software: you can redistribute it and/or modify it |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
11 // under the terms of the GNU General Public License as published by |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
12 // the Free Software Foundation, either version 3 of the License, or |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
13 // (at your option) any later version. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
14 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
15 // Octave is distributed in the hope that it will be useful, but |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
16 // WITHOUT ANY WARRANTY; without even the implied warranty of |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
18 // GNU General Public License for more details. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
19 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
20 // You should have received a copy of the GNU General Public License |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
21 // along with Octave; see the file COPYING. If not, see |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
22 // <https://www.gnu.org/licenses/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 //////////////////////////////////////////////////////////////////////// |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 #if defined (HAVE_CONFIG_H) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 # include "config.h" |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 #endif |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 |
27412
da1f59fe04b3
try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents:
27393
diff
changeset
|
30 #include <utility> |
da1f59fe04b3
try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents:
27393
diff
changeset
|
31 |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 #include <QApplication> |
27648
2952471e29a7
eliminate global access to resource_manager in qterminal widget
John W. Eaton <jwe@octave.org>
parents:
27630
diff
changeset
|
33 #include <QClipboard> |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 #include <QFile> |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 #include <QTextCodec> |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 #include <QThread> |
27412
da1f59fe04b3
try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents:
27393
diff
changeset
|
37 #include <QTimer> |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
38 #include <QTranslator> |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 |
29787
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
40 // QTerminal includes |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
41 #include "QTerminal.h" |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
42 |
31222
1a0756f7c90a
disable experimental terminal widget when building without qscintilla
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31087
diff
changeset
|
43 #if defined (HAVE_QSCINTILLA) |
1a0756f7c90a
disable experimental terminal widget when building without qscintilla
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31087
diff
changeset
|
44 # include "command-widget.h" |
1a0756f7c90a
disable experimental terminal widget when building without qscintilla
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31087
diff
changeset
|
45 #endif |
29835
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
46 #include "community-news.h" |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
47 #include "documentation-dock-widget.h" |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
48 #include "files-dock-widget.h" |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
49 #include "history-dock-widget.h" |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
50 #include "interpreter-qobject.h" |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
51 #include "main-window.h" |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
52 #include "octave-qobject.h" |
27412
da1f59fe04b3
try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents:
27393
diff
changeset
|
53 #include "qt-application.h" |
27263
99aa1bcb8848
rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
27261
diff
changeset
|
54 #include "qt-interpreter-events.h" |
29836
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
55 #include "release-notes.h" |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
56 #include "resource-manager.h" |
27630
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27624
diff
changeset
|
57 #include "shortcut-manager.h" |
29787
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
58 #include "terminal-dock-widget.h" |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
59 #include "variable-editor.h" |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
60 #include "workspace-model.h" |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
61 #include "workspace-view.h" |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
62 |
27616
1c13a0f36160
Temporarily disable code in cset d0fe6e344c41 (bug #55940)
Rik <rik@octave.org>
parents:
27604
diff
changeset
|
63 // Bug #55940 (Disable App Nap on Mac) |
27575
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
64 #if defined (Q_OS_MAC) |
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
65 # include <objc/runtime.h> |
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
66 # include <objc/message.h> |
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
67 #endif |
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
68 |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
69 #include "interpreter.h" |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
70 #include "oct-env.h" |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
71 #include "version.h" |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
72 |
27412
da1f59fe04b3
try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents:
27393
diff
changeset
|
73 #include "ovl.h" |
da1f59fe04b3
try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents:
27393
diff
changeset
|
74 |
27621
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
75 |
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
76 // Bug #55940 (Disable App Nap on Mac) |
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
77 #if defined (Q_OS_MAC) |
27624
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
78 static void disable_app_nap (void) |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
79 { |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
80 Class process_info_class; |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
81 SEL process_info_selector; |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
82 SEL begin_activity_with_options_selector; |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
83 id process_info; |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
84 id reason_string; |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
85 id osx_latencycritical_activity; |
27621
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
86 |
27624
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
87 // Option codes found at https://stackoverflow.com/questions/22784886/what-can-make-nanosleep-drift-with-exactly-10-sec-on-mac-os-x-10-9/32729281#32729281 |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
88 unsigned long long NSActivityUserInitiatedAllowingIdleSystemSleep = 0x00FFFFFFULL; |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
89 unsigned long long NSActivityLatencyCritical = 0xFF00000000ULL; |
27621
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
90 |
27624
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
91 // Avoid errors on older versions of OS X |
30702
36be88bf3525
Use reinterpret_cast for return value of objc_getClass.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30564
diff
changeset
|
92 process_info_class = reinterpret_cast<Class> (objc_getClass ("NSProcessInfo")); |
27624
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
93 if (process_info_class == nil) |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
94 return; |
27621
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
95 |
27624
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
96 process_info_selector = sel_getUid ("processInfo"); |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
97 if (class_getClassMethod (process_info_class, process_info_selector) |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
98 == nullptr) |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
99 return; |
27621
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
100 |
27624
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
101 begin_activity_with_options_selector = sel_getUid ("beginActivityWithOptions:reason:"); |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
102 if (class_getInstanceMethod (process_info_class, |
27935
f1844e33f621
maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
103 begin_activity_with_options_selector) |
27624
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
104 == nullptr) |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
105 return; |
27621
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
106 |
28063
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
107 process_info = reinterpret_cast<id (*) (id, SEL)> (objc_msgSend) |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
108 (reinterpret_cast<id> (process_info_class), |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
109 process_info_selector); |
27624
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
110 if (process_info == nil) |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
111 return; |
27621
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
112 |
28063
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
113 reason_string = reinterpret_cast<id (*) (id, SEL)> (objc_msgSend) |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
114 (reinterpret_cast<id> (objc_getClass ("NSString")), |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
115 sel_getUid ("alloc")); |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
116 reason_string = reinterpret_cast<id (*) (id, SEL, const char *)> (objc_msgSend) |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
117 (reason_string, sel_getUid ("initWithUTF8String:"), |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
118 "App Nap causes pause() malfunction"); |
27621
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
119 |
27624
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
120 // Start an Activity that suppresses App Nap. This Activity will run for |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
121 // the entire duration of the Octave process. This is intentional, |
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
122 // not a leak. |
28063
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
123 osx_latencycritical_activity = |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
124 reinterpret_cast<id (*) (id, SEL, unsigned long long, id)> (objc_msgSend) |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
125 (process_info, |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
126 begin_activity_with_options_selector, |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
127 NSActivityUserInitiatedAllowingIdleSystemSleep |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
128 | NSActivityLatencyCritical, |
60e4a9909fac
Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27935
diff
changeset
|
129 reason_string); |
27624
d6b561842eeb
maint: Fix indentation in static function to disable App Nap.
Andrew Janke <andrew@apjanke.net>
parents:
27621
diff
changeset
|
130 } |
27621
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
131 #endif |
39fac14ab25a
Enable App Nap disabling on macOS (bug #55490).
Andrew Janke <andrew@apjanke.net>
parents:
27620
diff
changeset
|
132 |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
133 namespace octave |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
134 { |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
135 // Disable all Qt messages by default. |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
136 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
137 static void |
30398
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29836
diff
changeset
|
138 message_handler (QtMsgType, const QMessageLogContext&, const QString&) |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
139 { } |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
140 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
141 //! Reimplement QApplication::notify. Octave's own exceptions are |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
142 //! caught and rethrown in the interpreter thread. |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
143 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
144 bool octave_qapplication::notify (QObject *receiver, QEvent *ev) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
145 { |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
146 try |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
147 { |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
148 return QApplication::notify (receiver, ev); |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
149 } |
27481
458adc344819
avoid possible crash due to execution_exception in GUI thread
John W. Eaton <jwe@octave.org>
parents:
27412
diff
changeset
|
150 catch (execution_exception& ee) |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
151 { |
27302
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
152 emit interpreter_event |
28851
1ac5a76ae91d
use [=] capture default specification where possible
John W. Eaton <jwe@octave.org>
parents:
28799
diff
changeset
|
153 ([=] (void) |
27302
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
154 { |
27393
efe72866b483
mark all interpreter_event lambda functions with special comment
John W. Eaton <jwe@octave.org>
parents:
27302
diff
changeset
|
155 // INTERPRETER THREAD |
27481
458adc344819
avoid possible crash due to execution_exception in GUI thread
John W. Eaton <jwe@octave.org>
parents:
27412
diff
changeset
|
156 throw ee; |
27302
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
157 }); |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
158 } |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
159 |
27935
f1844e33f621
maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
160 return false; |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
161 } |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
162 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
163 // We will create a QApplication object, even if START_GUI is false, |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
164 // so that we can use Qt widgets for plot windows when running in |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
165 // command-line mode. Note that we are creating an |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
166 // octave_qapplication object but handling it as a QApplication object |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
167 // because the octave_qapplication should behave identically to a |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
168 // QApplication object except that it overrides the notify method so |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
169 // we can handle forward Octave interpreter exceptions from the GUI |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
170 // thread to the interpreter thread. |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
171 |
29153
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
172 base_qobject::base_qobject (qt_application& app_context, bool gui_app) |
29549
cf02394695b3
* octave-qobject.cc: Minor style fixes.
John W. Eaton <jwe@octave.org>
parents:
29548
diff
changeset
|
173 : QObject (), |
cf02394695b3
* octave-qobject.cc: Minor style fixes.
John W. Eaton <jwe@octave.org>
parents:
29548
diff
changeset
|
174 m_app_context (app_context), |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
175 m_argc (m_app_context.sys_argc ()), |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
176 m_argv (m_app_context.sys_argv ()), |
27218
a044202208af
more refactoring of GUI classes that manage the interpreter
John W. Eaton <jwe@octave.org>
parents:
27197
diff
changeset
|
177 m_qapplication (new octave_qapplication (m_argc, m_argv)), |
29549
cf02394695b3
* octave-qobject.cc: Minor style fixes.
John W. Eaton <jwe@octave.org>
parents:
29548
diff
changeset
|
178 m_resource_manager (), |
cf02394695b3
* octave-qobject.cc: Minor style fixes.
John W. Eaton <jwe@octave.org>
parents:
29548
diff
changeset
|
179 m_shortcut_manager (*this), |
cf02394695b3
* octave-qobject.cc: Minor style fixes.
John W. Eaton <jwe@octave.org>
parents:
29548
diff
changeset
|
180 m_qt_tr (new QTranslator ()), |
cf02394695b3
* octave-qobject.cc: Minor style fixes.
John W. Eaton <jwe@octave.org>
parents:
29548
diff
changeset
|
181 m_gui_tr (new QTranslator ()), |
cf02394695b3
* octave-qobject.cc: Minor style fixes.
John W. Eaton <jwe@octave.org>
parents:
29548
diff
changeset
|
182 m_qsci_tr (new QTranslator ()), |
cf02394695b3
* octave-qobject.cc: Minor style fixes.
John W. Eaton <jwe@octave.org>
parents:
29548
diff
changeset
|
183 m_translators_installed (false), |
27588
f0e3f3e28a8e
move qt_interpreter_events object from interpreter_qobject to octave_qobject
John W. Eaton <jwe@octave.org>
parents:
27582
diff
changeset
|
184 m_qt_interpreter_events (new qt_interpreter_events (*this)), |
f0e3f3e28a8e
move qt_interpreter_events object from interpreter_qobject to octave_qobject
John W. Eaton <jwe@octave.org>
parents:
27582
diff
changeset
|
185 m_interpreter_qobj (new interpreter_qobject (*this)), |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
186 m_main_thread (new QThread ()), |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
187 m_gui_app (gui_app), |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
188 m_interpreter_ready (false), |
29785
8ba6f4d0373c
eliminate unused reference to base_qobject in workspace_model
John W. Eaton <jwe@octave.org>
parents:
29783
diff
changeset
|
189 m_workspace_model (new workspace_model ()), |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
190 m_documentation_widget (), |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
191 m_file_browser_widget (), |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
192 m_history_widget (), |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
193 m_workspace_widget (), |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
194 m_editor_widget (), |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
195 m_variable_editor_widget (), |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
196 m_main_window (nullptr) |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
197 { |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
198 std::string show_gui_msgs = |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
199 sys::env::getenv ("OCTAVE_SHOW_GUI_MESSAGES"); |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
200 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
201 // Installing our handler suppresses the messages. |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
202 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
203 if (show_gui_msgs.empty ()) |
29549
cf02394695b3
* octave-qobject.cc: Minor style fixes.
John W. Eaton <jwe@octave.org>
parents:
29548
diff
changeset
|
204 qInstallMessageHandler (message_handler); |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
205 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
206 // Set the codec for all strings (before wizard or any GUI object) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
207 #if ! defined (Q_OS_WIN32) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
208 QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8")); |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
209 #endif |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
210 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
211 // Register octave_value_list for connecting thread crossing signals. |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
212 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
213 qRegisterMetaType<octave_value_list> ("octave_value_list"); |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
214 |
27616
1c13a0f36160
Temporarily disable code in cset d0fe6e344c41 (bug #55940)
Rik <rik@octave.org>
parents:
27604
diff
changeset
|
215 // Bug #55940 (Disable App Nap on Mac) |
27575
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
216 #if defined (Q_OS_MAC) |
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
217 // Mac App Nap feature causes pause() and sleep() to misbehave. |
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
218 // Disable it for the entire program run. |
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
219 disable_app_nap (); |
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
220 #endif |
d0fe6e344c41
Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940).
Andrew Janke <andrew@apjanke.net>
parents:
27551
diff
changeset
|
221 |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
222 // Force left-to-right alignment (see bug #46204) |
27218
a044202208af
more refactoring of GUI classes that manage the interpreter
John W. Eaton <jwe@octave.org>
parents:
27197
diff
changeset
|
223 m_qapplication->setLayoutDirection (Qt::LeftToRight); |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
224 |
29548
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
225 // Qt docs recommend using Qt::QueuedConnection when connecting to |
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
226 // the QCoreApplication::exit slot. |
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
227 connect (m_interpreter_qobj, &interpreter_qobject::shutdown_finished, |
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
228 m_qapplication, &octave_qapplication::exit, |
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
229 Qt::QueuedConnection); |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
230 |
29786
63c515ff762f
eliminate more signal connections to parent objects
John W. Eaton <jwe@octave.org>
parents:
29785
diff
changeset
|
231 connect (m_interpreter_qobj, &interpreter_qobject::ready, |
63c515ff762f
eliminate more signal connections to parent objects
John W. Eaton <jwe@octave.org>
parents:
29785
diff
changeset
|
232 this, &base_qobject::interpreter_ready); |
63c515ff762f
eliminate more signal connections to parent objects
John W. Eaton <jwe@octave.org>
parents:
29785
diff
changeset
|
233 |
29575
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
234 connect (m_main_thread, &QThread::finished, |
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
235 m_main_thread, &QThread::deleteLater); |
27302
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
236 |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
237 // Handle any interpreter_event signal from the octave_qapplication |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
238 // object here. |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
239 |
29575
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
240 connect (m_qapplication, QOverload<const fcn_callback&>::of (&octave_qapplication::interpreter_event), |
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
241 this, QOverload<const fcn_callback&>::of (&base_qobject::interpreter_event)); |
27302
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
242 |
29575
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
243 connect (m_qapplication, QOverload<const meth_callback&>::of (&octave_qapplication::interpreter_event), |
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
244 this, QOverload<const meth_callback&>::of (&base_qobject::interpreter_event)); |
27588
f0e3f3e28a8e
move qt_interpreter_events object from interpreter_qobject to octave_qobject
John W. Eaton <jwe@octave.org>
parents:
27582
diff
changeset
|
245 |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
246 if (m_app_context.experimental_terminal_widget ()) |
29787
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
247 { |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
248 connect (qt_link (), &qt_interpreter_events::start_gui_signal, |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
249 this, &base_qobject::start_gui); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
250 |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
251 connect (qt_link (), &qt_interpreter_events::show_terminal_window_signal, |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
252 this, &base_qobject::show_terminal_window); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
253 } |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
254 |
29575
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
255 connect (qt_link (), &qt_interpreter_events::copy_image_to_clipboard_signal, |
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
256 this, &base_qobject::copy_image_to_clipboard); |
29153
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
257 |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
258 connect (qt_link (), &qt_interpreter_events::show_documentation_signal, |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
259 this, &base_qobject::show_documentation_window); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
260 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
261 connect (qt_link (), &qt_interpreter_events::show_file_browser_signal, |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
262 this, &base_qobject::show_file_browser_window); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
263 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
264 connect (qt_link (), &qt_interpreter_events::show_command_history_signal, |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
265 this, &base_qobject::show_command_history_window); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
266 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
267 connect (qt_link (), &qt_interpreter_events::show_workspace_signal, |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
268 this, &base_qobject::show_workspace_window); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
269 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
270 connect (qt_link (), &qt_interpreter_events::edit_variable_signal, |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
271 this, &base_qobject::show_variable_editor_window); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
272 |
29835
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
273 connect (qt_link (), &qt_interpreter_events::show_community_news_signal, |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
274 this, &base_qobject::show_community_news); |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
275 |
29836
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
276 connect (qt_link (), &qt_interpreter_events::show_release_notes_signal, |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
277 this, &base_qobject::show_release_notes); |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
278 |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
279 if (m_app_context.experimental_terminal_widget ()) |
29153
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
280 { |
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
281 m_qapplication->setQuitOnLastWindowClosed (false); |
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
282 } |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
283 else |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
284 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
285 if (gui_app) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
286 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
287 m_main_window = new main_window (*this); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
288 |
29835
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
289 connect (m_main_window, &main_window::show_community_news_signal, |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
290 this, &base_qobject::show_community_news); |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
291 |
29836
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
292 connect (m_main_window, &main_window::show_release_notes_signal, |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
293 this, &base_qobject::show_release_notes); |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
294 |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
295 if (m_interpreter_ready) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
296 m_main_window->handle_octave_ready (); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
297 else |
29575
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
298 connect (m_interpreter_qobj, &interpreter_qobject::ready, |
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
299 m_main_window, &main_window::handle_octave_ready); |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
300 |
29575
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
301 connect (qt_link (), &qt_interpreter_events::focus_window_signal, |
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
302 m_main_window, &main_window::focus_window); |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
303 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
304 m_app_context.gui_running (true); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
305 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
306 else |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
307 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
308 // Get settings file. |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
309 m_resource_manager.reload_settings (); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
310 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
311 // After settings. |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
312 config_translators (); |
30772
36dc11ee220d
reorganize GUIs icons
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30711
diff
changeset
|
313 m_resource_manager.config_icon_theme (); |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
314 |
29780
d79f65e37e89
provide shortcuts in widgets launched from the cli
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29775
diff
changeset
|
315 // Initilize the shortcut-manager |
d79f65e37e89
provide shortcuts in widgets launched from the cli
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29775
diff
changeset
|
316 m_shortcut_manager.init_data (); |
d79f65e37e89
provide shortcuts in widgets launched from the cli
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29775
diff
changeset
|
317 |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
318 m_qapplication->setQuitOnLastWindowClosed (false); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
319 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
320 } |
29153
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
321 |
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
322 start_main_thread (); |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
323 } |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
324 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
325 base_qobject::~base_qobject (void) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
326 { |
27219
b88d66c631c8
delete translator objects in base_qobject destructor
John W. Eaton <jwe@octave.org>
parents:
27218
diff
changeset
|
327 // Note that we don't delete m_main_thread here. That is handled by |
b88d66c631c8
delete translator objects in base_qobject destructor
John W. Eaton <jwe@octave.org>
parents:
27218
diff
changeset
|
328 // deleteLater slot that is called when the m_main_thread issues a |
b88d66c631c8
delete translator objects in base_qobject destructor
John W. Eaton <jwe@octave.org>
parents:
27218
diff
changeset
|
329 // finished signal. |
b88d66c631c8
delete translator objects in base_qobject destructor
John W. Eaton <jwe@octave.org>
parents:
27218
diff
changeset
|
330 |
29757
f8322ca49578
delete main window before dock widgets (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29756
diff
changeset
|
331 // FIXME: Why are dock widget settings and/or the main window |
f8322ca49578
delete main window before dock widgets (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29756
diff
changeset
|
332 // configuration not saved correctly if the main window is deleted |
f8322ca49578
delete main window before dock widgets (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29756
diff
changeset
|
333 // after the dock widgets? |
f8322ca49578
delete main window before dock widgets (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29756
diff
changeset
|
334 |
f8322ca49578
delete main window before dock widgets (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29756
diff
changeset
|
335 |
29756
7db4a4e94556
use deleteLater to delete dock widgets (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29755
diff
changeset
|
336 // Calling close will cause settings to be saved. |
29758
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
337 // If m_main_window exists, the widgets are closed by the main window |
29755
23cf249a0ad8
explicitly close all dock widgets in base_qobject destructor (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29754
diff
changeset
|
338 |
29758
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
339 if (! m_main_window) |
29756
7db4a4e94556
use deleteLater to delete dock widgets (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29755
diff
changeset
|
340 { |
29787
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
341 if (m_terminal_widget) |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
342 m_terminal_widget->close (); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
343 |
29758
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
344 if (m_documentation_widget) |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
345 m_documentation_widget->close (); |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
346 |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
347 if (m_file_browser_widget) |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
348 m_file_browser_widget->close (); |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
349 |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
350 if (m_history_widget) |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
351 m_history_widget->close (); |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
352 |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
353 if (m_workspace_widget) |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
354 m_workspace_widget->close (); |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
355 |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
356 if (m_editor_widget) |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
357 m_editor_widget->close (); |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
358 |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
359 if (m_variable_editor_widget) |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
360 m_variable_editor_widget->close (); |
29835
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
361 |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
362 if (m_community_news) |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
363 m_community_news->close (); |
29756
7db4a4e94556
use deleteLater to delete dock widgets (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29755
diff
changeset
|
364 } |
29758
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
365 else |
29756
7db4a4e94556
use deleteLater to delete dock widgets (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29755
diff
changeset
|
366 { |
29758
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
367 delete m_main_window; |
29756
7db4a4e94556
use deleteLater to delete dock widgets (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29755
diff
changeset
|
368 } |
29755
23cf249a0ad8
explicitly close all dock widgets in base_qobject destructor (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29754
diff
changeset
|
369 |
29787
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
370 delete m_terminal_widget; |
29758
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
371 delete m_documentation_widget; |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
372 delete m_file_browser_widget; |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
373 delete m_history_widget; |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
374 delete m_workspace_widget; |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
375 delete m_editor_widget; |
1511b7cd3474
only close dock widgets when main window does not exist (bug #60646)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29757
diff
changeset
|
376 delete m_variable_editor_widget; |
29835
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
377 delete m_community_news; |
29755
23cf249a0ad8
explicitly close all dock widgets in base_qobject destructor (bug #60646)
John W. Eaton <jwe@octave.org>
parents:
29754
diff
changeset
|
378 |
27218
a044202208af
more refactoring of GUI classes that manage the interpreter
John W. Eaton <jwe@octave.org>
parents:
27197
diff
changeset
|
379 delete m_interpreter_qobj; |
27219
b88d66c631c8
delete translator objects in base_qobject destructor
John W. Eaton <jwe@octave.org>
parents:
27218
diff
changeset
|
380 delete m_qsci_tr; |
b88d66c631c8
delete translator objects in base_qobject destructor
John W. Eaton <jwe@octave.org>
parents:
27218
diff
changeset
|
381 delete m_gui_tr; |
b88d66c631c8
delete translator objects in base_qobject destructor
John W. Eaton <jwe@octave.org>
parents:
27218
diff
changeset
|
382 delete m_qt_tr; |
27218
a044202208af
more refactoring of GUI classes that manage the interpreter
John W. Eaton <jwe@octave.org>
parents:
27197
diff
changeset
|
383 delete m_qapplication; |
28799
6aba3944b608
fix deleting pointer when octave exists
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28795
diff
changeset
|
384 delete m_workspace_model; |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
385 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
386 string_vector::delete_c_str_vec (m_argv); |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
387 } |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
388 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
389 void base_qobject::config_translators (void) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
390 { |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
391 if (m_translators_installed) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
392 return; |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
393 |
27620
45bb5bbaf291
don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27619
diff
changeset
|
394 m_resource_manager.config_translators (m_qt_tr, m_qsci_tr, m_gui_tr); |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
395 |
27218
a044202208af
more refactoring of GUI classes that manage the interpreter
John W. Eaton <jwe@octave.org>
parents:
27197
diff
changeset
|
396 m_qapplication->installTranslator (m_qt_tr); |
a044202208af
more refactoring of GUI classes that manage the interpreter
John W. Eaton <jwe@octave.org>
parents:
27197
diff
changeset
|
397 m_qapplication->installTranslator (m_gui_tr); |
a044202208af
more refactoring of GUI classes that manage the interpreter
John W. Eaton <jwe@octave.org>
parents:
27197
diff
changeset
|
398 m_qapplication->installTranslator (m_qsci_tr); |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
399 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
400 m_translators_installed = true; |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
401 } |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
402 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
403 void base_qobject::start_main_thread (void) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
404 { |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
405 // Note: if using the new experimental terminal widget, we defer |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
406 // initializing and executing the interpreter until the main event |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
407 // loop begins executing. |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
408 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
409 // With the old terminal widget, we defer initializing and executing |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
410 // the interpreter until after the main window and QApplication are |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
411 // running to prevent race conditions. |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
412 |
29544
4eeef8cdaa2c
Backout changes to octave-qobject.cc in cset 3d34b70b5a49 (bug #60420)
Rik <rik@octave.org>
parents:
29542
diff
changeset
|
413 QTimer::singleShot (0, m_interpreter_qobj, SLOT (execute (void))); |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
414 |
27218
a044202208af
more refactoring of GUI classes that manage the interpreter
John W. Eaton <jwe@octave.org>
parents:
27197
diff
changeset
|
415 m_interpreter_qobj->moveToThread (m_main_thread); |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
416 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
417 m_main_thread->start (); |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
418 } |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
419 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
420 int base_qobject::exec (void) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
421 { |
29548
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
422 int status = m_qapplication->exec (); |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
423 |
29548
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
424 #if defined (Q_OS_MAC) |
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
425 // fprintf to stderr is needed by macOS, for poorly-understood reasons. |
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
426 fprintf (stderr, "\n"); |
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
427 #endif |
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
428 |
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
429 m_main_thread->quit (); |
f6ad83cbe3c4
simplify interpreter shutdown in the GUI
John W. Eaton <jwe@octave.org>
parents:
29544
diff
changeset
|
430 m_main_thread->wait (); |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
431 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
432 return status; |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
433 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
434 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
435 // Provided for convenience. Will be removed once we eliminate the |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
436 // old terminal widget. |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
437 bool base_qobject::experimental_terminal_widget (void) const |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
438 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
439 return m_app_context.experimental_terminal_widget (); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
440 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
441 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
442 bool base_qobject::gui_running (void) const |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
443 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
444 return m_app_context.gui_running (); |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
445 } |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
446 |
29787
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
447 QPointer<terminal_dock_widget> |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
448 base_qobject::terminal_widget (main_window *mw) |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
449 { |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
450 if (m_terminal_widget && mw) |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
451 { |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
452 m_terminal_widget->set_main_window (mw); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
453 m_terminal_widget->set_adopted (true); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
454 } |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
455 else if (! m_terminal_widget) |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
456 { |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
457 m_terminal_widget |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
458 = QPointer<terminal_dock_widget> (new terminal_dock_widget (mw, *this)); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
459 if (experimental_terminal_widget ()) |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
460 { |
31222
1a0756f7c90a
disable experimental terminal widget when building without qscintilla
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31087
diff
changeset
|
461 #if defined (HAVE_QSCINTILLA) |
29787
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
462 command_widget *cmd_widget |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
463 = m_terminal_widget->get_command_widget (); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
464 |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
465 connect (cmd_widget, &command_widget::interpreter_pause, |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
466 this, &base_qobject::interpreter_pause); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
467 |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
468 connect (cmd_widget, &command_widget::interpreter_resume, |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
469 this, &base_qobject::interpreter_resume); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
470 |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
471 connect (cmd_widget, &command_widget::interpreter_stop, |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
472 this, &base_qobject::interpreter_stop); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
473 |
29796
a0fce019cd1f
additional reorganization of signal/slot connections in main_window class
John W. Eaton <jwe@octave.org>
parents:
29787
diff
changeset
|
474 connect (qt_link (), &qt_interpreter_events::interpreter_output_signal, |
31087
9c0099048264
exp cmd widget: fix missing promt after error
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30964
diff
changeset
|
475 m_terminal_widget, &terminal_dock_widget::interpreter_output_signal); |
29796
a0fce019cd1f
additional reorganization of signal/slot connections in main_window class
John W. Eaton <jwe@octave.org>
parents:
29787
diff
changeset
|
476 |
a0fce019cd1f
additional reorganization of signal/slot connections in main_window class
John W. Eaton <jwe@octave.org>
parents:
29787
diff
changeset
|
477 connect (qt_link (), &qt_interpreter_events::update_prompt_signal, |
31087
9c0099048264
exp cmd widget: fix missing promt after error
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30964
diff
changeset
|
478 m_terminal_widget, &terminal_dock_widget::update_prompt_signal); |
9c0099048264
exp cmd widget: fix missing promt after error
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30964
diff
changeset
|
479 |
9c0099048264
exp cmd widget: fix missing promt after error
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30964
diff
changeset
|
480 connect (qt_link (), &qt_interpreter_events::new_command_line_signal, |
9c0099048264
exp cmd widget: fix missing promt after error
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30964
diff
changeset
|
481 m_terminal_widget, &terminal_dock_widget::new_command_line_signal); |
29796
a0fce019cd1f
additional reorganization of signal/slot connections in main_window class
John W. Eaton <jwe@octave.org>
parents:
29787
diff
changeset
|
482 |
29787
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
483 connect_interpreter_events (cmd_widget); |
31222
1a0756f7c90a
disable experimental terminal widget when building without qscintilla
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31087
diff
changeset
|
484 #endif |
29787
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
485 } |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
486 else |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
487 { |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
488 QTerminal *cmd_widget = m_terminal_widget->get_qterminal (); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
489 |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
490 // Connect the interrupt signal (emitted by Ctrl-C) |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
491 connect (cmd_widget, &QTerminal::interrupt_signal, |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
492 this, &base_qobject::interpreter_interrupt); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
493 } |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
494 } |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
495 |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
496 return m_terminal_widget; |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
497 } |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
498 |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
499 QPointer<documentation_dock_widget> |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
500 base_qobject::documentation_widget (main_window *mw) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
501 { |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
502 if (m_documentation_widget && mw) |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
503 { |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
504 m_documentation_widget->set_main_window (mw); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
505 m_documentation_widget->set_adopted (true); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
506 } |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
507 else if (! m_documentation_widget) |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
508 { |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
509 m_documentation_widget |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
510 = QPointer<documentation_dock_widget> (new documentation_dock_widget (mw, *this)); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
511 |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
512 connect (qt_link (), |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
513 &qt_interpreter_events::register_documentation_signal, |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
514 m_documentation_widget, |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
515 &documentation_dock_widget::registerDoc); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
516 |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
517 connect (qt_link (), |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
518 &qt_interpreter_events::unregister_documentation_signal, |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
519 m_documentation_widget, |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
520 &documentation_dock_widget::unregisterDoc); |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
521 } |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
522 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
523 return m_documentation_widget; |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
524 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
525 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
526 QPointer<files_dock_widget> |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
527 base_qobject::file_browser_widget (main_window *mw) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
528 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
529 if (m_file_browser_widget) |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
530 { |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
531 m_file_browser_widget->set_main_window (mw); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
532 m_file_browser_widget->set_adopted (true); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
533 } |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
534 else if (! m_file_browser_widget) |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
535 m_file_browser_widget |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
536 = QPointer<files_dock_widget> (new files_dock_widget (mw, *this)); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
537 |
29796
a0fce019cd1f
additional reorganization of signal/slot connections in main_window class
John W. Eaton <jwe@octave.org>
parents:
29787
diff
changeset
|
538 connect (qt_link (), &qt_interpreter_events::directory_changed_signal, |
a0fce019cd1f
additional reorganization of signal/slot connections in main_window class
John W. Eaton <jwe@octave.org>
parents:
29787
diff
changeset
|
539 m_file_browser_widget, &files_dock_widget::update_octave_directory); |
a0fce019cd1f
additional reorganization of signal/slot connections in main_window class
John W. Eaton <jwe@octave.org>
parents:
29787
diff
changeset
|
540 |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
541 return m_file_browser_widget; |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
542 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
543 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
544 QPointer<history_dock_widget> |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
545 base_qobject::history_widget (main_window *mw) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
546 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
547 if (m_history_widget) |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
548 { |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
549 m_history_widget->set_main_window (mw); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
550 m_history_widget->set_adopted (true); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
551 } |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
552 else if (! m_history_widget) |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
553 { |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
554 m_history_widget |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
555 = QPointer<history_dock_widget> (new history_dock_widget (mw, *this)); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
556 |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
557 connect (qt_link (), &qt_interpreter_events::set_history_signal, |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
558 m_history_widget, &history_dock_widget::set_history); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
559 |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
560 connect (qt_link (), &qt_interpreter_events::append_history_signal, |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
561 m_history_widget, &history_dock_widget::append_history); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
562 |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
563 connect (qt_link (), &qt_interpreter_events::clear_history_signal, |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
564 m_history_widget, &history_dock_widget::clear_history); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
565 |
29775
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
566 emit interpreter_event |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
567 ([=] (interpreter& interp) { |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
568 // INTERPRETER THREAD |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
569 |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
570 event_manager& xevmgr = interp.get_event_manager (); |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
571 |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
572 xevmgr.set_history (); |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
573 }); |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
574 } |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
575 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
576 return m_history_widget; |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
577 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
578 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
579 QPointer<workspace_view> |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
580 base_qobject::workspace_widget (main_window *mw) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
581 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
582 if (m_workspace_widget) |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
583 { |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
584 m_workspace_widget->set_main_window (mw); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
585 m_workspace_widget->set_adopted (true); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
586 } |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
587 else if (! m_workspace_widget) |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
588 { |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
589 m_workspace_widget |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
590 = QPointer<workspace_view> (new workspace_view (mw, *this)); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
591 |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
592 m_workspace_widget->setModel (m_workspace_model); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
593 |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
594 connect (m_workspace_model, &workspace_model::model_changed, |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
595 m_workspace_widget, &workspace_view::handle_model_changed); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
596 |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
597 connect (qt_link (), &qt_interpreter_events::set_workspace_signal, |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
598 m_workspace_model, &workspace_model::set_workspace); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
599 |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
600 connect (qt_link (), &qt_interpreter_events::clear_workspace_signal, |
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
601 m_workspace_model, &workspace_model::clear_workspace); |
29768
38bbe1a2828f
allow variable editor to open from workspace view without main window
John W. Eaton <jwe@octave.org>
parents:
29762
diff
changeset
|
602 |
29774
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
603 connect (m_workspace_widget, |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
604 &workspace_view::copy_variable_value_to_clipboard, |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
605 [=] (const QString& var_name) { |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
606 emit interpreter_event |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
607 ([=] (interpreter& interp) |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
608 { |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
609 // INTERPRETER THREAD |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
610 |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
611 octave_value val = interp.varval (var_name.toStdString ()); |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
612 |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
613 if (val.is_undefined ()) |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
614 val = 0; |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
615 |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
616 std::ostringstream buf; |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
617 val.print_raw (buf, true); |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
618 |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
619 // FIXME: is the following operation thread safe or should |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
620 // it be done with a signal/slot connection? |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
621 |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
622 QClipboard *clipboard = QApplication::clipboard (); |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
623 clipboard->setText (QString::fromStdString (buf.str ())); |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
624 }); |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
625 }); |
29773
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
626 |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
627 connect (m_workspace_widget, &workspace_view::rename_variable_signal, |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
628 [=] (const QString& old_name, const QString& new_name) { |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
629 emit interpreter_event |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
630 ([=] (interpreter& interp) { |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
631 // INTERPRETER THREAD |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
632 |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
633 symbol_scope scope = interp.get_current_scope (); |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
634 |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
635 if (scope) |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
636 { |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
637 scope.rename (old_name.toStdString (), |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
638 new_name.toStdString ()); |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
639 |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
640 tree_evaluator& tw = interp.get_evaluator (); |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
641 |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
642 event_manager& xevmgr = interp.get_event_manager (); |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
643 |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
644 xevmgr.set_workspace (true, tw.get_symbol_info ()); |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
645 } |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
646 |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
647 // FIXME: if this action fails, do we need a way to |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
648 // display that info in the GUI? |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
649 }); |
5f404ae822ee
allow variable renaming in workspace_view to work without main_window
John W. Eaton <jwe@octave.org>
parents:
29768
diff
changeset
|
650 }); |
29774
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
651 |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
652 connect (m_workspace_widget, &workspace_view::edit_variable_signal, |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
653 [=] (const QString& var_name) { |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
654 emit interpreter_event |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
655 ([=] (interpreter& interp) { |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
656 // INTERPRETER THREAD |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
657 |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
658 std::string name = var_name.toStdString (); |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
659 octave_value val = interp.varval (name); |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
660 |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
661 event_manager& xevmgr = interp.get_event_manager (); |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
662 |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
663 xevmgr.edit_variable (name, val); |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
664 }); |
aa46787ed8b7
eliminate direct dependence on octave intepreter from workspace_view
John W. Eaton <jwe@octave.org>
parents:
29773
diff
changeset
|
665 }); |
29775
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
666 |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
667 emit interpreter_event |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
668 ([=] (interpreter& interp) { |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
669 // INTERPRETER THREAD |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
670 |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
671 event_manager& xevmgr = interp.get_event_manager (); |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
672 |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
673 xevmgr.set_workspace (); |
a64352cadda8
use interpreter events to set initial data for workspace and history widgets
John W. Eaton <jwe@octave.org>
parents:
29774
diff
changeset
|
674 }); |
29702
3a684b0e7406
only connect dock widget signals in base_qobject when creating dock widgets
John W. Eaton <jwe@octave.org>
parents:
29700
diff
changeset
|
675 } |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
676 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
677 return m_workspace_widget; |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
678 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
679 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
680 QPointer<file_editor_interface> |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
681 base_qobject::editor_widget (main_window */*mw*/) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
682 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
683 #if 0 |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
684 if (m_editor_widget && mw) |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
685 { |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
686 m_editor_widget->set_main_window (mw); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
687 m_editor_widget->set_adopted (true); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
688 } |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
689 else if (! m_editor_widget) |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
690 m_editor_widget = new file_editor (mw, *this); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
691 #endif |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
692 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
693 return m_editor_widget; |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
694 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
695 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
696 QPointer<variable_editor> |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
697 base_qobject::variable_editor_widget (main_window *mw) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
698 { |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
699 if (m_variable_editor_widget && mw) |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
700 { |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
701 m_variable_editor_widget->set_main_window (mw); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
702 m_variable_editor_widget->set_adopted (true); |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
703 } |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
704 else if (! m_variable_editor_widget) |
29762
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
705 { |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
706 m_variable_editor_widget |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
707 = QPointer<variable_editor> (new variable_editor (mw, *this)); |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
708 |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
709 connect (m_variable_editor_widget, &variable_editor::updated, |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
710 this, &base_qobject::handle_variable_editor_update); |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
711 |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
712 connect (m_variable_editor_widget, &variable_editor::command_signal, |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
713 this, &base_qobject::execute_command); |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
714 |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
715 connect (qt_link (), |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
716 &qt_interpreter_events::refresh_variable_editor_signal, |
29822
0923ae48a4f7
avoid possible crash on return to command line after closing main window
John W. Eaton <jwe@octave.org>
parents:
29796
diff
changeset
|
717 m_variable_editor_widget, &variable_editor::refresh); |
29783
5154c91e0d98
eliminate some connections to parent objects in octave_dock_widget classes
John W. Eaton <jwe@octave.org>
parents:
29780
diff
changeset
|
718 |
5154c91e0d98
eliminate some connections to parent objects in octave_dock_widget classes
John W. Eaton <jwe@octave.org>
parents:
29780
diff
changeset
|
719 connect_interpreter_events<variable_editor> (m_variable_editor_widget); |
29762
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
720 } |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
721 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
722 return m_variable_editor_widget; |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
723 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
724 |
29835
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
725 QPointer<community_news> base_qobject::community_news_widget (int serial) |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
726 { |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
727 if (! m_community_news) |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
728 m_community_news |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
729 = QPointer<community_news> (new community_news (*this, serial)); |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
730 |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
731 return m_community_news; |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
732 } |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
733 |
29836
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
734 QPointer<release_notes> base_qobject::release_notes_widget (void) |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
735 { |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
736 if (! m_release_notes) |
30964
04601f6c47f4
fix broken icon path after new icon structure in GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30772
diff
changeset
|
737 m_release_notes = QPointer<release_notes> (new release_notes (*this)); |
29836
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
738 |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
739 return m_release_notes; |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
740 } |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
741 |
27588
f0e3f3e28a8e
move qt_interpreter_events object from interpreter_qobject to octave_qobject
John W. Eaton <jwe@octave.org>
parents:
27582
diff
changeset
|
742 bool base_qobject::confirm_shutdown (void) |
f0e3f3e28a8e
move qt_interpreter_events object from interpreter_qobject to octave_qobject
John W. Eaton <jwe@octave.org>
parents:
27582
diff
changeset
|
743 { |
29153
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
744 // Currently, we forward to main_window::confirm_shutdown instead of |
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
745 // just displaying a dialog box here because the main_window also |
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
746 // knows about and is responsible for notifying the editor. |
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
747 |
02ee34a30351
eliminate separate cli_qobject and gui_qobject classes
John W. Eaton <jwe@octave.org>
parents:
28851
diff
changeset
|
748 return m_main_window ? m_main_window->confirm_shutdown () : true; |
27588
f0e3f3e28a8e
move qt_interpreter_events object from interpreter_qobject to octave_qobject
John W. Eaton <jwe@octave.org>
parents:
27582
diff
changeset
|
749 } |
f0e3f3e28a8e
move qt_interpreter_events object from interpreter_qobject to octave_qobject
John W. Eaton <jwe@octave.org>
parents:
27582
diff
changeset
|
750 |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
751 void base_qobject::start_gui (bool gui_app) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
752 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
753 if (m_app_context.experimental_terminal_widget ()) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
754 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
755 if (m_main_window) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
756 return; |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
757 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
758 m_gui_app = gui_app; |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
759 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
760 m_main_window = new main_window (*this); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
761 |
29575
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
762 connect (qt_link (), &qt_interpreter_events::focus_window_signal, |
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
763 m_main_window, &main_window::focus_window); |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
764 |
29575
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
765 connect (qt_link (), &qt_interpreter_events::close_gui_signal, |
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
766 this, &base_qobject::close_gui); |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
767 |
29575
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
768 connect (m_main_window, &main_window::close_gui_signal, |
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
769 this, &base_qobject::close_gui); |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
770 |
29835
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
771 connect (m_main_window, &main_window::show_community_news_signal, |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
772 this, &base_qobject::show_community_news); |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
773 |
29836
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
774 connect (m_main_window, &main_window::show_release_notes_signal, |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
775 this, &base_qobject::show_release_notes); |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
776 |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
777 if (m_interpreter_ready) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
778 m_main_window->handle_octave_ready (); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
779 else |
29575
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
780 connect (m_interpreter_qobj, &interpreter_qobject::ready, |
c7206af46897
Avoid use of SIGNAL/SLOT where possible (bug #60420)
Rik <rik@octave.org>
parents:
29549
diff
changeset
|
781 m_main_window, &main_window::handle_octave_ready); |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
782 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
783 if (m_gui_app) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
784 m_qapplication->setQuitOnLastWindowClosed (true); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
785 else |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
786 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
787 // FIXME: Save current values of PS1 and PS2 so they can be |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
788 // restored when we return to the command line? |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
789 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
790 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
791 m_app_context.gui_running (true); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
792 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
793 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
794 |
29787
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
795 void base_qobject::show_terminal_window (void) |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
796 { |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
797 terminal_dock_widget *widget |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
798 = (m_terminal_widget |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
799 ? m_terminal_widget : terminal_widget ()); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
800 |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
801 if (! widget->isVisible ()) |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
802 { |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
803 widget->show (); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
804 widget->raise (); |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
805 } |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
806 } |
b4d2fa28d1d4
allow terminal window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29786
diff
changeset
|
807 |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
808 void base_qobject::show_documentation_window (const QString& file) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
809 { |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
810 documentation_dock_widget *widget |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
811 = (m_documentation_widget |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
812 ? m_documentation_widget : documentation_widget ()); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
813 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
814 widget->showDoc (file); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
815 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
816 if (! widget->isVisible ()) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
817 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
818 widget->show (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
819 widget->raise (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
820 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
821 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
822 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
823 void base_qobject::show_file_browser_window (void) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
824 { |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
825 files_dock_widget *widget |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
826 = m_file_browser_widget ? m_file_browser_widget : file_browser_widget (); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
827 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
828 if (! widget->isVisible ()) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
829 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
830 widget->show (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
831 widget->raise (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
832 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
833 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
834 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
835 void base_qobject::show_command_history_window (void) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
836 { |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
837 history_dock_widget *widget |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
838 = m_history_widget ? m_history_widget : history_widget (); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
839 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
840 if (! widget->isVisible ()) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
841 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
842 widget->show (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
843 widget->raise (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
844 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
845 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
846 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
847 void base_qobject::show_workspace_window (void) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
848 { |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
849 workspace_view *widget |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
850 = m_workspace_widget ? m_workspace_widget : workspace_widget (); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
851 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
852 if (! widget->isVisible ()) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
853 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
854 widget->show (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
855 widget->raise (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
856 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
857 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
858 |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
859 void base_qobject::show_variable_editor_window (const QString& name, |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
860 const octave_value& value) |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
861 { |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
862 variable_editor *widget |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
863 = (m_variable_editor_widget |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
864 ? m_variable_editor_widget : variable_editor_widget ()); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
865 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
866 if (! widget->isVisible ()) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
867 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
868 widget->show (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
869 widget->raise (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
870 } |
29754
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
871 |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
872 // FIXME: Should this be done with a signal/slot connection? |
4c569e386e9b
improve behavior of dockable widgets (bug #60750)
John W. Eaton <jwe@octave.org>
parents:
29702
diff
changeset
|
873 widget->edit_variable (name, value); |
29613
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
874 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
875 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
876 void base_qobject::handle_variable_editor_update (void) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
877 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
878 // Called when the variable editor emits the updated signal. The size |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
879 // of a variable may have changed, so we refresh the workspace in the |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
880 // interpreter. That will eventually cause the workspace view in the |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
881 // GUI to be updated. |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
882 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
883 interpreter_event |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
884 ([] (interpreter& interp) |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
885 { |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
886 // INTERPRETER THREAD |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
887 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
888 tree_evaluator& tw = interp.get_evaluator (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
889 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
890 event_manager& xevmgr = interp.get_event_manager (); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
891 |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
892 xevmgr.set_workspace (true, tw.get_symbol_info (), false); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
893 }); |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
894 } |
9367cba2a6d5
allow most dock widgets to be used from command line
John W. Eaton <jwe@octave.org>
parents:
29575
diff
changeset
|
895 |
29835
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
896 void base_qobject::show_community_news (int serial) |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
897 { |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
898 // Ensure widget exists. |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
899 community_news_widget (serial); |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
900 |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
901 m_community_news->display (); |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
902 } |
a946d742fb97
allow community news window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29822
diff
changeset
|
903 |
29836
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
904 void base_qobject::show_release_notes (void) |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
905 { |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
906 // Ensure widget exists. |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
907 release_notes_widget (); |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
908 |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
909 m_release_notes->display (); |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
910 } |
56465c0739fa
allow release notes window to be opened from command line
John W. Eaton <jwe@octave.org>
parents:
29835
diff
changeset
|
911 |
29762
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
912 void base_qobject::execute_command (const QString& command) |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
913 { |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
914 emit interpreter_event |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
915 ([=] (interpreter& interp) |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
916 { |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
917 // INTERPRETER THREAD |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
918 |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
919 // FIXME: Do we need to do anything special about errors here? |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
920 // Currently the eval function will just call error() in the |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
921 // interpreter event loop and throw an execution error. It will |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
922 // be caught, so shouldn't crash the interpreter, but the |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
923 // message may not go anywhere useful depending on how the GUI |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
924 // is being used or if Octave running server mode. |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
925 |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
926 interp.eval (command.toStdString (), 0); |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
927 }); |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
928 } |
84d7e1ace446
improve variable editor functionality when used without GUI main window
John W. Eaton <jwe@octave.org>
parents:
29758
diff
changeset
|
929 |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
930 void base_qobject::close_gui (void) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
931 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
932 if (m_app_context.experimental_terminal_widget ()) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
933 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
934 if (! m_main_window) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
935 return; |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
936 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
937 // FIXME: Restore previous values of PS1 and PS2 if we are |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
938 // returning to the command line? |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
939 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
940 interpreter_event |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
941 ([=] (interpreter& interp) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
942 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
943 // INTERPRETER THREAD |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
944 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
945 application *app = interp.get_app_context (); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
946 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
947 cmdline_options opts = app->options (); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
948 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
949 if (opts.gui ()) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
950 interp.quit (0, false, false); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
951 }); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
952 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
953 m_app_context.gui_running (false); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
954 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
955 if (m_main_window) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
956 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
957 m_main_window->deleteLater (); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
958 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
959 m_main_window = nullptr; |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
960 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
961 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
962 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
963 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
964 void base_qobject::interpreter_ready (void) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
965 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
966 m_interpreter_ready = true; |
28347
00a9a49c7670
improve interpreter shutdown process (bug #56952)
John W. Eaton <jwe@octave.org>
parents:
28063
diff
changeset
|
967 } |
00a9a49c7670
improve interpreter shutdown process (bug #56952)
John W. Eaton <jwe@octave.org>
parents:
28063
diff
changeset
|
968 |
27302
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
969 void base_qobject::interpreter_event (const fcn_callback& fcn) |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
970 { |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
971 // The following is a direct function call across threads. It works |
29783
5154c91e0d98
eliminate some connections to parent objects in octave_dock_widget classes
John W. Eaton <jwe@octave.org>
parents:
29780
diff
changeset
|
972 // because it is accessing a thread-safe queue of events that |
27302
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
973 // are later executed by the Octave interpreter in the other thread. |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
974 |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
975 // See also the comments in interpreter-qobject.h about |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
976 // interpreter_qobject slots. |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
977 |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
978 m_interpreter_qobj->interpreter_event (fcn); |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
979 } |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
980 |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
981 void base_qobject::interpreter_event (const meth_callback& meth) |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
982 { |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
983 // The following is a direct function call across threads. It works |
29783
5154c91e0d98
eliminate some connections to parent objects in octave_dock_widget classes
John W. Eaton <jwe@octave.org>
parents:
29780
diff
changeset
|
984 // because it is accessing a thread-safe queue of events that |
27302
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
985 // are later executed by the Octave interpreter in the other thread. |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
986 |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
987 // See also the comments in interpreter-qobject.h about |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
988 // interpreter_qobject slots. |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
989 |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
990 m_interpreter_qobj->interpreter_event (meth); |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
991 } |
5f170ea12fa1
use Qt signals to pass interpreter callbacks to octave-qobject
John W. Eaton <jwe@octave.org>
parents:
27263
diff
changeset
|
992 |
29292
eb1e10abe9d5
use method in interpreter class to interrupt interpreter execution in GUI
John W. Eaton <jwe@octave.org>
parents:
29219
diff
changeset
|
993 void base_qobject::interpreter_interrupt (void) |
eb1e10abe9d5
use method in interpreter class to interrupt interpreter execution in GUI
John W. Eaton <jwe@octave.org>
parents:
29219
diff
changeset
|
994 { |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
995 m_interpreter_qobj->interrupt (); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
996 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
997 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
998 // FIXME: Should we try to make the pause, stop, and resume actions |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
999 // work for both the old and new terminal widget? |
29292
eb1e10abe9d5
use method in interpreter class to interrupt interpreter execution in GUI
John W. Eaton <jwe@octave.org>
parents:
29219
diff
changeset
|
1000 |
29503
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1001 void base_qobject::interpreter_pause (void) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1002 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1003 if (m_app_context.experimental_terminal_widget ()) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1004 m_interpreter_qobj->pause (); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1005 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1006 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1007 void base_qobject::interpreter_stop (void) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1008 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1009 if (m_app_context.experimental_terminal_widget ()) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1010 m_interpreter_qobj->stop (); |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1011 } |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1012 |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1013 void base_qobject::interpreter_resume (void) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1014 { |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1015 if (m_app_context.experimental_terminal_widget ()) |
3bfec185c9e2
experimental command window widget with server loop
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
1016 m_interpreter_qobj->resume (); |
29292
eb1e10abe9d5
use method in interpreter class to interrupt interpreter execution in GUI
John W. Eaton <jwe@octave.org>
parents:
29219
diff
changeset
|
1017 } |
eb1e10abe9d5
use method in interpreter class to interrupt interpreter execution in GUI
John W. Eaton <jwe@octave.org>
parents:
29219
diff
changeset
|
1018 |
27197
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1019 void base_qobject::copy_image_to_clipboard (const QString& file, |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1020 bool remove_file) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1021 { |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1022 QClipboard *clipboard = QApplication::clipboard (); |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1023 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1024 QImage img (file); |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1025 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1026 if (img.isNull ()) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1027 { |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1028 // Report error? |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1029 return; |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1030 } |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1031 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1032 clipboard->setImage (img); |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1033 |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1034 if (remove_file) |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1035 QFile::remove (file); |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1036 } |
b8c0d5ad024f
refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1037 } |