[mf] 14923: more rosshell separations

more rosshell separations
Modified:
branches/lean-explorer/reactos/subsys/system/explorer/explorer.h
Modified:
branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc
Modified:
branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp
  _____  

Modified:
branches/lean-explorer/reactos/subsys/system/explorer/explorer.h
--- branches/lean-explorer/reactos/subsys/system/explorer/explorer.h
2005-05-01 20:02:30 UTC (rev 14922)
+++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.h
2005-05-01 20:12:06 UTC (rev 14923)
@@ -54,4 +54,7 @@

 
 
 #include "shell/shellbrowser.h"
+
+#ifndef ROSSHELL
 #include "shell/mainframe.h"
+#endif
  _____  

Modified:
branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc
---
branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc
2005-05-01 20:02:30 UTC (rev 14922)
+++
branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc
2005-05-01 20:12:06 UTC (rev 14923)
@@ -83,7 +83,6 @@

     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"
@@ -100,6 +99,14 @@
 
 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"
     IDS_CONNECTIONS         "Conec?ii"
     IDS_DRIVES              "Discuri"
@@ -116,13 +123,6 @@
     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 @@
 // 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 @@
 
 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 @@
     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"
@@ -356,6 +355,14 @@
 
 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"
     IDS_CONNECTIONS         "Netzwerk-Verbindungen"
     IDS_DRIVES              "Verzeichnisse"
@@ -372,13 +379,6 @@
     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 @@
     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"
@@ -570,6 +569,14 @@
 
 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"
     IDS_CONNECTIONS         "Network Connections"
     IDS_DRIVES              "Drives"
@@ -586,13 +593,6 @@
     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 @@
     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"
@@ -685,6 +684,14 @@
 
 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"
     IDS_CONNECTIONS         "Connexions rÚseaux"
     IDS_DRIVES              "Disques"
@@ -701,13 +708,6 @@
     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 @@
     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"
@@ -770,6 +769,14 @@
 
 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"
     IDS_CONNECTIONS         "Conecþ§es da rede"
     IDS_DRIVES              "Drives"
@@ -786,13 +793,6 @@
     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 @@
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
+IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp"
 #ifndef _ROS_
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 STRINGTABLE DISCARDABLE 
  _____  

Modified:
branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp
--- branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp
2005-05-01 20:02:30 UTC (rev 14922)
+++ branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp
2005-05-01 20:12:06 UTC (rev 14923)
@@ -233,6 +233,10 @@

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