diff --git a/reactos/subsys/system/explorer/explorer.h b/reactos/subsys/system/explorer/explorer.h index 591627e178e..892cf5bad51 100644 --- a/reactos/subsys/system/explorer/explorer.h +++ b/reactos/subsys/system/explorer/explorer.h @@ -54,4 +54,7 @@ #include "shell/shellbrowser.h" + +#ifndef ROSSHELL #include "shell/mainframe.h" +#endif diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc index 915c8d65e1a..fe9dea996c7 100644 --- a/reactos/subsys/system/explorer/explorer_intres.rc +++ b/reactos/subsys/system/explorer/explorer_intres.rc @@ -83,7 +83,6 @@ BEGIN IDS_TITLE "ReactOS Explorer" IDS_START "Începe" IDS_LOGOFF "Închide sesiunea ..." - IDS_TERMINATE "Închide" IDS_SHUTDOWN "Oprire calculator ..." IDS_LAUNCH "Pornire ..." IDS_START_HELP "Ajutor" @@ -98,6 +97,14 @@ BEGIN IDS_ADMIN "Administrare" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "mimimize all windows" + IDS_DESKTOP_NUM "Desktop %d" + IDS_TERMINATE "Închide" +END + STRINGTABLE DISCARDABLE BEGIN IDS_NETWORK "Reþea" @@ -116,13 +123,6 @@ BEGIN IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Desktop %d" -END - #endif // Romanian resources ///////////////////////////////////////////////////////////////////////////// @@ -141,7 +141,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Bitmap // -IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" IDB_LOGOV BITMAP DISCARDABLE "res/logov.bmp" IDB_LOGOV256 BITMAP DISCARDABLE "res/logov256.bmp" IDB_LOGOV16 BITMAP DISCARDABLE "res/logov16.bmp" @@ -259,6 +258,7 @@ END 3 TEXTINCLUDE DISCARDABLE BEGIN + "IDB_TOOLBAR BITMAP DISCARDABLE ""res/toolbar.bmp""\r\n" "#ifndef _ROS_\r\n" "LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r\n" "STRINGTABLE DISCARDABLE \r\n" @@ -339,7 +339,6 @@ BEGIN IDS_TITLE "Reactos Explorer" IDS_START "Start" IDS_LOGOFF "Abmelden..." - IDS_TERMINATE "ROS Explorer beenden" IDS_SHUTDOWN "Herunterfahren..." IDS_LAUNCH "Starten..." IDS_START_HELP "Hilfe" @@ -354,6 +353,14 @@ BEGIN IDS_ADMIN "Verwaltung" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "alle Fenster minimieren" + IDS_DESKTOP_NUM "Desktop %d" + IDS_TERMINATE "ROS Explorer beenden" +END + STRINGTABLE DISCARDABLE BEGIN IDS_NETWORK "Netzwerk" @@ -372,13 +379,6 @@ BEGIN IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "alle Fenster minimieren" - IDS_DESKTOP_NUM "Desktop %d" -END - #endif // German (Germany) resources ///////////////////////////////////////////////////////////////////////////// @@ -553,7 +553,6 @@ BEGIN IDS_TITLE "Reactos Explorer" IDS_START "Start" IDS_LOGOFF "Log Off..." - IDS_TERMINATE "Terminate ROS Explorer" IDS_SHUTDOWN "Turn Off..." IDS_LAUNCH "Run..." IDS_START_HELP "Help" @@ -568,6 +567,14 @@ BEGIN IDS_ADMIN "Administration" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "mimimize all windows" + IDS_DESKTOP_NUM "Desktop %d" + IDS_TERMINATE "Terminate ROS Explorer" +END + STRINGTABLE DISCARDABLE BEGIN IDS_NETWORK "Network" @@ -586,13 +593,6 @@ BEGIN IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Desktop %d" -END - #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// @@ -668,7 +668,6 @@ BEGIN IDS_TITLE "Explorateur Reactos" IDS_START "Démarrer" IDS_LOGOFF "Déconnexion ..." - IDS_TERMINATE "Déconnexion" IDS_SHUTDOWN "Arrêter..." IDS_LAUNCH "Exécuter..." IDS_START_HELP "Aide" @@ -683,6 +682,14 @@ BEGIN IDS_ADMIN "Administration" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "mimimize all windows" + IDS_DESKTOP_NUM "Bureau %d" + IDS_TERMINATE "Déconnexion" +END + STRINGTABLE DISCARDABLE BEGIN IDS_NETWORK "Réseaux" @@ -701,13 +708,6 @@ BEGIN IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Bureau %d" -END - #endif // French (France) resources ///////////////////////////////////////////////////////////////////////////// @@ -753,7 +753,6 @@ BEGIN IDS_TITLE "Explorador do Reactos" IDS_START "Iniciar" IDS_LOGOFF "Terminar sessão..." - IDS_TERMINATE "Terminar ROS Explorer" IDS_SHUTDOWN "Desligar..." IDS_LAUNCH "Executar..." IDS_START_HELP "Ajuda" @@ -768,6 +767,14 @@ BEGIN IDS_ADMIN "Administrar" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "mimimize all windows" + IDS_DESKTOP_NUM "Desktop %d" + IDS_TERMINATE "Terminar ROS Explorer" +END + STRINGTABLE DISCARDABLE BEGIN IDS_NETWORK "Rede" @@ -786,13 +793,6 @@ BEGIN IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Desktop %d" -END - #endif // Portuguese (Portugal) resources ///////////////////////////////////////////////////////////////////////////// @@ -803,6 +803,7 @@ END // // Generated from the TEXTINCLUDE 3 resource. // +IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" #ifndef _ROS_ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/reactos/subsys/system/explorer/rosshell.dsp b/reactos/subsys/system/explorer/rosshell.dsp index 3128569a784..244e8a30940 100644 --- a/reactos/subsys/system/explorer/rosshell.dsp +++ b/reactos/subsys/system/explorer/rosshell.dsp @@ -233,6 +233,10 @@ SOURCE=.\res\documents.ico # End Source File # Begin Source File +SOURCE=.\res\explorer.ico +# End Source File +# Begin Source File + SOURCE=.\explorer_intres.h # End Source File # Begin Source File @@ -386,6 +390,10 @@ SOURCE=.\shell\entries.h # End Source File # Begin Source File +SOURCE=.\shell\shellbrowser.h +# End Source File +# Begin Source File + SOURCE=.\shell\shellfs.cpp # End Source File # Begin Source File