[ros-diffs] [dreimer] 29915: Patch by Pierre Schweitzer: - Fixed a small regression with save button state introduced in rev 29850 - Moved UINT i to loop as it was done previously (that's C99 standard, and better) - Updated french translation

Author: dreimer
Date: Sat Oct 27 17:17:48 2007
New Revision: 29915

URL: http://svn.reactos.org/svn/reactos?rev=29915&view=rev
Log:
Patch by Pierre Schweitzer:
- Fixed a small regression with save button state introduced in rev 29850
- Moved UINT i to loop as it was done previously (that's C99 standard, and better)
- Updated french translation

Modified:
    trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc
    trunk/tools/RosBE-Windows/Tools/config/options.c

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 Sat Oct 27 17:17:48 2007
@@ -5,20 +5,20 @@
 CAPTION "Paramètres de l'Environnement de Compilation de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Path to gcc Compiler", 0x0, 10, 107, 100, 15
+  LTEXT "Chemin vers le compilateur GCC", 0x0, 10, 107, 110, 15
   LTEXT "Couleur d'arrière plan", 0x0, 10, 10, 75, 12
   COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
CBS_DROPDOWNLIST
   LTEXT "Couleur de la police", 0x0, 10, 35, 75, 12
   COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
CBS_DROPDOWNLIST
-  CONTROL "Texte d'exemple", ID_EXAMPLE, "static", WS_CHILD |
WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36
-  CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12
+  CONTROL "Texte d'exemple", ID_EXAMPLE, "static", WS_CHILD |
WS_VISIBLE | WS_TABSTOP | SS_CENTER, 125, 58, 120, 36
+  CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME,
"button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12
   CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
   CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX
| WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12
   CONTROL "Optimiser les fichiers", ID_STRIP, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12
-  CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
-  CONTROL "Change Folder for OUT", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
+  CONTROL "Changer de répertoire pour OBJ", ID_OTHEROBJ, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 150, 12
+  CONTROL "Changer de répertoire pour OUT", ID_OTHEROUT, "button",
BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 150, 12
   EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
-  PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 1, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
   EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
   PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
   EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED

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 Sat Oct 27 17:17:48 2007
@@ -130,7 +130,6 @@
         case WM_INITDIALOG:
         {
             WCHAR Path[MAX_PATH];
-            UINT i;
 
             hIcon = LoadImage( hInstance,
                                MAKEINTRESOURCE(ID_OPTICON),
@@ -141,7 +140,7 @@
             if(hIcon)
                 SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
 
-            for(i = 0; i < sizeof(Colors) / sizeof(char *); i++)
+            for(UINT i = 0; i < sizeof(Colors) / sizeof(char *); i++)
             {
                 SendDlgItemMessage(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM)
(Colors[i]));
                 SendDlgItemMessage(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM)
(Colors[i]));
@@ -248,13 +247,9 @@
                             }
                         }
                         pidl = SHBrowseForFolder(&PathInfo);
-                        if (pidl)
-                        {
-                            if (SHGetPathFromIDList(pidl, path))
-                            {
-                                SetDlgItemText(Dlg, Control, path);
-                            }
-                        }
+                        if (!pidl || !SHGetPathFromIDList(pidl, path))
+                            break;
+                        SetDlgItemText(Dlg, Control, path);
                     }
                     case ID_STRIP:
                     case ID_USECCACHE: