Changeset 31240 in vbox

Timestamp:

Jul 30, 2010 12:07:44 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: cleaned up session/machine state mess; added session state to the cache key

Location:

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

Files:

• UIVMDesktop.cpp (modified) (1 diff)
• UIVMItem.cpp (modified) (5 diffs)
• UIVMItem.h (modified) (3 diffs)
• UIVMListView.cpp (modified) (9 diffs)
• UIVMListView.h (modified) (1 diff)
• VBoxSelectorWnd.cpp (modified) (2 diffs)

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

@@ -1252 +1252 @@
     if (m_pVMItem)
     {
-        bool saved = m_pVMItem->state() == KMachineState_Saved;
+        bool saved = m_pVMItem->machineState() == KMachineState_Saved;
         bool busy = m_pVMItem->sessionState() != KSessionState_Unlocked;
         m_pEditBtn->setEnabled(!saved && !busy);

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

@@ -149 +149 @@
 ////////////////////////////////////////////////////////////////////////////////
 
+QString UIVMItem::machineStateName() const
+{
+    return m_fAccessible ? vboxGlobal().toString(m_machineState) :
+           QApplication::translate("UIVMListView", "Inaccessible");
+}
+
 QString UIVMItem::sessionStateName() const
 {
-    return m_fAccessible ? vboxGlobal().toString(m_state) :
+    return m_fAccessible ? vboxGlobal().toString(m_sessionState) :
            QApplication::translate("UIVMListView", "Inaccessible");
 }
@@ -174 +180 @@
             "VM tooltip (name, last state change, session state)")
             .arg(toolTip)
-            .arg(vboxGlobal().toString(m_state))
+            .arg(vboxGlobal().toString(m_machineState))
             .arg(dateTime)
             .arg(vboxGlobal().toString(m_sessionState));
@@ -208 +214 @@
         m_strName = name;
 
-        m_state = m_machine.GetState();
+        m_machineState = m_machine.GetState();
         m_lastStateChange.setTime_t(m_machine.GetLastStateChange() / 1000);
         m_sessionState = m_machine.GetSessionState();
@@ -214 +220 @@
         m_cSnaphot = m_machine.GetSnapshotCount();
 
-        if (   m_state == KMachineState_PoweredOff
-            || m_state == KMachineState_Saved
-            || m_state == KMachineState_Teleported
-            || m_state == KMachineState_Aborted
+        if (   m_machineState == KMachineState_PoweredOff
+            || m_machineState == KMachineState_Saved
+            || m_machineState == KMachineState_Teleported
+            || m_machineState == KMachineState_Aborted
            )
         {
@@ -246 +252 @@
         needsResort = name != m_strName;
         m_strName = name;
-        m_state = KMachineState_Null;
+        m_machineState = KMachineState_Null;
         m_sessionState = KSessionState_Null;
         m_lastStateChange = QDateTime::currentDateTime();

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

@@ -40 +40 @@
     QString id() const { return m_strId; }
 
+    QString machineStateName() const;
+    QIcon machineStateIcon() const { return m_fAccessible ? vboxGlobal().toIcon(m_machineState) : QPixmap(":/state_aborted_16px.png"); }
+
     QString sessionStateName() const;
-    QIcon sessionStateIcon() const { return m_fAccessible ? vboxGlobal().toIcon(m_state) : QPixmap(":/state_aborted_16px.png"); }
 
     QString snapshotName() const { return m_strSnapshotName; }
@@ -50 +52 @@
     bool accessible() const { return m_fAccessible; }
     const CVirtualBoxErrorInfo &accessError() const { return m_accessError; }
-    KMachineState state() const { return m_state; }
+    KMachineState machineState() const { return m_machineState; }
     KSessionState sessionState() const { return m_sessionState; }
 
@@ -72 +74 @@
     QString m_strName;
     QString m_strSnapshotName;
-    KMachineState m_state;
     QDateTime m_lastStateChange;
+    KMachineState m_machineState;
     KSessionState m_sessionState;
     QString m_strOSTypeId;

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

@@ -187 +187 @@
                          .arg(item->name())
                          .arg(item->snapshotName())
-                         .arg(item->sessionStateName());
+                         .arg(item->machineStateName());
             break;
         }
@@ -201 +201 @@
             break;
         }
-        case SessionStateDisplayRole:
-        {
-            v = m_VMItemList.at(aIndex.row())->sessionStateName();
-            break;
-        }
-        case SessionStateDecorationRole:
-        {
-            v = m_VMItemList.at(aIndex.row())->sessionStateIcon();
-            break;
-        }
-        case SessionStateFontRole:
+        case MachineStateDisplayRole:
+        {
+            v = m_VMItemList.at(aIndex.row())->machineStateName();
+            break;
+        }
+        case MachineStateDecorationRole:
+        {
+            v = m_VMItemList.at(aIndex.row())->machineStateIcon();
+            break;
+        }
+        case MachineStateFontRole:
         {
             QFont f = qApp->font();
@@ -218 +218 @@
                 f.setItalic(true);
             v = f;
+            break;
+        }
+        case SessionStateDisplayRole:
+        {
+            v = m_VMItemList.at(aIndex.row())->sessionStateName();
             break;
         }
@@ -394 +399 @@
     QRect vmNameRT = rect(aOption, aIndex, Qt::DisplayRole);
     QRect shotRT = rect(aOption, aIndex, UIVMItemModel::SnapShotDisplayRole);
-    QRect stateIconRT = rect(aOption, aIndex, UIVMItemModel::SessionStateDecorationRole);
-    QRect stateRT = rect(aOption, aIndex, UIVMItemModel::SessionStateDisplayRole);
+    QRect stateIconRT = rect(aOption, aIndex, UIVMItemModel::MachineStateDecorationRole);
+    QRect stateRT = rect(aOption, aIndex, UIVMItemModel::MachineStateDisplayRole);
     /* Calculate the position for every item */
     calcLayout(aIndex, &osTypeRT, &vmNameRT, &shotRT, &stateIconRT, &stateRT);
@@ -409 +414 @@
     /* Generate the key used in the pixmap cache. Needs to be composed with all
      * values which might be changed. */
-    QString key = QString("vbox:%1:%2:%3:%4:%5:%6")
+    QString key = QString("vbox:%1:%2:%3:%4:%5:%6:%7")
         .arg(index.data(Qt::DisplayRole).toString())
         .arg(index.data(UIVMItemModel::OSTypeIdRole).toString())
         .arg(index.data(UIVMItemModel::SnapShotDisplayRole).toString())
+        .arg(index.data(UIVMItemModel::MachineStateDisplayRole).toString())
         .arg(index.data(UIVMItemModel::SessionStateDisplayRole).toString())
         .arg(option.state)
@@ -468 +474 @@
     const QFont shotFont = index.data(UIVMItemModel::SnapShotFontRole).value<QFont>();
 
-    const QString state = index.data(UIVMItemModel::SessionStateDisplayRole).toString();
-    const QFont stateFont = index.data(UIVMItemModel::SessionStateFontRole).value<QFont>();
-    const QPixmap stateIcon = index.data(UIVMItemModel::SessionStateDecorationRole).value<QIcon>().pixmap(QSize(16, 16), iconMode(option.state), iconState(option.state));
+    const QString state = index.data(UIVMItemModel::MachineStateDisplayRole).toString();
+    const QFont stateFont = index.data(UIVMItemModel::MachineStateFontRole).value<QFont>();
+    const QPixmap stateIcon = index.data(UIVMItemModel::MachineStateDecorationRole).value<QIcon>().pixmap(QSize(16, 16), iconMode(option.state), iconState(option.state));
 
     /* Get the sizes for all items */
@@ -476 +482 @@
     QRect vmNameRT = rect(option, index, Qt::DisplayRole);
     QRect shotRT = rect(option, index, UIVMItemModel::SnapShotDisplayRole);
-    QRect stateIconRT = rect(option, index, UIVMItemModel::SessionStateDecorationRole);
-    QRect stateRT = rect(option, index, UIVMItemModel::SessionStateDisplayRole);
+    QRect stateIconRT = rect(option, index, UIVMItemModel::MachineStateDecorationRole);
+    QRect stateRT = rect(option, index, UIVMItemModel::MachineStateDisplayRole);
 
     /* Calculate the positions for all items */
@@ -595 +601 @@
                 break;
             }
-        case UIVMItemModel::SessionStateDisplayRole:
+        case UIVMItemModel::MachineStateDisplayRole:
             {
-                QString text = aIndex.data(UIVMItemModel::SessionStateDisplayRole).toString();
-                QFontMetrics fm(fontMetric(aIndex, UIVMItemModel::SessionStateFontRole));
+                QString text = aIndex.data(UIVMItemModel::MachineStateDisplayRole).toString();
+                QFontMetrics fm(fontMetric(aIndex, UIVMItemModel::MachineStateFontRole));
                 return QRect(QPoint(0, 0), fm.size(0, text));
                 break;
             }
-        case UIVMItemModel::SessionStateDecorationRole:
+        case UIVMItemModel::MachineStateDecorationRole:
             {
-                QIcon icon = aIndex.data(UIVMItemModel::SessionStateDecorationRole).value<QIcon>();
+                QIcon icon = aIndex.data(UIVMItemModel::MachineStateDecorationRole).value<QIcon>();
                 return QRect(QPoint(0, 0), icon.actualSize(QSize(16, 16), iconMode(aOption.state), iconState(aOption.state)));
                 break;
@@ -617 +623 @@
 {
     const int nameSpaceWidth = fontMetric(aIndex, Qt::FontRole).width(' ');
-    const int stateSpaceWidth = fontMetric(aIndex, UIVMItemModel::SessionStateFontRole).width(' ');
+    const int stateSpaceWidth = fontMetric(aIndex, UIVMItemModel::MachineStateFontRole).width(' ');
     /* Really basic layout managment.
      * First layout as usual */

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

@@ -35 +35 @@
     enum { SnapShotDisplayRole = Qt::UserRole,
            SnapShotFontRole,
+           MachineStateDisplayRole,
+           MachineStateDecorationRole,
+           MachineStateFontRole,
            SessionStateDisplayRole,
-           SessionStateDecorationRole,
-           SessionStateFontRole,
            OSTypeIdRole,
            UIVMItemPtrRole };

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

@@ -724 +724 @@
     }
 
-    AssertMsg (   item->state() == KMachineState_PoweredOff
-               || item->state() == KMachineState_Saved
-               || item->state() == KMachineState_Teleported
-               || item->state() == KMachineState_Aborted
-               , ("Machine must be PoweredOff/Saved/Aborted (%d)", item->state()));
+    AssertMsg (   item->machineState() == KMachineState_PoweredOff
+               || item->machineState() == KMachineState_Saved
+               || item->machineState() == KMachineState_Teleported
+               || item->machineState() == KMachineState_Aborted
+               , ("Machine must be PoweredOff/Saved/Aborted (%d)", item->machineState()));
 
     QString id = item->id();
@@ -1190 +1190 @@
         CMachine m = item->machine();
 
-        KMachineState state = item->state();
+        KMachineState state = item->machineState();
         bool running = item->sessionState() != KSessionState_Unlocked;
         bool modifyEnabled = !running && state != KMachineState_Saved;