Changeset 37549 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Jun 20, 2011 8:44:19 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

72386

Message:

Desktop: add file icons for the supported virtual disk image formats

Location:

trunk/src/VBox/Installer/win

Files:

• Resources/Makefile.kmk (modified) (4 diffs)
• Resources/resource.h (modified) (1 diff)
• VirtualBox.wxs (modified) (1 diff)

trunk/src/VBox/Installer/win/Resources/Makefile.kmk

@@ -43 +43 @@
   VBOX_WINDOWS_ICON_EXT_OVA     := $(VBOX_RESOURCES_PATH_WIN)/OSE/virtualbox-ova.ico
   VBOX_WINDOWS_ICON_EXT_OVF     := $(VBOX_RESOURCES_PATH_WIN)/OSE/virtualbox-ovf.ico
+  VBOX_WINDOWS_ICON_EXT_VDI     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vdi.ico
+  VBOX_WINDOWS_ICON_EXT_VMDK    := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vmdk.ico
+  VBOX_WINDOWS_ICON_EXT_VHD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vhd.ico
+  VBOX_WINDOWS_ICON_EXT_HDD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-hdd.ico
 else
   VBOX_WINDOWS_ICON_EXT_VBOX    := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vbox.ico
@@ -48 +52 @@
   VBOX_WINDOWS_ICON_EXT_OVA     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-ova.ico
   VBOX_WINDOWS_ICON_EXT_OVF     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-ovf.ico
+  VBOX_WINDOWS_ICON_EXT_VDI     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vdi.ico
+  VBOX_WINDOWS_ICON_EXT_VMDK    := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vmdk.ico
+  VBOX_WINDOWS_ICON_EXT_VHD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vhd.ico
+  VBOX_WINDOWS_ICON_EXT_HDD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-hdd.ico
 endif
 
@@ -55 +63 @@
         $(VBOX_WINDOWS_ICON_EXT_EXTPACK) \
         $(VBOX_WINDOWS_ICON_EXT_OVA) \
-        $(VBOX_WINDOWS_ICON_EXT_OVF)
+        $(VBOX_WINDOWS_ICON_EXT_OVF) \
+        $(VBOX_WINDOWS_ICON_EXT_VMDK) \
+        $(VBOX_WINDOWS_ICON_EXT_VHD) \
+        $(VBOX_WINDOWS_ICON_EXT_HDD)
 
 $$(VBoxRes_0_OUTDIR)/VBoxRes-icons.rc: \
@@ -63 +74 @@
         $(APPEND) $@ 'IDI_FILETYPE_VBOX         ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_EXT_VBOX))"'
         $(APPEND) $@ 'IDI_FILETYPE_VBOX_EXTPACK ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_EXT_EXTPACK))"'
-        $(APPEND) $@ 'IDI_FILETYPE_VBOX_OVA             ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_EXT_OVA))"'
-        $(APPEND) $@ 'IDI_FILETYPE_VBOX_OVF             ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_EXT_OVF))"'
+        $(APPEND) $@ 'IDI_FILETYPE_VBOX_OVA     ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_EXT_OVA))"'
+        $(APPEND) $@ 'IDI_FILETYPE_VBOX_OVF     ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_EXT_OVF))"'
+        $(APPEND) $@ 'IDI_FILETYPE_VBOX_VMDK    ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_EXT_VMDK))"'
+        $(APPEND) $@ 'IDI_FILETYPE_VBOX_VHD     ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_EXT_VHD))"'
+        $(APPEND) $@ 'IDI_FILETYPE_VBOX_HDD     ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_EXT_HDD))"'
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Installer/win/Resources/resource.h

@@ -23 +23 @@
 #define IDI_FILETYPE_VBOX_OVF       301
 #define IDI_FILETYPE_VBOX_OVA       302
+#define IDI_FILETYPE_VBOX_VDI       303
+#define IDI_FILETYPE_VBOX_VMDK      304
+#define IDI_FILETYPE_VBOX_VHD       305
+#define IDI_FILETYPE_VBOX_HDD       306

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -386 +386 @@
                             </Extension>
                         </ProgId>
+                        <ProgId Id="progId_VirtualBox.Shell.vdi" Description="Virtual Disk Image" Icon="file_VBoxRes.dll" IconIndex="-303">
+                            <Extension Id="vdi" ContentType="application/x-virtualbox-vdi" />
+                        </ProgId>
+                        <ProgId Id="progId_VirtualBox.Shell.vmdk" Description="Virtual Machine Disk Format" Icon="file_VBoxRes.dll" IconIndex="-304">
+                            <Extension Id="vmdk" ContentType="application/x-virtualbox-vmdk" />
+                        </ProgId>
+                        <ProgId Id="progId_VirtualBox.Shell.vhd" Description="Virtual Hard Disk" Icon="file_VBoxRes.dll" IconIndex="-305">
+                            <Extension Id="vhd" ContentType="application/x-virtualbox-vhd" />
+                        </ProgId>
+                        <ProgId Id="progId_VirtualBox.Shell.hdd" Description="Virtual Hard Disk" Icon="file_VBoxRes.dll" IconIndex="-306">
+                            <Extension Id="hdd" ContentType="application/x-virtualbox-hdd" />
+                        </ProgId>
 
                         <!-- Files -->