Mercurial > octave
changeset 29535:0b429d1a4974
fix several gui issues (shown with OCTAVE_SHOW_GUI_MESSAGES=1)
* QTerminal.cc (construct): fix widget for slot for clear window action
* Filter.cpp (request_open_file): signal request_open_file_signal with
third argument
* Filter.h: dito
* QUnixTerminalImpl.cpp (initialize): update connecting this signal
* gui-preferences-global.h: remove invalid items from style sheets
* octave-qscintilla.h: fix interpreter event declaration
* main-window.cc (do_reset_windows): only resize command window when
it is really included in the main window layout
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Thu, 15 Apr 2021 17:48:35 +0200 |
| parents | 0ff064f09927 |
| children | 205033e01792 |
| files | libgui/qterminal/libqterminal/QTerminal.cc libgui/qterminal/libqterminal/unix/Filter.cpp libgui/qterminal/libqterminal/unix/Filter.h libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp libgui/src/gui-preferences-global.h libgui/src/m-editor/octave-qscintilla.h libgui/src/main-window.cc |
| diffstat | 7 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/QTerminal.cc Thu Apr 15 09:07:13 2021 +0200 +++ b/libgui/qterminal/libqterminal/QTerminal.cc Thu Apr 15 17:48:35 2021 +0200 @@ -317,7 +317,7 @@ _contextMenu->addSeparator (); - _contextMenu->addAction (tr ("Clear Window"), parent (), + _contextMenu->addAction (tr ("Clear Window"), xparent, SLOT (handle_clear_command_window_request ())); connect (this, SIGNAL (customContextMenuRequested (QPoint)),
--- a/libgui/qterminal/libqterminal/unix/Filter.cpp Thu Apr 15 09:07:13 2021 +0200 +++ b/libgui/qterminal/libqterminal/unix/Filter.cpp Thu Apr 15 17:48:35 2021 +0200 @@ -683,7 +683,7 @@ // the function name. depending on this we have to invoke different // slots in main_window if (file_info.isAbsolute () && file_info.exists ()) - emit request_open_file_signal (file, line); + emit request_open_file_signal (file, QString (), line); else emit request_edit_mfile_signal (file, line); }
--- a/libgui/qterminal/libqterminal/unix/Filter.h Thu Apr 15 09:07:13 2021 +0200 +++ b/libgui/qterminal/libqterminal/unix/Filter.h Thu Apr 15 17:48:35 2021 +0200 @@ -245,7 +245,7 @@ signals: void request_edit_mfile_signal (const QString&, int); - void request_open_file_signal (const QString&, int); + void request_open_file_signal (const QString&, const QString&, int); protected: /**
--- a/libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp Thu Apr 15 09:07:13 2021 +0200 +++ b/libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp Thu Apr 15 17:48:35 2021 +0200 @@ -51,8 +51,8 @@ connect (file_filter, SIGNAL (request_edit_mfile_signal (const QString&, int)), main_win, SLOT (edit_mfile (const QString&, int))); - connect (file_filter, SIGNAL (request_open_file_signal (const QString&, int)), - main_win, SLOT (open_file (const QString&, int))); + connect (file_filter, SIGNAL (request_open_file_signal (const QString&, const QString&,int)), + main_win, SIGNAL (open_file_signal (const QString&, const QString&,int))); connect(m_terminalView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(handleCustomContextMenuRequested(QPoint)));
--- a/libgui/src/gui-preferences-global.h Thu Apr 15 09:07:13 2021 +0200 +++ b/libgui/src/gui-preferences-global.h Thu Apr 15 17:48:35 2021 +0200 @@ -49,8 +49,6 @@ const QString global_toolbar_style ("QToolBar {" - "spacing-top: 0px;" - "spacing-bottom: 0px;" "margin-top: 0px;" "margin-bottom: 0px;" "padding-top: 0px;" @@ -61,8 +59,6 @@ const QString global_menubar_style ("QMenuBar {" - "spacing-top: 0px;" - "spacing-bottom: 0px;" "margin-top: 0px;" "margin-bottom: 0px;" "padding-top: 0px;"
--- a/libgui/src/m-editor/octave-qscintilla.h Thu Apr 15 09:07:13 2021 +0200 +++ b/libgui/src/m-editor/octave-qscintilla.h Thu Apr 15 17:48:35 2021 +0200 @@ -94,11 +94,13 @@ void show_doc_signal (const QString&); void context_menu_break_condition_signal (int); void context_menu_break_once (int); - void interpreter_event (const meth_callback& meth); void ctx_menu_run_finished_signal (bool, int, QTemporaryFile*, QTemporaryFile*, bool, bool); void focus_console_after_command_signal (void); + void interpreter_event (const fcn_callback& fcn); + void interpreter_event (const meth_callback& meth); + public slots: void handle_enter_debug_mode (void);
--- a/libgui/src/main-window.cc Thu Apr 15 09:07:13 2021 +0200 +++ b/libgui/src/main-window.cc Thu Apr 15 17:48:35 2021 +0200 @@ -2955,8 +2955,10 @@ set_default_geometry (); int win_x = geometry ().width (); - // Resize command window, the important one in the default layout - resize_dock (m_command_window, 7*win_x/8, -1); + // Resize command window (if docked), + //the important one in the default layout + if (dockWidgetArea (m_command_window) != Qt::NoDockWidgetArea) + resize_dock (m_command_window, 7*win_x/8, -1); // See Octave bug #53409 and https://bugreports.qt.io/browse/QTBUG-55357 #if (QT_VERSION < 0x050601) || (QT_VERSION >= 0x050701)