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

Timestamp:

Jun 5, 2023 2:54:10 PM (20 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Adding some infrastructure for VISO open functionality.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (2 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• medium/viso/UIVisoContentBrowser.cpp (modified) (1 diff)
• medium/viso/UIVisoContentBrowser.h (modified) (1 diff)
• medium/viso/UIVisoCreator.cpp (modified) (7 diffs)
• medium/viso/UIVisoCreator.h (modified) (2 diffs)

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

@@ -2546 +2546 @@
         setStatusTip(QApplication::translate("UIActionPool", "Reset the VISO content."));
         setToolTip(QApplication::translate("UIActionPool", "Reset the VISO content.")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+class UIActionMenuVISOCreatorOpen : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuVISOCreatorOpen(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/cd_remove_16px.png", ":/cd_16px.png")
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const RT_OVERRIDE
+    {
+        return QString("VISOOpen");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() RT_OVERRIDE
+    {
+        setName(QApplication::translate("UIActionPool", "Open"));
+        setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the VISO content."));
+        setToolTip(QApplication::translate("UIActionPool", "Open the VISO content.")
                    + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
     }
@@ -3204 +3236 @@
     m_pool[UIActionIndex_M_VISOCreator_Rename] = new UIActionMenuVISOCreatorRename(this);
     m_pool[UIActionIndex_M_VISOCreator_Reset] = new UIActionMenuVISOCreatorReset(this);
+    m_pool[UIActionIndex_M_VISOCreator_Open] = new UIActionMenuVISOCreatorOpen(this);
 
     /* Medium Selector actions: */

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

@@ -158 +158 @@
     UIActionIndex_M_VISOCreator_Rename,
     UIActionIndex_M_VISOCreator_Reset,
+    UIActionIndex_M_VISOCreator_Open,
 
     /* Medium selector actions : */

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -607 +607 @@
 }
 
+void UIVisoContentBrowser::parseVisoFileContent(const QString &strFileName)
+{
+    Q_UNUSED(strFileName);
+}
+
 QModelIndex UIVisoContentBrowser::convertIndexToTableIndex(const QModelIndex &index)
 {

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.h

@@ -70 +70 @@
     void setVisoName(const QString &strName);
     virtual bool tableViewHasSelection() const final override;
+    void parseVisoFileContent(const QString &strFileName);
 
 public slots:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -33 +33 @@
 
 /* GUI includes: */
+#include "QIDialogButtonBox.h"
+#include "QIFileDialog.h"
+#include "QIToolBar.h"
 #include "UIActionPool.h"
-#include "QIDialogButtonBox.h"
+#include "UICommon.h"
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
 #include "UIModalWindowManager.h"
-#include "QIToolBar.h"
 #include "UIVisoHostBrowser.h"
 #include "UIVisoCreator.h"
@@ -45 +47 @@
 #include "UIVisoCreatorOptionsPanel.h"
 #include "UIVisoContentBrowser.h"
-#include "UICommon.h"
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
@@ -69 +70 @@
     , m_pRenameAction(0)
     , m_pResetAction(0)
+    , m_pOpenAction(0)
     , m_pMainLayout(0)
     , m_pHostBrowser(0)
@@ -227 +229 @@
 
     menu.exec(pContextMenuRequester->mapToGlobal(point));
+}
+
+void UIVisoCreatorWidget::sltHandleOpenAction()
+{
+    QString strFileName =  QIFileDialog::getOpenFileName(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD),
+                                                         "Viso files (*.viso)", this, UIVisoCreatorWidget::tr("Select a viso file to load"));
+    if (!strFileName.isEmpty() && m_pVISOContentBrowser)
+        m_pVISOContentBrowser->parseVisoFileContent(strFileName);
 }
 
@@ -366 +376 @@
         connect(m_pRenameAction, &QAction::triggered,
                 m_pVISOContentBrowser,&UIVisoContentBrowser::sltHandleItemRenameAction);
+    if (m_pOpenAction)
+        connect(m_pOpenAction, &QAction::triggered,
+                this, &UIVisoCreatorWidget::sltHandleOpenAction);
 }
 
@@ -376 +389 @@
     m_pActionOptions = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel);
 
+    m_pOpenAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Open);
     m_pAddAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Add);
     if (m_pAddAction && m_pHostBrowser)
@@ -402 +416 @@
         m_pMainMenu->addAction(m_pActionOptions);
         m_pMainMenu->addSeparator();
-        m_pMainMenu->addAction(m_pAddAction);
-        m_pMainMenu->addAction(m_pRemoveAction);
-        m_pMainMenu->addAction(m_pCreateNewDirectoryAction);
-        m_pMainMenu->addAction(m_pResetAction);
+        if (m_pAddAction)
+            m_pMainMenu->addAction(m_pAddAction);
+        if (m_pOpenAction)
+            m_pMainMenu->addAction(m_pOpenAction);
+        if (m_pRemoveAction)
+            m_pMainMenu->addAction(m_pRemoveAction);
+        if (m_pCreateNewDirectoryAction)
+            m_pMainMenu->addAction(m_pCreateNewDirectoryAction);
+        if (m_pResetAction)
+            m_pMainMenu->addAction(m_pResetAction);
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -121 +121 @@
     void sltHandleContentBrowserTableSelectionChanged(bool fIsSelectionEmpty);
     void sltHandleShowContextMenu(const QWidget *pContextMenuRequester, const QPoint &point);
+    void sltHandleOpenAction();
 
 private:
@@ -174 +175 @@
         QAction              *m_pRenameAction;
         QAction              *m_pResetAction;
+        QAction              *m_pOpenAction;
     /** @} */