diff --git a/reactos/subsys/system/explorer/doc/changes.txt b/reactos/subsys/system/explorer/doc/changes.txt index c50b6792522..3c71b82bd27 100644 --- a/reactos/subsys/system/explorer/doc/changes.txt +++ b/reactos/subsys/system/explorer/doc/changes.txt @@ -49,3 +49,4 @@ If you search for more information, look into the CVS repository. 29.11.2003 m. fuchs implemented GDB stub for remote debugging 06.12.2003 m. fuchs basic support to display NTFS streams in winefile windows 20.12.2003 m. fuchs context menu implementation for desktop window +01.01.2004 m. fuchs integrated icons of Everaldo (http://www.everaldo.com) into the start menu. diff --git a/reactos/subsys/system/explorer/explorer.dsp b/reactos/subsys/system/explorer/explorer.dsp index c9c4c0a79c3..f327013428d 100644 --- a/reactos/subsys/system/explorer/explorer.dsp +++ b/reactos/subsys/system/explorer/explorer.dsp @@ -334,13 +334,21 @@ SOURCE=.\utility\window.h # End Group # Begin Group "resources" -# PROP Default_Filter "" +# PROP Default_Filter "bmp,ico" +# Begin Source File + +SOURCE=.\res\action.ico +# End Source File # Begin Source File SOURCE=.\res\appicon.ico # End Source File # Begin Source File +SOURCE=.\res\apps.ico +# End Source File +# Begin Source File + SOURCE=.\res\arrow.ico # End Source File # Begin Source File @@ -349,6 +357,14 @@ SOURCE=.\res\arrowsel.ico # End Source File # Begin Source File +SOURCE=.\res\computer.ico +# End Source File +# Begin Source File + +SOURCE=.\res\config.ico +# End Source File +# Begin Source File + SOURCE=.\de.rc !IF "$(CFG)" == "explorer - Win32 Release" @@ -398,6 +414,10 @@ SOURCE=.\de.rc # End Source File # Begin Source File +SOURCE=.\res\documents.ico +# End Source File +# Begin Source File + SOURCE=.\res\drivebar.bmp # End Source File # Begin Source File @@ -463,14 +483,26 @@ SOURCE=.\explorer_intres.rc # End Source File # Begin Source File +SOURCE=.\res\favorites.ico +# End Source File +# Begin Source File + SOURCE=.\res\floating.ico # End Source File # Begin Source File +SOURCE=.\res\folder.ico +# End Source File +# Begin Source File + SOURCE=.\res\images.bmp # End Source File # Begin Source File +SOURCE=.\res\info.ico +# End Source File +# Begin Source File + SOURCE=.\res\logoff.ico # End Source File # Begin Source File @@ -483,6 +515,14 @@ SOURCE=.\res\logov256.bmp # End Source File # Begin Source File +SOURCE=.\res\network.ico +# End Source File +# Begin Source File + +SOURCE=.\res\printer.ico +# End Source File +# Begin Source File + SOURCE=.\res\reactos.ico # End Source File # Begin Source File @@ -536,6 +576,18 @@ SOURCE=.\resource.rc # End Source File # Begin Source File +SOURCE=".\res\ros-big.ico" +# End Source File +# Begin Source File + +SOURCE=".\res\search-doc.ico" +# End Source File +# Begin Source File + +SOURCE=.\res\search.ico +# End Source File +# Begin Source File + SOURCE=.\res\startmenu.bmp # End Source File # Begin Source File @@ -705,26 +757,10 @@ SOURCE=.\dialogs\searchprogram.h # End Group # Begin Source File -SOURCE=.\res\action.ico -# End Source File -# Begin Source File - -SOURCE=.\res\apps.ico -# End Source File -# Begin Source File - SOURCE=.\buildno.h # End Source File # Begin Source File -SOURCE=.\res\config.ico -# End Source File -# Begin Source File - -SOURCE=.\res\documents.ico -# End Source File -# Begin Source File - SOURCE=.\explorer.cpp # End Source File # Begin Source File @@ -737,31 +773,11 @@ SOURCE=.\externals.h # End Source File # Begin Source File -SOURCE=.\res\favorites.ico -# End Source File -# Begin Source File - -SOURCE=.\res\folder.ico -# End Source File -# Begin Source File - SOURCE=.\globals.h # End Source File # Begin Source File SOURCE=".\i386-stub-win32.c" # End Source File -# Begin Source File - -SOURCE=.\res\info.ico -# End Source File -# Begin Source File - -SOURCE=".\res\ros-big.ico" -# End Source File -# Begin Source File - -SOURCE=.\res\search.ico -# End Source File # End Target # End Project diff --git a/reactos/subsys/system/explorer/explorer_intres.h b/reactos/subsys/system/explorer/explorer_intres.h index 9346bbba1fd..fd2e8c78d87 100644 --- a/reactos/subsys/system/explorer/explorer_intres.h +++ b/reactos/subsys/system/explorer/explorer_intres.h @@ -62,6 +62,10 @@ #define IDI_SEARCH 143 #define IDI_ACTION 144 #define IDI_FOLDER 145 +#define IDI_SEARCH_DOC 146 +#define IDI_PRINTER 147 +#define IDI_NETWORK 148 +#define IDI_COMPUTER 149 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 @@ -101,7 +105,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 146 +#define _APS_NEXT_RESOURCE_VALUE 150 #define _APS_NEXT_COMMAND_VALUE 40004 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc index 21f27232e4e..6ad181fc265 100644 --- a/reactos/subsys/system/explorer/explorer_intres.rc +++ b/reactos/subsys/system/explorer/explorer_intres.rc @@ -401,6 +401,10 @@ IDI_APPS ICON DISCARDABLE "res\\apps.ico" IDI_SEARCH ICON DISCARDABLE "res\\search.ico" IDI_ACTION ICON DISCARDABLE "res\\action.ico" IDI_FOLDER ICON DISCARDABLE "res\\folder.ico" +IDI_SEARCH_DOC ICON DISCARDABLE "res\\search-doc.ico" +IDI_PRINTER ICON DISCARDABLE "res\\printer.ico" +IDI_NETWORK ICON DISCARDABLE "res\\network.ico" +IDI_COMPUTER ICON DISCARDABLE "res\\computer.ico" ///////////////////////////////////////////////////////////////////////////// // diff --git a/reactos/subsys/system/explorer/res/computer.ico b/reactos/subsys/system/explorer/res/computer.ico new file mode 100644 index 00000000000..d4f62e2536c Binary files /dev/null and b/reactos/subsys/system/explorer/res/computer.ico differ diff --git a/reactos/subsys/system/explorer/res/network.ico b/reactos/subsys/system/explorer/res/network.ico new file mode 100644 index 00000000000..8e5af63a9a3 Binary files /dev/null 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 new file mode 100644 index 00000000000..7e0f99773f3 Binary files /dev/null and b/reactos/subsys/system/explorer/res/printer.ico differ diff --git a/reactos/subsys/system/explorer/res/search-doc.ico b/reactos/subsys/system/explorer/res/search-doc.ico new file mode 100644 index 00000000000..98eb6f2dc82 Binary files /dev/null and b/reactos/subsys/system/explorer/res/search-doc.ico differ diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp index 5303cb79785..03a6326da5e 100644 --- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp +++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp @@ -1019,16 +1019,16 @@ void SettingsMenu::AddEntries() #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCONTROLPANEL)) #endif - AddButton(ResString(IDS_CONTROL_PANEL), 0, false, IDC_CONTROL_PANEL); + AddButton(ResString(IDS_CONTROL_PANEL), SmallIcon(IDI_CONFIG), false, IDC_CONTROL_PANEL); - AddButton(ResString(IDS_PRINTERS), 0, true, IDC_PRINTERS); - AddButton(ResString(IDS_CONNECTIONS), 0, true, IDC_CONNECTIONS); - AddButton(ResString(IDS_ADMIN), 0, true, IDC_ADMIN); + AddButton(ResString(IDS_PRINTERS), SmallIcon(IDI_PRINTER), true, IDC_PRINTERS); + AddButton(ResString(IDS_CONNECTIONS), SmallIcon(IDI_NETWORK), true, IDC_CONNECTIONS); + AddButton(ResString(IDS_ADMIN), SmallIcon(IDI_CONFIG), 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), 0, true, IDC_SETTINGS_MENU); + AddButton(ResString(IDS_SETTINGS_MENU), SmallIcon(IDI_CONFIG), true, IDC_SETTINGS_MENU); } int SettingsMenu::Command(int id, int code) @@ -1070,9 +1070,9 @@ void BrowseMenu::AddEntries() #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NONETHOOD)) // or REST_NOENTIRENETWORK ? #endif - AddButton(ResString(IDS_NETWORK), 0, true, IDC_NETWORK); + AddButton(ResString(IDS_NETWORK), SmallIcon(IDI_NETWORK), true, IDC_NETWORK); - AddButton(ResString(IDS_DRIVES), 0, true, IDC_DRIVES); + AddButton(ResString(IDS_DRIVES), SmallIcon(IDI_FOLDER), true, IDC_DRIVES); } int BrowseMenu::Command(int id, int code) @@ -1099,14 +1099,14 @@ void SearchMenu::AddEntries() { super::AddEntries(); - AddButton(ResString(IDS_SEARCH_PRG), 0, false, IDC_SEARCH_PROGRAM); + AddButton(ResString(IDS_SEARCH_PRG), SmallIcon(IDI_APPS), false, IDC_SEARCH_PROGRAM); - AddButton(ResString(IDS_SEARCH_FILES), 0, false, IDC_SEARCH_FILES); + AddButton(ResString(IDS_SEARCH_FILES), SmallIcon(IDI_SEARCH_DOC), false, IDC_SEARCH_FILES); #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_HASFINDCOMPUTERS)) #endif - AddButton(ResString(IDS_SEARCH_COMPUTER), 0, false, IDC_SEARCH_COMPUTER); + AddButton(ResString(IDS_SEARCH_COMPUTER), SmallIcon(IDI_COMPUTER), false, IDC_SEARCH_COMPUTER); } int SearchMenu::Command(int id, int code)