# HG changeset patch
# User Torsten Lilge <ttl-octave@mailbox.org>
# Date 1618501715 -7200
# Node ID 0b429d1a4974558eb3e517f6fc1646351230516f
# Parent  0ff064f09927c04cc3084c4551ac7c0dc4156761
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

diff -r 0ff064f09927 -r 0b429d1a4974 libgui/qterminal/libqterminal/QTerminal.cc
--- 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)),
diff -r 0ff064f09927 -r 0b429d1a4974 libgui/qterminal/libqterminal/unix/Filter.cpp
--- 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);
 }
diff -r 0ff064f09927 -r 0b429d1a4974 libgui/qterminal/libqterminal/unix/Filter.h
--- 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:
     /**
diff -r 0ff064f09927 -r 0b429d1a4974 libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp
--- 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)));
diff -r 0ff064f09927 -r 0b429d1a4974 libgui/src/gui-preferences-global.h
--- 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;"
diff -r 0ff064f09927 -r 0b429d1a4974 libgui/src/m-editor/octave-qscintilla.h
--- 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);
diff -r 0ff064f09927 -r 0b429d1a4974 libgui/src/main-window.cc
--- 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)