This patch, against 072000 nightly sources, makes some minor UI
changes with respect to the preferences menu and dialog box:
1. The name in the menu is changed in the en-EN (and I guess default)
version from Tools->Options to Tools->Preferences. I am not qualified
to say whether this minor nomenclature difference should be reflected
in the other languages via the headers src/wp/ap/xp/ap_Menu_LabelSet_*.h.
I have also not made any changes in Abi help files.
2. Similarly, the title in the affiliated dialog box is changed from
"Options" to "Preferences".
3. The tab I added a little while back, labelled "Smart Quotes" is
now labelled "Other" and so is available for sundry isolated
preference things. To minimize long-term confusion, I have renamed
some variables from being "smart quote" oriented to being "other"
oriented. The change is complete for Unix and for XP, and I also
tried to make the changes for Win32 and QNX. I can't compile the
Win32 and QNX platforms, but there's a reasonable chance I didn't fat
finger it and the build is not broken. Folks who ported the "Smart
Quotes" tab to other platforms might be interested in looking over the
platform-specific variable names for appropriateness, even if the
build still works.
--
[EMAIL PROTECTED] (WJCarpenter) PGP 0x91865119
38 95 1B 69 C9 C6 3D 25 73 46 32 04 69 D6 ED F3
diff -ru abi-072000-ORIG/src/wp/ap/qnx/ap_QNXDialog_Options.cpp
abi-072000/src/wp/ap/qnx/ap_QNXDialog_Options.cpp
--- abi-072000-ORIG/src/wp/ap/qnx/ap_QNXDialog_Options.cpp Wed Jul 19 14:08:55
2000
+++ abi-072000/src/wp/ap/qnx/ap_QNXDialog_Options.cpp Thu Jul 20 21:15:12 2000
@@ -544,7 +544,7 @@
/*** Other/Misc Tab (smart quotes) ***/
n = 0;
- PtSetArg(&args[n++], Pt_ARG_TITLE,
TR(pSS->getValue(AP_STRING_ID_DLG_Options_TabLabel_SmartQuotes)), 0);
+ PtSetArg(&args[n++], Pt_ARG_TITLE,
+TR(pSS->getValue(AP_STRING_ID_DLG_Options_TabLabel_Other)), 0);
PtSetArg(&args[n++], Pt_ARG_WIDTH, TAB_WIDTH, 0);
PtSetArg(&args[n++], Pt_ARG_HEIGHT, TAB_HEIGHT, 0);
PtWidget_t *miscTab = PtCreateWidget(PtPane, panelGroup, n, args);
diff -ru abi-072000-ORIG/src/wp/ap/unix/ap_UnixDialog_Options.cpp
abi-072000/src/wp/ap/unix/ap_UnixDialog_Options.cpp
--- abi-072000-ORIG/src/wp/ap/unix/ap_UnixDialog_Options.cpp Sun Jul 16 00:11:31
2000
+++ abi-072000/src/wp/ap/unix/ap_UnixDialog_Options.cpp Thu Jul 20 17:45:05 2000
@@ -207,7 +207,7 @@
GtkWidget *glade_menuitem;
GtkWidget *labelSpell;
- GtkWidget *tableSmartQuotes;
+ GtkWidget *tableOther;
GtkWidget *checkbuttonSmartQuotesEnable;
GtkWidget *labelSmartQuotes;
@@ -595,25 +595,25 @@
// END: glade stuff
- // SMART QUOTES
////////////////////////////////////////////////////////////////
- tableSmartQuotes = gtk_table_new (2, 3, FALSE);
- gtk_widget_ref (tableSmartQuotes);
- gtk_object_set_data_full (GTK_OBJECT (windowOptions), "tableSmartQuotes",
tableSmartQuotes,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (tableSmartQuotes);
- gtk_container_add (GTK_CONTAINER (notebook1), tableSmartQuotes);
- gtk_container_set_border_width (GTK_CONTAINER (tableSmartQuotes), 10);
+ // OTHER STUFF (including SMART QUOTES) //////////////////////////////
+ tableOther = gtk_table_new (2, 3, FALSE);
+ gtk_widget_ref (tableOther);
+ gtk_object_set_data_full (GTK_OBJECT (windowOptions), "tableOther", tableOther,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (tableOther);
+ gtk_container_add (GTK_CONTAINER (notebook1), tableOther);
+ gtk_container_set_border_width (GTK_CONTAINER (tableOther), 10);
checkbuttonSmartQuotesEnable = gtk_check_button_new_with_label
(pSS->getValue(AP_STRING_ID_DLG_Options_Label_SmartQuotesEnable));
gtk_widget_ref (checkbuttonSmartQuotesEnable);
gtk_object_set_data_full (GTK_OBJECT (windowOptions),
"checkbuttonSmartQuotesEnable", checkbuttonSmartQuotesEnable,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (checkbuttonSmartQuotesEnable);
- gtk_table_attach (GTK_TABLE (tableSmartQuotes), checkbuttonSmartQuotesEnable,
0, 3, 0, 1,
+ gtk_table_attach (GTK_TABLE (tableOther), checkbuttonSmartQuotesEnable, 0, 3,
+0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- labelSmartQuotes = gtk_label_new
(pSS->getValue(AP_STRING_ID_DLG_Options_TabLabel_SmartQuotes));
+ labelSmartQuotes = gtk_label_new
+(pSS->getValue(AP_STRING_ID_DLG_Options_TabLabel_Other));
gtk_widget_ref (labelSmartQuotes);
gtk_object_set_data_full (GTK_OBJECT (windowOptions), "labelSmartQuotes",
labelSmartQuotes,
(GtkDestroyNotify) gtk_widget_unref);
diff -ru abi-072000-ORIG/src/wp/ap/win/ap_Win32Dialog_Options.cpp
abi-072000/src/wp/ap/win/ap_Win32Dialog_Options.cpp
--- abi-072000-ORIG/src/wp/ap/win/ap_Win32Dialog_Options.cpp Sun Jul 16 18:10:15
2000
+++ abi-072000/src/wp/ap/win/ap_Win32Dialog_Options.cpp Thu Jul 20 21:20:51 2000
@@ -216,7 +216,7 @@
#define SPELL_INDEX 0
#define PREF_INDEX 1
#define VIEW_INDEX 2
-#define SMARTQUOTES_INDEX 3
+#define OTHER_INDEX 3
BOOL AP_Win32Dialog_Options::_onInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
{
@@ -266,9 +266,9 @@
tie.lParam = AP_RID_DIALOG_OPT_VIEW;
TabCtrl_InsertItem(m_hwndTab, VIEW_INDEX, &tie);
- tie.pszText = (LPSTR) _GV(DLG_Options_TabLabel_SmartQuotes);
- tie.lParam = AP_RID_DIALOG_OPT_SMARTQUOTES;
- TabCtrl_InsertItem(m_hwndTab, SMARTQUOTES_INDEX, &tie);
+ tie.pszText = (LPSTR) _GV(DLG_Options_TabLabel_Other);
+ tie.lParam = AP_RID_DIALOG_OPT_OTHER;
+ TabCtrl_InsertItem(m_hwndTab, OTHER_INDEX, &tie);
// finally, create the (modeless) child dialogs
@@ -296,7 +296,7 @@
&& (m_vecSubDlgHWnd.getItemCount()>0)
&& (w == m_vecSubDlgHWnd.getLastItem())));
- tp.which = AP_RID_DIALOG_OPT_SMARTQUOTES;
+ tp.which = AP_RID_DIALOG_OPT_OTHER;
pTemplate = UT_LockDlgRes(hinst, MAKEINTRESOURCE(tp.which));
w = CreateDialogIndirectParam(hinst, pTemplate, m_hwndTab,
(DLGPROC)s_tabProc, (LPARAM)&tp);
@@ -418,7 +418,7 @@
}
break;
- case AP_RID_DIALOG_OPT_SMARTQUOTES:
+ case AP_RID_DIALOG_OPT_OTHER:
{
_DS(OPTIONS_CHK_SmartQuotesEnable,
DLG_Options_Label_SmartQuotesEnable);
}
@@ -594,7 +594,7 @@
return;
case id_CHECK_SMART_QUOTES_ENABLE:
-
EnableWindow(GetDlgItem((HWND)m_vecSubDlgHWnd.getNthItem(SMARTQUOTES_INDEX),id_CHECK_SMART_QUOTES_ENABLE),value);
+
+EnableWindow(GetDlgItem((HWND)m_vecSubDlgHWnd.getNthItem(OTHER_INDEX),id_CHECK_SMART_QUOTES_ENABLE),value);
return;
default:
@@ -624,7 +624,7 @@
DEFINE_GET_SET_BOOL(SPELL_INDEX,SpellNumbers);
DEFINE_GET_SET_BOOL(SPELL_INDEX,SpellInternet);
-DEFINE_GET_SET_BOOL(SMARTQUOTES_INDEX,SmartQuotesEnable);
+DEFINE_GET_SET_BOOL(OTHER_INDEX,SmartQuotesEnable);
DEFINE_GET_SET_BOOL(PREF_INDEX,PrefsAutoSave);
diff -ru abi-072000-ORIG/src/wp/ap/win/ap_Win32Res_DlgOptions.rc2
abi-072000/src/wp/ap/win/ap_Win32Res_DlgOptions.rc2
--- abi-072000-ORIG/src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 Sun Jul 16 18:10:15
2000
+++ abi-072000/src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 Thu Jul 20 21:22:48 2000
@@ -166,8 +166,8 @@
BS_AUTOCHECKBOX | WS_TABSTOP,15,130,291,10
END
-// The sub-dialog for the SMARTQUOTES tab of the Options dialog
-AP_RID_DIALOG_OPT_SMARTQUOTES DIALOG DISCARDABLE 0, 0, 322, 220
+// The sub-dialog for the OTHER tab of the Options dialog
+AP_RID_DIALOG_OPT_OTHER DIALOG DISCARDABLE 0, 0, 322, 220
STYLE DS_CONTROL | WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
diff -ru abi-072000-ORIG/src/wp/ap/win/ap_Win32Resources.rc2
abi-072000/src/wp/ap/win/ap_Win32Resources.rc2
--- abi-072000-ORIG/src/wp/ap/win/ap_Win32Resources.rc2 Sun Jul 16 18:10:16 2000
+++ abi-072000/src/wp/ap/win/ap_Win32Resources.rc2 Thu Jul 20 21:22:27 2000
@@ -42,7 +42,7 @@
#define AP_RID_DIALOG_FIELD 212
#define AP_RID_DIALOG_WORDCOUNT 213
#define AP_RID_DIALOG_GOTO 214
-#define AP_RID_DIALOG_OPT_SMARTQUOTES 215 // tab-sub-dlg
+#define AP_RID_DIALOG_OPT_OTHER 215
+ // tab-sub-dlg
#include "ap_Win32Resources_DialogReplace.rc2"
#include "ap_Win32Res_DlgBreak.rc2"
diff -ru abi-072000-ORIG/src/wp/ap/xp/ap_Menu_LabelSet_en-US.h
abi-072000/src/wp/ap/xp/ap_Menu_LabelSet_en-US.h
--- abi-072000-ORIG/src/wp/ap/xp/ap_Menu_LabelSet_en-US.h Thu Jul 6 16:42:09
2000
+++ abi-072000/src/wp/ap/xp/ap_Menu_LabelSet_en-US.h Thu Jul 20 17:45:46 2000
@@ -106,7 +106,7 @@
MenuLabel(AP_MENU_ID_TOOLS, "&Tools",
NULL)
MenuLabel(AP_MENU_ID_TOOLS_SPELL, "&Spelling", "Check
the document for incorrect spelling")
MenuLabel(AP_MENU_ID_TOOLS_WORDCOUNT, "&Word Count", "Count the
number of words in the document")
- MenuLabel(AP_MENU_ID_TOOLS_OPTIONS, "&Options",
"Set options")
+ MenuLabel(AP_MENU_ID_TOOLS_OPTIONS, "&Preferences", "Set
+preferences")
MenuLabel(AP_MENU_ID_ALIGN, "&Align",
NULL)
MenuLabel(AP_MENU_ID_ALIGN_LEFT, "&Left",
"Left-justify the paragraph")
diff -ru abi-072000-ORIG/src/wp/ap/xp/ap_String_Id.h
abi-072000/src/wp/ap/xp/ap_String_Id.h
--- abi-072000-ORIG/src/wp/ap/xp/ap_String_Id.h Sun Jul 16 00:11:31 2000
+++ abi-072000/src/wp/ap/xp/ap_String_Id.h Thu Jul 20 17:46:08 2000
@@ -161,10 +161,10 @@
dcl(DLG_Para_PreviewFollowParagraph,"Following Paragraph Following Paragraph
Following Paragraph Following Paragraph Following Paragraph Following Paragraph
Following Paragraph")
/* Options dialog */
-dcl(DLG_Options_OptionsTitle, "Options")
+dcl(DLG_Options_OptionsTitle, "Preferences")
dcl(DLG_Options_TabLabel_Spelling, "Spelling")
-dcl(DLG_Options_TabLabel_SmartQuotes, "Smart Quotes")
+dcl(DLG_Options_TabLabel_Other, "Other")
dcl(DLG_Options_TabLabel_Preferences, "Preference Schemes")
dcl(DLG_Options_TabLabel_View, "View")
