Changeset 50907 in vbox for trunk/src/VBox

Timestamp:

Mar 27, 2014 3:00:16 PM (11 years ago)

Author:

vboxsync

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

93031

Message:

FE/Qt: Selector UI: VM item stuff: Integrate ConfigurationAccessLevel stuff (provided by r93030).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (1 diff)
• UIVMItem.cpp (modified) (2 diffs)
• UIVMItem.h (modified) (3 diffs)
• graphics/details/UIGDetailsElement.cpp (modified) (1 diff)
• graphics/details/UIGDetailsSet.cpp (modified) (3 diffs)
• graphics/details/UIGDetailsSet.h (modified) (4 diffs)

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

@@ -1721 +1721 @@
             return !m_pChooser->isGroupSavingInProgress() &&
                    items.size() == 1 &&
-                   pItem->reconfigurable();
+                   pItem->configurationAccessLevel() != ConfigurationAccessLevel_Null;
         }
         case UIActionIndexSelector_Simple_Machine_Clone:

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

@@ -257 +257 @@
         }
 
-        /* Should we allow reconfiguration for this item? */
-        m_fReconfigurable = m_machineState != KMachineState_Stuck &&
-                            VBoxGlobal::shouldWeAllowMachineReconfiguration(m_machine);
+        /* Determine configuration access level: */
+        m_configurationAccessLevel = ::configurationAccessLevel(m_sessionState, m_machineState);
+        /* Also take restrictions into account: */
+        if (   m_configurationAccessLevel != ConfigurationAccessLevel_Null
+            && !VBoxGlobal::shouldWeAllowMachineReconfiguration(m_machine))
+            m_configurationAccessLevel = ConfigurationAccessLevel_Null;
 
         /* Should we show details for this item? */
@@ -287 +290 @@
 #endif
 
-        /* Should we allow reconfiguration for this item? */
-        m_fReconfigurable = false;
+        /* Set configuration access level to NULL: */
+        m_configurationAccessLevel = ConfigurationAccessLevel_Null;
 
         /* Should we show details for this item? */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h

@@ -24 +24 @@
 #include <QMimeData>
 
+/* GUI includes: */
+#include "UISettingsDefs.h"
+
 /* COM includes: */
 #include "COMEnums.h"
 #include "CVirtualBoxErrorInfo.h"
 #include "CMachine.h"
+
+/* Using declarations: */
+using namespace UISettingsDefs;
 
 class UIVMItem
@@ -65 +71 @@
     bool switchTo();
 
-    bool reconfigurable() const { return m_fReconfigurable; }
     bool hasDetails() const { return m_fHasDetails; }
+
+    /** Returns configuration access level. */
+    ConfigurationAccessLevel configurationAccessLevel() const { return m_configurationAccessLevel; }
 
     static bool isItemEditable(UIVMItem *pItem);
@@ -98 +106 @@
     ULONG m_pid;
 
-    bool m_fReconfigurable;
     bool m_fHasDetails;
+
+    /** Holds configuration access level. */
+    ConfigurationAccessLevel m_configurationAccessLevel;
 };
 

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

@@ -621 +621 @@
     QPoint point = pEvent->pos().toPoint();
     bool fNameHovered = QRect(QPoint(iElementNameX, iElementNameY), m_nameSize).contains(point);
-    if (m_pSet->elementNameHoverable() && m_fNameHovered != fNameHovered)
+    if (   m_pSet->configurationAccessLevel() != ConfigurationAccessLevel_Null
+        && m_fNameHovered != fNameHovered)
     {
         m_fNameHovered = fNameHovered;

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

@@ -33 +33 @@
 UIGDetailsSet::UIGDetailsSet(UIGDetailsItem *pParent)
     : UIGDetailsItem(pParent)
-    , m_fElementNameHoverable(false)
+    , m_pMachineItem(0)
     , m_fHasDetails(false)
+    , m_configurationAccessLevel(ConfigurationAccessLevel_Null)
     , m_fFullSet(true)
     , m_pBuildStep(0)
@@ -61 +62 @@
 {
     /* Remember passed arguments: */
-    m_machine = pMachineItem->machine();
-    m_fElementNameHoverable = pMachineItem->reconfigurable();
-    m_fHasDetails = pMachineItem->hasDetails();
+    m_pMachineItem = pMachineItem;
+    m_machine = m_pMachineItem->machine();
+    m_fHasDetails = m_pMachineItem->hasDetails();
     m_fFullSet = fFullSet;
     m_settings = settings;
@@ -555 +556 @@
         return;
 
+    /* Recache properties: */
+    m_configurationAccessLevel = m_pMachineItem->configurationAccessLevel();
+
     /* Cleanup build-step: */
     delete m_pBuildStep;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.h

@@ -23 +23 @@
 #include "UIGDetailsItem.h"
 #include "UIDefs.h"
+#include "UISettingsDefs.h"
 
 /* COM includes: */
@@ -30 +31 @@
 /* Forward declarations: */
 class UIVMItem;
+
+/* Using declarations: */
+using namespace UISettingsDefs;
 
 /* Details set
@@ -52 +56 @@
     /* API: Machine stuff: */
     const CMachine& machine() const { return m_machine; }
-    bool elementNameHoverable() const { return m_fElementNameHoverable; }
     bool hasDetails() const { return m_fHasDetails; }
+
+    /** Returns configuration access level. */
+    ConfigurationAccessLevel configurationAccessLevel() const { return m_configurationAccessLevel; }
 
 private slots:
@@ -101 +107 @@
     UIGDetailsElement* createElement(DetailsElementType elementType, bool fOpen);
 
+    /** Machine-item this set built for. */
+    UIVMItem *m_pMachineItem;
+
     /* Main variables: */
     CMachine m_machine;
     QMap<int, UIGDetailsItem*> m_elements;
-    bool m_fElementNameHoverable;
     bool m_fHasDetails;
+
+    /** Holds configuration access level. */
+    ConfigurationAccessLevel m_configurationAccessLevel;
 
     /* Prepare variables: */