Changeset 34728 in vbox for trunk/src

Timestamp:

Dec 6, 2010 10:40:42 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_delete_90px.png (added)
• images/progress_poweroff_90px.png (added)
• images/progress_start_90px.png (added)
• src/VBoxMediaManagerDlg.cpp (modified) (1 diff)
• src/runtime/UIMachineLogic.cpp (modified) (1 diff)
• src/runtime/UIMachineWindow.cpp (modified) (1 diff)
• src/runtime/UISession.cpp (modified) (2 diffs)
• src/selector/VBoxSelectorWnd.cpp (modified) (1 diff)
• src/wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)

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

@@ -153 +153 @@
     <file alias="progress_export_90px.png">images/progress_export_90px.png</file>
     <file alias="progress_install_guest_additions_90px.png">images/progress_install_guest_additions_90px.png</file>
+    <file alias="progress_start_90px.png">images/progress_start_90px.png</file>
+    <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="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

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

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

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

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

@@ -352 +352 @@
                         {
                             /* Show the power down progress dialog: */
-                            vboxProblem().showModalProgressDialog(progress, machine.GetName());
+                            vboxProblem().showModalProgressDialog(progress, machine.GetName(), ":/progress_poweroff_90px.png", 0, true);
                             if (progress.GetResultCode() != 0)
                                 vboxProblem().cannotStopMachine(progress);

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

@@ -205 +205 @@
         vboxProblem().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_restore_90px.png", mainMachineWindow(), true, 0);
     else
-        vboxProblem().showModalProgressDialog(progress, machine.GetName(), "", mainMachineWindow());
+        vboxProblem().showModalProgressDialog(progress, machine.GetName(), ":/progress_start_90px.png", mainMachineWindow(), true);
 
     /* Check for a progress failure: */
@@ -258 +258 @@
                     uimachine()->machineLogic()->setPreventAutoClose(true);
                 /* Show the power down progress dialog */
-                vboxProblem().showModalProgressDialog(progress, machine.GetName(), "", mainMachineWindow());
+                vboxProblem().showModalProgressDialog(progress, machine.GetName(), ":/progress_poweroff_90px.png", mainMachineWindow(), true);
                 if (progress.GetResultCode() != 0)
                     vboxProblem().cannotStopMachine(progress);

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

@@ -768 +768 @@
                 if (machine.isOk())
                 {
-                    vboxProblem().showModalProgressDialog(progress, item->name(), "");
+                    vboxProblem().showModalProgressDialog(progress, item->name(), ":/progress_delete_90px.png", 0, true);
                     if (progress.GetResultCode() != 0)
                         vboxProblem().cannotDeleteMachine(machine);

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

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