Changeset 100905 in vbox for trunk/src/VBox

Timestamp:

Aug 18, 2023 11:23:20 AM (19 months ago)

Author:

vboxsync

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

158841

Message:

FE/Qt: bugref:10496, bugref:6699. Adding missing toolbar action connections.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIFileManager.cpp (modified) (4 diffs)
• UIFileManager.h (modified) (2 diffs)
• UIFileManagerPanel.cpp (modified) (1 diff)
• UIFileManagerPanel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

@@ -243 +243 @@
 
         m_pVerticalSplitter->addWidget(pTopWidget);
-        /* Prepare operations and log panels and insert them into splitter: */
-        prepareOperationsAndLogPanels(m_pVerticalSplitter);
 
         for (int i = 0; i < m_pVerticalSplitter->count(); ++i)
@@ -255 +253 @@
     m_pPanel = new UIFileManagerPanel(this, UIFileManagerOptions::instance());
     AssertReturnVoid(m_pPanel);
+
+    m_panelActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_T_Preferences));
+    m_panelActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_T_Log));
+    m_panelActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations));
+
+    m_pActionPool->action(UIActionIndex_M_FileManager_T_Preferences)->setData(static_cast<int>(UIFileManagerPanel::Page_Preferences));
+    m_pActionPool->action(UIActionIndex_M_FileManager_T_Log)->setData(static_cast<int>(UIFileManagerPanel::Page_Log));
+    m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations)->setData(static_cast<int>(UIFileManagerPanel::Page_Operations));
+
     m_pVerticalSplitter->addWidget(m_pPanel);
+    m_pPanel->hide();
 }
 
@@ -388 +396 @@
     if (!pSenderAction)
         return;
-    UIDialogPanel* pPanel = 0;
-    /* Look for the sender() within the m_panelActionMap's values: */
-    for (QMap<UIDialogPanel*, QAction*>::const_iterator iterator = m_panelActionMap.begin();
-        iterator != m_panelActionMap.end(); ++iterator)
-    {
-        if (iterator.value() == pSenderAction)
-            pPanel = iterator.key();
-    }
-    if (!pPanel)
-        return;
+
+    m_pPanel->setVisible(fChecked);
+
     if (fChecked)
-        showPanel(pPanel);
-    else
-        hidePanel(pPanel);
+    {
+        /* Make sure only pSenderAction is toggled on. */
+        for(QSet<QAction*>::iterator iter = m_panelActions.begin(); iter != m_panelActions.end(); ++iter)
+        {
+            QAction *pAction = *iter;
+            if (!pAction || pAction == pSenderAction)
+                continue;
+            pAction->blockSignals(true);
+            pAction->setChecked(false);
+            pAction->blockSignals(false);
+        }
+        m_pPanel->setCurrentIndex(pSenderAction->data().toInt());
+    }
+
+    // UIDialogPanel* pPanel = 0;
+    // /* Look for the sender() within the m_panelActionMap's values: */
+    // for (QMap<UIDialogPanel*, QAction*>::const_iterator iterator = m_panelActionMap.begin();
+    //     iterator != m_panelActionMap.end(); ++iterator)
+    // {
+    //     if (iterator.value() == pSenderAction)
+    //         pPanel = iterator.key();
+    // }
+    // if (!pPanel)
+    //     return;
+    // if (fChecked)
+    //     showPanel(pPanel);
+    // else
+    //     hidePanel(pPanel);
 }
 
@@ -555 +581 @@
     }
 }
-
-void UIFileManager::prepareOperationsAndLogPanels(QSplitter *pSplitter)
-{
-    Q_UNUSED(pSplitter);
-    // if (!pSplitter)
-    //     return;
-    // m_pPanel = new UIFileManagerOperationsPanel;
-    // if (m_pPanel)
-    // {
-    //     m_pPanel->hide();
-    //     connect(m_pPanel, &UIFileManagerOperationsPanel::sigFileOperationComplete,
-    //             this, &UIFileManager::sltFileOperationComplete);
-    //     connect(m_pPanel, &UIFileManagerOperationsPanel::sigFileOperationFail,
-    //             this, &UIFileManager::sltReceieveLogOutput);
-    // }
-}
-
 
 template<typename T>

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h

@@ -136 +136 @@
     void prepareVerticalToolBar(QHBoxLayout *layout);
     void prepareToolBar();
-    void prepareOperationsAndLogPanels(QSplitter *pSplitter);
 
     /** Saves list of panels and file manager options to the extra data. */
@@ -179 +178 @@
     QPointer<UIActionPool>  m_pActionPool;
     const bool     m_fShowToolbar;
-    QMap<UIDialogPanel*, QAction*> m_panelActionMap;
+    QSet<QAction*> m_panelActions;
     QList<UIDialogPanel*>          m_visiblePanelsList;
     UIFileManagerLogPanel         *m_pLogPanel;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.cpp

@@ -627 +627 @@
     connect(pOperationsWidget, &UIFileOperationProgressWidget::sigFocusOut,
             this, &UIFileManagerPanel::sltHandleWidgetFocusOut);
-    //sigShowPanel(this);
+}
+
+void UIFileManagerPanel::setCurrentIndex(int iIndex)
+{
+    if (!m_pTabWidget || iIndex >= m_pTabWidget->count() || iIndex < 0)
+        return;
+    m_pTabWidget->setCurrentIndex(iIndex);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.h

@@ -70 +70 @@
     void appendLog(const QString &strLog, const QString &strMachineName, FileManagerLogType eLogType);
     void addNewProgress(const CProgress &comProgress, const QString &strSourceTableName);
-
+    void setCurrentIndex(int iIndex);
     enum Page
     {