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

Timestamp:

Jul 30, 2013 2:54:39 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Adding extra-data flag 'GUI/RestrictedVisualStates' to restrict unwanted visual-representation states.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (2 diffs)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (2 diffs)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIKeyboardHandler.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (5 diffs)
• runtime/UIMachine.h (modified) (3 diffs)
• runtime/UIMachineDefs.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UIMachineLogic.h (modified) (1 diff)
• runtime/UIMachineMenuBar.cpp (modified) (3 diffs)
• runtime/UIMachineMenuBar.h (modified) (3 diffs)
• runtime/UIMachineWindow.h (modified) (1 diff)
• runtime/UIMouseHandler.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (1 diff)
• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

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

@@ -57 +57 @@
 template<> bool canConvert<StorageSlot>();
 template<> bool canConvert<RuntimeMenuType>();
+template<> bool canConvert<UIVisualStateType>();
 template<> bool canConvert<DetailsElementType>();
 template<> bool canConvert<GlobalSettingsPageType>();
@@ -91 +92 @@
 template<> QString toInternalString(const RuntimeMenuType &runtimeMenuType);
 template<> RuntimeMenuType fromInternalString<RuntimeMenuType>(const QString &strRuntimeMenuType);
+template<> QString toInternalString(const UIVisualStateType &visualStateType);
+template<> UIVisualStateType fromInternalString<UIVisualStateType>(const QString &strVisualStateType);
 template<> QString toString(const DetailsElementType &detailsElementType);
 template<> DetailsElementType fromString<DetailsElementType>(const QString &strDetailsElementType);

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

@@ -33 +33 @@
 template<> bool canConvert<StorageSlot>() { return true; }
 template<> bool canConvert<RuntimeMenuType>() { return true; }
+template<> bool canConvert<UIVisualStateType>() { return true; }
 template<> bool canConvert<DetailsElementType>() { return true; }
 template<> bool canConvert<GlobalSettingsPageType>() { return true; }
@@ -305 +306 @@
     /* Corresponding type for known words: */
     return values.at(keys.indexOf(QRegExp(strRuntimeMenuType, Qt::CaseInsensitive)));
+}
+
+/* QString <= UIVisualStateType: */
+template<> QString toInternalString(const UIVisualStateType &visualStateType)
+{
+    QString strResult;
+    switch (visualStateType)
+    {
+        case UIVisualStateType_Normal:     strResult = "Normal"; break;
+        case UIVisualStateType_Fullscreen: strResult = "Fullscreen"; break;
+        case UIVisualStateType_Seamless:   strResult = "Seamless"; break;
+        case UIVisualStateType_Scale:      strResult = "Scale"; break;
+        case UIVisualStateType_All:        strResult = "All"; break;
+        default:
+        {
+            AssertMsgFailed(("No text for visual state type=%d", visualStateType));
+            break;
+        }
+    }
+    return strResult;
+}
+
+/* UIVisualStateType <= QString: */
+template<> UIVisualStateType fromInternalString<UIVisualStateType>(const QString &strVisualStateType)
+{
+    /* Here we have some fancy stuff allowing us
+     * to search through the keys using 'case-insensitive' rule: */
+    QStringList keys;     QList<UIVisualStateType> values;
+    keys << "Normal";     values << UIVisualStateType_Normal;
+    keys << "Fullscreen"; values << UIVisualStateType_Fullscreen;
+    keys << "Seamless";   values << UIVisualStateType_Seamless;
+    keys << "Scale";      values << UIVisualStateType_Scale;
+    keys << "All";        values << UIVisualStateType_All;
+    /* Invalid type for unknown words: */
+    if (!keys.contains(strVisualStateType, Qt::CaseInsensitive))
+        return UIVisualStateType_Invalid;
+    /* Corresponding type for known words: */
+    return values.at(keys.indexOf(QRegExp(strVisualStateType, Qt::CaseInsensitive)));
 }
 

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

@@ -53 +53 @@
 /* Machine-window definitions: */
 const char* UIDefs::GUI_RestrictedRuntimeMenus = "GUI/RestrictedRuntimeMenus";
+const char* UIDefs::GUI_RestrictedVisualStates = "GUI/RestrictedVisualStates";
 const char* UIDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts";
 const char* UIDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition";

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

@@ -125 +125 @@
     /* Machine-window declarations: */
     extern const char* GUI_RestrictedRuntimeMenus;
+    extern const char* GUI_RestrictedVisualStates;
     extern const char* GUI_Input_MachineShortcuts;
     extern const char* GUI_LastNormalWindowPosition;
@@ -240 +241 @@
 };
 
+/* Runtime UI visual-state types: */
+enum UIVisualStateType
+{
+    UIVisualStateType_Invalid    = 0,
+    UIVisualStateType_Normal     = RT_BIT(0),
+    UIVisualStateType_Fullscreen = RT_BIT(1),
+    UIVisualStateType_Seamless   = RT_BIT(2),
+    UIVisualStateType_Scale      = RT_BIT(3),
+    UIVisualStateType_All        = 0xFF
+};
+
 /* Details element type: */
 enum DetailsElementType

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

@@ -3779 +3779 @@
         if (value != RuntimeMenuType_Invalid)
             result = static_cast<RuntimeMenuType>(result | value);
+    }
+    /* Return result: */
+    return result;
+}
+
+/* static */
+UIVisualStateType VBoxGlobal::restrictedVisualStateTypes(CMachine &machine)
+{
+    /* Prepare result: */
+    UIVisualStateType result = UIVisualStateType_Invalid;
+    /* Load restricted visual-state-types: */
+    QString strList(machine.GetExtraData(GUI_RestrictedVisualStates));
+    QStringList list = strList.split(',');
+    /* Convert list into appropriate values: */
+    foreach (const QString &strValue, list)
+    {
+        UIVisualStateType value = gpConverter->fromInternalString<UIVisualStateType>(strValue);
+        if (value != UIVisualStateType_Invalid)
+            result = static_cast<UIVisualStateType>(result | value);
     }
     /* Return result: */

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

@@ -375 +375 @@
     static bool shouldWeAllowSnapshotOperations(CMachine &machine, bool fIncludingSanityCheck = true);
     static RuntimeMenuType restrictedRuntimeMenuTypes(CMachine &machine);
+    static UIVisualStateType restrictedVisualStateTypes(CMachine &machine);
     static QList<IndicatorType> restrictedStatusBarIndicators(CMachine &machine);
     static QList<MachineCloseAction> restrictedMachineCloseActions(CMachine &machine);

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

@@ -25 +25 @@
 
 /* GUI includes: */
-#include "UIMachineDefs.h"
+#include "UIDefs.h"
 #ifdef Q_WS_MAC
 # include <CoreFoundation/CFBase.h>

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

@@ -370 +370 @@
     , m_pSession(0)
     , m_pVisualState(0)
+    , m_allowedVisualStateTypes(UIVisualStateType_Invalid)
 {
     /* Store self pointer: */
@@ -505 +506 @@
     /* Load machine settings: */
     CMachine machine = uisession()->session().GetMachine();
+    UIVisualStateType restrictedVisualStateTypes = VBoxGlobal::restrictedVisualStateTypes(machine);
+    m_allowedVisualStateTypes = static_cast<UIVisualStateType>(UIVisualStateType_All ^ restrictedVisualStateTypes);
 
     /* Load extra-data settings: */
@@ -520 +523 @@
             /* Test 'scale' flag: */
             QString strScaleSettings = machine.GetExtraData(GUI_Scale);
-            if (strScaleSettings == "on")
+            if (strScaleSettings == "on" && isVisualStateAllowedScale())
             {
                 fIsSomeExtendedModeChosen = true;
@@ -532 +535 @@
             /* Test 'seamless' flag: */
             QString strSeamlessSettings = machine.GetExtraData(GUI_Seamless);
-            if (strSeamlessSettings == "on")
+            if (strSeamlessSettings == "on" && isVisualStateAllowedSeamless())
             {
                 fIsSomeExtendedModeChosen = true;
@@ -545 +548 @@
             /* Test 'fullscreen' flag: */
             QString strFullscreenSettings = machine.GetExtraData(GUI_Fullscreen);
-            if (strFullscreenSettings == "on")
+            if (strFullscreenSettings == "on" && isVisualStateAllowedFullscreen())
             {
                 fIsSomeExtendedModeChosen = true;

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

@@ -23 +23 @@
 #include <QObject>
 
-/* GUI includes:  */
+/* GUI includes: */
+#include "UIDefs.h"
 #include "UIMachineDefs.h"
 
@@ -50 +51 @@
     UISession *uisession() const { return m_pSession; }
 
+    /* API: Visual-state stuff: */
+    bool isVisualStateAllowedFullscreen() const { return m_allowedVisualStateTypes & UIVisualStateType_Fullscreen; }
+    bool isVisualStateAllowedSeamless() const { return m_allowedVisualStateTypes & UIVisualStateType_Seamless; }
+    bool isVisualStateAllowedScale() const { return m_allowedVisualStateTypes & UIVisualStateType_Scale; }
+
 private slots:
 
@@ -75 +81 @@
     UISession *m_pSession;
     UIVisualState *m_pVisualState;
+    UIVisualStateType m_allowedVisualStateTypes;
 
     /* Friend classes: */

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

@@ -22 +22 @@
 /* Global includes */
 #include <iprt/cdefs.h>
-
-/* Machine states enum: */
-enum UIVisualStateType
-{
-    UIVisualStateType_Normal,
-    UIVisualStateType_Fullscreen,
-    UIVisualStateType_Seamless,
-    UIVisualStateType_Scale
-};
 
 /* Machine elements enum: */

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

@@ -448 +448 @@
     /* Update action states: */
     gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->setEnabled(uisession()->isGuestSupportsGraphics());
-    gActionPool->action(UIActionIndexRuntime_Toggle_Seamless)->setEnabled(uisession()->isGuestSupportsSeamless());
+    gActionPool->action(UIActionIndexRuntime_Toggle_Seamless)->setEnabled(uisession()->isVisualStateAllowedSeamless() && uisession()->isGuestSupportsSeamless());
 }
 

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

@@ -21 +21 @@
 
 /* GUI includes: */
-#include "UIMachineDefs.h"
+#include "UIDefs.h"
 #include <QIWithRetranslateUI.h>
 #ifdef VBOX_WITH_DEBUGGER_GUI

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

@@ -34 +34 @@
 #include "UINetworkManager.h"
 #include "VBoxGlobal.h"
+#include "UISession.h"
 
 /* COM includes: */
@@ -99 +100 @@
 };
 
-UIMachineMenuBar::UIMachineMenuBar(const CMachine &machine)
+UIMachineMenuBar::UIMachineMenuBar(UISession *pSession, const CMachine &machine)
     /* On the Mac we add some items only the first time, cause otherwise they
      * will be merged more than once to the application menu by Qt. */
-    : m_machine(machine)
+    : m_pSession(pSession)
+    , m_machine(machine)
 {
 }
@@ -226 +228 @@
 
     /* View submenu: */
-    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen));
-    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless));
-    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Scale));
-    pMenu->addSeparator();
+    bool fIsAllowedFullscreen = uisession()->isVisualStateAllowedFullscreen();
+    bool fIsAllowedSeamless = uisession()->isVisualStateAllowedSeamless();
+    bool fIsAllowedScale = uisession()->isVisualStateAllowedScale();
+    gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen)->setEnabled(fIsAllowedFullscreen);
+    if (fIsAllowedFullscreen)
+        pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen));
+    gActionPool->action(UIActionIndexRuntime_Toggle_Seamless)->setEnabled(fIsAllowedSeamless);
+    if (fIsAllowedSeamless)
+        pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless));
+    gActionPool->action(UIActionIndexRuntime_Toggle_Scale)->setEnabled(fIsAllowedScale);
+    if (fIsAllowedScale)
+        pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Scale));
+    if (fIsAllowedFullscreen || fIsAllowedSeamless || fIsAllowedScale)
+        pMenu->addSeparator();
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize));
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_AdjustWindow));

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

@@ -33 +33 @@
 class QMenu;
 class QMenuBar;
+class UISession;
 
 class UIMachineMenuBar
@@ -38 +39 @@
 public:
 
-    UIMachineMenuBar(const CMachine &machine);
+    UIMachineMenuBar(UISession *pSession, const CMachine &machine);
 
     QMenu* createMenu(RuntimeMenuType fOptions = RuntimeMenuType_All);
@@ -54 +55 @@
     void prepareMenuHelp(QMenu *pMenu);
 
+    /* Helper: UI session stuff: */
+    UISession* uisession() const { return m_pSession; }
+
+    /* Variables: */
+    UISession *m_pSession;
     CMachine m_machine;
 };

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

@@ -25 +25 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
-#include "UIMachineDefs.h"
+#include "UIDefs.h"
 
 /* COM includes: */

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

@@ -27 +27 @@
 
 /* GUI includes: */
-#include "UIMachineDefs.h"
+#include "UIDefs.h"
 
 /* Forward declarations: */

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

@@ -457 +457 @@
 }
 
+bool UISession::isVisualStateAllowedFullscreen() const
+{
+    return m_pMachine->isVisualStateAllowedFullscreen();
+}
+
+bool UISession::isVisualStateAllowedSeamless() const
+{
+    return m_pMachine->isVisualStateAllowedSeamless();
+}
+
+bool UISession::isVisualStateAllowedScale() const
+{
+    return m_pMachine->isVisualStateAllowedScale();
+}
+
 bool UISession::setPause(bool fOn)
 {
@@ -904 +919 @@
 void UISession::prepareMenuPool()
 {
-    m_pMenuPool = new UIMachineMenuBar(session().GetMachine());
+    m_pMenuPool = new UIMachineMenuBar(this, session().GetMachine());
 }
 

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

@@ -103 +103 @@
     QCursor cursor() const { return m_cursor; }
 
+    /* API: Visual-state stuff: */
+    bool isVisualStateAllowedFullscreen() const;
+    bool isVisualStateAllowedSeamless() const;
+    bool isVisualStateAllowedScale() const;
+
     bool isSaved() const { return machineState() == KMachineState_Saved; }
     bool isTurnedOff() const { return machineState() == KMachineState_PoweredOff ||

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -29 +29 @@
 #include "UIMachineLogicFullscreen.h"
 #include "UIMachineWindowFullscreen.h"
+#include "UIMachineDefs.h"
 #include "UIMiniToolBar.h"
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -31 +31 @@
 #include "UIMachineViewSeamless.h"
 #ifndef Q_WS_MAC
+# include "UIMachineDefs.h"
 # include "UIMiniToolBar.h"
 #endif /* !Q_WS_MAC */