Changeset 23282 in vbox for trunk/src/VBox

Timestamp:

Sep 24, 2009 12:41:35 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New Storage UI: Icons partially updated (1st update).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox.qrc (modified) (6 diffs)
• images/attachment_16px.png (added)
• images/attachment_add_16px.png (added)
• images/attachment_add_disabled_16px.png (added)
• images/attachment_disabled_16px.png (added)
• images/attachment_remove_16px.png (added)
• images/attachment_remove_disabled_16px.png (added)
• images/controller_add_16px.png (added)
• images/controller_add_disabled_16px.png (added)
• images/controller_remove_16px.png (added)
• images/controller_remove_disabled_16px.png (added)
• images/floppy_16px.png (added)
• images/hd_add_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_add_16px.png )
• images/hd_add_22px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_add_22px.png )
• images/hd_add_disabled_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_add_disabled_16px.png )
• images/hd_add_disabled_22px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_add_disabled_22px.png )
• images/hd_new_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_new_16px.png )
• images/hd_new_22px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_new_22px.png )
• images/hd_new_disabled_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_new_disabled_16px.png )
• images/hd_new_disabled_22px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_new_disabled_22px.png )
• images/hd_release_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_release_16px.png )
• images/hd_release_22px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_release_22px.png )
• images/hd_release_disabled_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_release_disabled_16px.png )
• images/hd_release_disabled_22px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_release_disabled_22px.png )
• images/hd_remove_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_remove_16px.png )
• images/hd_remove_22px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_remove_22px.png )
• images/hd_remove_disabled_16px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_remove_disabled_16px.png )
• images/hd_remove_disabled_22px.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vdm_remove_disabled_22px.png )
• images/ide_16px.png (modified) ( previous)
• images/sata_16px.png (modified) ( previous)
• images/scsi_16px.png (modified) ( previous)
• src/VBoxMediaManagerDlg.cpp (modified) (1 diff)
• src/VBoxSettingsDialogSpecific.cpp (modified) (1 diff)
• src/VBoxVMSettingsHD.cpp (modified) (1 diff)

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

@@ -93 +93 @@
     <file alias="vmw_new_harddisk.png">images/vmw_new_harddisk.png</file>
     <file alias="vmw_new_user.png">images/vmw_new_user.png</file>
-    <file alias="fd_16px.png">images/fd_16px.png</file>
-    <file alias="fd_disabled_16px.png">images/fd_disabled_16px.png</file>
-    <file alias="fd_32px.png">images/fd_32px.png</file>
-    <file alias="fd_disabled_32px.png">images/fd_disabled_32px.png</file>
-    <file alias="fd_read_16px.png">images/fd_read_16px.png</file>
-    <file alias="fd_write_16px.png">images/fd_write_16px.png</file>
+    <file alias="hd_16px.png">images/hd_16px.png</file>
+    <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
+    <file alias="hd_32px.png">images/hd_32px.png</file>
+    <file alias="hd_disabled_32px.png">images/hd_disabled_32px.png</file>
+    <file alias="hd_read_16px.png">images/hd_read_16px.png</file>
+    <file alias="hd_write_16px.png">images/hd_write_16px.png</file>
+    <file alias="hd_add_16px.png">images/hd_add_16px.png</file>
+    <file alias="hd_add_disabled_16px.png">images/hd_add_disabled_16px.png</file>
+    <file alias="hd_add_22px.png">images/hd_add_22px.png</file>
+    <file alias="hd_add_disabled_22px.png">images/hd_add_disabled_22px.png</file>
+    <file alias="hd_new_16px.png">images/hd_new_16px.png</file>
+    <file alias="hd_new_disabled_16px.png">images/hd_new_disabled_16px.png</file>
+    <file alias="hd_new_22px.png">images/hd_new_22px.png</file>
+    <file alias="hd_new_disabled_22px.png">images/hd_new_disabled_22px.png</file>
+    <file alias="hd_release_16px.png">images/hd_release_16px.png</file>
+    <file alias="hd_release_disabled_16px.png">images/hd_release_disabled_16px.png</file>
+    <file alias="hd_release_22px.png">images/hd_release_22px.png</file>
+    <file alias="hd_release_disabled_22px.png">images/hd_release_disabled_22px.png</file>
+    <file alias="hd_remove_16px.png">images/hd_remove_16px.png</file>
+    <file alias="hd_remove_disabled_16px.png">images/hd_remove_disabled_16px.png</file>
+    <file alias="hd_remove_22px.png">images/hd_remove_22px.png</file>
+    <file alias="hd_remove_disabled_22px.png">images/hd_remove_disabled_22px.png</file>
     <file alias="cd_16px.png">images/cd_16px.png</file>
     <file alias="cd_disabled_16px.png">images/cd_disabled_16px.png</file>
@@ -107 +123 @@
     <file alias="cd_unmount_16px.png">images/cd_unmount_16px.png</file>
     <file alias="cd_unmount_dis_16px.png">images/cd_unmount_dis_16px.png</file>
-    <file alias="hd_16px.png">images/hd_16px.png</file>
-    <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
-    <file alias="hd_32px.png">images/hd_32px.png</file>
-    <file alias="hd_disabled_32px.png">images/hd_disabled_32px.png</file>
-    <file alias="hd_read_16px.png">images/hd_read_16px.png</file>
-    <file alias="hd_write_16px.png">images/hd_write_16px.png</file>
+    <file alias="fd_16px.png">images/fd_16px.png</file>
+    <file alias="fd_disabled_16px.png">images/fd_disabled_16px.png</file>
+    <file alias="fd_32px.png">images/fd_32px.png</file>
+    <file alias="fd_disabled_32px.png">images/fd_disabled_32px.png</file>
+    <file alias="fd_read_16px.png">images/fd_read_16px.png</file>
+    <file alias="fd_write_16px.png">images/fd_write_16px.png</file>
+    <file alias="fd_unmount_16px.png">images/fd_unmount_16px.png</file>
+    <file alias="fd_unmount_dis_16px.png">images/fd_unmount_dis_16px.png</file>
     <file alias="mouse_16px.png">images/mouse_16px.png</file>
     <file alias="mouse_disabled_16px.png">images/mouse_disabled_16px.png</file>
@@ -167 +185 @@
     <file alias="poweroff_16px.png">images/poweroff_16px.png</file>
     <file alias="poweroff_disabled_16px.png">images/poweroff_disabled_16px.png</file>
-    <file alias="fd_unmount_16px.png">images/fd_unmount_16px.png</file>
-    <file alias="fd_unmount_dis_16px.png">images/fd_unmount_dis_16px.png</file>
     <file alias="guesttools_16px.png">images/guesttools_16px.png</file>
     <file alias="guesttools_disabled_16px.png">images/guesttools_disabled_16px.png</file>
@@ -300 +316 @@
     <file alias="vrdp_32px.png">images/vrdp_32px.png</file>
     <file alias="vrdp_disabled_32px.png">images/vrdp_disabled_32px.png</file>
-    <file alias="vdm_add_16px.png">images/vdm_add_16px.png</file>
-    <file alias="vdm_add_disabled_16px.png">images/vdm_add_disabled_16px.png</file>
-    <file alias="vdm_add_22px.png">images/vdm_add_22px.png</file>
-    <file alias="vdm_add_disabled_22px.png">images/vdm_add_disabled_22px.png</file>
-    <file alias="vdm_new_16px.png">images/vdm_new_16px.png</file>
-    <file alias="vdm_new_disabled_16px.png">images/vdm_new_disabled_16px.png</file>
-    <file alias="vdm_new_22px.png">images/vdm_new_22px.png</file>
-    <file alias="vdm_new_disabled_22px.png">images/vdm_new_disabled_22px.png</file>
-    <file alias="vdm_release_16px.png">images/vdm_release_16px.png</file>
-    <file alias="vdm_release_disabled_16px.png">images/vdm_release_disabled_16px.png</file>
-    <file alias="vdm_release_22px.png">images/vdm_release_22px.png</file>
-    <file alias="vdm_release_disabled_22px.png">images/vdm_release_disabled_22px.png</file>
-    <file alias="vdm_remove_16px.png">images/vdm_remove_16px.png</file>
-    <file alias="vdm_remove_disabled_16px.png">images/vdm_remove_disabled_16px.png</file>
-    <file alias="vdm_remove_22px.png">images/vdm_remove_22px.png</file>
-    <file alias="vdm_remove_disabled_22px.png">images/vdm_remove_disabled_22px.png</file>
     <file alias="meditation_32px.png">images/meditation_32px.png</file>
     <file alias="welcome.png">images/welcome.png</file>
@@ -331 +331 @@
     <file alias="sata_16px.png">images/sata_16px.png</file>
     <file alias="scsi_16px.png">images/scsi_16px.png</file>
+    <file alias="floppy_16px.png">images/floppy_16px.png</file>
     <file alias="import_16px.png">images/import_16px.png</file>
     <file alias="export_16px.png">images/export_16px.png</file>
@@ -347 +348 @@
     <file alias="minus_10px.png">images/minus_10px.png</file>
     <file alias="minus_disabled_10px.png">images/minus_disabled_10px.png</file>
+    <file alias="controller_add_16px.png">images/controller_add_16px.png</file>
+    <file alias="controller_add_disabled_16px.png">images/controller_add_disabled_16px.png</file>
+    <file alias="controller_remove_16px.png">images/controller_remove_16px.png</file>
+    <file alias="controller_remove_disabled_16px.png">images/controller_remove_disabled_16px.png</file>
+    <file alias="attachment_16px.png">images/attachment_16px.png</file>
+    <file alias="attachment_disabled_16px.png">images/attachment_disabled_16px.png</file>
+    <file alias="attachment_add_16px.png">images/attachment_add_16px.png</file>
+    <file alias="attachment_add_disabled_16px.png">images/attachment_add_disabled_16px.png</file>
+    <file alias="attachment_remove_16px.png">images/attachment_remove_16px.png</file>
+    <file alias="attachment_remove_disabled_16px.png">images/attachment_remove_disabled_16px.png</file>
  </qresource>
  </RCC>

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

@@ -345 +345 @@
     mNewAction->setIcon (VBoxGlobal::iconSetFull (
         QSize (22, 22), QSize (16, 16),
-        ":/vdm_new_22px.png", ":/vdm_new_16px.png",
-        ":/vdm_new_disabled_22px.png", ":/vdm_new_disabled_16px.png"));
+        ":/hd_new_22px.png", ":/hd_new_16px.png",
+        ":/hd_new_disabled_22px.png", ":/hd_new_disabled_16px.png"));
     mAddAction->setIcon (VBoxGlobal::iconSetFull (
         QSize (22, 22), QSize (16, 16),
-        ":/vdm_add_22px.png", ":/vdm_add_16px.png",
-        ":/vdm_add_disabled_22px.png", ":/vdm_add_disabled_16px.png"));
+        ":/hd_add_22px.png", ":/hd_add_16px.png",
+        ":/hd_add_disabled_22px.png", ":/hd_add_disabled_16px.png"));
 //  mEditAction->setIcon (VBoxGlobal::iconSet (":/guesttools_16px.png", ":/guesttools_disabled_16px.png"));
     mRemoveAction->setIcon (VBoxGlobal::iconSetFull (
         QSize (22, 22), QSize (16, 16),
-        ":/vdm_remove_22px.png", ":/vdm_remove_16px.png",
-        ":/vdm_remove_disabled_22px.png", ":/vdm_remove_disabled_16px.png"));
+        ":/hd_remove_22px.png", ":/hd_remove_16px.png",
+        ":/hd_remove_disabled_22px.png", ":/hd_remove_disabled_16px.png"));
     mReleaseAction->setIcon (VBoxGlobal::iconSetFull (
         QSize (22, 22), QSize (16, 16),
-        ":/vdm_release_22px.png", ":/vdm_release_16px.png",
-        ":/vdm_release_disabled_22px.png", ":/vdm_release_disabled_16px.png"));
+        ":/hd_release_22px.png", ":/hd_release_16px.png",
+        ":/hd_release_disabled_22px.png", ":/hd_release_disabled_16px.png"));
     mRefreshAction->setIcon (VBoxGlobal::iconSetFull (
         QSize (22, 22), QSize (16, 16),

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

@@ -272 +272 @@
         connect (prefPage, SIGNAL (storageChanged()), this, SLOT (resetFirstRunFlag()));
         addItem (":/hd_32px.png", ":/hd_disabled_32px.png",
-                 ":/hd_16px.png", ":/hd_disabled_16px.png",
+                 ":/attachment_16px.png", ":/attachment_disabled_16px.png",
                  StorageId, "#storage", prefPage);
     }

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

@@ -114 +114 @@
     mPool.resize (MaxIndex);
 
-    mPool [AddControllerEn]  = QPixmap (":/add_host_iface_16px.png"); // TODO Update Icon!!!
-    mPool [AddControllerDis] = QPixmap (":/add_host_iface_disabled_16px.png"); // TODO Update Icon!!!
-    mPool [DelControllerEn]  = QPixmap (":/remove_host_iface_16px.png"); // TODO Update Icon!!!
-    mPool [DelControllerDis] = QPixmap (":/remove_host_iface_disabled_16px.png"); // TODO Update Icon!!!
-
-    mPool [AddAttachmentEn]  = QPixmap (":/vdm_add_16px.png"); // TODO Update Icon!!!
-    mPool [AddAttachmentDis] = QPixmap (":/vdm_add_disabled_16px.png"); // TODO Update Icon!!!
-    mPool [DelAttachmentEn]  = QPixmap (":/vdm_remove_16px.png"); // TODO Update Icon!!!
-    mPool [DelAttachmentDis] = QPixmap (":/vdm_remove_disabled_16px.png"); // TODO Update Icon!!!
+    mPool [AddControllerEn]  = QPixmap (":/add_host_iface_16px.png"); // TODO (":/controller_add_16px.png");
+    mPool [AddControllerDis] = QPixmap (":/add_host_iface_disabled_16px.png"); // TODO (":/controller_add_disabled_16px.png");
+    mPool [DelControllerEn]  = QPixmap (":/remove_host_iface_16px.png"); // TODO (":/controller_remove_16px.png");
+    mPool [DelControllerDis] = QPixmap (":/remove_host_iface_disabled_16px.png"); // TODO (":/controller_remove_disabled_16px.png");
+
+    mPool [AddAttachmentEn]  = QPixmap (":/attachment_add_16px.png");
+    mPool [AddAttachmentDis] = QPixmap (":/attachment_add_disabled_16px.png");
+    mPool [DelAttachmentEn]  = QPixmap (":/attachment_remove_16px.png");
+    mPool [DelAttachmentDis] = QPixmap (":/attachment_remove_disabled_16px.png");
 
     mPool [IDEController]    = QPixmap (":/ide_16px.png");
     mPool [SATAController]   = QPixmap (":/sata_16px.png");
     mPool [SCSIController]   = QPixmap (":/scsi_16px.png");
-    mPool [FloppyController] = QPixmap (":/fd_16px.png"); // TODO Update Icon!!!
-
-    mPool [HDAttachmentEn]   = QPixmap (":/hd_16px.png"); // TODO Update Icon!!!
-    mPool [HDAttachmentDis]  = QPixmap (":/hd_disabled_16px.png"); // TODO Update Icon!!!
+    mPool [FloppyController] = QPixmap (":/floppy_16px.png");
+
+    mPool [HDAttachmentEn]   = QPixmap (":/hd_16px.png");
+    mPool [HDAttachmentDis]  = QPixmap (":/hd_disabled_16px.png");
     mPool [CDAttachmentEn]   = QPixmap (":/cd_16px.png");
     mPool [CDAttachmentDis]  = QPixmap (":/cd_disabled_16px.png");