5 Nov
2007
5 Nov
'07
10:15 p.m.
Author: pschweitzer
Date: Tue Nov 6 01:15:45 2007
New Revision: 30204
URL: http://svn.reactos.org/svn/reactos?rev=30204&view=rev
Log:
Moved colors names to RC files
Modified:
trunk/tools/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc
trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc
trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc
trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc
trunk/tools/RosBE-Windows/Tools/config/options.c
trunk/tools/RosBE-Windows/Tools/config/resources.h
Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original)
+++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Tue Nov 6 01:15:45 2007
@@ -27,6 +27,7 @@
- Improved Save button status (Pierre Schweitzer)
- Previous settings are loaded (Pierre Schweitzer)
- Fixed various bugs (Pierre Schweitzer)
+ - Moved colors names to RC files (Pierre Schweitzer)
- Fixed German RC File of Options.exe. (Daniel Reimer)
- Modify options.exe to enable and disable stripping and ccache. This gives back the
possibility to give more than one command to make. (Daniel Reimer)
- Fixed Russian RC File of options.exe (towerr)
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Tue Nov 6 01:15:45 2007
@@ -31,6 +31,22 @@
STRINGTABLE
BEGIN
+ CLR0, "Black"
+ CLR1, "Blue"
+ CLR2, "Green"
+ CLR3, "Aqua"
+ CLR4, "Red"
+ CLR5, "Purple"
+ CLR6, "Yellow"
+ CLR7, "White"
+ CLR8, "Gray"
+ CLR9, "Light Blue"
+ CLR10, "Light Green"
+ CLR11, "Light Aqua"
+ CLR12, "Light Red"
+ CLR13, "Light Purple"
+ CLR14, "Light Yellow"
+ CLR15, "Bright White"
MSG_NOGCCFOUND, "Kein GCC Compiler gefunden ! Bitte überprüfen sie ihren
Pfad."
MSG_FILEFAILED, "rosbe-options.cmd konnte nicht erstellt werden!"
MSG_DIREFAILED, "Log directory konnte nicht erstellt werden!"
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Tue Nov 6 01:15:45 2007
@@ -31,6 +31,22 @@
STRINGTABLE
BEGIN
+ CLR0, "Black"
+ CLR1, "Blue"
+ CLR2, "Green"
+ CLR3, "Aqua"
+ CLR4, "Red"
+ CLR5, "Purple"
+ CLR6, "Yellow"
+ CLR7, "White"
+ CLR8, "Gray"
+ CLR9, "Light Blue"
+ CLR10, "Light Green"
+ CLR11, "Light Aqua"
+ CLR12, "Light Red"
+ CLR13, "Light Purple"
+ CLR14, "Light Yellow"
+ CLR15, "Bright White"
MSG_NOGCCFOUND, "No GCC compiler found ! Please check your directory."
MSG_FILEFAILED, "Failed to create rosbe-options.cmd!"
MSG_DIREFAILED, "Failed to create log directory!"
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Tue Nov 6 01:15:45 2007
@@ -31,6 +31,22 @@
STRINGTABLE
BEGIN
+ CLR0, "Noir"
+ CLR1, "Bleu"
+ CLR2, "Vert"
+ CLR3, "Turquoise"
+ CLR4, "Rouge"
+ CLR5, "Violet"
+ CLR6, "Jaune"
+ CLR7, "Blanc"
+ CLR8, "Gris"
+ CLR9, "Bleu Clair"
+ CLR10, "Vert Clair"
+ CLR11, "Turquoise Clair"
+ CLR12, "Rouge Clair"
+ CLR13, "Violet Clair"
+ CLR14, "Jaune Clair"
+ CLR15, "Blanc Brillant"
MSG_NOGCCFOUND, "Impossible de trouver le compilateur GCC ! Veuillez vérifier
votre répertoire."
MSG_FILEFAILED, "Impossible de créer rosbe-options.cmd!"
MSG_DIREFAILED, "Impossible de créer le répertoire pour le journal!"
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Tue Nov 6 01:15:45 2007
@@ -33,6 +33,22 @@
STRINGTABLE
BEGIN
+ CLR0, "Black"
+ CLR1, "Blue"
+ CLR2, "Green"
+ CLR3, "Aqua"
+ CLR4, "Red"
+ CLR5, "Purple"
+ CLR6, "Yellow"
+ CLR7, "White"
+ CLR8, "Gray"
+ CLR9, "Light Blue"
+ CLR10, "Light Green"
+ CLR11, "Light Aqua"
+ CLR12, "Light Red"
+ CLR13, "Light Purple"
+ CLR14, "Light Yellow"
+ CLR15, "Bright White"
MSG_NOGCCFOUND, "Êîìïèëÿòîð GCC íåíàéäåí! Ïðîâåðüòå ïðàâèëüíîñòü óñòàíîâêè."
MSG_FILEFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd"
MSG_DIREFAILED, "Íåâîçìîæíî ñîçäàòü ïàïêó äëÿ ëîãîâ!"
Modified: trunk/tools/RosBE-Windows/Tools/config/options.c
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/options.c (original)
+++ trunk/tools/RosBE-Windows/Tools/config/options.c Tue Nov 6 01:15:45 2007
@@ -259,11 +259,7 @@
case WM_INITDIALOG:
{
LOGFONT lf;
- // note: do not change the order - theses are the color under winxp they
might differ in another OSes
- WCHAR *Colors[] = { L"Black", L"Blue",
L"Green", L"Aqua", L"Red", L"Purple",
- L"Yellow", L"White", L"Gray", L"Light
Blue", L"Light Green",
- L"Light Aqua", L"Light Red", L"Light
Purple", L"Light Yellow", L"Bright White"
- };
+ WCHAR TempColor[256];
hIcon = LoadImage( hInstance,
MAKEINTRESOURCE(ID_OPTICON),
@@ -280,10 +276,11 @@
lf.lfItalic, lf.lfUnderline, lf.lfStrikeOut, lf.lfCharSet,
lf.lfOutPrecision,
lf.lfClipPrecision, lf.lfQuality, lf.lfPitchAndFamily, lf.lfFaceName);
- for(UINT i = 0; i < sizeof(Colors) / sizeof(char *); i++)
- {
- SendDlgItemMessageW(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM)
(Colors[i]));
- SendDlgItemMessageW(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM)
(Colors[i]));
+ for(UINT i = 0; i < 16; i++)
+ {
+ LoadString(hInstance, i, TempColor, 256);
+ SendDlgItemMessageW(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM) TempColor);
+ SendDlgItemMessageW(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM) TempColor);
}
LoadSettings(Dlg, &Settings);
return TRUE;
Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/resources.h (original)
+++ trunk/tools/RosBE-Windows/Tools/config/resources.h Tue Nov 6 01:15:45 2007
@@ -8,30 +8,48 @@
*
*/
+/* Colors */
+#define CLR0 0x00
+#define CLR1 0x01
+#define CLR2 0x02
+#define CLR3 0x03
+#define CLR4 0x04
+#define CLR5 0x05
+#define CLR6 0x06
+#define CLR7 0x07
+#define CLR8 0x08
+#define CLR9 0x09
+#define CLR10 0x0a
+#define CLR11 0x0b
+#define CLR12 0x0c
+#define CLR13 0x0d
+#define CLR14 0x0e
+#define CLR15 0x0f
+
/* Controls */
-#define ID_OK 0x01
-#define ID_CANCEL 0x02
-#define ID_OPTICON 0x03
-#define ID_SAVELOGS 0x04
-#define ID_SHOWBUILDTIME 0x05
-#define ID_USECCACHE 0x06
-#define ID_STRIP 0x07
-#define ID_OTHEROBJ 0x08
-#define ID_OTHEROUT 0x09
-#define ID_LOGDIR 0x0a
-#define ID_MGWDIR 0x0b
-#define ID_OBJDIR 0x0c
-#define ID_OUTDIR 0x0d
-#define ID_BROWSE 0x0e
-#define ID_BROWSEMGW 0x0f
-#define ID_BROWSEOBJ 0x10
-#define ID_BROWSEOUT 0x11
-#define ID_DIALOG 0x12
-#define ID_EXAMPLE 0x13
-#define IDC_FONT 0x14
-#define IDC_BACK 0x15
+#define ID_OK 0x11
+#define ID_CANCEL 0x12
+#define ID_OPTICON 0x13
+#define ID_SAVELOGS 0x14
+#define ID_SHOWBUILDTIME 0x15
+#define ID_USECCACHE 0x16
+#define ID_STRIP 0x17
+#define ID_OTHEROBJ 0x18
+#define ID_OTHEROUT 0x19
+#define ID_LOGDIR 0x1a
+#define ID_MGWDIR 0x1b
+#define ID_OBJDIR 0x1c
+#define ID_OUTDIR 0x1d
+#define ID_BROWSE 0x1e
+#define ID_BROWSEMGW 0x1f
+#define ID_BROWSEOBJ 0x20
+#define ID_BROWSEOUT 0x21
+#define ID_DIALOG 0x22
+#define ID_EXAMPLE 0x23
+#define IDC_FONT 0x24
+#define IDC_BACK 0x25
/* Strings */
-#define MSG_NOGCCFOUND 0x16
-#define MSG_FILEFAILED 0x17
-#define MSG_DIREFAILED 0x18
+#define MSG_NOGCCFOUND 0x26
+#define MSG_FILEFAILED 0x27
+#define MSG_DIREFAILED 0x28