Changeset 1068 in vbox for trunk

Timestamp:

Feb 26, 2007 8:50:40 PM (18 years ago)

Author:

vboxsync

Message:

1765: Indicate that a VM has snapshots

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMListBox.h (modified) (4 diffs)
• src/VBoxSelectorWnd.cpp (modified) (18 diffs)
• src/VBoxVMListBox.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMListBox.h

@@ -58 +58 @@
     QFont nameFont() const { return mNameFont; }
 
+    QFont shotFont() const { return mShotFont; }
+
     QFont stateFont (CEnums::SessionState aS) const
     {
@@ -81 +83 @@
     CVirtualBox mVBox;
     QFont mNameFont;
+    QFont mShotFont;
     QFont mStateBusyFont;
     int mMargin;
@@ -121 +124 @@
     int height (const QListBox *) const;
     int width (const QListBox *) const;
-    
+
     bool accessible() const { return mAccessible; }
     const CVirtualBoxErrorInfo &accessError() const { return mAccessError; }
@@ -137 +140 @@
     QUuid mId;
     QString mSettingsFile;
-    
+
     bool mAccessible;
     CVirtualBoxErrorInfo mAccessError;
-    
+
     QString mName;
+    QString mSnapshotName;
     CEnums::MachineState mState;
     QDateTime mLastStateChange;

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

@@ -70 +70 @@
 
     void languageChange();
-    
+
     void setDetailsText (const QString &aText)
     {
@@ -83 +83 @@
         raiseWidget (1);
     }
-    
+
     void setEmpty()
     {
@@ -95 +95 @@
         return connect (mDetailsText, aSignal, aReceiver, aMember);
     }
-    
+
 private:
 
@@ -117 +117 @@
 {
     Assert (mRefreshAction);
-    
+
     /* create normal details page */
-    
+
     mDetailsText = new QTextBrowser (mErrBox);
     mDetailsText->setFocusPolicy (QWidget::StrongFocus);
@@ -133 +133 @@
 {
     /* create inaccessible details page */
-    
+
     if (mErrBox)
         return;
@@ -141 +141 @@
     QVBoxLayout *layout = new QVBoxLayout (mErrBox);
     layout->setSpacing (10);
-    
+
     mErrLabel = new QLabel (mErrBox);
     mErrLabel->setAlignment (WordBreak);
@@ -156 +156 @@
         mRefreshButton = new QToolButton (mErrBox);
         mRefreshButton->setFocusPolicy (QWidget::StrongFocus);
-    
+
         QHBoxLayout *hLayout = new QHBoxLayout (layout);
         hLayout->addItem (new QSpacerItem (0, 0, QSizePolicy::Expanding,
                                                  QSizePolicy::Minimum));
         hLayout->add (mRefreshButton);
-        
+
         connect (mRefreshButton, SIGNAL (clicked()),
                  mRefreshAction, SIGNAL (activated()));
@@ -168 +168 @@
     layout->addItem (new QSpacerItem (0, 0, QSizePolicy::Minimum,
                                             QSizePolicy::Expanding));
-    
+
     addWidget (mErrBox, 1);
-    
-    languageChange();    
+
+    languageChange();
 }
 
@@ -259 +259 @@
     vmRefreshAction->setIconSet (VBoxGlobal::iconSet (
         "refresh_16px.png", "refresh_disabled_16px.png"));
-    
+
     helpContentsAction = new QAction (this, "helpContentsAction");
     helpContentsAction->setIconSet (VBoxGlobal::iconSet ("help_16px.png"));
@@ -353 +353 @@
 
     menuBar()->insertItem (QString::null, helpMenu, 3);
-    
+
     languageChange();
 
@@ -729 +729 @@
 
     AssertMsgReturn (item, ("Item must be always selected here"), (void) 0);
-    
+
     refreshVMItem (item->id(), true /* aDetails */, true /* aSnapshots */);
 }
@@ -888 +888 @@
     if (menuBar()->findItem(3))
         menuBar()->findItem(3)->setText (tr ("&Help"));
-    
+
     vmDetailsView->languageChange();
 }
@@ -910 +910 @@
     {
         CMachine m = item->machine();
+
         if (aRefreshDetails)
         {
@@ -918 +919 @@
         if (aRefreshSnapshots)
         {
+            /* update snapshots tab name */
+            QString shotName = tr ("&Snapshots");
+            ULONG shotCount = m.GetSnapshotCount();
+            if (shotCount)
+                shotName += QString (" (%1)").arg (shotCount);
+            vmTabWidget->changeTab (vmSnapshotsWgt, shotName);
             /* refresh snapshots widget */
             vmSnapshotsWgt->setMachine (m);
@@ -955 +962 @@
 
         vmDetailsView->setEnabled (true);
-        
+
         /* empty and disable refresh snapshots widget */
         vmSnapshotsWgt->setMachine (CMachine());
@@ -974 +981 @@
 
     do
-    {    
+    {
         /* ignore the signal if a modal widget is currently active (we won't be
          * able to properly show the modeless VDI manager window in this case) */
         if (QApplication::activeModalWidget())
             break;
-        
+
         /* ignore the signal if a VBoxDiskImageManagerDlg window is active */
         if (qApp->activeWindow() &&
             !strcmp (qApp->activeWindow()->className(), "VBoxDiskImageManagerDlg"))
             break;
-    
+
         /* look for at least one inaccessible media */
         VBoxMediaList::const_iterator it;
@@ -990 +997 @@
             if ((*it).status == VBoxMedia::Inaccessible)
                 break;
-    
+
         if (it != list.end() && vboxProblem().remindAboutInaccessibleMedia())
         {
@@ -1046 +1053 @@
 }
 
-void VBoxSelectorWnd::snapshotChanged (const VBoxSnapshotEvent &/* e */)
-{
-    /// @todo (dmik) nothing to do, should remove I guess
-}
+void VBoxSelectorWnd::snapshotChanged (const VBoxSnapshotEvent &aEvent)
+{
+    refreshVMItem (aEvent.machineId, false, true);
+}

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

@@ -98 +98 @@
 
     mNameFont = QFont ("Arial", font().pointSize() + 1, QFont::Bold);
+    mShotFont = QFont ("Arial", font().pointSize() + 1);
     mStateBusyFont = font();
     mStateBusyFont.setItalic (true);
@@ -251 +252 @@
     {
         QString name = mMachine.GetName();
+        CSnapshot snp = mMachine.GetCurrentSnapshot();
+        mSnapshotName = snp.isNull() ? QString::null : snp.GetName();
         needsResort = name != mName;
         mName = name;
-    
+
         mState = mMachine.GetState();
         mLastStateChange.setTime_t (mMachine.GetLastStateChange() / 1000);
@@ -262 +265 @@
     {
         mAccessError = mMachine.GetAccessError();
-        
+
         /* this should be in sync with
          * VBoxProblemReporter::confirmMachineDeletion() */
@@ -287 +290 @@
 
     QString toolTip;
-    
+
     if (mAccessible)
     {
+        toolTip = QString ("<b>%1</b>").arg (mName);
+        if (!mSnapshotName.isNull())
+            toolTip += QString (" (%1)").arg (mSnapshotName);
         toolTip = QString (VBoxVMListBox::tr (
-            "<nobr><b>%1</b><br></nobr>"
+            "<nobr>%1<br></nobr>"
             "<nobr>%2 since %3</nobr><br>"
             "<nobr>Session %4</nobr>",
             "VM tooltip (name, last state change, session state)"))
-            .arg (mName)
+            .arg (toolTip)
             .arg (vboxGlobal().toString (mState))
             .arg (dateTime)
@@ -320 +326 @@
 
     QFontMetrics fmName = QFontMetrics (lb->nameFont());
+    QFontMetrics fmShot = QFontMetrics (lb->shotFont());
     QFontMetrics fmState = QFontMetrics (lb->stateFont (mSessionState));
     const int marg = lb->margin();
@@ -326 +333 @@
     QPixmap pmState;
     QString strState;
-    
+
     if (mAccessible)
     {
@@ -342 +349 @@
 
     int nameWidth = fmName.width (mName);
+    if (!mSnapshotName.isNull())
+        nameWidth += fmShot.width (QString (" (%1)").arg (mSnapshotName));
     int stateWidth = pmState.width() + fmState.width (' ') +
                      fmState.width (strState);
@@ -404 +413 @@
 
     QFontMetrics fmName = QFontMetrics (lb->nameFont());
+    QFontMetrics fmShot = QFontMetrics (lb->shotFont());
     QFontMetrics fmState = QFontMetrics (lb->stateFont (mSessionState));
     const int marg = lb->margin();
@@ -446 +456 @@
     aP->drawText (textX, marg + fmName.ascent(), mName);
 
+    if (!mSnapshotName.isNull())
+    {
+        int nameWidth = fmName.width (mName);
+        aP->setFont (lb->shotFont());
+        QString shotName = QString (" (%1)").arg (mSnapshotName);
+        aP->drawText (textX + nameWidth, marg + fmName.ascent(), shotName);
+    }
+
     int stateY = marg + fmName.lineSpacing();
     int stateH = QMAX (pmState.height(), fmState.height());