Author: akhaldi Date: Wed Jun 17 18:30:14 2015 New Revision: 68174
URL: http://svn.reactos.org/svn/reactos?rev=68174&view=rev Log: [SHELL32] Fix IDI_SHELL_EXTENDED_PROPERTIES, use the icons 6 and 7 for floppy drive and remove floppy.ico. By Jared Smudde. CORE-9804
Added: trunk/reactos/dll/win32/shell32/res/icons/174.ico (with props) Removed: trunk/reactos/dll/win32/shell32/res/icons/floppy.ico Modified: trunk/reactos/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/res/icons/6.ico trunk/reactos/dll/win32/shell32/res/icons/7.ico trunk/reactos/dll/win32/shell32/shresdef.h
Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res.... ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Wed Jun 17 18:30:14 2015 @@ -3,9 +3,9 @@ IDI_SHELL_EXE ICON "res/icons/3.ico" IDI_SHELL_FOLDER ICON "res/icons/4.ico" IDI_SHELL_FOLDER_OPEN ICON "res/icons/5.ico" -IDI_SHELL_5_12_FLOPPY ICON "res/icons/floppy.ico" -IDI_SHELL_3_14_FLOPPY ICON "res/icons/floppy.ico" -IDI_SHELL_FLOPPY ICON "res/icons/floppy.ico" +IDI_SHELL_5_12_FLOPPY ICON "res/icons/6.ico" +IDI_SHELL_3_14_FLOPPY ICON "res/icons/7.ico" +IDI_SHELL_FLOPPY ICON "res/icons/7.ico" IDI_SHELL_DRIVE ICON "res/icons/9.ico" IDI_SHELL_NETDRIVE ICON "res/icons/10.ico" IDI_SHELL_NETDRIVE2 ICON "res/icons/11.ico" /* THIS SHOULD BE IDI_SHELL_NETDRIVE_OFF */ @@ -65,7 +65,8 @@ /* TODO: 168.ico, 169.ico, 170.ico, 171.ico */ IDI_SHELL_NETWORK_FOLDER ICON "res/icons/172.ico" IDI_SHELL_FAVORITES2 ICON "res/icons/173.ico" -/* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ +IDI_SHELL_EXTENDED_PROPERTIES ICON "res/icons/174.ico" +/* TODO: 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */
/* Folder Options, General dialog */ IDI_SHELL_SHOW_COMMON_TASKS ICON "res/icons/182.ico" @@ -123,8 +124,7 @@ IDI_SHELL_TUNES ICON "res/icons/277.ico" /* TODO: 278.ico */ IDI_SHELL_USER_ACCOUNTS ICON "res/icons/279.ico" -IDI_SHELL_EXTENDED_PROPERTIES ICON "res/icons/280.ico" -/* TODO: 281.ico, 282.ico, 283.ico, 284.ico */ +/* TODO: 280.ico, 281.ico, 282.ico, 283.ico, 284.ico */ IDI_SHELL_HELP_FILE ICON "res/icons/289.ico" IDI_SHELL_GO ICON "res/icons/290.ico" IDI_SHELL_DVD_DRIVE ICON "res/icons/291.ico"
Added: trunk/reactos/dll/win32/shell32/res/icons/174.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icons... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/dll/win32/shell32/res/icons/174.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Modified: trunk/reactos/dll/win32/shell32/res/icons/6.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icons... ============================================================================== Binary files - no diff available.
Modified: trunk/reactos/dll/win32/shell32/res/icons/7.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icons... ============================================================================== Binary files - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/icons/floppy.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icons... ============================================================================== Binary file - no diff available.
Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef.... ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Wed Jun 17 18:30:14 2015 @@ -381,7 +381,8 @@ /* TODO: 168.ico, 169.ico, 170.ico, 171.ico */ #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES2 173 -/* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ +#define IDI_SHELL_EXTENDED_PROPERTIES 174 +/* TODO: 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ #define IDI_SHELL_EMPTY_RECYCLE_BIN1 191 #define IDI_SHELL_FULL_RECYCLE_BIN1 192 /* TODO: 193.ico, 194.ico, 196.ico, 197.ico, 198.ico, 199.ico, 200.ico */ @@ -429,7 +430,6 @@ #define IDI_SHELL_TUNES 277 /* TODO: 278.ico */ #define IDI_SHELL_USER_ACCOUNTS 279 -#define IDI_SHELL_EXTENDED_PROPERTIES 280 /* TODO: 281.ico, 282.ico, 283.ico, 284.ico */ #define IDI_SHELL_HELP_FILE 289 #define IDI_SHELL_GO 290