[ros-diffs] [dreimer] 29311: Patch III from Pierre Schweitzer. Correct Button States and Whitespace changes.

Author: dreimer
Date: Sun Sep 30 17:56:28 2007
New Revision: 29311

URL: http://svn.reactos.org/svn/reactos?rev=29311&view=rev
Log:
Patch III from Pierre Schweitzer.
Correct Button States and Whitespace changes.

Modified:
    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
    trunk/tools/RosBE-Windows/Tools/config/todo.txt

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 Sun Sep 30 17:56:28 2007
@@ -13,8 +13,8 @@
   COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
CBS_DROPDOWNLIST
   CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21
   CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21
-  EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP
-  PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP
+  EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED
   EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP
   PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP
   PUSHBUTTON "Speichern", ID_OK, 63, 155, 59, 26, WS_TABSTOP

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 Sun Sep 30 17:56:28 2007
@@ -13,8 +13,8 @@
   COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
CBS_DROPDOWNLIST
   CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21
   CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21
-  EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP
-  PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP
+  EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED
   EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP
   PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP
   PUSHBUTTON "Save", ID_OK, 63, 155, 59, 26, WS_TABSTOP

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 Sun Sep 30 17:56:28 2007
@@ -13,8 +13,8 @@
   COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
CBS_DROPDOWNLIST
   CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21
   CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21
-  EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP
-  PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP
+  EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED
   EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP
   PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP
   PUSHBUTTON "Sauvegarder", ID_OK, 63, 155, 59, 26, WS_TABSTOP

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 Sun Sep 30 17:56:28 2007
@@ -13,8 +13,8 @@
   COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
CBS_DROPDOWNLIST
   CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21
   CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21
-  EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP
-  PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP
+  EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED
   EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP
   PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP
   PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 155, 59, 26, WS_TABSTOP

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 Sun Sep 30 17:56:28 2007
@@ -65,7 +65,7 @@
 DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
     WCHAR defaultmingwpath[MAX_PATH];
-	static HICON hIcon;
+    static HICON hIcon;
 
     switch (Msg)
     {
@@ -90,8 +90,7 @@
             GetCurrentDirectory(MAX_PATH, defaultmingwpath);
             wcscat(defaultmingwpath, MINGWVERSION);
             SetDlgItemText(Dlg, ID_MGWDIR, defaultmingwpath);
-            EnableWindow(GetDlgItem(Dlg, ID_BROWSE), FALSE);
-            EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), FALSE);
+
             return TRUE;
         }
 
@@ -122,7 +121,7 @@
                 WCHAR MGWPath[MAX_PATH];
                 BROWSEINFO PathInfo;
                 ZeroMemory(&PathInfo, sizeof(BROWSEINFO));
-/* Fails with IShellFolder interface */
+/* FIXME : Fails with IShellFolder interface */
 #if 0
                 LPSHELLFOLDER psf = NULL;
                 HRESULT hr;
@@ -148,10 +147,10 @@
             return FALSE;
         }
 
-		case WM_DESTROY:
-		{
-			DestroyIcon(hIcon);
-		}
+        case WM_DESTROY:
+        {
+            DestroyIcon(hIcon);
+        }
 
         case WM_CLOSE:
         {

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 Sun Sep 30 17:56:28 2007
@@ -1,12 +1,13 @@
-#define ID_OPTICON 0x3
-#define ID_DIALOG 0x10
 #define ID_OK 0x1
 #define ID_CANCEL 0x2
-#define IDC_FONT 0x1
-#define IDC_BACK 0x2
-#define ID_SAVELOGS 0x5
-#define ID_SHOWBUILDTIME 0x6
-#define ID_LOGDIR 0x7
+#define ID_OPTICON 0x3
+#define ID_SAVELOGS 0x4
+#define ID_SHOWBUILDTIME 0x5
+#define ID_LOGDIR 0x6
 #define ID_BROWSE 0x7
 #define ID_MGWDIR 0x8
 #define ID_BROWSEMGW 0x9
+#define ID_DIALOG 0x10
+#define IDC_FONT 0x1
+#define IDC_BACK 0x2
+

Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original)
+++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Sun Sep 30 17:56:28 2007
@@ -2,5 +2,4 @@
 - Load old settings
 - Disable Save button if there are no changes
 - Check validity of log path before saving
-- Find out how to disable ... button
 - Font preview