In the AbiWord Windows version, three dialogs use right justified labels.
They are the page setup, columns and the image properties dialog.
This patch propose to left justify the labels so that the look get closer,
in that respect, to the other 29 dialogs.
On the image properties dialog there is another benefit. The "preserve
aspcet ratio" button gets more space. I need that space for the french
translation.
I also expanded the "Extra parameters" label of the Insert->field dialog to
make room for translation.
Gilles Saint-Denis
Index: abi/src/af/xap/win/xap_Win32Res_DlgImage.rc2
===================================================================
RCS file: /cvsroot/abi/src/af/xap/win/xap_Win32Res_DlgImage.rc2,v
retrieving revision 1.1
diff -u -r1.1 xap_Win32Res_DlgImage.rc2
--- abi/src/af/xap/win/xap_Win32Res_DlgImage.rc2 26 Feb 2002 17:57:30 -0000
1.1
+++ abi/src/af/xap/win/xap_Win32Res_DlgImage.rc2 7 Apr 2002 23:33:04 -0000
@@ -42,12 +42,12 @@
// NOTE -- these placeholder strings get overridden at runtime
// NOTE -- they're just here to make sizing easier
-XAP_RID_DIALOG_IMAGE DIALOG DISCARDABLE 0, 0, 175, 100
+XAP_RID_DIALOG_IMAGE DIALOG DISCARDABLE 0, 0, 175, 89
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Image Properties"
FONT 8, "MS Sans Serif"
BEGIN
- RTEXT "Height:", XAP_RID_DIALOG_IMAGE_LBL_HEIGHT,
+ LTEXT "Height:", XAP_RID_DIALOG_IMAGE_LBL_HEIGHT,
7,7,45,14, SS_CENTERIMAGE
EDITTEXT
XAP_RID_DIALOG_IMAGE_EBX_HEIGHT,
55,7,100,14,
ES_AUTOHSCROLL | WS_TABSTOP
@@ -55,7 +55,7 @@
"msctls_updown32", UDS_ARROWKEYS | UDS_WRAP,
155,7,12,14
- RTEXT "Width:", XAP_RID_DIALOG_IMAGE_LBL_WIDTH,
+ LTEXT "Width:", XAP_RID_DIALOG_IMAGE_LBL_WIDTH,
7,25,45,14,
SS_CENTERIMAGE
EDITTEXT
XAP_RID_DIALOG_IMAGE_EBX_WIDTH,
55,25,100,14,
ES_AUTOHSCROLL | WS_TABSTOP
@@ -65,7 +65,7 @@
CONTROL "Pres", XAP_RID_DIALOG_IMAGE_CHK_ASPECT,
"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,
- 55,50,125,10
+ 7,50,160,10
CONTROL "", XAP_RID_DIALOG_IMAGE_STATIC,
"Static",
SS_BLACKFRAME | SS_SUNKEN,
Index: abi/src/wp/ap/win/ap_Win32Res_DlgColumns.rc2
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_DlgColumns.rc2,v
retrieving revision 1.4
diff -u -r1.4 ap_Win32Res_DlgColumns.rc2
--- abi/src/wp/ap/win/ap_Win32Res_DlgColumns.rc2 21 Oct 2001 20:19:39 -0000
1.4
+++ abi/src/wp/ap/win/ap_Win32Res_DlgColumns.rc2 7 Apr 2002 23:33:21 -0000
@@ -98,19 +98,19 @@
"Static",
SS_GRAYFRAME | SS_SUNKEN, 7,125,231,1
- RTEXT "Number of Columns:",
AP_RID_DIALOG_COLUMN_TEXT_NUMCOLUMNS, 7,128,89,14,SS_CENTERIMAGE
+ LTEXT "Number of Columns:",
+AP_RID_DIALOG_COLUMN_TEXT_NUMCOLUMNS, 7,128,97,14,SS_CENTERIMAGE
EDITTEXT
AP_RID_DIALOG_COLUMN_EDIT_NUMCOLUMNS, 108,128,118,14,ES_AUTOHSCROLL
CONTROL "Spin1",
AP_RID_DIALOG_COLUMN_SPIN_NUMCOLUMNS,
"msctls_updown32",
UDS_ARROWKEYS | UDS_WRAP, 226,128,12,14
- RTEXT "Space after Column:",
AP_RID_DIALOG_COLUMN_TEXT_SPACEAFTER, 7,144,89,14,SS_CENTERIMAGE
+ LTEXT "Space after Column:",
+AP_RID_DIALOG_COLUMN_TEXT_SPACEAFTER, 7,144,97,14,SS_CENTERIMAGE
EDITTEXT
AP_RID_DIALOG_COLUMN_EDIT_SPACEAFTER, 108,144,118,14,ES_AUTOHSCROLL
CONTROL "Spin1",
AP_RID_DIALOG_COLUMN_SPIN_SPACEAFTER,
"msctls_updown32",
UDS_ARROWKEYS | UDS_WRAP, 226,144,12,14
- RTEXT "Max Column size:",
AP_RID_DIALOG_COLUMN_TEXT_MAXSIZE, 7,160,89,14,SS_CENTERIMAGE
+ LTEXT "Max Column size:",
+AP_RID_DIALOG_COLUMN_TEXT_MAXSIZE, 7,160,97,14,SS_CENTERIMAGE
EDITTEXT
AP_RID_DIALOG_COLUMN_EDIT_MAXSIZE, 108,160,118,14,ES_AUTOHSCROLL
CONTROL "Spin1",
AP_RID_DIALOG_COLUMN_SPIN_MAXSIZE,
"msctls_updown32",
Index: abi/src/wp/ap/win/ap_Win32Res_DlgField.rc2
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_DlgField.rc2,v
retrieving revision 1.4
diff -u -r1.4 ap_Win32Res_DlgField.rc2
--- abi/src/wp/ap/win/ap_Win32Res_DlgField.rc2 15 Jan 2002 17:54:11 -0000 1.4
+++ abi/src/wp/ap/win/ap_Win32Res_DlgField.rc2 7 Apr 2002 23:33:21 -0000
@@ -52,7 +52,7 @@
LISTBOX
AP_RID_DIALOG_FIELD_LIST_FORMATS,104,16,110,107,
LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- LTEXT "Extra Parameters", AP_RID_DIALOG_FIELD_TEXT_PARAM,
7,128,90,8
+ LTEXT "Extra Parameters", AP_RID_DIALOG_FIELD_TEXT_PARAM,
+7,128,207,8
EDITTEXT
AP_RID_DIALOG_FIELD_EDIT_PARAM, 7,137,207,14
DEFPUSHBUTTON "OK", AP_RID_DIALOG_FIELD_BTN_OK,
221,7,50,14
PUSHBUTTON "Cancel",
AP_RID_DIALOG_FIELD_BTN_CANCEL, 221,24,50,14
Index: abi/src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2,v
retrieving revision 1.5
diff -u -r1.5 ap_Win32Res_DlgPageSetup.rc2
--- abi/src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2 4 Oct 2001 15:11:48 -0000
1.5
+++ abi/src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2 7 Apr 2002 23:33:22 -0000
@@ -111,29 +111,29 @@
AP_RID_DIALOG_PAGE_SETUP_LBL_PAPERSIZE,
15,18,113,8
COMBOBOX AP_RID_DIALOG_PAGE_SETUP_LBX_PAPERSIZE,
- 29,26,102,65,
+ 15,26,116,65,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- RTEXT "Width:",
+ LTEXT "Width:",
AP_RID_DIALOG_PAGE_SETUP_LBL_WITDH,
- 11,41,66,14, SS_CENTERIMAGE
+ 15,41,62,14, SS_CENTERIMAGE
EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EBX_WIDTH,
81,41,40,14, ES_AUTOHSCROLL
CONTROL "Spin1",
AP_RID_DIALOG_PAGE_SETUP_SPN_WIDTH,
"msctls_updown32", UDS_ARROWKEYS | UDS_WRAP,
120,41,11,14
- RTEXT "Height:",
+ LTEXT "Height:",
AP_RID_DIALOG_PAGE_SETUP_LBL_HEIGHT,
- 11,57,66,14,SS_CENTERIMAGE
+ 15,57,62,14,SS_CENTERIMAGE
EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EBX_HEIGHT,
82,57,40,14,ES_AUTOHSCROLL
CONTROL "Spin1",
AP_RID_DIALOG_PAGE_SETUP_SPN_HEIGHT,
"msctls_updown32", UDS_ARROWKEYS | UDS_WRAP,
120,57,11,14
- RTEXT "Units:",
+ LTEXT "Units:",
AP_RID_DIALOG_PAGE_SETUP_LBL_UNITS,
- 11,73,66,12,SS_CENTERIMAGE
+ 15,73,62,12,SS_CENTERIMAGE
COMBOBOX AP_RID_DIALOG_PAGE_SETUP_LBX_UNITS,
82,73,49,65,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -181,16 +181,16 @@
STYLE WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
- RTEXT "Units:",
+ LTEXT "Units:",
AP_RID_DIALOG_PAGE_SETUP_LBL_UNITS,
- 14,5,66,12,SS_CENTERIMAGE
+ 7,5,73,12,SS_CENTERIMAGE
COMBOBOX AP_RID_DIALOG_PAGE_SETUP_LBX_MARGINUNITS,
85,5,49,65,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- RTEXT "Top:",
+ LTEXT "Top:",
AP_RID_DIALOG_PAGE_SETUP_LBL_TOP,
- 14,30,66,14,SS_CENTERIMAGE
+ 7,30,73,14,SS_CENTERIMAGE
EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EBX_TOP,
84,30,40,14,ES_AUTOHSCROLL
CONTROL "Spin1",
@@ -198,9 +198,9 @@
"msctls_updown32", UDS_ARROWKEYS | UDS_WRAP,
123,30,11,14
- RTEXT "Bottom:",
+ LTEXT "Bottom:",
AP_RID_DIALOG_PAGE_SETUP_LBL_BOTTOM,
- 14,46,66,14,SS_CENTERIMAGE
+ 7,46,73,14,SS_CENTERIMAGE
EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EBX_BOTTOM,
84,46,40,14,ES_AUTOHSCROLL
CONTROL "Spin1",
@@ -208,9 +208,9 @@
"msctls_updown32", UDS_ARROWKEYS | UDS_WRAP,
123,46,11,14
- RTEXT "Left:",
+ LTEXT "Left:",
AP_RID_DIALOG_PAGE_SETUP_LBL_LEFT,
- 14,62,66,14,SS_CENTERIMAGE
+ 7,62,73,14,SS_CENTERIMAGE
EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EBX_LEFT,
84,62,40,14,ES_AUTOHSCROLL
CONTROL "Spin1",
@@ -218,9 +218,9 @@
"msctls_updown32", UDS_ARROWKEYS | UDS_WRAP,
123,62,11,14
- RTEXT "Right:",
+ LTEXT "Right:",
AP_RID_DIALOG_PAGE_SETUP_LBL_RIGHT,
- 14,78,66,14,SS_CENTERIMAGE
+ 7,78,73,14,SS_CENTERIMAGE
EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EBX_RIGHT,
84,78,40,14,ES_AUTOHSCROLL
CONTROL "Spin1",
@@ -228,9 +228,9 @@
"msctls_updown32", UDS_ARROWKEYS | UDS_WRAP,
123,78,11,14
- RTEXT "Header:",
+ LTEXT "Header:",
AP_RID_DIALOG_PAGE_SETUP_LBL_HEADER,
- 14,106,66,14,SS_CENTERIMAGE
+ 7,106,73,14,SS_CENTERIMAGE
EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EBX_HEADER,
84,106,40,14,ES_AUTOHSCROLL
CONTROL "Spin1",
@@ -238,9 +238,9 @@
"msctls_updown32", UDS_ARROWKEYS | UDS_WRAP,
123,106,11,14
- RTEXT "Footer:",
+ LTEXT "Footer:",
AP_RID_DIALOG_PAGE_SETUP_LBL_FOOTER,
- 14,122,66,14,SS_CENTERIMAGE
+ 7,122,73,14,SS_CENTERIMAGE
EDITTEXT AP_RID_DIALOG_PAGE_SETUP_EBX_FOOTER,
84,122,40,14,ES_AUTOHSCROLL
CONTROL "Spin1",
