Changeset 24789 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 19, 2009 1:33:42 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Snapshots tree-widget, few string tag renamed.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotsWgt.cpp (modified) (9 diffs)

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

@@ -46 +46 @@
     SnapshotWgtItem (QTreeWidget *aTreeWidget, const CSnapshot &aSnapshot)
         : QTreeWidgetItem (aTreeWidget, ItemType)
+        , mIsCurrentState (false)
         , mSnapshot (aSnapshot)
     {
@@ -53 +54 @@
     SnapshotWgtItem (QTreeWidgetItem *aRootItem, const CSnapshot &aSnapshot)
         : QTreeWidgetItem (aRootItem, ItemType)
+        , mIsCurrentState (false)
         , mSnapshot (aSnapshot)
     {
@@ -60 +62 @@
     SnapshotWgtItem (QTreeWidget *aTreeWidget, const CMachine &aMachine)
         : QTreeWidgetItem (aTreeWidget, ItemType)
+        , mIsCurrentState (true)
         , mMachine (aMachine)
     {
@@ -68 +71 @@
     SnapshotWgtItem (QTreeWidgetItem *aRootItem, const CMachine &aMachine)
         : QTreeWidgetItem (aRootItem, ItemType)
+        , mIsCurrentState (true)
         , mMachine (aMachine)
     {
@@ -78 +82 @@
         {
             case Qt::DisplayRole:
-                return QVariant (QString ("%1%2").arg (QTreeWidgetItem::data (aColumn, aRole).toString()).arg (mAge));
+                return mIsCurrentState ? QTreeWidgetItem::data (aColumn, aRole) :
+                       QVariant (QString ("%1%2").arg (QTreeWidgetItem::data (aColumn, aRole).toString()).arg (mAge));
             default:
                 break;
@@ -130 +135 @@
     void recache()
     {
-        if (!mSnapshot.isNull())
-        {
-            mId = mSnapshot.GetId();
-            setText (0, mSnapshot.GetName());
-            mOnline = mSnapshot.GetOnline();
-            setIcon (0, vboxGlobal().snapshotIcon (mOnline));
-            mDesc = mSnapshot.GetDescription();
-            mTimestamp.setTime_t (mSnapshot.GetTimeStamp() / 1000);
-            mCurStateModified = false;
-        }
-        else
+        if (mIsCurrentState)
         {
             Assert (!mMachine.isNull());
@@ -153 +148 @@
                     QString::null;
         }
+        else
+        {
+            Assert (!mSnapshot.isNull());
+            mId = mSnapshot.GetId();
+            setText (0, mSnapshot.GetName());
+            mOnline = mSnapshot.GetOnline();
+            setIcon (0, vboxGlobal().snapshotIcon (mOnline));
+            mDesc = mSnapshot.GetDescription();
+            mTimestamp.setTime_t (mSnapshot.GetTimeStamp() / 1000);
+            mCurStateModified = false;
+        }
         adjustText();
         recacheToolTip();
@@ -175 +181 @@
         if (mTimestamp.daysTo (QDateTime::currentDateTime()) > 30)
         {
-            mAge = VBoxSnapshotsWgt::tr (" [%1]").arg (mTimestamp.toString (Qt::LocalDate));
+            mAge = VBoxSnapshotsWgt::tr (" (%1)").arg (mTimestamp.toString (Qt::LocalDate));
             ageFormat = AgeMax;
         }
         else if (mTimestamp.secsTo (QDateTime::currentDateTime()) > 60 * 60 * 24)
         {
-            mAge = VBoxSnapshotsWgt::tr (" [%1d ago]").arg (mTimestamp.secsTo (QDateTime::currentDateTime()) / 60 / 60 / 24);
+            mAge = VBoxSnapshotsWgt::tr (" (%n day(s) ago)", "", mTimestamp.secsTo (QDateTime::currentDateTime()) / 60 / 60 / 24);
             ageFormat = AgeInDays;
         }
         else if (mTimestamp.secsTo (QDateTime::currentDateTime()) > 60 * 60)
         {
-            mAge = VBoxSnapshotsWgt::tr (" [%1h ago]").arg (mTimestamp.secsTo (QDateTime::currentDateTime()) / 60 / 60);
+            mAge = VBoxSnapshotsWgt::tr (" (%n hour(s) ago)", "", mTimestamp.secsTo (QDateTime::currentDateTime()) / 60 / 60);
             ageFormat = AgeInHours;
         }
         else if (mTimestamp.secsTo (QDateTime::currentDateTime()) > 60)
         {
-            mAge = VBoxSnapshotsWgt::tr (" [%1min ago]").arg (mTimestamp.secsTo (QDateTime::currentDateTime()) / 60);
+            mAge = VBoxSnapshotsWgt::tr (" (%n minute(s) ago)", "", mTimestamp.secsTo (QDateTime::currentDateTime()) / 60);
             ageFormat = AgeInMinutes;
         }
         else
         {
-            mAge = VBoxSnapshotsWgt::tr (" [%1sec ago]").arg (mTimestamp.secsTo (QDateTime::currentDateTime()));
+            mAge = VBoxSnapshotsWgt::tr (" (%n second(s) ago)", "", mTimestamp.secsTo (QDateTime::currentDateTime()));
             ageFormat = AgeInSeconds;
         }
@@ -262 +268 @@
         setToolTip (0, toolTip);
     }
+
+    bool mIsCurrentState;
 
     CSnapshot mSnapshot;