Changeset 370 in vbox for trunk

Timestamp:

Jan 26, 2007 5:47:30 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Icon update from Ivan (Consoel->VM, VDM).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile (modified) (1 diff)
• VBoxUI.pro (modified) (3 diffs)
• images/about_16px.png (modified) ( previous)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)
• ui/VBoxDiskImageManagerDlg.ui.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile

@@ -314 +314 @@
 # static images are imported from VBoxUI.pro as IMAGES
 
-$(PATH_VirtualBox)/ui/vbox_image_collection.txt: Makefile $(IMAGES)
+$(PATH_VirtualBox)/ui/vbox_image_collection.txt: Makefile VBoxUI.pro $(IMAGES)
         @echo " \
         $(IMAGES) \

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

@@ -113 +113 @@
         images/ico40x01.png \
         images/ico64x01.png \
+        images/help_16px.png \
         images/about_16px.png \
         images/site_16px.png \
@@ -120 +121 @@
         images/fullscreen_16px.png \
         images/fullscreen_disabled_16px.png \
+        images/acpi_16px.png \
+        images/acpi_disabled_16px.png \
+        images/adjust_win_size_16px.png \
+        images/adjust_win_size_disabled_16px.png \
+        images/auto_resize_16px.png \
+        images/auto_resize_disabled_16px.png \
         images/exit_16px.png \
         images/fd_unmount_16px.png \
@@ -174 +181 @@
         images/show_snapshot_details_dis_16px.png \
         images/show_snapshot_details_dis_22px.png \
+        images/refresh_16px.png \
+        images/refresh_disabled_16px.png \
+        images/refresh_22px.png \
+        images/refresh_disabled_22px.png \
+        images/vdm_add_16px.png \
+        images/vdm_add_disabled_16px.png \
+        images/vdm_add_22px.png \
+        images/vdm_add_disabled_22px.png \
+        images/vdm_new_16px.png \
+        images/vdm_new_disabled_16px.png \
+        images/vdm_new_22px.png \
+        images/vdm_new_disabled_22px.png \
+        images/vdm_release_16px.png \
+        images/vdm_release_disabled_16px.png \
+        images/vdm_release_22px.png \
+        images/vdm_release_disabled_22px.png \
+        images/vdm_remove_16px.png \
+        images/vdm_remove_disabled_16px.png \
+        images/vdm_remove_22px.png \
+        images/vdm_remove_disabled_22px.png \
         images/about_600px.png

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

@@ -182 +182 @@
     vmAutoresizeGuestAction = new QAction (runningActions, "vmAutoresizeGuestAction");
     vmAutoresizeGuestAction->setIconSet (
-        VBoxGlobal::iconSet ("fullscreen_16px.png", "fullscreen_disabled_16px.png"));
+        VBoxGlobal::iconSet ("auto_resize_16px.png", "auto_resize_disabled_16px.png"));
     vmAutoresizeGuestAction->setToggleAction (true);
 
     vmAdjustWindowAction = new QAction (this, "vmAdjustWindowAction");
     vmAdjustWindowAction->setIconSet (
-        VBoxGlobal::iconSet ("fullscreen_16px.png", "fullscreen_disabled_16px.png"));
+        VBoxGlobal::iconSet ("adjust_win_size_16px.png",
+                             "adjust_win_size_disabled_16px.png"));
 
     vmTypeCADAction = new QAction (runningActions, "vmTypeCADAction");
@@ -208 +209 @@
 
     vmACPIShutdownAction = new QAction (this, "vmACPIShutdownAction");
+    vmACPIShutdownAction->setIconSet (
+        VBoxGlobal::iconSet ("acpi_16px.png", "acpi_disabled_16px.png"));
 
     vmCloseAction = new QAction (this, "vmCloseAction");

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

@@ -256 +256 @@
     
     helpContentsAction = new QAction (this, "helpContentsAction");
-    helpContentsAction->setIconSet (VBoxGlobal::iconSet ("about_16px.png"));
+    helpContentsAction->setIconSet (VBoxGlobal::iconSet ("help_16px.png"));
     helpWebAction = new QAction (this, "helpWebAction");
     helpWebAction->setIconSet (VBoxGlobal::iconSet ("site_16px.png"));

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

@@ -322 +322 @@
     imRefreshAction->setStatusTip (tr ("Refresh media image list"));
 
-    imNewAction->setIconSet (VBoxGlobal::iconSet ("hd_16px.png", "hd_disabled_16px.png"));
-    imAddAction->setIconSet (VBoxGlobal::iconSet ("cd_16px.png", "cd_disabled_16px.png"));
+    imNewAction->setIconSet (VBoxGlobal::iconSetEx (
+        "vdm_new_22px.png", "vdm_new_16px.png",
+        "vdm_new_disabled_22px.png", "vdm_new_disabled_16px.png"));
+    imAddAction->setIconSet (VBoxGlobal::iconSetEx (
+        "vdm_add_22px.png", "vdm_add_16px.png",
+        "vdm_add_disabled_22px.png", "vdm_add_disabled_16px.png"));
     // imEditAction->setIconSet (VBoxGlobal::iconSet ("guesttools_16px.png", "guesttools_disabled_16px.png"));
-    imRemoveAction->setIconSet (VBoxGlobal::iconSet ("delete_16px.png", "delete_dis_16px.png"));
-    imReleaseAction->setIconSet (VBoxGlobal::iconSet ("start_16px.png", "start_dis_16px.png"));
-    imRefreshAction->setIconSet (VBoxGlobal::iconSet ("settings_16px.png", "settings_dis_16px.png"));
+    imRemoveAction->setIconSet (VBoxGlobal::iconSetEx (
+        "vdm_remove_22px.png", "vdm_remove_16px.png",
+        "vdm_remove_disabled_22px.png", "vdm_remove_disabled_16px.png"));
+    imReleaseAction->setIconSet (VBoxGlobal::iconSetEx (
+        "vdm_release_22px.png", "vdm_release_16px.png",
+        "vdm_release_disabled_22px.png", "vdm_release_disabled_16px.png"));
+    imRefreshAction->setIconSet (VBoxGlobal::iconSetEx (
+        "refresh_22px.png", "refresh_16px.png",
+        "refresh_disabled_22px.png", "refresh_disabled_16px.png"));
 
     // imEditAction->addTo (itemMenu);
@@ -338 +348 @@
     toolBar->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Minimum);
     ((QVBoxLayout*)centralWidget()->layout())->insertWidget(0, toolBar);
-    setUsesTextLabel (true);
+
+    toolBar->setUsesTextLabel (true);
+    toolBar->setUsesBigPixmaps (true);
 
     imNewAction->addTo (toolBar);