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

Timestamp:

Apr 21, 2020 4:01:57 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137432

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Sync definition rules for last chosen item and group order saved to extra-data.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserAbstractModel.cpp (modified) (2 diffs)
• UIChooserAbstractModel.h (modified) (2 diffs)
• UIChooserNodeMachine.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -363 +363 @@
     return    UIThreadGroupDefinitionSave::instance()
            || UIThreadGroupOrderSave::instance();
+}
+
+/* static */
+QString UIChooserAbstractModel::toOldStyleUuid(const QUuid &uId)
+{
+    return uId.toString().remove(QRegExp("[{}]"));
 }
 
@@ -991 +997 @@
 }
 
-/* static */
-QString UIChooserAbstractModel::toOldStyleUuid(const QUuid &uId)
-{
-    return uId.toString().remove(QRegExp("[{}]"));
-}
-
 
 /*********************************************************************************************************************************

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.h

@@ -107 +107 @@
         /** Returns whether group saving is in progress. */
         bool isGroupSavingInProgress() const;
+
+        /** Returns QString representation for passed @a uId, wiping out {} symbols.
+          * @note  Required for backward compatibility after QString=>QUuid change. */
+        static QString toOldStyleUuid(const QUuid &uId);
     /** @} */
 
@@ -232 +236 @@
         /** Makes sure group orders saving is finished. */
         void makeSureGroupOrdersSaveIsFinished();
-
-        /** Returns QString representation for passed @a uId, wiping out {} symbols.
-          * @note  Required for backward compatibility after QString=>QUuid change. */
-        static QString toOldStyleUuid(const QUuid &uId);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeMachine.cpp

@@ -138 +138 @@
 QString UIChooserNodeMachine::definition() const
 {
-    return QString("m=%1").arg(name());
+    return QString("m=%1").arg(UIChooserAbstractModel::toOldStyleUuid(cache()->id()));
 }