[ros-diffs] [gedmurphy] 20824: - Split up the icon resources so each start menu entry has it's own icon

- Split up the icon resources so each start menu entry has it's own icon
- Add many new icons to make ReactOS prettier
Modified: trunk/reactos/subsys/system/explorer/explorer.cpp
Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc
Modified: trunk/reactos/subsys/system/explorer/globals.h
Modified: trunk/reactos/subsys/system/explorer/res/action.ico
Added: trunk/reactos/subsys/system/explorer/res/administration.ico
Modified: trunk/reactos/subsys/system/explorer/res/config.ico
Added: trunk/reactos/subsys/system/explorer/res/control-panel.ico
Added: trunk/reactos/subsys/system/explorer/res/desktop-settings.ico
Modified: trunk/reactos/subsys/system/explorer/res/documents.ico
Modified: trunk/reactos/subsys/system/explorer/res/favorites.ico
Modified: trunk/reactos/subsys/system/explorer/res/info.ico
Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico
Added: trunk/reactos/subsys/system/explorer/res/network-conns.ico
Modified: trunk/reactos/subsys/system/explorer/res/network.ico
Modified: trunk/reactos/subsys/system/explorer/res/printer.ico
Modified: trunk/reactos/subsys/system/explorer/res/shutdown.ico
Modified: trunk/reactos/subsys/system/explorer/resource.h
Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp
  _____  

Modified: trunk/reactos/subsys/system/explorer/explorer.cpp
--- trunk/reactos/subsys/system/explorer/explorer.cpp	2006-01-13
00:15:31 UTC (rev 20823)
+++ trunk/reactos/subsys/system/explorer/explorer.cpp	2006-01-13
00:15:53 UTC (rev 20824)
@@ -395,6 +395,10 @@

     _icons[ICID_SHUTDOWN]	= Icon(ICID_SHUTDOWN,	IDI_SHUTDOWN);
 	_icons[ICID_BOOKMARK]	= Icon(ICID_BOOKMARK,	IDI_DOT_TRANS);
     _icons[ICID_MINIMIZE]	= Icon(ICID_MINIMIZE,	IDI_MINIMIZE);
+	_icons[ICID_CONTROLPAN]	    = Icon(ICID_CONTROLPAN,
IDI_CONTROLPAN);
+    _icons[ICID_DESKSETTING]    = Icon(ICID_DESKSETTING,
IDI_DESKSETTING);
+	_icons[ICID_NETCONNS]	    = Icon(ICID_NETCONNS,
IDI_NETCONNS);
+    _icons[ICID_ADMINISTRATION]	= Icon(ICID_ADMINISTRATION,
IDI_ADMINISTRATION);
 }
 
 
  _____  

Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc
--- trunk/reactos/subsys/system/explorer/explorer_intres.rc
2006-01-13 00:15:31 UTC (rev 20823)
+++ trunk/reactos/subsys/system/explorer/explorer_intres.rc
2006-01-13 00:15:53 UTC (rev 20824)
@@ -166,6 +166,12 @@

 IDI_NOTIFY_L            ICON    DISCARDABLE     "res/notify_l.ico"
 IDI_NOTIFY_R            ICON    DISCARDABLE     "res/notify_r.ico"
 IDI_MINIMIZE            ICON    DISCARDABLE     "res/minimize.ico" 
+IDI_CONTROLPAN          ICON    DISCARDABLE     "res/control-panel.ico"
+IDI_DESKSETTING         ICON    DISCARDABLE
"res/desktop-settings.ico"
+IDI_NETCONNS            ICON    DISCARDABLE     "res/network-conns.ico"
+IDI_ADMINISTRATION      ICON    DISCARDABLE
"res/administration.ico"
+
+
 #endif    // Neutral resources
 
////////////////////////////////////////////////////////////////////////
/////
 
  _____  

Modified: trunk/reactos/subsys/system/explorer/globals.h
--- trunk/reactos/subsys/system/explorer/globals.h	2006-01-13
00:15:31 UTC (rev 20823)
+++ trunk/reactos/subsys/system/explorer/globals.h	2006-01-13
00:15:53 UTC (rev 20824)
@@ -83,6 +83,10 @@

     ICID_SHUTDOWN,
 	ICID_BOOKMARK,
     ICID_MINIMIZE,
+    ICID_CONTROLPAN,
+    ICID_DESKSETTING,
+    ICID_NETCONNS,
+    ICID_ADMINISTRATION,
 
 	ICID_DYNAMIC
 };
  _____  

Modified: trunk/reactos/subsys/system/explorer/res/action.ico
(Binary files differ)
  _____  

Added: trunk/reactos/subsys/system/explorer/res/administration.ico
(Binary files differ)
Property changes on:
trunk/reactos/subsys/system/explorer/res/administration.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
  _____  

Modified: trunk/reactos/subsys/system/explorer/res/config.ico
(Binary files differ)
  _____  

Added: trunk/reactos/subsys/system/explorer/res/control-panel.ico
(Binary files differ)
Property changes on:
trunk/reactos/subsys/system/explorer/res/control-panel.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
  _____  

Added: trunk/reactos/subsys/system/explorer/res/desktop-settings.ico
(Binary files differ)
Property changes on:
trunk/reactos/subsys/system/explorer/res/desktop-settings.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
  _____  

Modified: trunk/reactos/subsys/system/explorer/res/documents.ico
(Binary files differ)
  _____  

Modified: trunk/reactos/subsys/system/explorer/res/favorites.ico
(Binary files differ)
  _____  

Modified: trunk/reactos/subsys/system/explorer/res/info.ico
(Binary files differ)
  _____  

Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico
(Binary files differ)
  _____  

Added: trunk/reactos/subsys/system/explorer/res/network-conns.ico
(Binary files differ)
Property changes on:
trunk/reactos/subsys/system/explorer/res/network-conns.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
  _____  

Modified: trunk/reactos/subsys/system/explorer/res/network.ico
(Binary files differ)
  _____  

Modified: trunk/reactos/subsys/system/explorer/res/printer.ico
(Binary files differ)
  _____  

Modified: trunk/reactos/subsys/system/explorer/res/shutdown.ico
(Binary files differ)
  _____  

Modified: trunk/reactos/subsys/system/explorer/resource.h
--- trunk/reactos/subsys/system/explorer/resource.h	2006-01-13
00:15:31 UTC (rev 20823)
+++ trunk/reactos/subsys/system/explorer/resource.h	2006-01-13
00:15:53 UTC (rev 20824)
@@ -118,6 +118,10 @@

 #define IDB_MDI                         170
 #define IDB_SDI                         171
 #define IDI_MINIMIZE                    172
+#define IDI_CONTROLPAN                  173
+#define IDI_DESKSETTING                 174
+#define IDI_NETCONNS                    175
+#define IDI_ADMINISTRATION              176
 #define ID_VIEW_NAME                    401
 #define ID_VIEW_ALL_ATTRIBUTES          402
 #define ID_VIEW_SELECTED_ATTRIBUTES     403
  _____  

Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp
--- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp
2006-01-13 00:15:31 UTC (rev 20823)
+++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp
2006-01-13 00:15:53 UTC (rev 20824)
@@ -2148,23 +2148,23 @@

 	AddButton(ResString(IDS_CONNECTIONS),		ICID_NETWORK,
false, IDC_CONNECTIONS);
 #else
 //TODO	AddButton(ResString(IDS_PRINTERS),
ICID_PRINTER, true, IDC_PRINTERS_MENU);
-	AddButton(ResString(IDS_CONNECTIONS),		ICID_NETWORK,
true, IDC_CONNECTIONS);
+	AddButton(ResString(IDS_CONNECTIONS),		ICID_NETCONNS,
true, IDC_CONNECTIONS);
 #endif
-	AddButton(ResString(IDS_ADMIN),
ICID_CONFIG, true, IDC_ADMIN);
+	AddButton(ResString(IDS_ADMIN),
ICID_ADMINISTRATION, true, IDC_ADMIN);
 
 #ifndef __MINGW32__	// SHRestricted() missing in MinGW (as of
29.10.2003)
 	if (!g_Globals._SHRestricted ||
!SHRestricted(REST_NOCONTROLPANEL))
 #endif
 		AddButton(ResString(IDS_SETTINGS_MENU),	ICID_CONFIG,
true, IDC_SETTINGS_MENU);
 
-	AddButton(ResString(IDS_DESKTOPBAR_SETTINGS), ICID_CONFIG,
false, ID_DESKTOPBAR_SETTINGS);
+	AddButton(ResString(IDS_DESKTOPBAR_SETTINGS), ICID_DESKSETTING,
false, ID_DESKTOPBAR_SETTINGS);
 
 	AddButton(ResString(IDS_PRINTERS),
ICID_PRINTER, false, IDC_PRINTERS);
 
 #ifndef __MINGW32__	// SHRestricted() missing in MinGW (as of
29.10.2003)
 	if (!g_Globals._SHRestricted ||
!SHRestricted(REST_NOCONTROLPANEL))
 #endif
-		AddButton(ResString(IDS_CONTROL_PANEL),	ICID_CONFIG,
false, IDC_CONTROL_PANEL);
+		AddButton(ResString(IDS_CONTROL_PANEL),	ICID_CONTROLPAN,
false, IDC_CONTROL_PANEL);
 }
 
 void BrowseMenu::AddEntries()