[ros-diffs] [pschweitzer] 30714: - Fixed and enabled about dialog - Added French translation
pschweitzer at svn.reactos.org
pschweitzer at svn.reactos.org
Sat Nov 24 10:14:57 CET 2007
Author: pschweitzer
Date: Sat Nov 24 12:14:56 2007
New Revision: 30714
URL: http://svn.reactos.org/svn/reactos?rev=30714&view=rev
Log:
- Fixed and enabled about dialog
- Added French translation
Added:
trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc (with props)
Modified:
trunk/rosapps/applications/screensavers/butterflies/butterflies.c
trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild
trunk/rosapps/applications/screensavers/butterflies/butterflies.rc
Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/butterflies.c?rev=30714&r1=30713&r2=30714&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/butterflies.c (original)
+++ trunk/rosapps/applications/screensavers/butterflies/butterflies.c Sat Nov 24 12:14:56 2007
@@ -232,20 +232,14 @@
}
BOOL AboutProc(HWND hdlg, UINT msg, WPARAM wpm, LPARAM lpm){
- /*
+
switch(msg){
case WM_CTLCOLORSTATIC:
- if(HWND(lpm) == GetDlgItem(hdlg, WEBPAGE1))
- {
- SetTextColor(HDC(wpm), RGB(0,0,255));
- SetBkColor(HDC(wpm), COLORREF(GetSysColor(COLOR_3DFACE)));
- return(int(GetSysColorBrush(COLOR_3DFACE)));
- }
- if(HWND(lpm) == GetDlgItem(hdlg, WEBPAGE2))
- {
- SetTextColor(HDC(wpm), RGB(0,0,255));
- SetBkColor(HDC(wpm), COLORREF(GetSysColor(COLOR_3DFACE)));
- return(int(GetSysColorBrush(COLOR_3DFACE)));
+ if(((HWND)lpm == GetDlgItem(hdlg, WEBPAGE1)) || ((HWND)lpm == GetDlgItem(hdlg, WEBPAGE2)))
+ {
+ SetTextColor((HDC)wpm, RGB(0,0,255));
+ SetBkColor((HDC)wpm, (COLORREF)GetSysColor(COLOR_3DFACE));
+ return((int)GetSysColorBrush(COLOR_3DFACE));
}
break;
case WM_COMMAND:
@@ -260,7 +254,7 @@
ShellExecute(NULL, "open", "http://www.thaputer.com", NULL, NULL, SW_SHOWNORMAL);
break;
}
- }*/
+ }
return FALSE;
}
@@ -321,7 +315,7 @@
EndDialog(hDlg, TRUE);
break;
case IDABOUT:
- //DialogBox(hInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hDlg, DLGPROC(AboutProc));
+ DialogBox(hInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hDlg, (DLGPROC)AboutProc);
break;
}
}
Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild?rev=30714&r1=30713&r2=30714&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild (original)
+++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild Sat Nov 24 12:14:56 2007
@@ -10,6 +10,7 @@
<library>opengl32</library>
<library>glu32</library>
<library>advapi32</library>
+ <library>shell32</library>
<metadata description = "Butterflies screensaver" />
Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/butterflies/butterflies.rc?rev=30714&r1=30713&r2=30714&view=diff
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Sat Nov 24 12:14:56 2007
@@ -13,4 +13,5 @@
#include "lang/bg-BG.rc"
#include "lang/de-DE.rc"
#include "lang/en-US.rc"
+#include "lang/fr-FR.rc"
#include "lang/uk-UA.rc"
Added: 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=30714&view=auto
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc (added)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc Sat Nov 24 12:14:56 2007
@@ -1,0 +1,144 @@
+//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"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,7,35,50,14
+ PUSHBUTTON "Annuler",IDCANCEL,61,35,50,14
+ CONTROL "Faire tourner les papillons",ROTATE,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,35,15,91,8
+ PUSHBUTTON "À propos de",IDABOUT,115,35,50,14
+END
+
+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"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,48,58,56,14
+ CTEXT "Écran de veille de papillons",IDC_STATIC,7,7,135,9
+ CTEXT "Démo par : NeHe ",IDC_STATIC,7,20,135,8
+ CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY |
+ NOT WS_GROUP
+ CTEXT "Écran de veille par : tHaPuTeR",IDC_STATIC,7,38,135,8,NOT
+ WS_GROUP
+ 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
+
Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
------------------------------------------------------------------------------
svn:eol-style = native
More information about the Ros-diffs
mailing list