Changeset 34983 in vbox

Timestamp:

Dec 13, 2010 10:14:08 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: more progress images

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox2.qrc (modified) (1 diff)
• images/progress_media_create_90px.png (added)
• images/progress_media_delete_90px.png (added)
• images/progress_snapshot_create_90px.png (added)
• images/progress_snapshot_discard_90px.png (added)
• images/progress_snapshot_restore_90px.png (added)
• src/VBoxMediaManagerDlg.cpp (modified) (1 diff)
• src/runtime/UIMachineLogic.cpp (modified) (1 diff)
• src/runtime/UIMachineWindow.cpp (modified) (1 diff)
• src/selector/VBoxSnapshotsWgt.cpp (modified) (3 diffs)
• src/wizards/newhd/UINewHDWzd.cpp (modified) (1 diff)
• src/wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

@@ -156 +156 @@
     <file alias="progress_poweroff_90px.png">images/progress_poweroff_90px.png</file>
     <file alias="progress_delete_90px.png">images/progress_delete_90px.png</file>
+    <file alias="progress_media_create_90px.png">images/progress_media_create_90px.png</file>
+    <file alias="progress_media_delete_90px.png">images/progress_media_delete_90px.png</file>
+    <file alias="progress_snapshot_create_90px.png">images/progress_snapshot_create_90px.png</file>
+    <file alias="progress_snapshot_restore_90px.png">images/progress_snapshot_restore_90px.png</file>
+    <file alias="progress_snapshot_discard_90px.png">images/progress_snapshot_discard_90px.png</file>
     <file alias="status_check_16px.png">images/status_check_16px.png</file>
     <file alias="status_check_32px.png">images/status_check_32px.png</file>

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

@@ -1081 +1081 @@
                 if (hardDisk.isOk())
                 {
-                    vboxProblem().showModalProgressDialog(progress, windowTitle(), ":/progress_delete_90px.png", this, true);
+                    vboxProblem().showModalProgressDialog(progress, windowTitle(), ":/progress_media_delete_90px.png", this, true);
                     if (!(progress.isOk() && progress.GetResultCode() == S_OK))
                     {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1019 +1019 @@
         {
             /* Show the "Taking Snapshot" progress dialog */
-            vboxProblem().showModalProgressDialog(progress, machine.GetName());
+            vboxProblem().showModalProgressDialog(progress, machine.GetName(), ":/progress_snapshot_create_90px.png", 0, true);
 
             if (progress.GetResultCode() != 0)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -371 +371 @@
                                 {
                                     /* Show the progress dialog: */
-                                    vboxProblem().showModalProgressDialog(progress, machine.GetName());
+                                    vboxProblem().showModalProgressDialog(progress, machine.GetName(), ":/progress_snapshot_discard_90px.png", 0, true);
                                     if (progress.GetResultCode() != 0)
                                         vboxProblem().cannotRestoreSnapshot(progress, snapshot.GetName());

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

@@ -536 +536 @@
     {
         /* Show the progress dialog */
-        vboxProblem().showModalProgressDialog (progress, mMachine.GetName(), "",
-                                               vboxProblem().mainWindowShown());
+        vboxProblem().showModalProgressDialog (progress, mMachine.GetName(), ":/progress_snapshot_restore_90px.png",
+                                               vboxProblem().mainWindowShown(), true);
 
         if (progress.GetResultCode() != 0)
@@ -582 +582 @@
     {
         /* Show the progress dialog */
-        vboxProblem().showModalProgressDialog (progress, mMachine.GetName(), "",
-                                               vboxProblem().mainWindowShown());
+        vboxProblem().showModalProgressDialog (progress, mMachine.GetName(), ":/progress_snapshot_discard_90px.png",
+                                               vboxProblem().mainWindowShown(), true);
 
         if (progress.GetResultCode() != 0)
@@ -653 +653 @@
         {
             /* Show the progress dialog */
-            vboxProblem().showModalProgressDialog (progress, mMachine.GetName(), "",
-                                                   vboxProblem().mainWindowShown());
+            vboxProblem().showModalProgressDialog (progress, mMachine.GetName(), ":/progress_snapshot_create_90px.png",
+                                                   vboxProblem().mainWindowShown(), true);
 
             if (progress.GetResultCode() != 0)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWzd.cpp

@@ -522 +522 @@
     }
 
-    vboxProblem().showModalProgressDialog(progress, windowTitle(), "", parentWidget());
+    vboxProblem().showModalProgressDialog(progress, windowTitle(), ":/progress_media_create_90px.png", this, true);
 
     if (progress.GetCanceled())

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -497 +497 @@
     if (m_HardDisk.isOk())
     {
-        vboxProblem().showModalProgressDialog(progress, windowTitle(), ":/progress_delete_90px.png", this, true);
+        vboxProblem().showModalProgressDialog(progress, windowTitle(), ":/progress_media_delete_90px.png", this, true);
         if (progress.isOk() && progress.GetResultCode() == S_OK)
             success = true;