Changeset 100478 in vbox for trunk/src/VBox

Timestamp:

Jul 10, 2023 4:17:55 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Adding some missing actions to dialog's menu.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoBrowserBase.h (modified) (1 diff)
• UIVisoContentBrowser.cpp (modified) (2 diffs)
• UIVisoCreator.cpp (modified) (1 diff)
• UIVisoHostBrowser.cpp (modified) (2 diffs)
• UIVisoHostBrowser.h (modified) (1 diff)

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

@@ -91 +91 @@
     QAction             *m_pGoForward;
     QAction             *m_pGoBackward;
-
+    QPointer<QMenu>      m_pSubMenu;
 
 protected slots:

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

@@ -430 +430 @@
         pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Local Path"), UICustomFileSystemModelData_LocalPath);
     }
+    if (m_pSubMenu)
+        m_pSubMenu->setTitle(QApplication::translate("UIVisoCreatorWidget", "VISO Browser"));
+
     setFileTableLabelText(QApplication::translate("UIVisoCreatorWidget","VISO Content"));
 }
@@ -633 +636 @@
 {
     AssertReturnVoid(pMenu);
-
-    pMenu->addAction(m_pRemoveAction);
-    pMenu->addAction(m_pRenameAction);
-    pMenu->addAction(m_pCreateNewDirectoryAction);
-    pMenu->addAction(m_pResetAction);
+    QMenu *pSubMenu = new QMenu(QApplication::translate("UIVisoCreatorWidget", "VISO Browser"), pMenu);
+    pMenu->addMenu(pSubMenu);
+    AssertReturnVoid(pSubMenu);
+    m_pSubMenu = pSubMenu;
+
+    m_pSubMenu->addAction(m_pGoBackward);
+    m_pSubMenu->addAction(m_pGoForward);
+    m_pSubMenu->addAction(m_pGoUp);
+    m_pSubMenu->addAction(m_pGoHome);
+
+    m_pSubMenu->addSeparator();
+
+    m_pSubMenu->addAction(m_pRemoveAction);
+    m_pSubMenu->addAction(m_pRenameAction);
+    m_pSubMenu->addAction(m_pCreateNewDirectoryAction);
+    m_pSubMenu->addAction(m_pResetAction);
 }
 

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

@@ -598 +598 @@
             m_pMainMenu->addAction(m_pRemoveISOAction);
     }
+
+    if (m_pHostBrowser)
+        m_pHostBrowser->prepareMainMenu(m_pMainMenu);
+
     if (m_pVISOContentBrowser)
         m_pVISOContentBrowser->prepareMainMenu(m_pMainMenu);

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

@@ -174 +174 @@
 {
     setFileTableLabelText(QApplication::translate("UIVisoCreatorWidget","Host System"));
+    if (m_pSubMenu)
+        m_pSubMenu->setTitle(QApplication::translate("UIVisoCreatorWidget", "VISO Browser"));
 }
 
@@ -271 +273 @@
 }
 
+void UIVisoHostBrowser::prepareMainMenu(QMenu *pMenu)
+{
+    AssertReturnVoid(pMenu);
+    QMenu *pSubMenu = new QMenu(QApplication::translate("UIVisoCreatorWidget", "Host Browser"), pMenu);
+    pMenu->addMenu(pSubMenu);
+    AssertReturnVoid(pSubMenu);
+    m_pSubMenu = pSubMenu;
+
+    m_pSubMenu->addAction(m_pGoBackward);
+    m_pSubMenu->addAction(m_pGoForward);
+    m_pSubMenu->addAction(m_pGoUp);
+    m_pSubMenu->addAction(m_pGoHome);
+}
+
 void UIVisoHostBrowser::sltTableSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
 {

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

@@ -60 +60 @@
     /* The list of path of the selected file objects. */
     QStringList selectedPathList() const;
+    void prepareMainMenu(QMenu *pMenu);
 
 public slots: