Changeset 75162 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 29, 2018 7:01:25 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Small fixes in selection logic of file manager

Location:

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

Files:

• UIGuestControlFileTable.cpp (modified) (4 diffs)
• UIGuestControlFileTable.h (modified) (3 diffs)
• UIGuestFileTable.cpp (modified) (1 diff)
• UIHostFileTable.cpp (modified) (3 diffs)

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

@@ -92 +92 @@
     virtual void selectionChanged(const QItemSelection & selected, const QItemSelection & deselected) /*override */;
     void contextMenuEvent(QContextMenuEvent *pEvent);
-    //void keyPressEvent(QKeyEvent * pEvent);
 
 private:
@@ -1110 +1109 @@
     m_pModel->endReset();
     m_pView->setRootIndex(m_pProxyModel->mapFromSource(currentIndex));
+    setSelectionDependentActionsEnabled(m_pView->hasSelection());
 }
 
@@ -1208 +1208 @@
     Q_UNUSED(selected);
     Q_UNUSED(deselected);
-    if (m_pView->hasSelection())
-        enableSelectionDependentActions();
-    else
-        disableSelectionDependentActions();
-}
-
+    setSelectionDependentActionsEnabled(m_pView->hasSelection());
+}
 
 void UIGuestControlFileTable::prepareActionConnections()
@@ -1483 +1479 @@
 }
 
-void UIGuestControlFileTable::enableSelectionDependentActions()
-{
-    for (int i = 0; i < m_selectionDependentActions.size(); ++i)
-    {
-        if (m_selectionDependentActions[i])
-            m_selectionDependentActions[i]->setEnabled(true);
-    }
-}
-
-void UIGuestControlFileTable::disableSelectionDependentActions()
-{
-    /* Disable all the action that operate on some selection: */
-    for (int i = 0; i < m_selectionDependentActions.size(); ++i)
-    {
-        if (m_selectionDependentActions[i])
-            m_selectionDependentActions[i]->setEnabled(false);
+void UIGuestControlFileTable::setSelectionDependentActionsEnabled(bool fIsEnabled)
+{
+    foreach (QAction *pAction, m_selectionDependentActions)
+    {
+        pAction->setEnabled(fIsEnabled);
     }
 }

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

@@ -293 +293 @@
     bool             eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
     CGuestFsObjInfo  guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const;
-    void             enableSelectionDependentActions();
-    void             disableSelectionDependentActions();
+    void             setSelectionDependentActionsEnabled(bool fIsEnabled);
     void             prepareActionConnections();
 
@@ -307 +306 @@
      *  systems this is empty and for windows system it should at least contain C:/ */
     QStringList m_driveLetterList;
-
+    /** The set of actions which need some selection to work on. Like cut, copy etc. */
+    QSet<QAction*> m_selectionDependentActions;
 
 protected slots:
@@ -362 +362 @@
     QGridLayout     *m_pMainLayout;
     QComboBox       *m_pLocationComboBox;
-    //QAction         *m_pGoUp;
-    //QAction         *m_pGoHome;
-    //QAction         *m_pRefresh;
-    //QAction         *m_pDelete;
-    //QAction         *m_pRename;
-    //QAction         *m_pCreateNewDirectory;
-    // QAction         *m_pShowProperties;
-    // QAction         *m_pSelectAll;
-    // QAction         *m_pInvertSelection;
-    /** The vector of actions which need some selection to work on. Like cut, copy etc. */
-    QVector<QAction*> m_selectionDependentActions;
     /** The absolue path list of the file objects which user has chosen to cut/copy. this
      *  list will be cleaned after a paste operation or overwritten by a subsequent cut/copy */

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

@@ -611 +611 @@
         m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties));
-    }
-
-    disableSelectionDependentActions();
+
+        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Delete));
+        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Rename));
+        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Copy));
+        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Cut));
+        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties));
+
+    }
+    setSelectionDependentActionsEnabled(false);
 }
 

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

@@ -148 +148 @@
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoHome));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Refresh));
-
         m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Delete));
@@ -162 +161 @@
         m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties));
+
+        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Delete));
+        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Rename));
+        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Copy));
+        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Cut));
+        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties));
     }
 
@@ -172 +177 @@
     // if (m_pPaste)
     //     m_pPaste->setVisible(false);
-
-    disableSelectionDependentActions();
+    setSelectionDependentActionsEnabled(false);
 }