Changeset 74740 in vbox

Timestamp:

Oct 10, 2018 12:50:25 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Propagate VBOX_GUI_WITH_NEW_MANAGER define to common GUI lib as well; some stuff required build-fix in that case as well.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/converter/UIConverterBackendGlobal.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -293 +293 @@
  VBoxGlobal_DEFS         += \
         $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VBOX_GUI_WITH_SHARED_LIBRARY) \
+        $(if $(VBOX_GUI_WITH_NEW_MANAGER),VBOX_GUI_WITH_NEW_MANAGER) \
         $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
         $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS) \

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

@@ -873 +873 @@
     switch (enmToolTypeMachine)
     {
+#ifndef VBOX_GUI_WITH_NEW_MANAGER
         case ToolTypeMachine_Invalid:   strResult = "None"; break;
         case ToolTypeMachine_Details:   strResult = "Details"; break;
         case ToolTypeMachine_Snapshots: strResult = "Snapshots"; break;
         case ToolTypeMachine_LogViewer: strResult = "LogViewer"; break;
+#else /* VBOX_GUI_WITH_NEW_MANAGER */
+        case ToolTypeMachine_Details:   strResult = "Details"; break;
+        case ToolTypeMachine_Snapshots: strResult = "Snapshots"; break;
+        case ToolTypeMachine_Logs:      strResult = "Logs"; break;
+#endif /* VBOX_GUI_WITH_NEW_MANAGER */
         default:
         {
@@ -892 +898 @@
      * to search through the keys using 'case-insensitive' rule: */
     QStringList keys;    QList<ToolTypeMachine> values;
+#ifndef VBOX_GUI_WITH_NEW_MANAGER
     keys << "None";      values << ToolTypeMachine_Invalid;
     keys << "Details";   values << ToolTypeMachine_Details;
     keys << "Snapshots"; values << ToolTypeMachine_Snapshots;
     keys << "LogViewer"; values << ToolTypeMachine_LogViewer;
+#else /* VBOX_GUI_WITH_NEW_MANAGER */
+    keys << "Details";   values << ToolTypeMachine_Details;
+    keys << "Snapshots"; values << ToolTypeMachine_Snapshots;
+    keys << "Logs";      values << ToolTypeMachine_Logs;
+#endif /* VBOX_GUI_WITH_NEW_MANAGER */
     /* Invalid type for unknown words: */
     if (!keys.contains(strToolTypeMachine, Qt::CaseInsensitive))
@@ -909 +921 @@
     switch (enmToolTypeGlobal)
     {
+#ifndef VBOX_GUI_WITH_NEW_MANAGER
         case ToolTypeGlobal_VirtualMedia: strResult = "VirtualMedia"; break;
         case ToolTypeGlobal_HostNetwork:  strResult = "HostNetwork"; break;
+#else /* VBOX_GUI_WITH_NEW_MANAGER */
+        case ToolTypeGlobal_Welcome: strResult = "Welcome"; break;
+        case ToolTypeGlobal_Media:   strResult = "Media"; break;
+        case ToolTypeGlobal_Network: strResult = "Network"; break;
+#endif /* VBOX_GUI_WITH_NEW_MANAGER */
         default:
         {
@@ -926 +944 @@
      * to search through the keys using 'case-insensitive' rule: */
     QStringList keys;       QList<ToolTypeGlobal> values;
+#ifndef VBOX_GUI_WITH_NEW_MANAGER
     keys << "VirtualMedia"; values << ToolTypeGlobal_VirtualMedia;
     keys << "HostNetwork";  values << ToolTypeGlobal_HostNetwork;
+#else /* VBOX_GUI_WITH_NEW_MANAGER */
+    keys << "Welcome"; values << ToolTypeGlobal_Welcome;
+    keys << "Media";   values << ToolTypeGlobal_Media;
+    keys << "Network"; values << ToolTypeGlobal_Network;
+#endif /* VBOX_GUI_WITH_NEW_MANAGER */
     /* Invalid type for unknown words: */
     if (!keys.contains(strToolTypeGlobal, Qt::CaseInsensitive))