[ros-diffs] [cfinck] 30959: Remove all that VS stuff from the butterflies screensaver resource files, create a "rsrc.rc" file and add common resources only one time. Also remove an unused string. This makes the screensaver much smaller and easier to translate.

cfinck at svn.reactos.org cfinck at svn.reactos.org
Sun Dec 2 15:39:07 CET 2007


Author: cfinck
Date: Sun Dec  2 17:39:07 2007
New Revision: 30959

URL: http://svn.reactos.org/svn/reactos?rev=30959&view=rev
Log:
Remove all that VS stuff from the butterflies screensaver resource files, create a "rsrc.rc" file and add common resources only one time. Also remove an unused string.
This makes the screensaver much smaller and easier to translate.

Added:
    trunk/rosapps/applications/screensavers/butterflies/rsrc.rc   (with props)
Modified:
    trunk/rosapps/applications/screensavers/butterflies/butterflies.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
    trunk/rosapps/applications/screensavers/butterflies/resource.h

Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/butterflies.rc?rev=30959&r1=30958&r2=30959&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Sun Dec  2 17:39:07 2007
@@ -7,12 +7,10 @@
 #define REACTOS_STR_FILE_DESCRIPTION    "Butterflies ScreenSaver\0"
 #define REACTOS_STR_INTERNAL_NAME       "butterflies\0"
 #define REACTOS_STR_ORIGINAL_FILENAME   "butterflies.scr\0"
-
 #include <reactos/version.rc>
 
-#include "lang/bg-BG.rc"
-#include "lang/de-DE.rc"
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/fr-FR.rc"
-#include "lang/uk-UA.rc"
+IDB_BUTTERFLY1   BITMAP   "res/butterfly1.bmp"
+IDB_BUTTERFLY2   BITMAP   "res/butterfly2.bmp"
+IDB_BUTTERFLY3   BITMAP   "res/butterfly3.bmp"
+
+#include "rsrc.rc"

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc?rev=30959&r1=30958&r2=30959&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc Sun Dec  2 17:39:07 2007
@@ -1,35 +1,9 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Bulgarian (BG) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
 
 IDD_DLG_SCREEN DIALOG DISCARDABLE  0, 0, 172, 57
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Åêðàíåí ïðåäïàçèòåë ñ ïåïåðóäè"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Äîáðå",IDOK,7,35,50,14
     PUSHBUTTON      "Îòêàç",IDCANCEL,61,35,50,14
@@ -41,7 +15,7 @@
 IDD_DLG_ABOUT DIALOG DISCARDABLE  0, 0, 149, 79
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Çà"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Äîáðå",IDOK,48,58,56,14
     CTEXT           "Ïåïåðóäåí åêðàíåí ïðåäïàçèòåë",IDC_STATIC,7,7,135,9
@@ -53,92 +27,3 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
-    IDD_DLG_SCREEN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 165
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 50
-    END
-
-    IDD_DLG_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 142
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 72
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BUTTERFLY1          BITMAP  DISCARDABLE     "res/butterfly1.bmp"
-IDB_BUTTERFLY2          BITMAP  DISCARDABLE     "res/butterfly2.bmp"
-IDB_BUTTERFLY3          BITMAP  DISCARDABLE     "res/butterfly3.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_STR_DESCRIP         "Ïåïåðóäè"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc?rev=30959&r1=30958&r2=30959&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc Sun Dec  2 17:39:07 2007
@@ -1,18 +1,9 @@
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-#include "afxres.h"
-#undef APSTUDIO_READONLY_SYMBOLS
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif
 
 IDD_DLG_SCREEN DIALOG DISCARDABLE  0, 0, 172, 57
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Schmetterlinge Einstellungen"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,7,35,50,14
     PUSHBUTTON      "Abbrechen",IDCANCEL,61,35,50,14
@@ -24,7 +15,7 @@
 IDD_DLG_ABOUT DIALOG DISCARDABLE  0, 0, 149, 79
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Über"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,48,58,56,14
     CTEXT           "Schmetterlinge",IDC_STATIC,7,7,135,9
@@ -36,62 +27,3 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
-    IDD_DLG_SCREEN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 165
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 50
-    END
-
-    IDD_DLG_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 142
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 72
-    END
-END
-#endif
-
-
-#ifdef APSTUDIO_INVOKED
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif
-
-IDB_BUTTERFLY1          BITMAP  DISCARDABLE     "res/butterfly1.bmp"
-IDB_BUTTERFLY2          BITMAP  DISCARDABLE     "res/butterfly2.bmp"
-IDB_BUTTERFLY3          BITMAP  DISCARDABLE     "res/butterfly3.bmp"
-
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_STR_DESCRIP         "Schmetterlinge"
-END
-
-#endif
-
-#ifndef APSTUDIO_INVOKED
-
-#endif

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc?rev=30959&r1=30958&r2=30959&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc Sun Dec  2 17:39:07 2007
@@ -1,35 +1,9 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
 
 IDD_DLG_SCREEN DIALOG DISCARDABLE  0, 0, 172, 57
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Butterflies ScreenSaver Settings"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,7,35,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,61,35,50,14
@@ -41,7 +15,7 @@
 IDD_DLG_ABOUT DIALOG DISCARDABLE  0, 0, 149, 79
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,48,58,56,14
     CTEXT           "Butterflies ScreenSaver",IDC_STATIC,7,7,135,9
@@ -53,92 +27,3 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
-    IDD_DLG_SCREEN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 165
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 50
-    END
-
-    IDD_DLG_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 142
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 72
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BUTTERFLY1          BITMAP  DISCARDABLE     "res/butterfly1.bmp"
-IDB_BUTTERFLY2          BITMAP  DISCARDABLE     "res/butterfly2.bmp"
-IDB_BUTTERFLY3          BITMAP  DISCARDABLE     "res/butterfly3.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_STR_DESCRIP         "Butterflies"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc?rev=30959&r1=30958&r2=30959&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc Sun Dec  2 17:39:07 2007
@@ -1,35 +1,9 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
 
 IDD_DLG_SCREEN DIALOG DISCARDABLE  0, 0, 172, 57
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuración del Salvapantallas de Mariposas"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Aceptar",IDOK,7,35,50,14
     PUSHBUTTON      "Cancelar",IDCANCEL,61,35,50,14
@@ -41,7 +15,7 @@
 IDD_DLG_ABOUT DIALOG DISCARDABLE  0, 0, 149, 79
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Aceptar",IDOK,48,58,56,14
     CTEXT           "Salvapantallas de Mariposas",IDC_STATIC,7,7,135,9
@@ -53,92 +27,3 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
-    IDD_DLG_SCREEN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 165
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 50
-    END
-
-    IDD_DLG_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 142
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 72
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BUTTERFLY1          BITMAP  DISCARDABLE     "res/butterfly1.bmp"
-IDB_BUTTERFLY2          BITMAP  DISCARDABLE     "res/butterfly2.bmp"
-IDB_BUTTERFLY3          BITMAP  DISCARDABLE     "res/butterfly3.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_STR_DESCRIP         "Mariposas"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc?rev=30959&r1=30958&r2=30959&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc Sun Dec  2 17:39:07 2007
@@ -1,35 +1,9 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// French resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
 
 IDD_DLG_SCREEN DIALOG DISCARDABLE  0, 0, 172, 57
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuration de l'écran de veille de papillons"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,7,35,50,14
     PUSHBUTTON      "Annuler",IDCANCEL,61,35,50,14
@@ -41,7 +15,7 @@
 IDD_DLG_ABOUT DIALOG DISCARDABLE  0, 0, 149, 79
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "À propos de"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,48,58,56,14
     CTEXT           "Écran de veille de papillons",IDC_STATIC,7,7,135,9
@@ -53,92 +27,3 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
-    IDD_DLG_SCREEN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 165
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 50
-    END
-
-    IDD_DLG_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 142
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 72
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BUTTERFLY1          BITMAP  DISCARDABLE     "res/butterfly1.bmp"
-IDB_BUTTERFLY2          BITMAP  DISCARDABLE     "res/butterfly2.bmp"
-IDB_BUTTERFLY3          BITMAP  DISCARDABLE     "res/butterfly3.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_STR_DESCRIP         "Papillons"
-END
-
-#endif    // French resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc?rev=30959&r1=30958&r2=30959&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc Sun Dec  2 17:39:07 2007
@@ -1,35 +1,9 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Ukraianian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
 
 IDD_DLG_SCREEN DIALOG DISCARDABLE  0, 0, 172, 57
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Butterflies ScreenSaver Settings"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,7,35,50,14
     PUSHBUTTON      "Ñêàñóâàòè",IDCANCEL,61,35,50,14
@@ -41,7 +15,7 @@
 IDD_DLG_ABOUT DIALOG DISCARDABLE  0, 0, 149, 79
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,48,58,56,14
     CTEXT           "Çàñòàâêà ""Butterflies""",IDC_STATIC,7,7,135,9
@@ -53,92 +27,3 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
-    IDD_DLG_SCREEN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 165
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 50
-    END
-
-    IDD_DLG_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 142
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 72
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BUTTERFLY1          BITMAP  DISCARDABLE     "res/butterfly1.bmp"
-IDB_BUTTERFLY2          BITMAP  DISCARDABLE     "res/butterfly2.bmp"
-IDB_BUTTERFLY3          BITMAP  DISCARDABLE     "res/butterfly3.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_STR_DESCRIP         "Butterflies"
-END
-
-#endif    // Ukraianian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

Modified: trunk/rosapps/applications/screensavers/butterflies/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/resource.h?rev=30959&r1=30958&r2=30959&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/resource.h (original)
+++ trunk/rosapps/applications/screensavers/butterflies/resource.h Sun Dec  2 17:39:07 2007
@@ -1,3 +1,4 @@
+#define IDC_STATIC                      -1
 
 #define IDS_STR_DESCRIP                 1
 #define IDABOUT                         3

Added: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/rsrc.rc?rev=30959&view=auto
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/rsrc.rc (added)
+++ trunk/rosapps/applications/screensavers/butterflies/rsrc.rc Sun Dec  2 17:39:07 2007
@@ -1,0 +1,6 @@
+#include "lang/bg-BG.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/uk-UA.rc"

Propchange: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc
------------------------------------------------------------------------------
    svn:eol-style = native




More information about the Ros-diffs mailing list