Changeset 92947 in vbox for trunk

Timestamp:

Dec 15, 2021 7:15:10 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9371. Some fixes related to managing multiple tabs.

Location:

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

Files:

• UIFileManager.cpp (modified) (12 diffs)
• UIFileManager.h (modified) (2 diffs)
• UIFileManagerGuestTable.cpp (modified) (1 diff)
• UIFileManagerTable.cpp (modified) (1 diff)
• UIFileManagerTable.h (modified) (1 diff)

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

@@ -215 +215 @@
         {
             m_pGuestTablesContainer->setTabPosition(QTabWidget::East);
-
             m_pGuestTablesContainer->setTabBarAutoHide(true);
             m_pFileTableSplitter->addWidget(m_pGuestTablesContainer);
@@ -326 +325 @@
                 this, &UIFileManager::sltFileTableSelectionChanged);
     }
+    if (m_pGuestTablesContainer)
+        connect(m_pGuestTablesContainer, &QITabWidget::currentChanged, this,
+                &UIFileManager::sltCurrentTabChanged);
+
     connect(&uiCommon(), &UICommon::sigAskToCommitData,
             this, &UIFileManager::sltCommitDataSignalReceived);
@@ -443 +446 @@
 void UIFileManager::sltFileTableSelectionChanged(bool fHasSelection)
 {
+    /* If we dont have a guest session running that actions should stay disabled: */
+    if (!currentGuestTable() || !currentGuestTable()->isGuestSessionRunning())
+    {
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest)->setEnabled(false);
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost)->setEnabled(false);
+        return;
+    }
+
     /* Enable/disable vertical toolbar actions: */
     UIFileManagerGuestTable *pGuestTable = qobject_cast<UIFileManagerGuestTable*>(sender());
 
+    /* If the signal is coming from a guest table which is not the current one just dont do anything: */
+    if (pGuestTable && pGuestTable != currentGuestTable())
+        return;
+
     if (pGuestTable)
     {
@@ -453 +468 @@
     }
 
-    if (sender() == m_pHostFileTable)
-    {
-        if (m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest))
-            m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest)->setEnabled(fHasSelection);
+    if (sender() == m_pHostFileTable && m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest))
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest)->setEnabled(fHasSelection);
+}
+
+void UIFileManager::sltCurrentTabChanged(int iIndex)
+{
+    Q_UNUSED(iIndex);
+    setVerticalToolBarActionsEnabled();
+}
+
+void UIFileManager::setVerticalToolBarActionsEnabled()
+{
+    if (!m_pGuestTablesContainer)
+        return;
+    UIFileManagerGuestTable *pTable = currentGuestTable();
+    if (!pTable)
+        return;
+
+    bool fRunning = pTable->isGuestSessionRunning();
+    if (m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost))
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost)->setEnabled(fRunning && pTable->hasSelection());
+
+    if (m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest))
+    {
+        bool fHostHasSelection = m_pHostFileTable ? m_pHostFileTable->hasSelection() : false;
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest)->setEnabled(fRunning && fHostHasSelection);
     }
 }
@@ -464 +501 @@
     if (m_pGuestTablesContainer && m_pHostFileTable)
     {
-        UIFileManagerGuestTable *pGuestFileTable = qobject_cast<UIFileManagerGuestTable*>(m_pGuestTablesContainer->currentWidget());
+        UIFileManagerGuestTable *pGuestFileTable = currentGuestTable();
         if (pGuestFileTable)
             pGuestFileTable->copyGuestToHost(m_pHostFileTable->currentDirectoryPath());
@@ -474 +511 @@
     if (m_pGuestTablesContainer && m_pHostFileTable)
     {
-        UIFileManagerGuestTable *pGuestFileTable = qobject_cast<UIFileManagerGuestTable*>(m_pGuestTablesContainer->currentWidget());
+        UIFileManagerGuestTable *pGuestFileTable = currentGuestTable();
         if (pGuestFileTable)
             pGuestFileTable->copyHostToGuest(m_pHostFileTable->selectedItemPathList());
@@ -654 +691 @@
 void UIFileManager::setSelectedVMListItems(const QList<UIVirtualMachineItem*> &items)
 {
+    AssertReturnVoid(m_pGuestTablesContainer);
     QVector<QUuid> selectedMachines;
 
@@ -662 +700 @@
         selectedMachines << item->id();
     }
+    /** Iterate through the current tabs and add any machine id for which we have a running guest session to the
+      * list of machine ids we want to have a tab for: */
+    for (int i = 0; i < m_pGuestTablesContainer->count(); ++i)
+    {
+        UIFileManagerGuestTable *pTable = qobject_cast<UIFileManagerGuestTable*>(m_pGuestTablesContainer->widget(i));
+        if (!pTable || !pTable->isGuestSessionRunning())
+            continue;
+        if (!selectedMachines.contains(pTable->machineId()))
+            selectedMachines << pTable->machineId();
+    }
+
     setMachines(selectedMachines);
 }
@@ -667 +716 @@
 void UIFileManager::setMachines(const QVector<QUuid> &machineIds)
 {
+    AssertReturnVoid(m_pGuestTablesContainer);
+
     /* List of machines that are newly added to selected machine list: */
     QVector<QUuid> newSelections;
@@ -681 +732 @@
     addTabs(newSelections);
     removeTabs(unselectedMachines);
+    m_pGuestTablesContainer->setCurrentIndex(m_pGuestTablesContainer->count()-1);
 }
 
@@ -692 +744 @@
     {
         UIFileManagerGuestTable *pTable = qobject_cast<UIFileManagerGuestTable*>(m_pGuestTablesContainer->widget(i));
-        /* Keep the tabs with running guest control session even if the corresponding vm has been de-selected. */
-        if (!pTable || pTable->isGuestSessionRunning())
+        if (!pTable)
             continue;
         if (machineIdsToRemove.contains(pTable->machineId()))
@@ -730 +781 @@
 }
 
-
+UIFileManagerGuestTable *UIFileManager::currentGuestTable()
+{
+    if (!m_pGuestTablesContainer)
+        return 0;
+    return qobject_cast<UIFileManagerGuestTable*>(m_pGuestTablesContainer->currentWidget());
+}
 #include "UIFileManager.moc"

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

@@ -117 +117 @@
     void sltCommitDataSignalReceived();
     void sltFileTableSelectionChanged(bool fHasSelection);
+    void sltCurrentTabChanged(int iIndex);
 
 private:
@@ -153 +154 @@
     void removeTabs(const QVector<QUuid> &machineIdsToRemove);
     void addTabs(const QVector<QUuid> &machineIdsToAdd);
+    void setVerticalToolBarActionsEnabled();
+    UIFileManagerGuestTable *currentGuestTable();
 
     QVBoxLayout              *m_pMainLayout;

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

@@ -428 +428 @@
                 break;
             case State_MachineNotRunning:
-                strWarningText = UIFileManager::tr("File manager cannot work since it works only with running guests.");
+                strWarningText = UIFileManager::tr("File manager cannot work since the selected guest is not currenly running.");
                 break;
             case State_NoGuestAdditions:
-                strWarningText = UIFileManager::tr("File manager cannot work since it needs running guest additions in the guest system.");
+                strWarningText = UIFileManager::tr("File manager cannot work since the selected guest does not have the guest additions.");
                 break;
             case State_SessionPossible:

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

@@ -1521 +1521 @@
 }
 
+bool UIFileManagerTable::hasSelection() const
+{
+    if (m_pView)
+        return m_pView->hasSelection();
+    return false;
+}
+
 void UIFileManagerTable::sltReceiveDirectoryStatistics(UIDirectoryStatistics statistics)
 {

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

@@ -155 +155 @@
     /** Peroforms whatever is necessary after a UIFileManagerOptions change. */
     void optionsUpdated();
+    bool hasSelection() const;
 
 public slots: