[ros-diffs] [janderwald] 24939: - move resource files

Author: janderwald
Date: Tue Nov 28 23:06:41 2006
New Revision: 24939

URL: http://svn.reactos.org/svn/reactos?rev=24939&view=rev
Log:
- move resource files

Added:
    trunk/reactos/base/applications/devmgmt/lang/
    trunk/reactos/base/applications/devmgmt/lang/de-DE.rc
      - copied, changed from r24938, trunk/reactos/base/applications/devmgmt/de-DE.rc
    trunk/reactos/base/applications/devmgmt/lang/en-US.rc
      - copied, changed from r24938, trunk/reactos/base/applications/devmgmt/en-US.rc
    trunk/reactos/base/applications/devmgmt/rsrc.rc   (with props)
Removed:
    trunk/reactos/base/applications/devmgmt/de-DE.rc
    trunk/reactos/base/applications/devmgmt/en-US.rc
Modified:
    trunk/reactos/base/applications/devmgmt/devmgmt.rc

Removed: trunk/reactos/base/applications/devmgmt/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/…
==============================================================================
--- trunk/reactos/base/applications/devmgmt/de-DE.rc (original)
+++ trunk/reactos/base/applications/devmgmt/de-DE.rc (removed)
@@ -1,81 +1,0 @@
-LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
-
-IDR_MAINMENU MENU
-BEGIN
-  POPUP "&Datei"
-  BEGIN
-    MENUITEM "&Beenden",                   IDC_EXIT
-  END
-  POPUP "Action"
-  BEGIN
-    MENUITEM "Drucken",                   IDC_PRINT, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Eigenschaften",              IDC_PROP, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Hilfe",                    IDC_PROGHELP, GRAYED
-  END
-  POPUP "View"
-  BEGIN
-    MENUITEM "Geräte nach Typ",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Geräte nach Verbindung",   IDC_STATIC, GRAYED
-    MENUITEM "Resourcen nach Typ",       IDC_STATIC, GRAYED
-    MENUITEM "Resourcen nach Verbindung", IDC_STATIC, GRAYED
-  END
-  POPUP "Help"
-  BEGIN
-    MENUITEM "Hilfe",                    IDC_PROGHELP
-    MENUITEM "Info",                   IDC_ABOUT
-  END
-END
-
-IDR_POPUP MENU
-BEGIN
-  POPUP "popup"
-  BEGIN
-    MENUITEM "Eigenschaften",              IDC_PROP, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Hilfe",                    IDC_PROGHELP
-  END
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,190,182
-CAPTION "Über Geräte-Manager"
-FONT 8,"Tahoma",0,0
-STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, IDC_STATIC, 48, 7, 130, 26
-  PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15
-  ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LICENSE "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_TOOLTIP_PROP      "Eigenschaften"
-  IDS_TOOLTIP_REFRESH   "Aktualisieren"
-  IDS_TOOLTIP_HELP      "Hilfe"
-  IDS_TOOLTIP_EXIT      "Beenden"
-END
-
-/* Hints */
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_HINT_BLANK        " "
-  IDS_HINT_EXIT         " Das Programm beenden."
-  IDS_HINT_REFRESH      " Die Service-Liste aktualisieren."
-  IDS_HINT_PROP         " Eigenschaften-Seite für die aktuelle Auswahl
anzeigen."
-  IDS_HINT_HELP         " Hilfe-Fenster anzeigen."
-  IDS_HINT_ABOUT        " Über ReactOS Geräte-Manager."
-
-  IDS_HINT_SYS_RESTORE  " Dieses Fenster auf normale Größe wiederherstellen."
-  IDS_HINT_SYS_MOVE     " Dieses Fenster verschieben."
-  IDS_HINT_SYS_SIZE     " Größe dieses Fensters ändern."
-  IDS_HINT_SYS_MINIMIZE " Dieses Fenster zu einem Symbol verkleinern."
-  IDS_HINT_SYS_MAXIMIZE " Dieses Fenster auf Bildschirmgröße vergrößern."
-  IDS_HINT_SYS_CLOSE    " Dieses Fenster schließen."
-END

Modified: trunk/reactos/base/applications/devmgmt/devmgmt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/…
==============================================================================
--- trunk/reactos/base/applications/devmgmt/devmgmt.rc (original)
+++ trunk/reactos/base/applications/devmgmt/devmgmt.rc Tue Nov 28 23:06:41 2006
@@ -7,23 +7,4 @@
 #define REACTOS_STR_ORIGINAL_FILENAME "devmgmt.exe\0"
 #include <reactos/version.rc>
 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-1 24 DISCARDABLE "manifest.xml"
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_APPNAME "ReactOS Device Manager"
-END
-
-IDI_MAIN_ICON   ICON    "res/computer.ico"
-IDB_ROOT_IMAGE  BITMAP  "res/root.bmp"
-
-/* main toolbar icons */
-IDB_PROP    BITMAP DISCARDABLE "res/properties.bmp"
-IDB_REFRESH BITMAP DISCARDABLE "res/refresh.bmp"
-IDB_HELP    BITMAP DISCARDABLE "res/help.bmp"
-IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
-
-#include "de-DE.rc"
-#include "en-US.rc"
+#include "rsrc.rc"

Removed: trunk/reactos/base/applications/devmgmt/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/…
==============================================================================
--- trunk/reactos/base/applications/devmgmt/en-US.rc (original)
+++ trunk/reactos/base/applications/devmgmt/en-US.rc (removed)
@@ -1,81 +1,0 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-IDR_MAINMENU MENU
-BEGIN
-  POPUP "&File"
-  BEGIN
-    MENUITEM "E&xit",                   IDC_EXIT
-  END
-  POPUP "Action"
-  BEGIN
-    MENUITEM "Print",                   IDC_PRINT, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Properties",              IDC_PROP, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Help",                    IDC_PROGHELP, GRAYED
-  END
-  POPUP "View"
-  BEGIN
-    MENUITEM "Devices by type",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Devices by connection",   IDC_STATIC, GRAYED
-    MENUITEM "Resources by type",       IDC_STATIC, GRAYED
-    MENUITEM "Resources by connection", IDC_STATIC, GRAYED
-  END
-  POPUP "Help"
-  BEGIN
-    MENUITEM "Help",                    IDC_PROGHELP
-    MENUITEM "About",                   IDC_ABOUT
-  END
-END
-
-IDR_POPUP MENU
-BEGIN
-  POPUP "popup"
-  BEGIN
-    MENUITEM "Properties",              IDC_PROP, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Help",                    IDC_PROGHELP
-  END
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,190,182
-CAPTION "About Device Manager"
-FONT 8,"Tahoma",0,0
-STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)&quot;quot;, IDC_STATIC, 48, 7, 130, 26
-  PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
-  ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LICENSE "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_TOOLTIP_PROP      "Properties"
-  IDS_TOOLTIP_REFRESH   "Refresh"
-  IDS_TOOLTIP_HELP      "Help"
-  IDS_TOOLTIP_EXIT      "Exit"
-END
-
-/* Hints */
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_HINT_BLANK        " "
-  IDS_HINT_EXIT         " Exits the program."
-  IDS_HINT_REFRESH      " Refresh the service list."
-  IDS_HINT_PROP         " Open property sheet for the current selection."
-  IDS_HINT_HELP         " Display help window."
-  IDS_HINT_ABOUT        " About ReactOS Device Manager."
-
-  IDS_HINT_SYS_RESTORE  " Restores this window to normal size."
-  IDS_HINT_SYS_MOVE     " Moves this window."
-  IDS_HINT_SYS_SIZE     " Resizes this window."
-  IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon."
-  IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen."
-  IDS_HINT_SYS_CLOSE    " Closes this window."
-END

Copied: trunk/reactos/base/applications/devmgmt/lang/de-DE.rc (from r24938,
trunk/reactos/base/applications/devmgmt/de-DE.rc)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/…
==============================================================================
--- trunk/reactos/base/applications/devmgmt/de-DE.rc (original)
+++ trunk/reactos/base/applications/devmgmt/lang/de-DE.rc Tue Nov 28 23:06:41 2006
@@ -65,6 +65,7 @@
 /* Hints */
 STRINGTABLE DISCARDABLE
 BEGIN
+  IDS_APPNAME "ReactOS Geräte-Manager"
   IDS_HINT_BLANK        " "
   IDS_HINT_EXIT         " Das Programm beenden."
   IDS_HINT_REFRESH      " Die Service-Liste aktualisieren."

Copied: trunk/reactos/base/applications/devmgmt/lang/en-US.rc (from r24938,
trunk/reactos/base/applications/devmgmt/en-US.rc)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/…
==============================================================================
--- trunk/reactos/base/applications/devmgmt/en-US.rc (original)
+++ trunk/reactos/base/applications/devmgmt/lang/en-US.rc Tue Nov 28 23:06:41 2006
@@ -65,6 +65,7 @@
 /* Hints */
 STRINGTABLE DISCARDABLE
 BEGIN
+  IDS_APPNAME "ReactOS Device Manager"
   IDS_HINT_BLANK        " "
   IDS_HINT_EXIT         " Exits the program."
   IDS_HINT_REFRESH      " Refresh the service list."

Added: trunk/reactos/base/applications/devmgmt/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/…
==============================================================================
--- trunk/reactos/base/applications/devmgmt/rsrc.rc (added)
+++ trunk/reactos/base/applications/devmgmt/rsrc.rc Tue Nov 28 23:06:41 2006
@@ -1,0 +1,18 @@
+#include <windows.h>
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+1 24 DISCARDABLE "manifest.xml"
+
+IDI_MAIN_ICON   ICON    "res/computer.ico"
+IDB_ROOT_IMAGE  BITMAP  "res/root.bmp"
+
+/* main toolbar icons */
+IDB_PROP    BITMAP DISCARDABLE "res/properties.bmp"
+IDB_REFRESH BITMAP DISCARDABLE "res/refresh.bmp"
+IDB_HELP    BITMAP DISCARDABLE "res/help.bmp"
+IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
+
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"

Propchange: trunk/reactos/base/applications/devmgmt/rsrc.rc
------------------------------------------------------------------------------
    svn:eol-style = native