Changeset 879 in vbox

Timestamp:

Feb 13, 2007 3:51:45 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Added the eraser icon (for clearing/resetting values to defaults); Fixed a minor bug in the auto-resize guest icon.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• images/auto_resize_off_16px.png (modified) ( previous)
• images/auto_resize_off_disabled_16px.png (modified) ( previous)
• images/auto_resize_on_16px.png (modified) ( previous)
• images/auto_resize_on_disabled_16px.png (modified) ( previous)
• images/eraser_16px.png (added)
• images/eraser_disabled_16px.png (added)
• src/VBoxSelectorWnd.cpp (modified) (2 diffs)
• ui/VBoxGlobalSettingsDlg.ui (modified) (2 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -187 +187 @@
         images/show_snapshot_details_dis_16px.png \
         images/show_snapshot_details_dis_22px.png \
+        images/eraser_16px.png \
+        images/eraser_disabled_16px.png \
         images/refresh_16px.png \
         images/refresh_disabled_16px.png \

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

@@ -185 +185 @@
     {
         mRefreshButton->setText (mRefreshAction->menuText());
-//        mRefreshButton->setText (mRefreshAction->text());
-//        mRefreshButton->setAccel (mRefreshAction->accel());
-//        mRefreshButton->setTextLabel (mRefreshAction->text());
-//        mRefreshButton->setIconSet (mRefreshAction->iconSet());
+        /* If we set the combination of the text label and icon
+         * below, we lose the Alt+R shortcut functionality... */
+        mRefreshButton->setTextLabel (mRefreshAction->text());
+        mRefreshButton->setAccel (mRefreshAction->accel());
+        mRefreshButton->setIconSet (mRefreshAction->iconSet());
+        mRefreshButton->setTextPosition (QToolButton::BesideIcon);
+        mRefreshButton->setUsesTextLabel (true);
     }
 }
@@ -253 +256 @@
         "vm_discard_dis.png", "discard_dis_16px.png"));
     vmRefreshAction = new QAction (this, "vmRefreshAction");
-    /// @todo (r=dmik) set icon set
+    vmRefreshAction->setIconSet (VBoxGlobal::iconSet (
+        "refresh_16px.png", "refresh_disabled_16px.png"));
     
     helpContentsAction = new QAction (this, "helpContentsAction");

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxGlobalSettingsDlg.ui

@@ -295 +295 @@
                                 </property>
                                 <property name="iconSet">
-                                    <iconset>delete_16px.png</iconset>
+                                    <iconset>eraser_16px.png</iconset>
                                 </property>
                                 <property name="autoRaise">
@@ -316 +316 @@
                                 </property>
                                 <property name="iconSet">
-                                    <iconset>delete_16px.png</iconset>
+                                    <iconset>eraser_16px.png</iconset>
                                 </property>
                                 <property name="autoRaise">

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -298 +298 @@
     tbSelectSavedStateFolder->setIconSet (VBoxGlobal::iconSet ("select_file_16px.png",
                                                                "select_file_dis_16px.png"));
-    tbResetSavedStateFolder->setIconSet (VBoxGlobal::iconSet ("delete_16px.png",
-                                                              "delete_dis_16px.png"));
+    tbResetSavedStateFolder->setIconSet (VBoxGlobal::iconSet ("eraser_16px.png",
+                                                              "eraser_disabled_16px.png"));
 
     /* HDD Images page */