Changeset 100946 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 22, 2023 5:19:28 PM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10496, bugref:9072. Connecting panel actions to panel tabs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerWidget.cpp (modified) (4 diffs)
• UIVMLogViewerWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -523 +523 @@
 void UIVMLogViewerWidget::sltPanelActionToggled(bool fChecked)
 {
-    Q_UNUSED(fChecked);
+    if (!m_pPanel)
+        return;
+    QAction *pAction = qobject_cast<QAction*>(sender());
+
+    if (!m_panelActions.contains(pAction))
+        return;
+
+    foreach (QAction *pOther, m_panelActions)
+    {
+        if (pOther == pAction)
+            continue;
+        pOther->blockSignals(true);
+        pOther->setChecked(false);
+        pOther->blockSignals(false);
+    }
+
+    m_pPanel->setVisible(fChecked);
+    if (fChecked)
+        m_pPanel->setCurrentIndex(pAction->data().toInt());
 }
 
@@ -707 +725 @@
     addAction(m_pActionPool->action(UIActionIndex_M_Log_S_Refresh));
     addAction(m_pActionPool->action(UIActionIndex_M_Log_S_Save));
+
+    m_panelActions.insert(m_pActionPool->action(UIActionIndex_M_Log_T_Find));
+    m_panelActions.insert(m_pActionPool->action(UIActionIndex_M_Log_T_Filter));
+    m_panelActions.insert(m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark));
+    m_panelActions.insert(m_pActionPool->action(UIActionIndex_M_Log_T_Preferences));
+
+    m_pActionPool->action(UIActionIndex_M_Log_T_Find)->setData((int)UIVMLogViewerPanelNew::Page_Search);
+    m_pActionPool->action(UIActionIndex_M_Log_T_Filter)->setData((int)UIVMLogViewerPanelNew::Page_Filter);
+    m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark)->setData((int)UIVMLogViewerPanelNew::Page_Bookmark);
+    m_pActionPool->action(UIActionIndex_M_Log_T_Preferences)->setData((int)UIVMLogViewerPanelNew::Page_Preferences);
 
     /* Connect actions: */
@@ -751 +779 @@
     connect(m_pTabWidget, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltCurrentTabChanged);
 
-    /* Create VM Log-Viewer options-panel: */
-    // m_pOptionsPanel = new UIVMLogViewerOptionsPanel(0, this);
-    // AssertReturnVoid(m_pOptionsPanel);
-    // /* Configure panel: */
-    // m_pOptionsPanel->hide();
-
-    // m_pMainLayout->addWidget(m_pOptionsPanel);
-
     m_pPanel = new UIVMLogViewerPanelNew(0, this);
     AssertReturnVoid(m_pPanel);
@@ -766 +786 @@
     m_pPanel->setWrapLines(m_bWrapLines);
     m_pPanel->setFontSizeInPoints(m_font.pointSize());
-    // connect(m_pPanel, &UIVMLogViewerPanelNew::sigShowLineNumbers, this, &UIVMLogViewerWidget::sltShowLineNumbers);
-    // connect(m_pPanel, &UIVMLogViewerPanelNew::sigWrapLines, this, &UIVMLogViewerWidget::sltWrapLines);
-    // connect(m_pPanel, &UIVMLogViewerPanelNew::sigChangeFontSizeInPoints, this, &UIVMLogViewerWidget::sltFontSizeChanged);
-    // connect(m_pPanel, &UIVMLogViewerPanelNew::sigChangeFont, this, &UIVMLogViewerWidget::sltChangeFont);
-    // connect(m_pPanel, &UIVMLogViewerPanelNew::sigResetToDefaults, this, &UIVMLogViewerWidget::sltResetOptionsToDefault);
-
+    m_pPanel->setVisible(false);
     connect(m_pPanel, &UIVMLogViewerPanelNew::sigHighlightingUpdated,
             this, &UIVMLogViewerWidget::sltSearchResultHighLigting);

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -36 +36 @@
 #include <QPair>
 #include <QPointer>
+#include <QSet>
 #include <QWidget>
 #include <QUuid>
@@ -250 +251 @@
     QPointer<UIVMLogPage> m_pPreviousLogPage;
     UIVMLogViewerPanelNew *m_pPanel;
-
+    QSet<QAction*> m_panelActions;
     friend class UIVMLogViewerFilterWidget;
     friend class UIVMLogViewerPanel;