Changeset 92899 in vbox for trunk/src

Timestamp:

Dec 14, 2021 2:55:00 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9371. Toggle copy actions according to file table selections.

Location:

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

Files:

• UIFileManager.cpp (modified) (5 diffs)
• UIFileManager.h (modified) (1 diff)
• UIFileManagerTable.cpp (modified) (1 diff)
• UIFileManagerTable.h (modified) (1 diff)

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

@@ -257 +257 @@
 
     m_pVerticalToolBar->setOrientation(Qt::Vertical);
-    m_pVerticalToolBar->setEnabled(false);
 
     /* Add to dummy QWidget to toolbar to center the action icons vertically: */
@@ -268 +267 @@
 
     m_pVerticalToolBar->addWidget(topSpacerWidget);
-    m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost));
-    m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest));
+    if (m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost))
+    {
+        m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost));
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost)->setEnabled(false);
+    }
+    if (m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest))
+    {
+        m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest));
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest)->setEnabled(false);
+    }
+
     m_pVerticalToolBar->addWidget(bottomSpacerWidget);
 
@@ -315 +323 @@
         connect(m_pHostFileTable, &UIFileManagerHostTable::sigDeleteConfirmationOptionChanged,
                 this, &UIFileManager::sltHandleOptionsUpdated);
+        connect(m_pHostFileTable, &UIFileManagerGuestTable::sigSelectionChanged,
+                this, &UIFileManager::sltFileTableSelectionChanged);
     }
     connect(&uiCommon(), &UICommon::sigAskToCommitData,
@@ -431 +441 @@
 }
 
+void UIFileManager::sltFileTableSelectionChanged(bool fHasSelection)
+{
+    /* Enable/disable vertical toolbar actions: */
+    UIFileManagerGuestTable *pGuestTable = qobject_cast<UIFileManagerGuestTable*>(sender());
+
+    if (pGuestTable)
+    {
+        if (m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost))
+            m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost)->setEnabled(fHasSelection);
+        return;
+    }
+
+    if (sender() == m_pHostFileTable)
+    {
+        if (m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest))
+            m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest)->setEnabled(fHasSelection);
+    }
+}
+
 void UIFileManager::copyToHost()
 {
@@ -691 +720 @@
             connect(pGuestFileTable, &UIFileManagerGuestTable::sigLogOutput,
                     this, &UIFileManager::sltReceieveLogOutput);
+            connect(pGuestFileTable, &UIFileManagerGuestTable::sigSelectionChanged,
+                    this, &UIFileManager::sltFileTableSelectionChanged);
+
         //     connect(m_pGuestFileTable, &UIFileManagerGuestTable::sigNewFileOperation,
         //             this, &UIFileManager::sltReceieveNewFileOperation);

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

@@ -114 +114 @@
     void sltHandleHidePanel(UIDialogPanel *pPanel);
     void sltCommitDataSignalReceived();
+    void sltFileTableSelectionChanged(bool fHasSelection);
 
 private:

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

@@ -1444 +1444 @@
     foreach (QAction *pAction, m_selectionDependentActions)
         pAction->setEnabled(fIsEnabled);
+    if (m_pView)
+        emit sigSelectionChanged(m_pView->hasSelection());
 }
 

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

@@ -138 +138 @@
     void sigLogOutput(QString strLog, const QString &strMachineName, FileManagerLogType eLogType);
     void sigDeleteConfirmationOptionChanged();
+    void sigSelectionChanged(bool fHasSelection);
 
 public: