Author: pschweitzer
Date: Tue Nov 6 01:39:12 2007
New Revision: 30205
URL:
http://svn.reactos.org/svn/reactos?rev=30205&view=rev
Log:
Added a status bar to display status of previous settings
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:39:12 2007
@@ -28,6 +28,7 @@
- Previous settings are loaded (Pierre Schweitzer)
- Fixed various bugs (Pierre Schweitzer)
- Moved colors names to RC files (Pierre Schweitzer)
+ - Added a status bar to display status of previous settings (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:39:12 2007
@@ -1,6 +1,6 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "RosBE Einstellungen"
FONT 8, "MS Shell Dlg"
@@ -27,6 +27,7 @@
PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+ CONTROL "Welcome !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
END
STRINGTABLE
@@ -50,4 +51,5 @@
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!"
+ MSG_SETLOADSUC, "Previous settings loaded successfully"
END
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:39:12 2007
@@ -1,6 +1,6 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Build Environment Settings"
FONT 8, "MS Shell Dlg"
@@ -27,6 +27,7 @@
PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
PUSHBUTTON "Save", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
PUSHBUTTON "Cancel", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+ CONTROL "Welcome !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
END
STRINGTABLE
@@ -50,4 +51,5 @@
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!"
+ MSG_SETLOADSUC, "Previous settings loaded successfully"
END
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:39:12 2007
@@ -1,6 +1,6 @@
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Paramètres de l'Environnement de Compilation de ReactOS"
FONT 8, "MS Shell Dlg"
@@ -27,6 +27,7 @@
PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
PUSHBUTTON "Sauvegarder", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
PUSHBUTTON "Annuler", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+ CONTROL "Bienvenue !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD
| WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
END
STRINGTABLE
@@ -48,6 +49,7 @@
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!"
+ MSG_FILEFAILED, "Impossible de créer rosbe-options.cmd !"
+ MSG_DIREFAILED, "Impossible de créer le répertoire pour le journal !"
+ MSG_SETLOADSUC, "Paramètres précédents chargés avec succès"
END
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:39:12 2007
@@ -2,7 +2,7 @@
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270
+ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290
STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ"
FONT 8,"MS Sans Serif",0,0
@@ -29,6 +29,7 @@
PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+ CONTROL "Welcome !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
END
STRINGTABLE
@@ -52,4 +53,5 @@
MSG_NOGCCFOUND, "Êîìïèëÿòîð GCC íåíàéäåí! Ïðîâåðüòå ïðàâèëüíîñòü óñòàíîâêè."
MSG_FILEFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd"
MSG_DIREFAILED, "Íåâîçìîæíî ñîçäàòü ïàïêó äëÿ ëîãîâ!"
+ MSG_SETLOADSUC, "Previous settings loaded successfully"
END
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:39:12 2007
@@ -98,6 +98,7 @@
WCHAR *ptr, *ptr2;
TCHAR TTempLine[25+MAX_PATH];
WCHAR WTempLine[25+MAX_PATH];
+ WCHAR SBTitle[256];
wcscpy(optionsfile, _wgetenv(L"APPDATA"));
if ((wcslen(optionsfile) + wcslen(L"\\RosBE\\rosbe-options.cmd")) <
MAX_PATH)
@@ -161,6 +162,8 @@
}
fclose(pFile);
free(TTempLine);
+ LoadString(hInstance, MSG_SETLOADSUC, SBTitle, 256);
+ SetDlgItemText(hwnd, ID_STATUSBAR, SBTitle);
}
else
{
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:39:12 2007
@@ -48,8 +48,10 @@
#define ID_EXAMPLE 0x23
#define IDC_FONT 0x24
#define IDC_BACK 0x25
+#define ID_STATUSBAR 0x26
/* Strings */
-#define MSG_NOGCCFOUND 0x26
-#define MSG_FILEFAILED 0x27
-#define MSG_DIREFAILED 0x28
+#define MSG_NOGCCFOUND 0x27
+#define MSG_FILEFAILED 0x28
+#define MSG_DIREFAILED 0x29
+#define MSG_SETLOADSUC 0x2a