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

Timestamp:

May 26, 2014 4:45:43 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Removing UIExtraDataDefs.h dependency from VBoxGlobal.h; removing RenderMode CLI logic, it's obsolete; extending RenderMode extra-data logic.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxAboutDlg.cpp (modified) (2 diffs)
• VBoxFBOverlay.cpp (modified) (1 diff)
• converter/UIConverterBackend.h (modified) (2 diffs)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• runtime/UIActionPoolRuntime.cpp (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (6 diffs)
• selector/UIActionPoolSelector.cpp (modified) (1 diff)
• selector/graphics/details/UIGMachinePreview.cpp (modified) (1 diff)
• widgets/UIHostComboEditor.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp

@@ -31 +31 @@
 # include "VBoxAboutDlg.h"
 # include "VBoxGlobal.h"
+# include "UIConverter.h"
+# include "UIExtraDataManager.h"
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -105 +107 @@
     QString strAboutText =  tr("VirtualBox Graphical User Interface");
 #ifdef DEBUG
-    QString strRenderingInfo(" (%1)");
-    QString strRenderingMode("QImage");
-# ifdef VBOX_GUI_USE_QUARTZ2D
-    if (vboxGlobal().vmRenderMode() == Quartz2DMode)
-        strRenderingMode = "Quartz2D";
-# endif /* VBOX_GUI_USE_QUARTZ2D */
-    strAboutText += strRenderingInfo.arg(strRenderingMode);
+    strAboutText += QString(" (%1)").arg(gpConverter->toString(gEDataManager->renderMode(vboxGlobal().managedVMUuid())));
 #endif /* DEBUG */
 #ifdef VBOX_BLEEDING_EDGE

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -32 +32 @@
 #include "UIMessageCenter.h"
 #include "UIPopupCenter.h"
+#include "UIExtraDataDefs.h"
 #include "VBoxGlobal.h"
 

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -72 +72 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 template<> bool canConvert<RuntimeMenuHelpActionType>();
+template<> bool canConvert<RenderMode>();
 template<> bool canConvert<UIVisualStateType>();
 template<> bool canConvert<DetailsElementType>();
@@ -128 +129 @@
 template<> QString toInternalString(const RuntimeMenuHelpActionType &runtimeMenuHelpActionType);
 template<> RuntimeMenuHelpActionType fromInternalString<RuntimeMenuHelpActionType>(const QString &strRuntimeMenuHelpActionType);
+template<> QString toInternalString(const RenderMode &renderMode);
+template<> RenderMode fromInternalString<RenderMode>(const QString &strRenderMode);
 template<> QString toInternalString(const UIVisualStateType &visualStateType);
 template<> UIVisualStateType fromInternalString<UIVisualStateType>(const QString &strVisualStateType);

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

@@ -44 +44 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 template<> bool canConvert<RuntimeMenuHelpActionType>() { return true; }
+template<> bool canConvert<RenderMode>() { return true; }
 template<> bool canConvert<UIVisualStateType>() { return true; }
 template<> bool canConvert<DetailsElementType>() { return true; }
@@ -675 +676 @@
 }
 
+/* QString <= RenderMode: */
+template<> QString toInternalString(const RenderMode &renderMode)
+{
+    QString strResult;
+    switch (renderMode)
+    {
+        case RenderMode_QImage:   strResult = "QImage"; break;
+#ifdef VBOX_GUI_USE_QUARTZ2D
+        case RenderMode_Quartz2D: strResult = "Quartz2D"; break;
+#endif /* VBOX_GUI_USE_QUARTZ2D */
+        default:
+        {
+            AssertMsgFailed(("No text for render-mode=%d", renderMode));
+            break;
+        }
+    }
+    return strResult;
+}
+
+/* RenderMode <= QString: */
+template<> RenderMode fromInternalString<RenderMode>(const QString &strRenderMode)
+{
+    /* Here we have some fancy stuff allowing us
+     * to search through the keys using 'case-insensitive' rule: */
+    QStringList keys;   QList<RenderMode> values;
+    keys << "QImage";   values << RenderMode_QImage;
+#ifdef VBOX_GUI_USE_QUARTZ2D
+    keys << "Quartz2D"; values << RenderMode_Quartz2D;
+#endif /* VBOX_GUI_USE_QUARTZ2D */
+    /* Invalid mode for unknown words: */
+    if (!keys.contains(strRenderMode, Qt::CaseInsensitive))
+        return RenderMode_Invalid;
+    /* Corresponding mode for known words: */
+    return values.at(keys.indexOf(QRegExp(strRenderMode, Qt::CaseInsensitive)));
+}
+
 /* QString <= UIVisualStateType: */
 template<> QString toInternalString(const UIVisualStateType &visualStateType)

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

@@ -345 +345 @@
 enum RenderMode
 {
-      InvalidRenderMode
-    , QImageMode
+    RenderMode_Invalid,
+    RenderMode_QImage,
 #ifdef VBOX_GUI_USE_QUARTZ2D
-    , Quartz2DMode
+    RenderMode_Quartz2D
 #endif /* VBOX_GUI_USE_QUARTZ2D */
 };

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

@@ -303 +303 @@
 }
 
+RenderMode UIExtraDataManager::renderMode(const QString &strId) const
+{
+    RenderMode rm = gpConverter->fromInternalString<RenderMode>(extraDataString(GUI_RenderMode, strId));
+    printf("RenderMode=%d\n", (int)rm);
+    return rm;
+}
+
 bool UIExtraDataManager::isFirstRun(const QString &strId) const
 {

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

@@ -130 +130 @@
     /** Defines @a mode (basic/expert) for wizard of @a type. */
     void setModeForWizard(WizardType type, WizardMode mode);
+
+    /** Returns render-mode for machine with passed @a strId. */
+    RenderMode renderMode(const QString &strId) const;
 
     /** Returns whether this machine started for the first time. */

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

@@ -178 +178 @@
 // VBoxGlobal
 ////////////////////////////////////////////////////////////////////////////////
-
-/** @internal
- *
- *  Determines the rendering mode from the argument. Sets the appropriate
- *  default rendering mode if the argument is NULL.
- */
-static RenderMode vboxGetRenderMode (const char *aModeStr)
-{
-    RenderMode mode = InvalidRenderMode;
-
-#ifdef VBOX_GUI_USE_QIMAGE
-    mode = QImageMode;
-#else /* !VBOX_GUI_USE_QIMAGE */
-# error "Cannot determine the default render mode!"
-#endif /* !VBOX_GUI_USE_QIMAGE */
-
-    if (aModeStr)
-    {
-        if (0) ;
-#ifdef VBOX_GUI_USE_QIMAGE
-        else if (::strcmp(aModeStr, "image") == 0)
-            mode = QImageMode;
-#endif /* VBOX_GUI_USE_QIMAGE */
-#ifdef VBOX_GUI_USE_QUARTZ2D
-        else if (::strcmp(aModeStr, "quartz2d") == 0)
-            mode = Quartz2DMode;
-#endif /* VBOX_GUI_USE_QUARTZ2D */
-    }
-
-    return mode;
-}
 
 /* static */
@@ -4055 +4024 @@
     bool bForceFullscreen = false;
 
-    vm_render_mode_str = RTStrDup (virtualBox()
-            .GetExtraData (GUI_RenderMode).toAscii().constData());
-
 #ifdef Q_WS_X11
     mIsKWinManaged = X11IsWindowManagerKWin();
@@ -4112 +4078 @@
         {
             ++i;
-        }
-        else if (!::strcmp (arg, "-rmode") || !::strcmp (arg, "--rmode"))
-        {
-            if (++i < argc)
-                vm_render_mode_str = qApp->argv() [i];
         }
         else if (!::strcmp (arg, "--settingspw"))
@@ -4284 +4245 @@
     }
 
-    vm_render_mode = vboxGetRenderMode (vm_render_mode_str);
-
 #ifdef VBOX_WITH_DEBUGGER_GUI
     /* setup the debugger gui. */

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

@@ -33 +33 @@
 #include "UIDefs.h"
 #include "UIMediumDefs.h"
-#include "UIExtraDataDefs.h"
 #include "VBoxGlobalSettings.h"
 
@@ -127 +126 @@
     QList<QUrl> &argUrlList() { return m_ArgUrlList; }
 
-    RenderMode vmRenderMode() const { return vm_render_mode; }
-    const char *vmRenderModeStr() const { return vm_render_mode_str; }
     bool isKWinManaged() const { return mIsKWinManaged; }
 
@@ -438 +435 @@
     mutable QReadWriteLock m_mediumEnumeratorDtorRwLock;
 
-    RenderMode vm_render_mode;
-    const char * vm_render_mode_str;
     bool mIsKWinManaged;
 

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

@@ -20 +20 @@
 /* Local includes: */
 #include "UIActionPoolRuntime.h"
+#include "UIExtraDataDefs.h"
 #include "UIShortcutPool.h"
 #include "VBoxGlobal.h"

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

@@ -49 +49 @@
 #include "UIMachineViewSeamless.h"
 #include "UIMachineViewScale.h"
+#include "UIExtraDataManager.h"
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
@@ -410 +411 @@
 {
     /* Prepare frame-buffer depending on render-mode: */
-    switch (vboxGlobal().vmRenderMode())
+    RenderMode rm = gEDataManager->renderMode(vboxGlobal().managedVMUuid());
+    switch (rm)
     {
 #ifdef VBOX_GUI_USE_QIMAGE
-        case QImageMode:
+        case RenderMode_QImage:
         {
             UIFrameBuffer *pFrameBuffer = uisession()->frameBuffer(screenId());
@@ -448 +450 @@
 
 #ifdef VBOX_GUI_USE_QUARTZ2D
-        case Quartz2DMode:
+        case RenderMode_Quartz2D:
         {
             /* Indicate that we are doing all drawing stuff ourself: */
@@ -484 +486 @@
 
         default:
-            AssertReleaseMsgFailed(("Render mode must be valid: %d\n", vboxGlobal().vmRenderMode()));
-            LogRel(("Invalid render mode: %d\n", vboxGlobal().vmRenderMode()));
+            AssertReleaseMsgFailed(("Render mode must be valid: %d\n", rm));
+            LogRel(("Invalid render mode: %d\n", rm));
             qApp->exit(1);
             break;
@@ -904 +906 @@
     {
 # ifdef VBOX_GUI_USE_QUARTZ2D
-        if (vboxGlobal().vmRenderMode() == Quartz2DMode)
+        if (gEDataManager->renderMode(vboxGlobal().managedVMUuid()) == RenderMode_Quartz2D)
         {
             /* If the render mode is Quartz2D we could use the CGImageRef
@@ -1078 +1080 @@
 
 #ifdef VBOX_GUI_USE_QUARTZ2D
-    if (vboxGlobal().vmRenderMode() == Quartz2DMode && m_pFrameBuffer)
+    if (gEDataManager->renderMode(vboxGlobal().managedVMUuid()) == RenderMode_Quartz2D && m_pFrameBuffer)
     {
         m_pFrameBuffer->paintEvent(pPaintEvent);

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

@@ -20 +20 @@
 /* Local includes: */
 #include "UIActionPoolSelector.h"
+#include "UIExtraDataDefs.h"
 #include "UIShortcutPool.h"
 #include "UIDefs.h"

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp

@@ -27 +27 @@
 #include "UIGMachinePreview.h"
 #include "UIVirtualBoxEventHandler.h"
+#include "UIExtraDataDefs.h"
 #include "UIImageTools.h"
 #include "VBoxGlobal.h"

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp

@@ -27 +27 @@
 /* GUI includes: */
 #include "UIHostComboEditor.h"
+#include "UIExtraDataDefs.h"
+#include "UIIconPool.h"
+#include "QIToolButton.h"
 #include "VBoxGlobal.h"
-#include "QIToolButton.h"
-#include "UIIconPool.h"
 
 #ifdef Q_WS_WIN