Changeset 51158 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 28, 2014 5:33:21 PM (11 years ago)

Author:

vboxsync

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

93493

Message:

FE/Qt: Runtime UI: Integrating per-VP extra-data flag (GUI/MachineWindowNamePostfix) allowing to preconfigure machine-window product postfix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• runtime/UISession.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -442 +442 @@
     return extraDataStringList(GUI_MachineWindowIcons, strID);
 }
+
+QString UIExtraDataManager::machineWindowNamePostfix(const QString &strID) const
+{
+    return extraDataString(GUI_MachineWindowNamePostfix, strID);
+}
 #endif /* !Q_WS_MAC */
 

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

@@ -129 +129 @@
     /** Except Mac OS X: Returns redefined machine-window icon names. */
     QStringList machineWindowIconNames(const QString &strID) const;
+    /** Except Mac OS X: Returns redefined machine-window name postfix. */
+    QString machineWindowNamePostfix(const QString &strID) const;
 #endif /* !Q_WS_MAC */
 

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

@@ -53 +53 @@
 #ifndef Q_WS_MAC
 const char* UIDefs::GUI_MachineWindowIcons = "GUI/MachineWindowIcons";
+const char* UIDefs::GUI_MachineWindowNamePostfix = "GUI/MachineWindowNamePostfix";
 #endif /* !Q_WS_MAC */
 const char* UIDefs::GUI_RestrictedRuntimeMenus = "GUI/RestrictedRuntimeMenus";

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

@@ -122 +122 @@
 #ifndef Q_WS_MAC
     extern const char* GUI_MachineWindowIcons;
+    extern const char* GUI_MachineWindowNamePostfix;
 #endif /* !Q_WS_MAC */
     extern const char* GUI_RestrictedRuntimeMenus;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -468 +468 @@
         /* Unusual on the Mac. */
 #ifndef Q_WS_MAC
-        strMachineName += " - " + defaultWindowTitle();
+        const QString strUserProductName = uisession()->machineWindowNamePostfix();
+        strMachineName += " - " + (strUserProductName.isEmpty() ? defaultWindowTitle() : strUserProductName);
 #endif /* !Q_WS_MAC */
         if (m.GetMonitorCount() > 1)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1128 +1128 @@
         if (!icon.isNull())
             m_pMachineWindowIcon = new QIcon(icon);
+
+        /* Load user's machine-window name postfix: */
+        m_strMachineWindowNamePostfix = gEDataManager->machineWindowNamePostfix(vboxGlobal().managedVMUuid());
 #endif /* !Q_WS_MAC */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -102 +102 @@
     /** Returns redefined machine-window icon. */
     QIcon* machineWindowIcon() const { return m_pMachineWindowIcon; }
+    /** Returns redefined machine-window name postfix. */
+    QString machineWindowNamePostfix() const { return m_strMachineWindowNamePostfix; }
     /** @} */
 #endif /* !Q_WS_MAC */
@@ -354 +356 @@
     /** Holds redefined machine-window icon. */
     QIcon *m_pMachineWindowIcon;
+    /** Holds redefined machine-window name postfix. */
+    QString m_strMachineWindowNamePostfix;
     /** @} */
 #endif /* !Q_WS_MAC */