Changeset 84991 in vbox

Timestamp:

Jun 29, 2020 12:46:08 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9743: VirtualBox Manager: NLS fixes for Move to Group functionality.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (3 diffs)

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

@@ -667 +667 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "[New]"));
+        setName(QApplication::translate("UIActionPool", "[New]", "group"));
         setStatusTip(QApplication::translate("UIActionPool", "Add new group based on selected virtual machines"));
     }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -832 +832 @@
     QAction *pAction = qobject_cast<QAction*>(sender());
     AssertPtrReturnVoid(pAction);
-    m_pWidget->moveMachineToGroup(pAction->text());
+    m_pWidget->moveMachineToGroup(pAction->property("actual_group_name").toString());
 }
 
@@ -1983 +1983 @@
         pMenu->addSeparator();
     foreach (const QString &strGroupName, groups)
-        pMenu->addAction(strGroupName, this, &UIVirtualBoxManager::sltPerformMachineMoveToSpecificGroup);
+    {
+        QString strVisibleGroupName = strGroupName;
+        if (strVisibleGroupName.startsWith('/'))
+            strVisibleGroupName.remove(0, 1);
+        if (strVisibleGroupName.isEmpty())
+            strVisibleGroupName = QApplication::translate("UIActionPool", "[Root]", "group");
+        QAction *pAction = pMenu->addAction(strVisibleGroupName, this, &UIVirtualBoxManager::sltPerformMachineMoveToSpecificGroup);
+        pAction->setProperty("actual_group_name", strGroupName);
+    }
 }
 
@@ -2005 +2013 @@
         pMenu->addSeparator();
     foreach (const QString &strGroupName, groups)
-        pMenu->addAction(strGroupName, this, &UIVirtualBoxManager::sltPerformMachineMoveToSpecificGroup);
+    {
+        QString strVisibleGroupName = strGroupName;
+        if (strVisibleGroupName.startsWith('/'))
+            strVisibleGroupName.remove(0, 1);
+        if (strVisibleGroupName.isEmpty())
+            strVisibleGroupName = QApplication::translate("UIActionPool", "[Root]", "group");
+        QAction *pAction = pMenu->addAction(strVisibleGroupName, this, &UIVirtualBoxManager::sltPerformMachineMoveToSpecificGroup);
+        pAction->setProperty("actual_group_name", strGroupName);
+    }
 }