Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp (revision 31239) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp (revision 31240) @@ -1252,5 +1252,5 @@ 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); Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp (revision 31239) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp (revision 31240) @@ -149,7 +149,13 @@ //////////////////////////////////////////////////////////////////////////////// +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,5 +180,5 @@ "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,5 +214,5 @@ 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,8 +220,8 @@ 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,5 +252,5 @@ needsResort = name != m_strName; m_strName = name; - m_state = KMachineState_Null; + m_machineState = KMachineState_Null; m_sessionState = KSessionState_Null; m_lastStateChange = QDateTime::currentDateTime(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h (revision 31239) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h (revision 31240) @@ -40,6 +40,8 @@ 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,5 +52,5 @@ 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,6 +74,6 @@ QString m_strName; QString m_strSnapshotName; - KMachineState m_state; QDateTime m_lastStateChange; + KMachineState m_machineState; KSessionState m_sessionState; QString m_strOSTypeId; Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp (revision 31239) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp (revision 31240) @@ -187,5 +187,5 @@ .arg(item->name()) .arg(item->snapshotName()) - .arg(item->sessionStateName()); + .arg(item->machineStateName()); break; } @@ -201,15 +201,15 @@ 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,4 +218,9 @@ f.setItalic(true); v = f; + break; + } + case SessionStateDisplayRole: + { + v = m_VMItemList.at(aIndex.row())->sessionStateName(); break; } @@ -394,6 +399,6 @@ 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,8 +414,9 @@ /* 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,7 +474,7 @@ const QFont shotFont = index.data(UIVMItemModel::SnapShotFontRole).value(); - const QString state = index.data(UIVMItemModel::SessionStateDisplayRole).toString(); - const QFont stateFont = index.data(UIVMItemModel::SessionStateFontRole).value(); - const QPixmap stateIcon = index.data(UIVMItemModel::SessionStateDecorationRole).value().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(); + const QPixmap stateIcon = index.data(UIVMItemModel::MachineStateDecorationRole).value().pixmap(QSize(16, 16), iconMode(option.state), iconState(option.state)); /* Get the sizes for all items */ @@ -476,6 +482,6 @@ 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,14 +601,14 @@ 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 icon = aIndex.data(UIVMItemModel::MachineStateDecorationRole).value(); return QRect(QPoint(0, 0), icon.actualSize(QSize(16, 16), iconMode(aOption.state), iconState(aOption.state))); break; @@ -617,5 +623,5 @@ { 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 */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.h (revision 31239) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.h (revision 31240) @@ -35,7 +35,8 @@ enum { SnapShotDisplayRole = Qt::UserRole, SnapShotFontRole, + MachineStateDisplayRole, + MachineStateDecorationRole, + MachineStateFontRole, SessionStateDisplayRole, - SessionStateDecorationRole, - SessionStateFontRole, OSTypeIdRole, UIVMItemPtrRole }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp (revision 31239) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp (revision 31240) @@ -724,9 +724,9 @@ } - 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,5 +1190,5 @@ CMachine m = item->machine(); - KMachineState state = item->state(); + KMachineState state = item->machineState(); bool running = item->sessionState() != KSessionState_Unlocked; bool modifyEnabled = !running && state != KMachineState_Saved;