This is a patch to extend some labels in various dialogs for AbiWord
Windows' version. It permit the use of available label width in dialogs thus
reducing the number of label translated text being truncated.
Also included are :
- addition of localisation for DLG_Column_RtlOrder in columns dialog
- enable/disable of TXT_AutoSavePeriod in options dialog. Removed gray
background to that same edit field.
- Removed gray background to word count edit field in the word count dialog.
Gilles Saint-Denis
Index: abi/src/af/xap/win/xap_Win32Res_DlgZoom.rc2
===================================================================
RCS file: /cvsroot/abi/src/af/xap/win/xap_Win32Res_DlgZoom.rc2,v
retrieving revision 1.1
diff -u -r1.1 xap_Win32Res_DlgZoom.rc2
--- abi/src/af/xap/win/xap_Win32Res_DlgZoom.rc2 1999/10/07 08:29:14 1.1
+++ abi/src/af/xap/win/xap_Win32Res_DlgZoom.rc2 2001/10/21 11:45:10
@@ -53,17 +53,17 @@
BEGIN
GROUPBOX "Zoom to", XAP_RID_DIALOG_ZOOM_TEXT_ZOOMTO,
7,7,86,125
CONTROL "&200 %", XAP_RID_DIALOG_ZOOM_RADIO_200,
-
"Button",BS_AUTORADIOBUTTON,16,21,69,10
+
+"Button",BS_AUTORADIOBUTTON,16,21,73,10
CONTROL "&100 %", XAP_RID_DIALOG_ZOOM_RADIO_100,
-
"Button",BS_AUTORADIOBUTTON,16,36,69,10
+
+"Button",BS_AUTORADIOBUTTON,16,36,73,10
CONTROL "&75 %", XAP_RID_DIALOG_ZOOM_RADIO_75,
-
"Button",BS_AUTORADIOBUTTON,16,51,69,10
+
+"Button",BS_AUTORADIOBUTTON,16,51,73,10
CONTROL "&Page width", XAP_RID_DIALOG_ZOOM_RADIO_WIDTH,
-
"Button",BS_AUTORADIOBUTTON,16,66,69,10
+
+"Button",BS_AUTORADIOBUTTON,16,66,73,10
CONTROL "&Whole page", XAP_RID_DIALOG_ZOOM_RADIO_WHOLE,
-
"Button",BS_AUTORADIOBUTTON,16,81,69,10
+
+"Button",BS_AUTORADIOBUTTON,16,81,73,10
CONTROL "P&ercent:", XAP_RID_DIALOG_ZOOM_RADIO_PCT,
-
"Button",BS_AUTORADIOBUTTON,16,96,69,10
+
+"Button",BS_AUTORADIOBUTTON,16,96,73,10
EDITTEXT XAP_RID_DIALOG_ZOOM_EDIT_PCT,
16,111,54,13,ES_AUTOHSCROLL
CONTROL "Spin", XAP_RID_DIALOG_ZOOM_SPIN_PCT,
"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
Index: abi/src/wp/ap/win/ap_Win32Dialog_Columns.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Columns.cpp,v
retrieving revision 1.9
diff -u -r1.9 ap_Win32Dialog_Columns.cpp
--- abi/src/wp/ap/win/ap_Win32Dialog_Columns.cpp 2001/10/04 20:23:44 1.9
+++ abi/src/wp/ap/win/ap_Win32Dialog_Columns.cpp 2001/10/21 11:45:24
@@ -111,6 +111,7 @@
_DS(COLUMN_TEXT_NUMCOLUMNS, DLG_Column_Number_Cols);
_DS(COLUMN_TEXT_SPACEAFTER, DLG_Column_Space_After);
_DS(COLUMN_TEXT_MAXSIZE, DLG_Column_Size);
+ _DS(COLUMN_CHECK_RTL_ORDER, DLG_Column_RtlOrder);
RECT rect;
GetClientRect(GetDlgItem(hWnd, AP_RID_DIALOG_COLUMN_RADIO_ONE), &rect);
Index: abi/src/wp/ap/win/ap_Win32Dialog_Options.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Options.cpp,v
retrieving revision 1.32
diff -u -r1.32 ap_Win32Dialog_Options.cpp
--- abi/src/wp/ap/win/ap_Win32Dialog_Options.cpp 2001/10/15 12:05:36 1.32
+++ abi/src/wp/ap/win/ap_Win32Dialog_Options.cpp 2001/10/21 11:45:28
@@ -592,6 +592,7 @@
_enableDisableLogic(id_CHECK_AUTO_SAVE_FILE);
bChecked = (IsDlgButtonChecked( hWnd,
AP_RID_DIALOG_OPTIONS_CHK_AutoSaveFile ) == BST_CHECKED);
+ EnableWindow( GetDlgItem( hWnd,
+AP_RID_DIALOG_OPTIONS_TXT_AutoSavePeriod), bChecked );
EnableWindow( GetDlgItem( hWnd,
AP_RID_DIALOG_OPTIONS_SPN_AutoSavePeriodSpin), bChecked );
EnableWindow( GetDlgItem( hWnd,
AP_RID_DIALOG_OPTIONS_TXT_AutoSaveExtension), bChecked );
return 0;
@@ -802,6 +803,7 @@
// Disable the input boxes if auto save is turned off
bChecked = (IsDlgButtonChecked( hWnd, AP_RID_DIALOG_OPTIONS_CHK_AutoSaveFile )
== BST_CHECKED);
+ EnableWindow( GetDlgItem( hWnd, AP_RID_DIALOG_OPTIONS_TXT_AutoSavePeriod),
+bChecked );
EnableWindow( GetDlgItem( hWnd, AP_RID_DIALOG_OPTIONS_SPN_AutoSavePeriodSpin),
bChecked );
EnableWindow( GetDlgItem( hWnd, AP_RID_DIALOG_OPTIONS_TXT_AutoSaveExtension),
bChecked );
}
Index: abi/src/wp/ap/win/ap_Win32Res_DlgBreak.rc2
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_DlgBreak.rc2,v
retrieving revision 1.1
diff -u -r1.1 ap_Win32Res_DlgBreak.rc2
--- abi/src/wp/ap/win/ap_Win32Res_DlgBreak.rc2 1999/04/21 04:06:14 1.1
+++ abi/src/wp/ap/win/ap_Win32Res_DlgBreak.rc2 2001/10/21 11:45:32
@@ -53,15 +53,15 @@
CONTROL "&Page break", AP_RID_DIALOG_BREAK_RADIO_PAGE,
"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,15,19,62,10
CONTROL "&Column break", AP_RID_DIALOG_BREAK_RADIO_COL,
-
"Button",BS_AUTORADIOBUTTON, 86,19,62,10
+
+"Button",BS_AUTORADIOBUTTON, 86,19,67,10
CONTROL "&Next page", AP_RID_DIALOG_BREAK_RADIO_NEXT,
"Button",BS_AUTORADIOBUTTON, 15,48,62,10
CONTROL "Con&tinuous", AP_RID_DIALOG_BREAK_RADIO_CONT,
"Button",BS_AUTORADIOBUTTON, 15,62,62,10
CONTROL "&Even page", AP_RID_DIALOG_BREAK_RADIO_EVEN,
-
"Button",BS_AUTORADIOBUTTON, 86,48,62,10
+
+"Button",BS_AUTORADIOBUTTON, 86,48,67,10
CONTROL "&Odd page", AP_RID_DIALOG_BREAK_RADIO_ODD,
-
"Button",BS_AUTORADIOBUTTON, 86,62,62,10
+
+"Button",BS_AUTORADIOBUTTON, 86,62,67,10
CONTROL "",
AP_RID_DIALOG_BREAK_LINE, "Static",SS_ETCHEDHORZ,7,39,150,1
LTEXT "Section breaks ",
AP_RID_DIALOG_BREAK_TEXT_SECTION,7,35,54,8
CONTROL "",
AP_RID_DIALOG_BREAK_LINE, "Static",SS_ETCHEDHORZ,7,78,150,1
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.3
diff -u -r1.3 ap_Win32Res_DlgColumns.rc2
--- abi/src/wp/ap/win/ap_Win32Res_DlgColumns.rc2 2001/10/04 20:23:44 1.3
+++ abi/src/wp/ap/win/ap_Win32Res_DlgColumns.rc2 2001/10/21 11:45:32
@@ -68,19 +68,19 @@
"Button",
BS_AUTORADIOBUTTON | BS_BITMAP | BS_PUSHLIKE,
20,22,20,20
- LTEXT "One",
AP_RID_DIALOG_COLUMN_TEXT_ONE, 42,30,29,10
+ LTEXT "One",
+AP_RID_DIALOG_COLUMN_TEXT_ONE, 42,30,45,10
CONTROL "Two",
AP_RID_DIALOG_COLUMN_RADIO_TWO,
"Button",
BS_AUTORADIOBUTTON | BS_BITMAP | BS_PUSHLIKE,
20,44,20,20
- LTEXT "Two",
AP_RID_DIALOG_COLUMN_TEXT_TWO, 42,52,29,10
+ LTEXT "Two",
+AP_RID_DIALOG_COLUMN_TEXT_TWO, 42,52,45,10
CONTROL "Three",
AP_RID_DIALOG_COLUMN_RADIO_THREE,
"Button",
BS_AUTORADIOBUTTON | BS_BITMAP | BS_PUSHLIKE,
20,66,20,20
- LTEXT "Three",
AP_RID_DIALOG_COLUMN_TEXT_THREE, 42,74,29,10
+ LTEXT "Three",
+AP_RID_DIALOG_COLUMN_TEXT_THREE, 42,74,45,10
GROUPBOX "Preview",
AP_RID_DIALOG_COLUMN_GROUP2, 108,7,70,98
CONTROL "",
AP_RID_DIALOG_COLUMN_PREVIEW,
@@ -88,11 +88,11 @@
CONTROL "Line between",
AP_RID_DIALOG_COLUMN_CHECK_LINE_BETWEEN,
"Button",
-
BS_AUTOCHECKBOX, 7,110,70,12
+
+ BS_AUTOCHECKBOX, 7,110,89,12
CONTROL "RTL Order",
AP_RID_DIALOG_COLUMN_CHECK_RTL_ORDER,
"Button",
-
BS_AUTOCHECKBOX, 108,110,70,12
+
+ BS_AUTOCHECKBOX, 108,110,130,12
CONTROL "",
AP_RID_DIALOG_COLUMN_STATIC,
"Static",
Index: abi/src/wp/ap/win/ap_Win32Res_DlgOptions.rc2
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_DlgOptions.rc2,v
retrieving revision 1.19
diff -u -r1.19 ap_Win32Res_DlgOptions.rc2
--- abi/src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 2001/10/15 15:02:43 1.19
+++ abi/src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 2001/10/21 11:45:34
@@ -124,13 +124,13 @@
GROUPBOX "Toolbars",AP_RID_DIALOG_OPTIONS_FRM_Toolbars,2,2,143,131
CONTROL "&Standard Toolbar",
AP_RID_DIALOG_OPTIONS_CHK_ViewShowStandardBar,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,5,15,110,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,5,15,130,10
CONTROL "&Format Toolbar",
AP_RID_DIALOG_OPTIONS_CHK_ViewShowFormatBar,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,5,30,110,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,5,30,130,10
CONTROL "&Extra Toolbar",
AP_RID_DIALOG_OPTIONS_CHK_ViewShowExtraBar,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,5,45,110,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,5,45,130,10
GROUPBOX "Button Style",AP_RID_DIALOG_OPTIONS_FRM_ButtonStyle,147,2,140,113
CONTROL "Icons",AP_RID_DIALOG_OPTIONS_RDO_Icons,"Button",
BS_AUTORADIOBUTTON | WS_TABSTOP,152,15,130,10
@@ -151,16 +151,16 @@
75
CONTROL "Check s&pelling as you type",
AP_RID_DIALOG_OPTIONS_CHK_SpellCheckAsType,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,5,15,130,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,5,15,135,10
CONTROL "Hide &spelling errors in the document",
AP_RID_DIALOG_OPTIONS_CHK_SpellHideErrors,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,5,30,130,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,5,30,135,10
CONTROL "A&lways suggest corrections",
AP_RID_DIALOG_OPTIONS_CHK_SpellSuggest,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,5,45,130,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,5,45,135,10
CONTROL "Suggest from &main only",
AP_RID_DIALOG_OPTIONS_CHK_SpellMainOnly,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,5,60,130,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,5,60,135,10
GROUPBOX "Ignore",AP_RID_DIALOG_OPTIONS_FRM_SpellIgnore,147,2,140,
75
CONTROL "Ignore words in &UPPERCASE",
@@ -180,7 +180,7 @@
PUSHBUTTON "Dictionary...",AP_RID_DIALOG_OPTIONS_BTN_CUSTOMDICT,207,82,80,14,
WS_DISABLED
RTEXT "Ignored Words:",AP_RID_DIALOG_OPTIONS_LBL_IGNOREDWORD,
- 5,100,115,12,SS_CENTERIMAGE
+ 5,100,110,12,SS_CENTERIMAGE
PUSHBUTTON "&Reset",AP_RID_DIALOG_OPTIONS_BTN_IGNOREDRESET,122,100,
80,14,WS_DISABLED
PUSHBUTTON "&Edit...",AP_RID_DIALOG_OPTIONS_BTN_IGNOREDEDIT,207,100,
@@ -238,24 +238,24 @@
BS_AUTOCHECKBOX | WS_TABSTOP,5,15,275,10
LTEXT "Current preferences scheme:",
AP_RID_DIALOG_OPTIONS_LBL_CURRENTSCHEME,5,30,120,10
- COMBOBOX AP_RID_DIALOG_OPTIONS_COMBO_CURRENTSCHEME,125,30,160,75,
+ COMBOBOX AP_RID_DIALOG_OPTIONS_COMBO_CURRENTSCHEME,125,30,157,75,
CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
GROUPBOX "Auto Save", AP_RID_DIALOG_OPTIONS_FRM_AutoSaveOptions,
2, 47, 285, 26
CONTROL "Auto save current file each",
AP_RID_DIALOG_OPTIONS_CHK_AutoSaveFile ,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
5, 60, 120, 10
- EDITTEXT AP_RID_DIALOG_OPTIONS_TXT_AutoSavePeriod,125,58,30,12, ES_LEFT |
WS_BORDER | WS_TABSTOP | ES_READONLY
+ EDITTEXT AP_RID_DIALOG_OPTIONS_TXT_AutoSavePeriod,125,58,30,12, ES_LEFT |
+WS_BORDER | WS_TABSTOP
CONTROL "Spin", AP_RID_DIALOG_OPTIONS_SPN_AutoSavePeriodSpin,
"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
UDS_AUTOBUDDY | UDS_ARROWKEYS
| UDS_NOTHOUSANDS,
152,60,8,8
LTEXT "minutes", AP_RID_DIALOG_OPTIONS_LBL_AutoSaveMinutes,
- 155,60,50,8
- LTEXT "With extension:", AP_RID_DIALOG_OPTIONS_LBL_AutoSaveExtension,
- 185,60,50,8
+ 157,60,50,8
+ RTEXT "With extension:", AP_RID_DIALOG_OPTIONS_LBL_AutoSaveExtension,
+ 182,60,70,8
EDITTEXT AP_RID_DIALOG_OPTIONS_TXT_AutoSaveExtension,
- 235,58,25,12, ES_LEFT | WS_BORDER | WS_TABSTOP
+ 257,58,25,12, ES_LEFT | WS_BORDER | WS_TABSTOP
CONTROL "Show Spash on Startup", AP_RID_DIALOG_OPTIONS_CHK_ShowSplash,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
@@ -265,13 +265,13 @@
2, 87, 285, 46
CONTROL "Default to right-to-left direction of text:",
AP_RID_DIALOG_OPTIONS_CHK_OtherDirectionRtl ,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
- 5,98, 285, 10
+ 5,98, 280, 10
CONTROL "Select correct shapes of glyphs from context:",
AP_RID_DIALOG_OPTIONS_CHK_OtherUseContextGlyphs ,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
- 5,109, 285, 10
+ 5,109, 280, 10
CONTROL "Save visual glyphs",
AP_RID_DIALOG_OPTIONS_CHK_OtherSaveContextGlyphs ,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
- 5,120, 285, 10
+ 5,120, 280, 10
END
Index: abi/src/wp/ap/win/ap_Win32Res_DlgParagraph.rc2
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_DlgParagraph.rc2,v
retrieving revision 1.6
diff -u -r1.6 ap_Win32Res_DlgParagraph.rc2
--- abi/src/wp/ap/win/ap_Win32Res_DlgParagraph.rc2 2001/03/11 08:12:10 1.6
+++ abi/src/wp/ap/win/ap_Win32Res_DlgParagraph.rc2 2001/10/21 11:45:35
@@ -102,7 +102,7 @@
STYLE DS_CONTROL | WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
- LTEXT "Ali&gnment:", AP_RID_DIALOG_PARA_TEXT_ALIGN,
2,6,43,8
+ LTEXT "Ali&gnment:", AP_RID_DIALOG_PARA_TEXT_ALIGN,
+2,6,50,8
COMBOBOX
AP_RID_DIALOG_PARA_COMBO_ALIGN, 54,4,52,59,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Bidi:", AP_RID_DIALOG_PARA_CHECK_BIDI,
@@ -112,40 +112,40 @@
CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
CONTROL "",
AP_RID_DIALOG_PARA_LINE, "Static",SS_ETCHEDHORZ,2,27,256,1
LTEXT "Indentation", AP_RID_DIALOG_PARA_TEXT_INDENT,
2,23,40,8
- LTEXT "&Left:", AP_RID_DIALOG_PARA_TEXT_LEFT,
12,38,15,8
+ LTEXT "&Left:", AP_RID_DIALOG_PARA_TEXT_LEFT,
+12,38,40,8
EDITTEXT
AP_RID_DIALOG_PARA_EDIT_LEFT, 54,36,52,12,ES_AUTOHSCROLL
CONTROL "Spin1", AP_RID_DIALOG_PARA_SPIN_LEFT,
"msctls_updown32",
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,106,35,11,14
- LTEXT "&Right:", AP_RID_DIALOG_PARA_TEXT_RIGHT,
12,55,20,8
+ LTEXT "&Right:", AP_RID_DIALOG_PARA_TEXT_RIGHT,
+12,55,40,8
EDITTEXT
AP_RID_DIALOG_PARA_EDIT_RIGHT, 54,53,52,12,ES_AUTOHSCROLL
CONTROL "Spin1", AP_RID_DIALOG_PARA_SPIN_RIGHT,
"msctls_updown32",
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,106,52,11,14
- LTEXT "&Special:", AP_RID_DIALOG_PARA_TEXT_HANG,
142,42,26,8
+ LTEXT "&Special:", AP_RID_DIALOG_PARA_TEXT_HANG,
+142,42,52,8
COMBOBOX
AP_RID_DIALOG_PARA_COMBO_HANG, 141,53,52,55,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "&By:", AP_RID_DIALOG_PARA_TEXT_BY,
198,42,11,8
+ LTEXT "&By:", AP_RID_DIALOG_PARA_TEXT_BY,
+ 198,42,52,8
EDITTEXT
AP_RID_DIALOG_PARA_EDIT_BY, 198,53,52,12,ES_AUTOHSCROLL
CONTROL "Spin1", AP_RID_DIALOG_PARA_SPIN_BY,
"msctls_updown32",
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,232,36,11,14
CONTROL "",
AP_RID_DIALOG_PARA_LINE, "Static",SS_ETCHEDHORZ,2,83,256,1
LTEXT "Spacing",
AP_RID_DIALOG_PARA_TEXT_SPACING,2,79,31,8
- LTEXT "&Before:",
AP_RID_DIALOG_PARA_TEXT_BEFORE, 12,95,24,8
+ LTEXT "&Before:",
+AP_RID_DIALOG_PARA_TEXT_BEFORE, 12,95,40,8
EDITTEXT
AP_RID_DIALOG_PARA_EDIT_BEFORE, 54,93,52,12,ES_AUTOHSCROLL
CONTROL "Spin1", AP_RID_DIALOG_PARA_SPIN_BEFORE,
"msctls_updown32",
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,106,92,11,14
- LTEXT "Aft&er:", AP_RID_DIALOG_PARA_TEXT_AFTER,
12,111,18,8
+ LTEXT "Aft&er:", AP_RID_DIALOG_PARA_TEXT_AFTER,
+12,111,40,8
EDITTEXT
AP_RID_DIALOG_PARA_EDIT_AFTER, 54,109,52,12,ES_AUTOHSCROLL
CONTROL "Spin1", AP_RID_DIALOG_PARA_SPIN_AFTER,
"msctls_updown32",
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,106,109,11,14
- LTEXT "Li&ne spacing:", AP_RID_DIALOG_PARA_TEXT_LEAD, 142,98,43,8
+ LTEXT "Li&ne spacing:", AP_RID_DIALOG_PARA_TEXT_LEAD, 142,98,52,8
COMBOBOX
AP_RID_DIALOG_PARA_COMBO_LEAD, 141,109,52,75,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "&At:", AP_RID_DIALOG_PARA_TEXT_AT,
198,98,10,8
+ LTEXT "&At:", AP_RID_DIALOG_PARA_TEXT_AT,
+ 198,98,52,8
EDITTEXT
AP_RID_DIALOG_PARA_EDIT_AT, 198,109,52,12,ES_AUTOHSCROLL
CONTROL "Spin1", AP_RID_DIALOG_PARA_SPIN_AT,
"msctls_updown32",
@@ -164,25 +164,25 @@
LTEXT "Pagination", AP_RID_DIALOG_PARA_TEXT_PAGE,
2,6,38,8
CONTROL "&Widow/Orphan control",
AP_RID_DIALOG_PARA_CHECK_WIDOW,
-
"Button",BS_AUTO3STATE | WS_TABSTOP,14,18,101,10
+
+"Button",BS_AUTO3STATE | WS_TABSTOP,14,18,126,10
CONTROL "Keep with ne&xt",
AP_RID_DIALOG_PARA_CHECK_NEXT,
"Button",BS_AUTO3STATE | WS_TABSTOP,150,18,101,10
CONTROL "&Keep lines together",
AP_RID_DIALOG_PARA_CHECK_TOGETHER,
-
"Button",BS_AUTO3STATE | WS_TABSTOP,14,32,101,10
+
+"Button",BS_AUTO3STATE | WS_TABSTOP,14,32,126,10
CONTROL "Page &break before",
AP_RID_DIALOG_PARA_CHECK_BREAK,
"Button",BS_AUTO3STATE | WS_TABSTOP,150,32,101,10
CONTROL "",
AP_RID_DIALOG_PARA_LINE, "Static",SS_ETCHEDHORZ,2,56,256,1
CONTROL "&Suppress line numbers",
AP_RID_DIALOG_PARA_CHECK_SUPPRESS,
-
"Button",BS_AUTO3STATE | WS_TABSTOP,14,64,101,10
+
+"Button",BS_AUTO3STATE | WS_TABSTOP,14,64,126,10
CONTROL "&Don't hyphenate",
AP_RID_DIALOG_PARA_CHECK_NOHYPHEN,
-
"Button",BS_AUTO3STATE | WS_TABSTOP,14,78,101,10
+
+"Button",BS_AUTO3STATE | WS_TABSTOP,14,78,126,10
CONTROL "",
AP_RID_DIALOG_PARA_LINE, "Static",SS_ETCHEDHORZ,2,136,256,1
- LTEXT "Preview",
AP_RID_DIALOG_PARA_TEXT_PREVIEW,2,132,30,8
+ LTEXT "Preview",
+AP_RID_DIALOG_PARA_TEXT_PREVIEW,2,132,40,8
CONTROL "(preview)", AP_RID_DIALOG_PARA_PREVIEW,
"Button",BS_OWNERDRAW, 14,145,233,65
END
Index: abi/src/wp/ap/win/ap_Win32Res_DlgTabs.rc2
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_DlgTabs.rc2,v
retrieving revision 1.1
diff -u -r1.1 ap_Win32Res_DlgTabs.rc2
--- abi/src/wp/ap/win/ap_Win32Res_DlgTabs.rc2 2000/09/05 09:01:32 1.1
+++ abi/src/wp/ap/win/ap_Win32Res_DlgTabs.rc2 2001/10/21 11:45:36
@@ -74,31 +74,32 @@
LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_TABSTOP
CONTROL "&Left",AP_RID_DIALOG_TABS_LEFT_RADIO,"Button",
- BS_AUTORADIOBUTTON | WS_GROUP,123,33,28,10
+ BS_AUTORADIOBUTTON | WS_GROUP,123,33,50,10
CONTROL "&Center",AP_RID_DIALOG_TABS_CENTER_RADIO,"Button",
- BS_AUTORADIOBUTTON,123,44,37,10
+ BS_AUTORADIOBUTTON,123,44,50,10
CONTROL "&Right",AP_RID_DIALOG_TABS_RIGHT_RADIO,"Button",
- BS_AUTORADIOBUTTON,123,56,33,10
+ BS_AUTORADIOBUTTON,123,56,50,10
CONTROL "&Decimal",AP_RID_DIALOG_TABS_DECIMAL_RADIO,"Button",
- BS_AUTORADIOBUTTON,183,33,41,10
+ BS_AUTORADIOBUTTON,183,33,45,10
CONTROL "&Bar",AP_RID_DIALOG_TABS_BAR_RADIO,"Button",
- BS_AUTORADIOBUTTON,183,44,27,10
+ BS_AUTORADIOBUTTON,183,44,45,10
CONTROL "&1 None",AP_RID_DIALOG_TABS_NONE_RADIO,"Button",
- BS_AUTORADIOBUTTON | WS_GROUP,123,82,39,10
+ BS_AUTORADIOBUTTON | WS_GROUP,123,82,50,10
CONTROL "&2 .........",AP_RID_DIALOG_TABS_DOTS_RADIO,"Button",
- BS_AUTORADIOBUTTON,123,93,40,10
+ BS_AUTORADIOBUTTON,123,93,50,10
CONTROL "&3 ---------",AP_RID_DIALOG_TABS_DASH_RADIO,"Button",
- BS_AUTORADIOBUTTON,183,82,40,10
+ BS_AUTORADIOBUTTON,183,82,45,10
CONTROL "&4 ____",AP_RID_DIALOG_TABS_UNDERLINE_RADIO,"Button",
- BS_AUTORADIOBUTTON,183,93,38,10
+ BS_AUTORADIOBUTTON,183,93,45,10
PUSHBUTTON "Set",AP_RID_DIALOG_TABS_SET_BUTTON,67,134,50,14
PUSHBUTTON "Clear",AP_RID_DIALOG_TABS_CLEAR_BUTTON,125,134,50,14
PUSHBUTTON "Clear &All",AP_RID_DIALOG_TABS_CLEAR_ALL_BUTTON,183,134,
50,14
LTEXT "Tab stop position:",
- AP_RID_DIALOG_TABS_TAB_STOP_POSITION_LABEL,7,9,57,8
- LTEXT "Default tab stops:",
- AP_RID_DIALOG_TABS_DEFAULT_TAB_STOPS_LABEL,113,9,56,8
+ AP_RID_DIALOG_TABS_TAB_STOP_POSITION_LABEL,7,9,80,8
+ RTEXT "Default tab stops:",
+ AP_RID_DIALOG_TABS_DEFAULT_TAB_STOPS_LABEL,104,7,66,14,
+ SS_CENTERIMAGE
GROUPBOX "Alignment",AP_RID_DIALOG_TABS_ALIGNMENT_LABEL,117,22,116,
46
GROUPBOX "Leader",AP_RID_DIALOG_TABS_LEADER_LABEL,117,72,116,39
Index: abi/src/wp/ap/win/ap_Win32Res_DlgWordCount.rc2
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_DlgWordCount.rc2,v
retrieving revision 1.2
diff -u -r1.2 ap_Win32Res_DlgWordCount.rc2
--- abi/src/wp/ap/win/ap_Win32Res_DlgWordCount.rc2 2000/07/03 19:58:03 1.2
+++ abi/src/wp/ap/win/ap_Win32Res_DlgWordCount.rc2 2001/10/21 11:45:36
@@ -77,7 +77,7 @@
DEFPUSHBUTTON "&Close", AP_RID_DIALOG_WORDCOUNT_BTN_CLOSE,
110,101,62,14
PUSHBUTTON "&Update", AP_RID_DIALOG_WORDCOUNT_BTN_UPDATE,
7,101,62,14
AUTOCHECKBOX "&Auto Update",
AP_RID_DIALOG_WORDCOUNT_CHK_AUTOUPDATE,7,7,55,10
- EDITTEXT
AP_RID_DIALOG_WORDCOUNT_EDIT_RATE,64,7,23,10, ES_LEFT | WS_BORDER | WS_TABSTOP |
ES_READONLY
+ EDITTEXT
+AP_RID_DIALOG_WORDCOUNT_EDIT_RATE,64,7,23,10, ES_LEFT | WS_BORDER | WS_TABSTOP
CONTROL "Spin",
AP_RID_DIALOG_WORDCOUNT_SPIN_RATE,
"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,89,7,8,8