Changeset 75202 in vbox for trunk

Timestamp:

Oct 31, 2018 9:30:01 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Move file table view context menu actions to UIActionPool

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (5 diffs)
• guestctrl/UIGuestControlFileManager.h (modified) (1 diff)
• guestctrl/UIGuestControlFileTable.cpp (modified) (8 diffs)
• guestctrl/UIGuestControlFileTable.h (modified) (2 diffs)
• guestctrl/UIGuestFileTable.cpp (modified) (1 diff)
• guestctrl/UIGuestFileTable.h (modified) (1 diff)
• guestctrl/UIHostFileTable.cpp (modified) (2 diffs)
• guestctrl/UIHostFileTable.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -1703 +1703 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "GoHome"));
+        setName(QApplication::translate("UIActionPool", "Go Home"));
         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
         setStatusTip(QApplication::translate("UIActionPool", "Go to home folder"));
@@ -1847 +1847 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "CreateNewDirectory"));
+        setName(QApplication::translate("UIActionPool", "Create New Directory"));
         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
         setStatusTip(QApplication::translate("UIActionPool", "Create New Directory"));
@@ -1988 +1988 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "SelectAll"));
+        setName(QApplication::translate("UIActionPool", "Select All"));
         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
         setStatusTip(QApplication::translate("UIActionPool", "Select all files objects"));
@@ -2024 +2024 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "InvertSelection"));
+        setName(QApplication::translate("UIActionPool", "Invert Selection"));
         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
         setStatusTip(QApplication::translate("UIActionPool", "Invert the current selection"));
@@ -2060 +2060 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "ShowProperties"));
+        setName(QApplication::translate("UIActionPool", "Show Properties"));
         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
         setStatusTip(QApplication::translate("UIActionPool", "Show the properties of currently selected file object(s)"));

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

@@ -128 +128 @@
     QTextEdit                  *m_pLogOutput;
     UIToolBar                  *m_pToolBar;
-    // QAction                    *m_pCopyGuestToHost;
-    // QAction                    *m_pCopyHostToGuest;
     QWidget                    *m_pFileTableContainerWidget;
     QHBoxLayout                *m_pFileTableContainerLayout;

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

@@ -71 +71 @@
 signals:
 
-    void sigGoUp();
-    void sigGoHome();
-    void sigRefresh();
-    void sigRename();
-    void sigCreateNewDirectory();
-    void sigDelete();
-    void sigCut();
-    void sigCopy();
-    void sigPaste();
-    void sigShowProperties();
     void sigSelectionChanged(const QItemSelection & selected, const QItemSelection & deselected);
 
@@ -91 +81 @@
 
     virtual void selectionChanged(const QItemSelection & selected, const QItemSelection & deselected) /*override */;
-    void contextMenuEvent(QContextMenuEvent *pEvent);
 
 private:
@@ -312 +301 @@
 void UIGuestControlFileView::configure()
 {
+    setContextMenuPolicy(Qt::CustomContextMenu);
     setShowGrid(false);
     setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -322 +312 @@
 }
 
-void UIGuestControlFileView::contextMenuEvent(QContextMenuEvent *pEvent)
-{
-    bool selectionAvaible = hasSelection();
-
-    QMenu *menu = new QMenu(this);
-    if (!menu)
-        return;
-
-    QAction *pActionGoUp = menu->addAction(QApplication::translate("UIGuestControlFileManager","Go up"));
-    if (pActionGoUp)
-    {
-        pActionGoUp->setIcon(UIIconPool::iconSet(QString(":/arrow_up_10px_x2.png")));
-        connect(pActionGoUp, &QAction::triggered, this, &UIGuestControlFileView::sigGoUp);
-    }
-    QAction *pActionGoHome = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Go home"));
-    if (pActionGoHome)
-    {
-        pActionGoHome->setIcon(UIIconPool::iconSet(QString(":/nw_24px.png")));
-        connect(pActionGoHome, &QAction::triggered, this, &UIGuestControlFileView::sigGoHome);
-    }
-
-    QAction *pActionRefresh = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Refresh"));
-    if (pActionRefresh)
-    {
-        pActionRefresh->setIcon(UIIconPool::iconSet(QString(":/refresh_24px.png")));
-        connect(pActionRefresh, &QAction::triggered, this, &UIGuestControlFileView::sigRefresh);
-    }
-
-    menu->addSeparator();
-    QAction *pActionDelete = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Delete"));
-    if (pActionDelete)
-    {
-        pActionDelete->setIcon(UIIconPool::iconSet(QString(":/vm_delete_32px.png")));
-        pActionDelete->setEnabled(selectionAvaible);
-        connect(pActionDelete, &QAction::triggered, this, &UIGuestControlFileView::sigDelete);
-    }
-
-    QAction *pActionRename = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Rename"));
-    if (pActionRename)
-    {
-        pActionRename->setIcon(UIIconPool::iconSet(QString(":/name_16px_x2.png")));
-        pActionRename->setEnabled(selectionAvaible);
-        pActionRename->setEnabled(selectionAvaible);
-        connect(pActionRename, &QAction::triggered, this, &UIGuestControlFileView::sigRename);
-    }
-
-    QAction *pActionCreateNewDirectory = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Create New Directory"));
-    if (pActionCreateNewDirectory)
-    {
-        pActionCreateNewDirectory->setIcon(UIIconPool::iconSet(QString(":/sf_add_16px.png")));
-        connect(pActionCreateNewDirectory, &QAction::triggered, this, &UIGuestControlFileView::sigCreateNewDirectory);
-    }
-
-    QAction *pActionCopy = 0;
-    QAction *pActionCut = 0;
-    QAction *pActionPaste = 0;
-
-    bool isGuestFileTable = qobject_cast<UIGuestFileTable*>(parent());
-
-    if (isGuestFileTable)
-    {
-        pActionCopy = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Copy"));
-        if (pActionCopy)
-        {
-            pActionCopy->setIcon(UIIconPool::iconSet(QString(":/fd_copy_32px.png")));
-            pActionCopy->setEnabled(selectionAvaible);
-            connect(pActionCopy, &QAction::triggered, this, &UIGuestControlFileView::sigCopy);
-        }
-
-        pActionCut = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Cut"));
-        if (pActionCut)
-        {
-            pActionCut->setIcon(UIIconPool::iconSet(QString(":/fd_move_32px.png")));
-            pActionCut->setEnabled(selectionAvaible);
-            connect(pActionCut, &QAction::triggered, this, &UIGuestControlFileView::sigCut);
-        }
-
-        pActionPaste = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Paste"));
-        if (pActionPaste)
-        {
-            pActionPaste->setIcon(UIIconPool::iconSet(QString(":/shared_clipboard_16px.png")));
-            connect(pActionPaste, &QAction::triggered, this, &UIGuestControlFileView::sigPaste);
-        }
-    }
-
-    menu->addSeparator();
-    QAction *pActionShowProperties = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Properties"));
-    if (pActionShowProperties)
-    {
-        pActionShowProperties->setIcon(UIIconPool::iconSet(QString(":/session_info_32px.png")));
-        pActionShowProperties->setEnabled(selectionAvaible);
-        connect(pActionShowProperties, &QAction::triggered, this, &UIGuestControlFileView::sigShowProperties);
-    }
-
-    menu->exec(pEvent->globalPos());
-
-    if (pActionGoUp)
-        disconnect(pActionGoUp, &QAction::triggered, this, &UIGuestControlFileView::sigGoUp);
-    if (pActionGoHome)
-        disconnect(pActionGoHome, &QAction::triggered, this, &UIGuestControlFileView::sigGoHome);
-    if (pActionRefresh)
-        disconnect(pActionRefresh, &QAction::triggered, this, &UIGuestControlFileView::sigRefresh);
-    if (pActionDelete)
-        disconnect(pActionDelete, &QAction::triggered, this, &UIGuestControlFileView::sigDelete);
-    if (pActionRename)
-        disconnect(pActionRename, &QAction::triggered, this, &UIGuestControlFileView::sigRename);
-    if (pActionCreateNewDirectory)
-        disconnect(pActionCreateNewDirectory, &QAction::triggered, this, &UIGuestControlFileView::sigCreateNewDirectory);
-    if (isGuestFileTable)
-    {
-        if (pActionCopy)
-            disconnect(pActionCopy, &QAction::triggered, this, &UIGuestControlFileView::sigCopy);
-        if (pActionCut)
-            disconnect(pActionCut, &QAction::triggered, this, &UIGuestControlFileView::sigCut);
-        if (pActionPaste)
-            disconnect(pActionPaste, &QAction::triggered, this, &UIGuestControlFileView::sigPaste);
-    }
-    if (pActionShowProperties)
-        disconnect(pActionShowProperties, &QAction::triggered, this, &UIGuestControlFileView::sigShowProperties);
-
-    delete menu;
-}
-
 bool UIGuestControlFileView::hasSelection() const
 {
@@ -458 +325 @@
     QTableView::selectionChanged(selected, deselected);
 }
-
 
 /*********************************************************************************************************************************
@@ -559 +425 @@
 {
 }
-
 
 /*********************************************************************************************************************************
@@ -835 +700 @@
         connect(m_pView, &UIGuestControlFileView::clicked,
                 this, &UIGuestControlFileTable::sltItemClicked);
-        connect(m_pView, &UIGuestControlFileView::sigGoUp,
-                this, &UIGuestControlFileTable::sltGoUp);
-        connect(m_pView, &UIGuestControlFileView::sigGoHome,
-                this, &UIGuestControlFileTable::sltGoHome);
-        connect(m_pView, &UIGuestControlFileView::sigRefresh,
-                this, &UIGuestControlFileTable::sltRefresh);
-        connect(m_pView, &UIGuestControlFileView::sigDelete,
-                this, &UIGuestControlFileTable::sltDelete);
-        connect(m_pView, &UIGuestControlFileView::sigRename,
-                this, &UIGuestControlFileTable::sltRename);
-        connect(m_pView, &UIGuestControlFileView::sigCreateNewDirectory,
-                this, &UIGuestControlFileTable::sltCreateNewDirectory);
-        connect(m_pView, &UIGuestControlFileView::sigCopy,
-                this, &UIGuestControlFileTable::sltCopy);
-        connect(m_pView, &UIGuestControlFileView::sigCut,
-                this, &UIGuestControlFileTable::sltCut);
-        connect(m_pView, &UIGuestControlFileView::sigPaste,
-                this, &UIGuestControlFileTable::sltPaste);
-        connect(m_pView, &UIGuestControlFileView::sigShowProperties,
-                this, &UIGuestControlFileTable::sltShowProperties);
         connect(m_pView, &UIGuestControlFileView::sigSelectionChanged,
                 this, &UIGuestControlFileTable::sltSelectionChanged);
+        connect(m_pView, &UIGuestControlFileView::customContextMenuRequested,
+                this, &UIGuestControlFileTable::sltCreateFileViewContextMenu);
 
     }
@@ -1236 +1083 @@
 {
     performSelectionSearch(strText);
+}
+
+void UIGuestControlFileTable::sltCreateFileViewContextMenu(const QPoint &point)
+{
+    QWidget *pSender = qobject_cast<QWidget*>(sender());
+    if (!pSender)
+        return;
+    createFileViewContextMenu(pSender, point);
 }
 

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

@@ -283 +283 @@
     virtual void     determineDriveLetters() = 0;
     virtual void     prepareToolbar() = 0;
+    virtual void     createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) = 0;
     QString          fileTypeString(FileObjectType type);
     /* @p item index is item location in model not in 'proxy' model */
@@ -323 +324 @@
     void sltPaste();
     void sltShowProperties();
+    void sltSelectAll();
+    void sltInvertSelection();
+
+private slots:
+
+    void sltCreateFileViewContextMenu(const QPoint &point);
     void sltSelectionChanged(const QItemSelection & selected, const QItemSelection & deselected);
     void sltLocationComboCurrentChange(const QString &strLocation);
-    void sltSelectAll();
-    void sltInvertSelection();
     void sltSearchTextChanged(const QString &strText);
 

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

@@ -561 +561 @@
     }
     setSelectionDependentActionsEnabled(false);
+}
+
+void UIGuestFileTable::createFileViewContextMenu(const QWidget *pWidget, const QPoint &/*point*/)
+{
+    if (!pWidget)
+        return;
+
+    // QMenu menu;
+    // menu.exec(mapToGlobal(position));
 }
 

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

@@ -54 +54 @@
     virtual void    determineDriveLetters() /* override */;
     virtual void    prepareToolbar() /* override */;
+    virtual void    createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) /* override */;
 
 private:

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

@@ -152 +152 @@
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Rename));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory));
-        m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Copy));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Cut));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Paste));
+        /* Hide cut, copy, and paste for now. We will implement those
+           when we have an API for host file operations: */
+        // m_pToolBar->addSeparator();
+        // m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Copy));
+        // m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Cut));
+        // m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Paste));
         m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll));
@@ -164 +166 @@
         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));
     }
 
+    setSelectionDependentActionsEnabled(false);
+}
+
+void UIHostFileTable::createFileViewContextMenu(const QWidget *pWidget, const QPoint &point)
+{
+    if (!pWidget)
+        return;
+
+    QMenu menu;
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoUp));
+
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoHome));
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Refresh));
+    menu.addSeparator();
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Delete));
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Rename));
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory));
     /* Hide cut, copy, and paste for now. We will implement those
        when we have an API for host file operations: */
-    // if (m_pCopy)
-    //     m_pCopy->setVisible(false);
-    // if (m_pCut)
-    //     m_pCut->setVisible(false);
-    // if (m_pPaste)
-    //     m_pPaste->setVisible(false);
-    setSelectionDependentActionsEnabled(false);
+    // menu.addSeparator();
+    // menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Copy));
+    // menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Cut));
+    // menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Paste));
+    menu.addSeparator();
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll));
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection));
+    menu.addSeparator();
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties));
+
+
+
+    menu.exec(pWidget->mapToGlobal(point));
 }
 

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

@@ -48 +48 @@
     virtual void    determineDriveLetters() /* override */;
     virtual void    prepareToolbar() /* override */;
+    virtual void    createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) /* override */;
 
 private: