Changeset 100156 in vbox

Timestamp:

Jun 12, 2023 3:25:05 PM (18 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Renaming etc.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (4 diffs)
• globals/UIActionPool.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

@@ -2292 +2292 @@
 };
 
-/** Toggle action extension, used to toggle 'VISO Creator options' panel in file manager. */
-class UIActionMenuVISOCreatorToggleOptionsPanel : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuVISOCreatorToggleOptionsPanel(UIActionPool *pParent)
+/** Toggle action extension, used to toggle 'VISO Creator settings' dialog in file manager. */
+class UIActionMenuVISOCreatorToggleSettingsDialog : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuVISOCreatorToggleSettingsDialog(UIActionPool *pParent)
         : UIActionToggle(pParent)
     {
@@ -2315 +2315 @@
     virtual QString shortcutExtraDataID() const RT_OVERRIDE
     {
-        return QString("ToggleVISOCreatorOptionsPanel");
+        return QString("ToggleVISOCreatorSettingsDialog");
     }
 
@@ -2327 +2327 @@
     virtual void retranslateUi() RT_OVERRIDE
     {
-        setName(QApplication::translate("UIActionPool", "Options"));
+        setName(QApplication::translate("UIActionPool", "Settings"));
         setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator"));
-        setStatusTip(QApplication::translate("UIActionPool", "Open panel for VISO Creator options"));
-        setToolTip(QApplication::translate("UIActionPool", "Open Options Panel")
+        setStatusTip(QApplication::translate("UIActionPool", "Open VISO Creator settings dialog"));
+        setToolTip(QApplication::translate("UIActionPool", "Open Settings Dialog")
                    + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
     }
@@ -3186 +3186 @@
     /* Create VISO Creator actions: */
     m_pool[UIActionIndex_M_VISOCreator] = new UIActionMenuVISOCreator(this);
-    m_pool[UIActionIndex_M_VISOCreator_ToggleOptionsPanel] = new UIActionMenuVISOCreatorToggleOptionsPanel(this);
+    m_pool[UIActionIndex_M_VISOCreator_ToggleSettingsDialog] = new UIActionMenuVISOCreatorToggleSettingsDialog(this);
     m_pool[UIActionIndex_M_VISOCreator_Add] = new UIActionMenuVISOCreatorAdd(this);
     m_pool[UIActionIndex_M_VISOCreator_Remove] = new UIActionMenuVISOCreatorRemove(this);

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

@@ -151 +151 @@
     /* VISO Creator actions: */
     UIActionIndex_M_VISOCreator,
-    UIActionIndex_M_VISOCreator_ToggleOptionsPanel,
+    UIActionIndex_M_VISOCreator_ToggleSettingsDialog,
     UIActionIndex_M_VISOCreator_Add,
     UIActionIndex_M_VISOCreator_Remove,

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

@@ -223 +223 @@
                                          bool fShowToolBar, const QString& strMachineName /* = QString() */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_pActionOptions(0)
+    , m_pActionSettings(0)
     , m_pAddAction(0)
     , m_pRemoveAction(0)
@@ -299 +299 @@
 {
     Q_UNUSED(pEvent);
-    if (m_pSettingsWidget && m_pSettingsWidget->isVisible() != m_fShowSettingsDialog /*&& m_pOverlayWidget*/ && m_pOverlayBlurEffect)
-    {
-        QPixmap shot = m_pBrowserContainerWidget->grab();
-        m_pOverlayWidget->setPixmap(shot);
-
-        if (m_fShowSettingsDialog)
-            m_pStackedLayout->setCurrentWidget(m_pOverlayWidget);
-        else
-            m_pStackedLayout->setCurrentWidget(m_pBrowserContainerWidget);
-
-        m_pSettingsWidget->setVisible(m_fShowSettingsDialog);
-
-        m_pOverlayBlurEffect->setEnabled(m_fShowSettingsDialog);
-        m_pSettingsWidget->raise();
-        if (m_fShowSettingsDialog)
-        {
-            int x = 0.5 * (m_pBrowserContainerWidget->width() - m_pSettingsWidget->width());
-            int y = 0.5 * (m_pBrowserContainerWidget->height() - m_pSettingsWidget->height());
-            m_pSettingsWidget->move(m_pBrowserContainerWidget->x() + x, m_pBrowserContainerWidget->y() + y);
-        }
-    }
 }
 
@@ -328 +307 @@
 }
 
-void UIVisoCreatorWidget::sltPanelActionToggled(bool fChecked)
+void UIVisoCreatorWidget::sltSettingsActionToggled(bool fChecked)
 {
     m_fShowSettingsDialog = fChecked;
-    repaint();
-    //update();
+    toggleSettingsWidget();
 }
 
@@ -505 +483 @@
     }
 
-    if (m_pActionOptions)
-        connect(m_pActionOptions, &QAction::triggered, this, &UIVisoCreatorWidget::sltPanelActionToggled);
+    if (m_pActionSettings)
+        connect(m_pActionSettings, &QAction::triggered, this, &UIVisoCreatorWidget::sltSettingsActionToggled);
 
     if (m_pSettingsWidget)
@@ -544 +522 @@
         return;
 
-    m_pActionOptions = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel);
+    m_pActionSettings = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleSettingsDialog);
 
     m_pAddAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Add);
@@ -564 +542 @@
     if (m_pToolBar)
     {
-        if (m_pActionOptions)
-            m_pToolBar->addAction(m_pActionOptions);
+        if (m_pActionSettings)
+            m_pToolBar->addAction(m_pActionSettings);
     }
     if (m_pMainMenu)
     {
-        m_pMainMenu->addAction(m_pActionOptions);
+        m_pMainMenu->addAction(m_pActionSettings);
         m_pMainMenu->addSeparator();
         if (m_pAddAction)
@@ -608 +586 @@
 
         m_pVerticalToolBar->addWidget(bottomSpacerWidget);
+    }
+}
+
+void UIVisoCreatorWidget::toggleSettingsWidget()
+{
+    if (m_pSettingsWidget && m_pSettingsWidget->isVisible() != m_fShowSettingsDialog /*&& m_pOverlayWidget*/ && m_pOverlayBlurEffect)
+    {
+        QPixmap shot = m_pBrowserContainerWidget->grab();
+        m_pOverlayWidget->setPixmap(shot);
+
+        if (m_fShowSettingsDialog)
+            m_pStackedLayout->setCurrentWidget(m_pOverlayWidget);
+        else
+            m_pStackedLayout->setCurrentWidget(m_pBrowserContainerWidget);
+
+        m_pSettingsWidget->setVisible(m_fShowSettingsDialog);
+
+        m_pOverlayBlurEffect->setEnabled(m_fShowSettingsDialog);
+        m_pSettingsWidget->raise();
+        if (m_fShowSettingsDialog)
+        {
+            int x = 0.5 * (m_pBrowserContainerWidget->width() - m_pSettingsWidget->width());
+            int y = 0.5 * (m_pBrowserContainerWidget->height() - m_pSettingsWidget->height());
+            m_pSettingsWidget->move(m_pBrowserContainerWidget->x() + x, m_pBrowserContainerWidget->y() + y);
+        }
     }
 }

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

@@ -98 +98 @@
 
     void sltAddObjectsToViso(QStringList pathList);
-    void sltPanelActionToggled(bool fChecked);
+    void sltSettingsActionToggled(bool fChecked);
     void sltVisoNameChanged(const QString& strVisoName);
     void sltCustomVisoOptionsChanged(const QStringList &customVisoOptions);
@@ -134 +134 @@
      * Leave out the vertical toolbar which is handled in prepareVerticalToolBar. */
     void populateMenuMainToolbar();
-    /** Set the root index of the m_pTableModel to the current index of m_pTreeModel. */
-    void setTableRootIndex(QModelIndex index = QModelIndex() );
-    void setTreeCurrentIndex(QModelIndex index = QModelIndex() );
-
+
+     void toggleSettingsWidget();
     /** @name Main toolbar (and main menu) actions
       * @{ */
-        QAction         *m_pActionOptions;
+        QAction         *m_pActionSettings;
     /** @} */