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

Timestamp:

Aug 17, 2022 4:42:24 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: Renaming and repositioning the newly added Help menu item.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• globals/UIActionPool.cpp (modified) (6 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)

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

@@ -581 +581 @@
         case UIExtraDataMetaDefs::MenuHelpActionType_Forums:               strResult = "Forums"; break;
         case UIExtraDataMetaDefs::MenuHelpActionType_Oracle:               strResult = "Oracle"; break;
-        case UIExtraDataMetaDefs::MenuHelpActionType_OnlineManual:         strResult = "OnlineManual"; break;
+        case UIExtraDataMetaDefs::MenuHelpActionType_OnlineDocumentation:  strResult = "OnlineDocumentation"; break;
 #ifndef VBOX_WS_MAC
         case UIExtraDataMetaDefs::MenuHelpActionType_About:                strResult = "About"; break;
@@ -609 +609 @@
     if (strMenuHelpActionType.compare("Oracle", Qt::CaseInsensitive) == 0)
         return UIExtraDataMetaDefs::MenuHelpActionType_Oracle;
-    if (strMenuHelpActionType.compare("OnlineManual", Qt::CaseInsensitive) == 0)
-        return UIExtraDataMetaDefs::MenuHelpActionType_OnlineManual;
+    if (strMenuHelpActionType.compare("OnlineDocumentation", Qt::CaseInsensitive) == 0)
+        return UIExtraDataMetaDefs::MenuHelpActionType_OnlineDocumentation;
 #ifndef VBOX_WS_MAC
     if (strMenuHelpActionType.compare("About", Qt::CaseInsensitive) == 0)

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

@@ -555 +555 @@
         MenuHelpActionType_Forums               = RT_BIT(3),
         MenuHelpActionType_Oracle               = RT_BIT(4),
-        MenuHelpActionType_OnlineManual         = RT_BIT(5),
+        MenuHelpActionType_OnlineDocumentation  = RT_BIT(5),
 #ifndef VBOX_WS_MAC
         MenuHelpActionType_About                = RT_BIT(6),

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

@@ -886 +886 @@
 
 
-/** Simple action extension, used as 'Online Manual' action class. */
-class UIActionSimpleOnlineManual : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionSimpleOnlineManual(UIActionPool *pParent)
+/** Simple action extension, used as 'Online Documentation' action class. */
+class UIActionSimpleOnlineDocumentation : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionSimpleOnlineDocumentation(UIActionPool *pParent)
         : UIActionSimple(pParent, ":/site_oracle_16px.png", ":/site_oracle_16px.png", true)
     {
@@ -905 +905 @@
     virtual int extraDataID() const RT_OVERRIDE
     {
-        return UIExtraDataMetaDefs::MenuHelpActionType_OnlineManual;
+        return UIExtraDataMetaDefs::MenuHelpActionType_OnlineDocumentation;
     }
     /** Returns action extra-data key. */
     virtual QString extraDataKey() const RT_OVERRIDE
     {
-        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_OnlineManual);
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_OnlineDocumentation);
     }
     /** Returns whether action is allowed. */
     virtual bool isAllowed() const RT_OVERRIDE
     {
-        return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_OnlineManual);
-    }
-
-    /** Returns shortcut extra-data ID. */
-    virtual QString shortcutExtraDataID() const RT_OVERRIDE
-    {
-        return QString("OnlineManual");
-    }
-
-    /** Handles translation event. */
-    virtual void retranslateUi() RT_OVERRIDE
-    {
-        setName(QApplication::translate("UIActionPool", "&Online Manual..."));
+        return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_OnlineDocumentation);
+    }
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const RT_OVERRIDE
+    {
+        return QString("OnlineDocumentation");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() RT_OVERRIDE
+    {
+        setName(QApplication::translate("UIActionPool", "&Online Documentation..."));
         setStatusTip(QApplication::translate("UIActionPool", "Open the browser and go to the VirtualBox user manual"));
     }
@@ -3129 +3129 @@
     m_pool[UIActionIndex_Simple_Forums] = new UIActionSimpleForums(this);
     m_pool[UIActionIndex_Simple_Oracle] = new UIActionSimpleOracle(this);
-    m_pool[UIActionIndex_Simple_OnlineManual] = new UIActionSimpleOnlineManual(this);
+    m_pool[UIActionIndex_Simple_OnlineDocumentation] = new UIActionSimpleOnlineDocumentation(this);
 #ifndef VBOX_WS_MAC
     m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
@@ -3252 +3252 @@
     connect(action(UIActionIndex_Simple_Oracle), &UIAction::triggered,
             &msgCenter(), &UIMessageCenter::sltShowOracle, Qt::UniqueConnection);
-    connect(action(UIActionIndex_Simple_OnlineManual), &UIAction::triggered,
-            &msgCenter(), &UIMessageCenter::sltShowOnlineManual, Qt::UniqueConnection);
+    connect(action(UIActionIndex_Simple_OnlineDocumentation), &UIAction::triggered,
+            &msgCenter(), &UIMessageCenter::sltShowOnlineDocumentation, Qt::UniqueConnection);
 #ifndef VBOX_WS_MAC
     connect(action(UIActionIndex_Simple_About), &UIAction::triggered,
@@ -3509 +3509 @@
     /* 'Contents' action: */
     fSeparator = addAction(pMenu, action(UIActionIndex_Simple_Contents)) || fSeparator;
+    /* 'Online Documentation' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndex_Simple_OnlineDocumentation)) || fSeparator;
     /* 'Web Site' action: */
     fSeparator = addAction(pMenu, action(UIActionIndex_Simple_WebSite)) || fSeparator;
@@ -3517 +3519 @@
     /* 'Oracle' action: */
     fSeparator = addAction(pMenu, action(UIActionIndex_Simple_Oracle)) || fSeparator;
-    /* 'Online Manual' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndex_Simple_OnlineManual)) || fSeparator;
 
     /* Separator? */

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

@@ -83 +83 @@
     UIActionIndex_Simple_Forums,
     UIActionIndex_Simple_Oracle,
-    UIActionIndex_Simple_OnlineManual,
+    UIActionIndex_Simple_OnlineDocumentation,
 #ifndef VBOX_WS_MAC
     UIActionIndex_Simple_About,

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

@@ -2046 +2046 @@
 }
 
-void UIMessageCenter::sltShowOnlineManual()
+void UIMessageCenter::sltShowOnlineDocumentation()
 {
     uiCommon().openURL("https://docs.oracle.com/en/virtualization/virtualbox/7.0/user/index.html");

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

@@ -451 +451 @@
     void sltShowForums();
     void sltShowOracle();
-    void sltShowOnlineManual();
+    void sltShowOnlineDocumentation();
     void sltShowHelpAboutDialog();
     void sltShowHelpHelpDialog();