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

Timestamp:

Aug 21, 2024 2:56:51 PM (3 months ago)

Author:

vboxsync

Message:

FE/Qt: Action pool & VISO Creator: Renaming Toggle Settings action NLS to Toggle Preferences as we are using preferences pane now, not separate settings dialog; Besides that, some internal refactoring for enum value and variables.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -2345 +2345 @@
 };
 
-/** 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)
+/** Toggle action extension, used to toggle 'VISO Creator Preferences' pane in VISO Creator. */
+class UIActionToggleVISOCreatorPreferences : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionToggleVISOCreatorPreferences(UIActionPool *pParent)
         : UIActionToggle(pParent)
     {
@@ -2368 +2368 @@
     virtual QString shortcutExtraDataID() const RT_OVERRIDE
     {
-        return QString("ToggleVISOCreatorSettingsDialog");
+        return QString("ToggleVISOCreatorPreferences");
     }
 
@@ -2380 +2380 @@
     virtual void retranslateUi() RT_OVERRIDE
     {
-        setName(QApplication::translate("UIActionPool", "Settings"));
+        setName(QApplication::translate("UIActionPool", "&Preferences"));
         setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator"));
-        setStatusTip(QApplication::translate("UIActionPool", "Open VISO Creator settings dialog"));
-        setToolTip(QApplication::translate("UIActionPool", "Open Settings Dialog")
+        setStatusTip(QApplication::translate("UIActionPool", "Open pane with VISO Creator preferences"));
+        setToolTip(QApplication::translate("UIActionPool", "Open Preferences Pane")
                    + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
     }
@@ -3561 +3561 @@
     /* Create VISO Creator actions: */
     m_pool[UIActionIndex_M_VISOCreator] = new UIActionMenuVISOCreator(this);
-    m_pool[UIActionIndex_M_VISOCreator_ToggleSettingsDialog] = new UIActionMenuVISOCreatorToggleSettingsDialog(this);
+    m_pool[UIActionIndex_M_VISOCreator_TogglePreferences] = new UIActionToggleVISOCreatorPreferences(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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2010-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -149 +149 @@
     /* VISO Creator actions: */
     UIActionIndex_M_VISOCreator,
-    UIActionIndex_M_VISOCreator_ToggleSettingsDialog,
+    UIActionIndex_M_VISOCreator_TogglePreferences,
     UIActionIndex_M_VISOCreator_Add,
     UIActionIndex_M_VISOCreator_Remove,

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -311 +311 @@
                                          bool fShowToolBar, const QString& strVisoFilePath, const QString& strMachineName)
     : QWidget(pParent)
-    , m_pActionSettings(0)
+    , m_pActionPreferences(0)
     , m_pAddAction(0)
     , m_pOpenAction(0)
@@ -334 +334 @@
     populateMenuMainToolbar();
     prepareConnections();
-    if (m_pActionSettings)
-        sltSettingsActionToggled(m_pActionSettings->isChecked());
+    if (m_pActionPreferences)
+        sltSettingsActionToggled(m_pActionPreferences->isChecked());
 }
 
@@ -503 +503 @@
 void UIVisoCreatorWidget::sltPanelContainerHidden()
 {
-    m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleSettingsDialog)->blockSignals(true);
-    m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleSettingsDialog)->setChecked(false);
-    m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleSettingsDialog)->blockSignals(false);
+    m_pActionPool->action(UIActionIndex_M_VISOCreator_TogglePreferences)->blockSignals(true);
+    m_pActionPool->action(UIActionIndex_M_VISOCreator_TogglePreferences)->setChecked(false);
+    m_pActionPool->action(UIActionIndex_M_VISOCreator_TogglePreferences)->blockSignals(false);
 }
 
@@ -594 +594 @@
     }
 
-    if (m_pActionSettings)
-        connect(m_pActionSettings, &QAction::triggered, this, &UIVisoCreatorWidget::sltSettingsActionToggled);
+    if (m_pActionPreferences)
+        connect(m_pActionPreferences, &QAction::triggered, this, &UIVisoCreatorWidget::sltSettingsActionToggled);
 
     if (m_pSettingsWidget)
@@ -627 +627 @@
         return;
 
-    m_pActionSettings = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleSettingsDialog);
+    m_pActionPreferences = m_pActionPool->action(UIActionIndex_M_VISOCreator_TogglePreferences);
 
     m_pAddAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Add);
@@ -648 +648 @@
     if (m_pToolBar)
     {
-        if (m_pActionSettings)
-            m_pToolBar->addAction(m_pActionSettings);
+        if (m_pActionPreferences)
+            m_pToolBar->addAction(m_pActionPreferences);
     }
     if (m_pMainMenu)
     {
-        m_pMainMenu->addAction(m_pActionSettings);
+        m_pMainMenu->addAction(m_pActionPreferences);
         m_pMainMenu->addSeparator();
         if (m_pOpenAction)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -155 +155 @@
     /** @name Main toolbar (and main menu) actions
       * @{ */
-        QAction         *m_pActionSettings;
+        QAction         *m_pActionPreferences;
     /** @} */