fixing text alignment in dialogs (right aligned on screen->RTEXT, centered->CTEXT)

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 7f5cb28..2250615 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1,7 +1,5 @@
 //Microsoft Developer Studio generated resource script.
 //
-// $Id$
-
 #include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -329,24 +327,24 @@ END
 IDD_OPEN DIALOGEX 0, 0, 356, 115
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Select Files or Directories..."
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "&Left:",IDC_STATIC,38,24,15,8
+    RTEXT           "&Left:",IDC_STATIC,13,24,40,8
     COMBOBOX        IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | 
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
                     WS_EX_ACCEPTFILES
     PUSHBUTTON      "&Browse...",IDC_LEFT_BUTTON,241,22,38,12
-    LTEXT           "&Right:",IDC_STATIC,33,40,20,8
+    RTEXT           "&Right:",IDC_STATIC,13,40,40,8
     COMBOBOX        IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | 
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
                     WS_EX_ACCEPTFILES
     PUSHBUTTON      "Bro&wse...",IDC_RIGHT_BUTTON,241,38,38,12
-    LTEXT           "E&xtensions:",IDC_STATIC,16,56,37,8
+    RTEXT           "E&xtensions:",IDC_STATIC,13,56,40,8
     COMBOBOX        IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN | 
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Re&cursive",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,35,72,48,10
-    LTEXT           "&Unpacker:",IDC_STATIC,19,88,34,8
+    RTEXT           "&Unpacker:",IDC_STATIC,13,88,40,8
     EDITTEXT        IDC_UNPACKER_EDIT,56,86,182,12,ES_AUTOHSCROLL | 
                     ES_READONLY
     PUSHBUTTON      "Select...",IDC_SELECT_UNPACKER,241,86,38,12
@@ -393,7 +391,7 @@ BEGIN
     PUSHBUTTON      "&Browse...",IDC_BROWSE_BUTTON,206,40,42,12
     COMBOBOX        IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    LTEXT           "&Versioning System",IDC_STATIC,16,22,60,10
+    LTEXT           "&Versioning System:",IDC_STATIC,16,22,60,10
 END
 
 IDD_PROPPAGE_LARGE DIALOGEX 0, 0, 235, 156
@@ -541,18 +539,18 @@ END
 IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Colors"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "Difference:",IDC_STATIC,43,29,36,8
+    RTEXT           "Difference:",IDC_STATIC,13,29,66,8
     CONTROL         "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | 
                     WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | 
                     WS_EX_CLIENTEDGE
-    LTEXT           "Selected Difference:",IDC_STATIC,13,49,66,8
+    RTEXT           "Selected Difference:",IDC_STATIC,13,49,66,8
     CONTROL         "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | 
                     WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | 
                     WS_EX_CLIENTEDGE
-    LTEXT           "Background",IDC_STATIC,86,15,40,8
-    LTEXT           "Deleted",IDC_STATIC,137,15,26,8
+    CTEXT           "Background",IDC_STATIC,81,15,50,8
+    CTEXT           "Deleted",IDC_STATIC,130,15,38,8
     CONTROL         "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | 
                     WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | 
                     WS_EX_CLIENTEDGE
@@ -565,11 +563,11 @@ BEGIN
     CONTROL         "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button",
                     BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | 
                     WS_EX_CLIENTEDGE
-    LTEXT           "Text",IDC_STATIC,184,15,15,8
+    CTEXT           "Text",IDC_STATIC,178,15,29,8
     CONTROL         "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | 
                     WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | 
                     WS_EX_CLIENTEDGE
-    LTEXT           "Ignored Difference:",IDC_STATIC,17,69,62,8
+    RTEXT           "Ignored Difference:",IDC_STATIC,13,69,66,8
     CONTROL         "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button",
                     BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | 
                     WS_EX_CLIENTEDGE

diff --git a/Src/readme.txt b/Src/readme.txt
index 2f3f180..5ec2711 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2003-11-09 Laoran
+ fixing text alignment in dialogs (right aligned on screen->RTEXT, centered->CTEXT)
+  WinMerge: Merge.rc
+  Languages : *.rc
+
 2003-11-09 Kimmo
  PATCH: [ 835198 ] Command line path arguments handling
   Submitted by Hern Chen