Changeset 92615 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 28, 2021 4:25:03 PM (3 years ago)

Author:

vboxsync

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

148507

Message:

FE/Qt: bugref:9371. Adding file manager as a new machine tool type.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/overview/UIVMActivityToolWidget.cpp (modified) (1 diff)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• globals/UIActionPoolManager.cpp (modified) (3 diffs)
• globals/UIActionPoolManager.h (modified) (2 diffs)
• manager/UIToolPaneMachine.cpp (modified) (3 diffs)
• manager/UIToolPaneMachine.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityToolWidget.cpp

@@ -113 +113 @@
     m_machineIds = machineIds;
 
-    //hide();
     removeTabs(unselectedMachines);
     addTabs(newSelections);
-    //show();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -1619 +1619 @@
         case UIToolType_Logs:               strResult = "Logs"; break;
         case UIToolType_VMActivity:         strResult = "Activity"; break;
+        case UIToolType_FileManager:        strResult = "FileManager"; break;
         default:
         {
@@ -1645 +1646 @@
     keys << "Logs";          values << UIToolType_Logs;
     keys << "Activity";      values << UIToolType_VMActivity;
+    keys << "FileManager";   values << UIToolType_FileManager;
     /* Invalid type for unknown words: */
     if (!keys.contains(strToolType, Qt::CaseInsensitive))

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -934 +934 @@
     UIToolType_Snapshots,
     UIToolType_Logs,
-    UIToolType_VMActivity
+    UIToolType_VMActivity,
+    UIToolType_FileManager
 };
 Q_DECLARE_METATYPE(UIToolType);

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

@@ -1904 +1904 @@
     }
 };
+
+/** Simple action extension, used as 'Show File Manager' action class. */
+class UIActionToggleManagerToolsMachineShowFileManager : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionToggleManagerToolsMachineShowFileManager(UIActionPool *pParent)
+        : UIActionToggle(pParent)
+    {
+        setProperty("UIToolType", QVariant::fromValue(UIToolType_FileManager));
+        /// @todo use icons with check-boxes
+        setIcon(UIIconPool::iconSetFull(":/file_manager_24px.png", ":/file_manager_16px.png",
+                                        ":/file_manager_disabled_24px.png", ":/file_manager_disabled_16px.png"));
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("ToolsMachineFileManager");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "&File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the File Manager"));
+    }
+};
+
 
 /** Menu action extension, used as 'Snapshot' menu class. */
@@ -3541 +3575 @@
     m_pool[UIActionIndexMN_M_Group_M_Tools_T_Logs] = new UIActionToggleManagerToolsMachineShowLogs(this);
     m_pool[UIActionIndexMN_M_Group_M_Tools_T_Activity] = new UIActionToggleManagerToolsMachineShowActivity(this);
+    m_pool[UIActionIndexMN_M_Group_M_Tools_T_FileManager] = new UIActionToggleManagerToolsMachineShowFileManager(this);
     m_pool[UIActionIndexMN_M_Group_S_Discard] = new UIActionSimpleManagerCommonPerformDiscard(this);
     m_pool[UIActionIndexMN_M_Group_S_ShowLogDialog] = new UIActionSimpleManagerCommonShowMachineLogs(this);
@@ -3586 +3621 @@
     m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Logs] = new UIActionToggleManagerToolsMachineShowLogs(this);
     m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Activity] = new UIActionToggleManagerToolsMachineShowActivity(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Tools_T_FileManager] = new UIActionToggleManagerToolsMachineShowFileManager(this);
     m_pool[UIActionIndexMN_M_Machine_S_Discard] = new UIActionSimpleManagerCommonPerformDiscard(this);
     m_pool[UIActionIndexMN_M_Machine_S_ShowLogDialog] = new UIActionSimpleManagerCommonShowMachineLogs(this);

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h

@@ -84 +84 @@
     UIActionIndexMN_M_Group_M_Tools_T_Logs,
     UIActionIndexMN_M_Group_M_Tools_T_Activity,
+    UIActionIndexMN_M_Group_M_Tools_T_FileManager,
     UIActionIndexMN_M_Group_S_Discard,
     UIActionIndexMN_M_Group_S_ShowLogDialog,
@@ -128 +129 @@
     UIActionIndexMN_M_Machine_M_Tools_T_Logs,
     UIActionIndexMN_M_Machine_M_Tools_T_Activity,
+    UIActionIndexMN_M_Machine_M_Tools_T_FileManager,
     UIActionIndexMN_M_Machine_S_Discard,
     UIActionIndexMN_M_Machine_S_ShowLogDialog,

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp

@@ -25 +25 @@
 /* GUI includes */
 #include "UIActionPoolManager.h"
+#include "UIDetails.h"
 #include "UIErrorPane.h"
-#include "UIDetails.h"
+#include "UIFileManager.h"
 #include "UIIconPool.h"
-#include "UIVMActivityToolWidget.h"
 #include "UISnapshotPane.h"
 #include "UIToolPaneMachine.h"
 #include "UIVirtualMachineItem.h"
+#include "UIVMActivityToolWidget.h"
 #include "UIVMLogViewerWidget.h"
+
 
 /* Other VBox includes: */
@@ -48 +50 @@
     , m_pPaneLogViewer(0)
     , m_pPaneVMActivityMonitor(0)
+    , m_pPaneFileManager(0)
     , m_fActive(false)
 {
@@ -210 +213 @@
                 connect(m_pPaneVMActivityMonitor, &UIVMActivityToolWidget::sigSwitchToActivityOverviewPane,
                         this, &UIToolPaneMachine::sigSwitchToActivityOverviewPane);
+                break;
+            }
+            case UIToolType_FileManager:
+            {
+                m_pPaneFileManager = 0;
+
+                // UIFileManager::UIFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
+                //                                      const CGuest &comGuest, QWidget *pParent, bool fShowToolbar /* = true */)
+
+                AssertPtrReturnVoid(m_pPaneFileManager);
+#ifndef VBOX_WS_MAC
+                const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
+                m_pPaneFileManager->setContentsMargins(iMargin, 0, iMargin, 0);
+#endif
+
+                /* Configure pane: */
+                m_pPaneFileManager->setProperty("ToolType", QVariant::fromValue(UIToolType_FileManager));
+                //m_pPaneFileManager->setSelectedVMListItems(m_items);
+                /* Add into layout: */
+                m_pLayout->addWidget(m_pPaneFileManager);
+                m_pLayout->setCurrentWidget(m_pPaneFileManager);
                 break;
             }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h

@@ -43 +43 @@
 class UIVirtualMachineItem;
 class UIVMLogViewerWidget;
-
+class UIFileManager;
 
 /** QWidget subclass representing container for tool panes. */
@@ -134 +134 @@
     /** Holds the Performance Monitor pane instance. */
     UIVMActivityToolWidget *m_pPaneVMActivityMonitor;
+    /** Holds the File Manager pane instance. */
+    UIFileManager *m_pPaneFileManager;
 
     /** Holds whether this pane is active. */