Mercurial > octave-antonio
comparison libgui/src/main-window.h @ 19949:857a8f018f53
set up octave_link when running with --no-gui option (bug #44116)
* main-window.h, main-window.cc (main_window::_start_gui): New member
variable.
(main_window::main_window): New argument, start_gui.
Skip most initialization if start_gui is false.
(main_window::confirm_shutdown_octave): Skip interactive confirmation
if _start_gui is false.
(main_window::connect_uiwidget_links, main_window::construct,
main_window::construct_octave_qt_link): Skip most initialization if
_start_gui is false.
(main_window::handle_octave_ready): Handle non-gui case.
* octave-gui.cc (octave_start_gui): Unify gui/non-gui options.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 17 Mar 2015 10:13:58 -0400 |
parents | f7a805f02723 |
children | c36f2b083613 |
comparison
equal
deleted
inserted
replaced
19948:fc6c87e254bf | 19949:857a8f018f53 |
---|---|
73 public: | 73 public: |
74 | 74 |
75 typedef std::pair <std::string, std::string> name_pair; | 75 typedef std::pair <std::string, std::string> name_pair; |
76 typedef std::pair <int, int> int_pair; | 76 typedef std::pair <int, int> int_pair; |
77 | 77 |
78 main_window (QWidget *parent = 0); | 78 main_window (QWidget *parent = 0, bool start_gui = true); |
79 | 79 |
80 ~main_window (void); | 80 ~main_window (void); |
81 | 81 |
82 bool command_window_has_focus (void) const; | 82 bool command_window_has_focus (void) const; |
83 | 83 |
171 | 171 |
172 void copyClipboard (void); | 172 void copyClipboard (void); |
173 void pasteClipboard (void); | 173 void pasteClipboard (void); |
174 void selectAll (void); | 174 void selectAll (void); |
175 | 175 |
176 void connect_uiwidget_links (); | 176 void connect_uiwidget_links (void); |
177 | 177 |
178 void handle_create_dialog (const QString& message, const QString& title, | 178 void handle_create_dialog (const QString& message, const QString& title, |
179 const QString& icon, const QStringList& button, | 179 const QString& icon, const QStringList& button, |
180 const QString& defbutton, | 180 const QString& defbutton, |
181 const QStringList& role); | 181 const QStringList& role); |
411 QSemaphore _dbg_processing; | 411 QSemaphore _dbg_processing; |
412 QMutex _dbg_queue_mutex; | 412 QMutex _dbg_queue_mutex; |
413 | 413 |
414 bool _prevent_readline_conflicts; | 414 bool _prevent_readline_conflicts; |
415 bool _suppress_dbg_location; | 415 bool _suppress_dbg_location; |
416 bool _start_gui; | |
416 }; | 417 }; |
417 | 418 |
418 class news_reader : public QObject | 419 class news_reader : public QObject |
419 { | 420 { |
420 Q_OBJECT | 421 Q_OBJECT |