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

Timestamp:

Apr 24, 2017 5:44:34 PM (8 years ago)

Author:

vboxsync

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

115034

Message:

FE/Qt: bugref:6911: Enable old-style user machine icon configuration for macOS as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)

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

@@ -95 +95 @@
 const char* UIExtraDataDefs::GUI_PreventSnapshotOperations = "GUI/PreventSnapshotOperations";
 const char* UIExtraDataDefs::GUI_FirstRun = "GUI/FirstRun";
+const char* UIExtraDataDefs::GUI_MachineWindowIcons = "GUI/MachineWindowIcons";
 #ifndef VBOX_WS_MAC
-const char* UIExtraDataDefs::GUI_MachineWindowIcons = "GUI/MachineWindowIcons";
 const char* UIExtraDataDefs::GUI_MachineWindowNamePostfix = "GUI/MachineWindowNamePostfix";
 #endif /* !VBOX_WS_MAC */

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

@@ -165 +165 @@
         /** Holds whether this machine is first time started. */
         extern const char* GUI_FirstRun;
-#ifndef VBOX_WS_MAC
         /** Except Mac OS X: Holds redefined machine-window icon names. */
         extern const char* GUI_MachineWindowIcons;
+#ifndef VBOX_WS_MAC
         /** Except Mac OS X: Holds redefined machine-window name postfix. */
         extern const char* GUI_MachineWindowNamePostfix;

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

@@ -2827 +2827 @@
 }
 
+QStringList UIExtraDataManager::machineWindowIconNames(const QString &strID)
+{
+    return extraDataStringList(GUI_MachineWindowIcons, strID);
+}
+
 #ifndef VBOX_WS_MAC
-QStringList UIExtraDataManager::machineWindowIconNames(const QString &strID)
-{
-    return extraDataStringList(GUI_MachineWindowIcons, strID);
-}
-
 QString UIExtraDataManager::machineWindowNamePostfix(const QString &strID)
 {

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

@@ -350 +350 @@
         void setMachineFirstTimeStarted(bool fFirstTimeStarted, const QString &strID);
 
-#ifndef VBOX_WS_MAC
         /** Except Mac OS X: Returns redefined machine-window icon names. */
         QStringList machineWindowIconNames(const QString &strID);
+#ifndef VBOX_WS_MAC
         /** Except Mac OS X: Returns redefined machine-window name postfix. */
         QString machineWindowNamePostfix(const QString &strID);

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

@@ -1290 +1290 @@
         {
             QIcon icon;
-#ifndef VBOX_WS_MAC
             /* Load user machine-window icon: */
             foreach (const QString &strIconName, gEDataManager->machineWindowIconNames(strMachineID))
                 if (!strIconName.isEmpty() && QFile::exists(strIconName))
                     icon.addFile(strIconName);
-#endif
             /* Use the OS type icon if user one was not set: */
             if (icon.isNull())