- 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

diff --git a/reactos/subsys/system/explorer/explorer.cpp b/reactos/subsys/system/explorer/explorer.cpp
index 22ed036..1faa4c7 100644 (file)
--- a/reactos/subsys/system/explorer/explorer.cpp
+++ b/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_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);

 }
 
 
 }
 
 

diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc
index b5cefae..0d4a19c 100644 (file)
--- a/reactos/subsys/system/explorer/explorer_intres.rc
+++ b/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_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
 /////////////////////////////////////////////////////////////////////////////
 
 #endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/reactos/subsys/system/explorer/globals.h b/reactos/subsys/system/explorer/globals.h
index 361e381..174c998 100644 (file)
--- a/reactos/subsys/system/explorer/globals.h
+++ b/reactos/subsys/system/explorer/globals.h
@@ -83,6 +83,10 @@ enum ICON_ID {
     ICID_SHUTDOWN,
        ICID_BOOKMARK,
     ICID_MINIMIZE,
     ICID_SHUTDOWN,
        ICID_BOOKMARK,
     ICID_MINIMIZE,

+    ICID_CONTROLPAN,
+    ICID_DESKSETTING,
+    ICID_NETCONNS,
+    ICID_ADMINISTRATION,

 
        ICID_DYNAMIC
 };
 
        ICID_DYNAMIC
 };

diff --git a/reactos/subsys/system/explorer/res/action.ico b/reactos/subsys/system/explorer/res/action.ico
index 7b15f37..233a137 100644 (file)
Binary files a/reactos/subsys/system/explorer/res/action.ico and b/reactos/subsys/system/explorer/res/action.ico differ

diff --git a/reactos/subsys/system/explorer/res/administration.ico b/reactos/subsys/system/explorer/res/administration.ico
new file mode 100644 (file)
index 0000000..2e37e2b
Binary files /dev/null and b/reactos/subsys/system/explorer/res/administration.ico differ

diff --git a/reactos/subsys/system/explorer/res/config.ico b/reactos/subsys/system/explorer/res/config.ico
index 3bdc474..29eca19 100644 (file)
Binary files a/reactos/subsys/system/explorer/res/config.ico and b/reactos/subsys/system/explorer/res/config.ico differ

diff --git a/reactos/subsys/system/explorer/res/control-panel.ico b/reactos/subsys/system/explorer/res/control-panel.ico
new file mode 100644 (file)
index 0000000..bd646c3
Binary files /dev/null and b/reactos/subsys/system/explorer/res/control-panel.ico differ

diff --git a/reactos/subsys/system/explorer/res/desktop-settings.ico b/reactos/subsys/system/explorer/res/desktop-settings.ico
new file mode 100644 (file)
index 0000000..96b5e84
Binary files /dev/null and b/reactos/subsys/system/explorer/res/desktop-settings.ico differ

diff --git a/reactos/subsys/system/explorer/res/documents.ico b/reactos/subsys/system/explorer/res/documents.ico
index 727e1e2..792f6d8 100644 (file)
Binary files a/reactos/subsys/system/explorer/res/documents.ico and b/reactos/subsys/system/explorer/res/documents.ico differ

diff --git a/reactos/subsys/system/explorer/res/favorites.ico b/reactos/subsys/system/explorer/res/favorites.ico
index 558748e..70d3404 100644 (file)
Binary files a/reactos/subsys/system/explorer/res/favorites.ico and b/reactos/subsys/system/explorer/res/favorites.ico differ

diff --git a/reactos/subsys/system/explorer/res/info.ico b/reactos/subsys/system/explorer/res/info.ico
index 3b8e613..de36cbe 100644 (file)
Binary files a/reactos/subsys/system/explorer/res/info.ico and b/reactos/subsys/system/explorer/res/info.ico differ

diff --git a/reactos/subsys/system/explorer/res/logoff.ico b/reactos/subsys/system/explorer/res/logoff.ico
index ad98a3a..86740e7 100644 (file)
Binary files a/reactos/subsys/system/explorer/res/logoff.ico and b/reactos/subsys/system/explorer/res/logoff.ico differ

diff --git a/reactos/subsys/system/explorer/res/network-conns.ico b/reactos/subsys/system/explorer/res/network-conns.ico
new file mode 100644 (file)
index 0000000..258b996
Binary files /dev/null and b/reactos/subsys/system/explorer/res/network-conns.ico differ

diff --git a/reactos/subsys/system/explorer/res/network.ico b/reactos/subsys/system/explorer/res/network.ico
index 5bcf5ec..299c8cd 100644 (file)
Binary files a/reactos/subsys/system/explorer/res/network.ico and b/reactos/subsys/system/explorer/res/network.ico differ

diff --git a/reactos/subsys/system/explorer/res/printer.ico b/reactos/subsys/system/explorer/res/printer.ico
index 7edda27..fd75da4 100644 (file)
Binary files a/reactos/subsys/system/explorer/res/printer.ico and b/reactos/subsys/system/explorer/res/printer.ico differ

diff --git a/reactos/subsys/system/explorer/res/shutdown.ico b/reactos/subsys/system/explorer/res/shutdown.ico
index 8b76962..056d359 100644 (file)
Binary files a/reactos/subsys/system/explorer/res/shutdown.ico and b/reactos/subsys/system/explorer/res/shutdown.ico differ

diff --git a/reactos/subsys/system/explorer/resource.h b/reactos/subsys/system/explorer/resource.h
index 680d993..4fd0a93 100644 (file)
--- a/reactos/subsys/system/explorer/resource.h
+++ b/reactos/subsys/system/explorer/resource.h
@@ -118,6 +118,10 @@
 #define IDB_MDI                         170
 #define IDB_SDI                         171
 #define IDI_MINIMIZE                    172
 #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
 #define ID_VIEW_NAME                    401
 #define ID_VIEW_ALL_ATTRIBUTES          402
 #define ID_VIEW_SELECTED_ATTRIBUTES     403

diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
index fb54000..7eaedae 100644 (file)
--- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp
+++ b/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, 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
 #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);
 
 
 #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_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()
 }
 
 void BrowseMenu::AddEntries()