refactor(qt): move debug log action from General widget to File menu

Author: kwvg

src/qt/bitcoingui.cpp

@@ -447,6 +447,8 @@ void BitcoinGUI::createActions()
     openPeersAction->setStatusTip(tr("Show peers info"));
     openRepairAction = new QAction(tr("Wallet &Repair"), this);
     openRepairAction->setStatusTip(tr("Show wallet repair options"));
+    openDebugLogAction = new QAction(tr("Open &debug log file"), this);
+    openDebugLogAction->setStatusTip(tr("Open the debug log file from the current data directory"));
     openConfEditorAction = new QAction(tr("Open &wallet configuration file"), this);
     openConfEditorAction->setStatusTip(tr("Open configuration file"));
     // override TextHeuristicRole set by default which confuses this action with application settings
@@ -517,7 +519,8 @@ void BitcoinGUI::createActions()
     connect(openPeersAction, &QAction::triggered, this, &BitcoinGUI::showPeers);
     connect(openRepairAction, &QAction::triggered, this, &BitcoinGUI::showRepair);
 
-    // Open configs and backup folder from menu
+    // Open logs, configs, and backup folder from menu
+    connect(openDebugLogAction, &QAction::triggered, GUIUtil::openDebugLogfile);
     connect(openConfEditorAction, &QAction::triggered, this, &BitcoinGUI::showConfEditor);
     connect(showBackupsAction, &QAction::triggered, this, &BitcoinGUI::showBackups);
 
@@ -640,6 +643,7 @@ void BitcoinGUI::createMenuBar()
         file->addAction(m_load_psbt_clipboard_action);
         file->addSeparator();
     }
+    file->addAction(openDebugLogAction);
     file->addAction(openConfEditorAction);
     if(walletFrame) {
         file->addAction(showBackupsAction);
@@ -1142,6 +1146,7 @@ void BitcoinGUI::createIconMenu(QMenu *pmenu)
         repair_action = pmenu->addAction(openRepairAction->text(), openRepairAction, &QAction::trigger);
     }
     pmenu->addSeparator();
+    QAction* debuglog_action = pmenu->addAction(openDebugLogAction->text(), openDebugLogAction, &QAction::trigger);
     QAction* conf_action = pmenu->addAction(openConfEditorAction->text(), openConfEditorAction, &QAction::trigger);
     QAction* backups_action{nullptr};
     if (enableWallet) {
@@ -1158,7 +1163,7 @@ void BitcoinGUI::createIconMenu(QMenu *pmenu)
         // Using QSystemTrayIcon::Context is not reliable.
         // See https://bugreports.qt.io/browse/QTBUG-91697
         pmenu, &QMenu::aboutToShow,
-        [this, show_hide_action, send_action, cj_send_action, receive_action, sign_action, verify_action, options_action, node_window_action, quit_action, repair_action, backups_action, info_action, graph_action, peer_action, conf_action] {
+        [this, show_hide_action, send_action, cj_send_action, receive_action, sign_action, verify_action, options_action, node_window_action, quit_action, repair_action, backups_action, info_action, graph_action, peer_action, debuglog_action, conf_action] {
             if (m_node.shutdownRequested()) return; // nothing to do, node is shutting down.
 
             if (show_hide_action) show_hide_action->setText(
@@ -1185,6 +1190,7 @@ void BitcoinGUI::createIconMenu(QMenu *pmenu)
                 node_window_action->setEnabled(openRPCConsoleAction->isEnabled());
                 graph_action->setEnabled(openGraphAction->isEnabled());
                 peer_action->setEnabled(openPeersAction->isEnabled());
+                debuglog_action->setEnabled(openDebugLogAction->isEnabled());
                 conf_action->setEnabled(openConfEditorAction->isEnabled());
                 if (quit_action) quit_action->setEnabled(true);
             }

src/qt/bitcoingui.h

@@ -173,6 +173,7 @@ class BitcoinGUI : public QMainWindow
     QAction* openGraphAction = nullptr;
     QAction* openPeersAction = nullptr;
     QAction* openRepairAction = nullptr;
+    QAction* openDebugLogAction = nullptr;
     QAction* openConfEditorAction = nullptr;
     QAction* showBackupsAction = nullptr;
     QAction* openAction = nullptr;

src/qt/forms/debugwindow.ui

@@ -138,43 +138,6 @@
          </widget>
         </widget>
        </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayoutInfoFooter">
-         <item>
-          <spacer name="horizontalSpacerInfoFooter">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="labelDebugLogfile">
-           <property name="text">
-            <string>Debug log file</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="openDebugLogfileButton">
-           <property name="toolTip">
-            <string>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</string>
-           </property>
-           <property name="text">
-            <string>&amp;Open</string>
-           </property>
-           <property name="autoDefault">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="pageConsole">

src/qt/res/css/general.css

@@ -1753,10 +1753,6 @@ QWidget#RPCConsole  QLabel#banHeading { /* Peers Info Header */
     margin-bottom: 15px;
 }
 
-QWidget#RPCConsole QPushButton#openDebugLogfileButton {
-    max-width: 60px;
-}
-
 QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */
     padding: 10px;
 }

src/qt/rpcconsole.cpp

@@ -555,7 +555,6 @@ RPCConsole::RPCConsole(interfaces::Node& node, QWidget* parent, Qt::WindowFlags
         + ts.from + "\" – " + tr("the peer selected us for high bandwidth relay") + "</li><li>\""
         + ts.no + "\" – " + tr("no high bandwidth relay selected") + "</li></ul>"};
     ui->peerHighBandwidthLabel->setToolTip(ui->peerHighBandwidthLabel->toolTip().arg(hb_list));
-    ui->openDebugLogfileButton->setToolTip(ui->openDebugLogfileButton->toolTip().arg(PACKAGE_NAME));
 
     setButtonIcons();
 
@@ -1202,11 +1201,6 @@ void RPCConsole::on_stackedWidgetRPC_currentChanged(int index)
     }
 }
 
-void RPCConsole::on_openDebugLogfileButton_clicked()
-{
-    GUIUtil::openDebugLogfile();
-}
-
 void RPCConsole::scrollToEnd()
 {
     QScrollBar *scrollbar = ui->messagesWidget->verticalScrollBar();

src/qt/rpcconsole.h

@@ -101,8 +101,6 @@ private Q_SLOTS:
     void showInfoView(int index);
     void on_lineEdit_returnPressed();
     void on_stackedWidgetRPC_currentChanged(int index);
-    /** open the debug.log from the current datadir */
-    void on_openDebugLogfileButton_clicked();
     /** change the time range of the network traffic graph */
     void on_sldGraphRange_valueChanged(int value);
     void resizeEvent(QResizeEvent *event) override;