Changeset 101090 in vbox

Timestamp:

Sep 12, 2023 12:14:34 PM (20 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

159059

Message:

FE/Qt: bugref:6699, bugref:9072. Making sure tool bar's pane actions are unchecked as log viewer is kicked off.

Location:

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

Files:

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

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

@@ -511 +511 @@
 void UIVMLogViewerWidget::sltPanelContainerHidden()
 {
-    foreach (QAction *pPanelAction, m_panelActions)
-    {
-        if (!pPanelAction)
-            continue;
-        pPanelAction->blockSignals(true);
-        pPanelAction->setChecked(false);
-        pPanelAction->blockSignals(false);
-    }
+    uncheckPaneActions();
 }
 
@@ -527 +520 @@
     QAction *pAction = qobject_cast<QAction*>(sender());
 
-    if (!m_panelActions.contains(pAction))
-        return;
-
-    foreach (QAction *pOther, m_panelActions)
+    if (!m_paneActions.contains(pAction))
+        return;
+
+    foreach (QAction *pOther, m_paneActions)
     {
         if (pOther == pAction)
@@ -703 +696 @@
         return;
 
-    for(QSet<QAction*>::iterator iter = m_panelActions.begin(); iter != m_panelActions.end(); ++iter)
-    {
-        QAction *pAction = *iter;
-
-        pAction->blockSignals(true);
-        pAction->setChecked(false);
-        pAction->blockSignals(false);
-    }
+    uncheckPaneActions();
 
     switch (static_cast<UIVMLogViewerPaneContainer::Page>(iIndex))
@@ -757 +743 @@
     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_paneActions.insert(m_pActionPool->action(UIActionIndex_M_Log_T_Find));
+    m_paneActions.insert(m_pActionPool->action(UIActionIndex_M_Log_T_Filter));
+    m_paneActions.insert(m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark));
+    m_paneActions.insert(m_pActionPool->action(UIActionIndex_M_Log_T_Preferences));
+    uncheckPaneActions();
 
     m_pActionPool->action(UIActionIndex_M_Log_T_Find)->setData((int)UIVMLogViewerPaneContainer::Page_Search);
@@ -1155 +1142 @@
 }
 
+void UIVMLogViewerWidget::uncheckPaneActions()
+{
+    foreach (QAction *pPanelAction, m_paneActions)
+    {
+        if (!pPanelAction)
+            continue;
+        pPanelAction->blockSignals(true);
+        pPanelAction->setChecked(false);
+        pPanelAction->blockSignals(false);
+    }
+}
+
 #include "UIVMLogViewerWidget.moc"

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

@@ -203 +203 @@
     /** If the current tab is a label tab then switch to the next tab and return true. Returns false otherwise. */
     bool labelTabHandler();
+    void uncheckPaneActions();
 
     /** Holds the widget's embedding type. */
@@ -244 +245 @@
     QPointer<UIVMLogPage> m_pPreviousLogPage;
     UIVMLogViewerPaneContainer *m_pPanel;
-    QSet<QAction*> m_panelActions;
+    QSet<QAction*> m_paneActions;
     friend class UIVMLogViewerFilterWidget;
     friend class UIVMLogViewerPane;