- Split up the icon resources so each start menu entry has it's own icon

- Add many new icons to make ReactOS prettier

svn path=/trunk/; revision=20824

reactos/subsys/system/explorer/explorer.cpp

@@ -395,6 +395,10 @@ void IconCache::init()
     _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);
 }
 
 

reactos/subsys/system/explorer/explorer_intres.rc

@@ -166,6 +166,12 @@ IDI_ARROW_DOWN          ICON    DISCARDABLE     "res/arrow_dwn.ico"
 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
 /////////////////////////////////////////////////////////////////////////////
 

reactos/subsys/system/explorer/globals.h

@@ -83,6 +83,10 @@ enum ICON_ID {
     ICID_SHUTDOWN,
 	ICID_BOOKMARK,
     ICID_MINIMIZE,
+    ICID_CONTROLPAN,
+    ICID_DESKSETTING,
+    ICID_NETCONNS,
+    ICID_ADMINISTRATION,
 
 	ICID_DYNAMIC
 };

reactos/subsys/system/explorer/resource.h

@@ -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

reactos/subsys/system/explorer/taskbar/startmenu.cpp

@@ -2148,23 +2148,23 @@ void SettingsMenu::AddEntries()
 	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()