? file ? src/Linux_2.2.14_i386_OBJ Index: src/wp/ap/beos/ap_BeOSDialog_Options.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/beos/ap_BeOSDialog_Options.cpp,v retrieving revision 1.4 diff -u -r1.4 ap_BeOSDialog_Options.cpp --- src/wp/ap/beos/ap_BeOSDialog_Options.cpp 1999/11/11 03:12:31 1.4 +++ src/wp/ap/beos/ap_BeOSDialog_Options.cpp 2000/02/27 04:09:55 @@ -130,10 +130,14 @@ return m_listViewRulerUnits; break; - case id_CHECK_VIEW_SHOW_TOOLBARS: - return m_checkbuttonViewShowToolbars; + case id_CHECK_VIEW_SHOW_FORMAT_TOOLBAR: + return m_checkbuttonViewShowFormatToolbar; break; + case id_CHECK_VIEW_SHOW_BUTTON_TOOLBAR: + return m_checkbuttonViewShowButtonToolbar; + break; + case id_CHECK_VIEW_ALL: return m_checkbuttonViewAll; break; @@ -212,7 +216,8 @@ DEFINE_GET_SET_BOOL (ViewShowRuler); // have a units option DEFINE_GET_SET_BOOL (ViewCursorBlink); -DEFINE_GET_SET_BOOL (ViewShowToolbars); +DEFINE_GET_SET_BOOL (ViewShowFormatToolbar); +DEFINE_GET_SET_BOOL (ViewShowButtonToolbar); DEFINE_GET_SET_BOOL (ViewAll); DEFINE_GET_SET_BOOL (ViewHiddenText); Index: src/wp/ap/beos/ap_BeOSDialog_Options.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/beos/ap_BeOSDialog_Options.h,v retrieving revision 1.3 diff -u -r1.3 ap_BeOSDialog_Options.h --- src/wp/ap/beos/ap_BeOSDialog_Options.h 1999/11/11 03:12:31 1.3 +++ src/wp/ap/beos/ap_BeOSDialog_Options.h 2000/02/27 04:09:55 @@ -57,7 +57,8 @@ SET_GATHER (ViewShowRuler, UT_Bool ); SET_GATHER (ViewRulerUnits, UT_Dimension); SET_GATHER (ViewCursorBlink, UT_Bool); - SET_GATHER (ViewShowToolbars, UT_Bool ); + SET_GATHER (ViewShowFormatToolbar, UT_Bool ); + SET_GATHER (ViewShowButtonToolbar, UT_Bool ); SET_GATHER (ViewAll, UT_Bool ); SET_GATHER (ViewHiddenText, UT_Bool ); Index: src/wp/ap/qnx/ap_QNXDialog_Options.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/qnx/ap_QNXDialog_Options.cpp,v retrieving revision 1.2 diff -u -r1.2 ap_QNXDialog_Options.cpp --- src/wp/ap/qnx/ap_QNXDialog_Options.cpp 2000/01/26 12:13:00 1.2 +++ src/wp/ap/qnx/ap_QNXDialog_Options.cpp 2000/02/27 04:09:56 @@ -236,7 +236,8 @@ PtWidget_t *listViewRulerUnit; PtWidget_t *listViewRulerUnit_menu; PtWidget_t *checkbuttonViewCursorBlink; - PtWidget_t *checkbuttonViewToolbars; + PtWidget_t *checkbuttonViewFormatToolbar; + PtWidget_t *checkbuttonViewButtonToolbar; PtWidget_t *frameViewStuff; PtWidget_t *vbox6; PtWidget_t *checkbuttonViewAll; @@ -608,12 +609,19 @@ gtk_option_menu_set_menu (GTK_OPTION_MENU (listViewRulerUnit), listViewRulerUnit_menu); - checkbuttonViewToolbars = gtk_check_button_new_with_label (pSS->getValue(AP_STRING_ID_DLG_Options_Label_ViewToolbars)); - gtk_widget_ref (checkbuttonViewToolbars); - gtk_object_set_data_full (GTK_OBJECT (windowOptions), "checkbuttonViewToolbars", checkbuttonViewToolbars, + checkbuttonViewFormatToolbar = gtk_check_button_new_with_label (pSS->getValue(AP_STRING_ID_DLG_Options_Label_ViewFormatToolbar)); + gtk_widget_ref (checkbuttonViewFormatToolbar); + gtk_object_set_data_full (GTK_OBJECT (windowOptions), "checkbuttonViewFormatToolbar", checkbuttonViewFormatToolbar, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (checkbuttonViewFormatToolbar); + gtk_box_pack_start (GTK_BOX (vbox7), checkbuttonViewFormatToolbar, FALSE, FALSE, 0); + + checkbuttonViewButtonToolbar = gtk_check_button_new_with_label (pSS->getValue(AP_STRING_ID_DLG_Options_Label_ViewButtonToolbar)); + gtk_widget_ref (checkbuttonViewButtonToolbar); + gtk_object_set_data_full (GTK_OBJECT (windowOptions), "checkbuttonViewButtonToolbar", checkbuttonViewButtonToolbar, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (checkbuttonViewToolbars); - gtk_box_pack_start (GTK_BOX (vbox7), checkbuttonViewToolbars, FALSE, FALSE, 0); + gtk_widget_show (checkbuttonViewButtonToolbar); + gtk_box_pack_start (GTK_BOX (vbox7), checkbuttonViewButtonToolbar, FALSE, FALSE, 0); checkbuttonViewCursorBlink = gtk_check_button_new_with_label (pSS->getValue(AP_STRING_ID_DLG_Options_Label_ViewCursorBlink)); gtk_widget_ref (checkbuttonViewCursorBlink); @@ -747,7 +755,8 @@ m_checkbuttonViewShowRuler = checkbuttonViewRuler; m_listViewRulerUnits = listViewRulerUnit; m_checkbuttonViewCursorBlink = checkbuttonViewCursorBlink; - m_checkbuttonViewShowToolbars = checkbuttonViewToolbars; + m_checkbuttonViewShowFormatToolbar = checkbuttonViewFormatToolbar; + m_checkbuttonViewShowButtonToolbar = checkbuttonViewButtonToolbar; m_checkbuttonViewAll = checkbuttonViewAll; m_checkbuttonViewHiddenText = checkbuttonViewHidden; m_checkbuttonViewUnprintable = checkbuttonViewUnprintable; @@ -854,10 +863,14 @@ return m_checkbuttonViewCursorBlink; break; - case id_CHECK_VIEW_SHOW_TOOLBARS: - return m_checkbuttonViewShowToolbars; + case id_CHECK_VIEW_SHOW_FORMAT_TOOLBAR: + return m_checkbuttonViewShowFormatToolbar; break; + case id_CHECK_VIEW_SHOW_BUTTON_TOOLBAR: + return m_checkbuttonViewShowButtonToolbar; + break; + case id_CHECK_VIEW_ALL: return m_checkbuttonViewAll; break; @@ -1009,7 +1022,8 @@ } DEFINE_GET_SET_BOOL (ViewCursorBlink); -DEFINE_GET_SET_BOOL (ViewShowToolbars); +DEFINE_GET_SET_BOOL (ViewShowFormatToolbar); +DEFINE_GET_SET_BOOL (ViewShowButtonToolbar); DEFINE_GET_SET_BOOL (ViewAll); DEFINE_GET_SET_BOOL (ViewHiddenText); Index: src/wp/ap/qnx/ap_QNXDialog_Options.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/qnx/ap_QNXDialog_Options.h,v retrieving revision 1.2 diff -u -r1.2 ap_QNXDialog_Options.h --- src/wp/ap/qnx/ap_QNXDialog_Options.h 2000/01/26 12:13:00 1.2 +++ src/wp/ap/qnx/ap_QNXDialog_Options.h 2000/02/27 04:09:56 @@ -58,7 +58,8 @@ SET_GATHER (ViewShowRuler, UT_Bool ); SET_GATHER (ViewRulerUnits, UT_Dimension); SET_GATHER (ViewCursorBlink, UT_Bool); - SET_GATHER (ViewShowToolbars, UT_Bool ); + SET_GATHER (ViewShowFormatToolbar, UT_Bool ); + SET_GATHER (ViewShowButtonToolbar, UT_Bool ); SET_GATHER (ViewAll, UT_Bool ); SET_GATHER (ViewHiddenText, UT_Bool ); @@ -98,7 +99,8 @@ PtWidget_t * m_listViewRulerUnits; PtWidget_t * m_listViewRulerUnits_menu; PtWidget_t * m_checkbuttonViewCursorBlink; - PtWidget_t * m_checkbuttonViewShowToolbars; + PtWidget_t * m_checkbuttonViewShowFormatToolbar; + PtWidget_t * m_checkbuttonViewShowButtonToolbar; PtWidget_t * m_checkbuttonViewAll; PtWidget_t * m_checkbuttonViewHiddenText; PtWidget_t * m_checkbuttonViewUnprintable; Index: src/wp/ap/unix/ap_UnixDialog_Options.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Options.cpp,v retrieving revision 1.6 diff -u -r1.6 ap_UnixDialog_Options.cpp --- src/wp/ap/unix/ap_UnixDialog_Options.cpp 1999/12/08 06:27:19 1.6 +++ src/wp/ap/unix/ap_UnixDialog_Options.cpp 2000/02/27 04:09:56 @@ -230,7 +230,8 @@ GtkWidget *listViewRulerUnit; GtkWidget *listViewRulerUnit_menu; GtkWidget *checkbuttonViewCursorBlink; - GtkWidget *checkbuttonViewToolbars; + GtkWidget *checkbuttonViewFormatToolbar; + GtkWidget *checkbuttonViewButtonToolbar; GtkWidget *frameViewStuff; GtkWidget *vbox6; GtkWidget *checkbuttonViewAll; @@ -602,12 +603,19 @@ gtk_option_menu_set_menu (GTK_OPTION_MENU (listViewRulerUnit), listViewRulerUnit_menu); - checkbuttonViewToolbars = gtk_check_button_new_with_label (pSS->getValue(AP_STRING_ID_DLG_Options_Label_ViewToolbars)); - gtk_widget_ref (checkbuttonViewToolbars); - gtk_object_set_data_full (GTK_OBJECT (windowOptions), "checkbuttonViewToolbars", checkbuttonViewToolbars, + checkbuttonViewFormatToolbar = gtk_check_button_new_with_label (pSS->getValue(AP_STRING_ID_DLG_Options_Label_ViewFormatToolbar)); + gtk_widget_ref (checkbuttonViewFormatToolbar); + gtk_object_set_data_full (GTK_OBJECT (windowOptions), "checkbuttonViewFormatToolbar", checkbuttonViewFormatToolbar, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (checkbuttonViewFormatToolbar); + gtk_box_pack_start (GTK_BOX (vbox7), checkbuttonViewFormatToolbar, FALSE, FALSE, 0); + + checkbuttonViewButtonToolbar = gtk_check_button_new_with_label (pSS->getValue(AP_STRING_ID_DLG_Options_Label_ViewButtonToolbar)); + gtk_widget_ref (checkbuttonViewButtonToolbar); + gtk_object_set_data_full (GTK_OBJECT (windowOptions), "checkbuttonViewButtonToolbar", checkbuttonViewButtonToolbar, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (checkbuttonViewToolbars); - gtk_box_pack_start (GTK_BOX (vbox7), checkbuttonViewToolbars, FALSE, FALSE, 0); + gtk_widget_show (checkbuttonViewButtonToolbar); + gtk_box_pack_start (GTK_BOX (vbox7), checkbuttonViewButtonToolbar, FALSE, FALSE, 0); checkbuttonViewCursorBlink = gtk_check_button_new_with_label (pSS->getValue(AP_STRING_ID_DLG_Options_Label_ViewCursorBlink)); gtk_widget_ref (checkbuttonViewCursorBlink); @@ -741,7 +749,8 @@ m_checkbuttonViewShowRuler = checkbuttonViewRuler; m_listViewRulerUnits = listViewRulerUnit; m_checkbuttonViewCursorBlink = checkbuttonViewCursorBlink; - m_checkbuttonViewShowToolbars = checkbuttonViewToolbars; + m_checkbuttonViewShowFormatToolbar = checkbuttonViewFormatToolbar; + m_checkbuttonViewShowButtonToolbar = checkbuttonViewButtonToolbar; m_checkbuttonViewAll = checkbuttonViewAll; m_checkbuttonViewHiddenText = checkbuttonViewHidden; m_checkbuttonViewUnprintable = checkbuttonViewUnprintable; @@ -845,10 +854,14 @@ return m_checkbuttonViewCursorBlink; break; - case id_CHECK_VIEW_SHOW_TOOLBARS: - return m_checkbuttonViewShowToolbars; + case id_CHECK_VIEW_SHOW_FORMAT_TOOLBAR: + return m_checkbuttonViewShowFormatToolbar; break; + case id_CHECK_VIEW_SHOW_BUTTON_TOOLBAR: + return m_checkbuttonViewShowButtonToolbar; + break; + case id_CHECK_VIEW_ALL: return m_checkbuttonViewAll; break; @@ -991,7 +1004,8 @@ } DEFINE_GET_SET_BOOL (ViewCursorBlink); -DEFINE_GET_SET_BOOL (ViewShowToolbars); +DEFINE_GET_SET_BOOL (ViewShowFormatToolbar); +DEFINE_GET_SET_BOOL (ViewShowButtonToolbar); DEFINE_GET_SET_BOOL (ViewAll); DEFINE_GET_SET_BOOL (ViewHiddenText); Index: src/wp/ap/unix/ap_UnixDialog_Options.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Options.h,v retrieving revision 1.6 diff -u -r1.6 ap_UnixDialog_Options.h --- src/wp/ap/unix/ap_UnixDialog_Options.h 1999/12/08 06:27:19 1.6 +++ src/wp/ap/unix/ap_UnixDialog_Options.h 2000/02/27 04:09:56 @@ -59,7 +59,8 @@ SET_GATHER (ViewShowRuler, UT_Bool ); SET_GATHER (ViewRulerUnits, UT_Dimension); SET_GATHER (ViewCursorBlink, UT_Bool); - SET_GATHER (ViewShowToolbars, UT_Bool ); + SET_GATHER (ViewShowFormatToolbar, UT_Bool ); + SET_GATHER (ViewShowButtonToolbar, UT_Bool ); SET_GATHER (ViewAll, UT_Bool ); SET_GATHER (ViewHiddenText, UT_Bool ); @@ -99,7 +100,8 @@ GtkWidget * m_listViewRulerUnits; GtkWidget * m_listViewRulerUnits_menu; GtkWidget * m_checkbuttonViewCursorBlink; - GtkWidget * m_checkbuttonViewShowToolbars; + GtkWidget * m_checkbuttonViewShowFormatToolbar; + GtkWidget * m_checkbuttonViewShowButtonToolbar; GtkWidget * m_checkbuttonViewAll; GtkWidget * m_checkbuttonViewHiddenText; GtkWidget * m_checkbuttonViewUnprintable; Index: src/wp/ap/win/ap_Win32Dialog_Options.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Options.cpp,v retrieving revision 1.9 diff -u -r1.9 ap_Win32Dialog_Options.cpp --- src/wp/ap/win/ap_Win32Dialog_Options.cpp 2000/01/31 12:19:40 1.9 +++ src/wp/ap/win/ap_Win32Dialog_Options.cpp 2000/02/27 04:09:56 @@ -488,9 +488,13 @@ EnableWindow(GetDlgItem((HWND)m_vecSubDlgHWnd.getNthItem(VIEW_INDEX),AP_RID_DIALOG_OPTIONS_CHK_ViewCursorBlink),value); return; - case id_CHECK_VIEW_SHOW_TOOLBARS: - EnableWindow(GetDlgItem((HWND)m_vecSubDlgHWnd.getNthItem(VIEW_INDEX),AP_RID_DIALOG_OPTIONS_CHK_ViewShowToolbars),value); + case id_CHECK_VIEW_SHOW_FORMAT_TOOLBAR: + EnableWindow(GetDlgItem((HWND)m_vecSubDlgHWnd.getNthItem(VIEW_INDEX),AP_RID_DIALOG_OPTIONS_CHK_ViewShowFormatToolbar),value); return; + + case id_CHECK_VIEW_SHOW_BUTTON_TOOLBAR: + EnableWindow(GetDlgItem((HWND)m_vecSubDlgHWnd.getNthItem(VIEW_INDEX),AP_RID_DIALOG_OPTIONS_CHK_ViewShowButtonToolbar),value); + return; case id_CHECK_VIEW_ALL: EnableWindow(GetDlgItem((HWND)m_vecSubDlgHWnd.getNthItem(VIEW_INDEX),AP_RID_DIALOG_OPTIONS_CHK_ViewAll),value); @@ -535,7 +539,8 @@ DEFINE_GET_SET_BOOL(VIEW_INDEX,ViewShowRuler); DEFINE_GET_SET_BOOL(VIEW_INDEX,ViewCursorBlink); -DEFINE_GET_SET_BOOL(VIEW_INDEX,ViewShowToolbars); +DEFINE_GET_SET_BOOL(VIEW_INDEX,ViewShowFormatToolbar); +DEFINE_GET_SET_BOOL(VIEW_INDEX,ViewShowButtonToolbar); DEFINE_GET_SET_BOOL(VIEW_INDEX,ViewAll); DEFINE_GET_SET_BOOL(VIEW_INDEX,ViewHiddenText); Index: src/wp/ap/win/ap_Win32Dialog_Options.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Options.h,v retrieving revision 1.4 diff -u -r1.4 ap_Win32Dialog_Options.h --- src/wp/ap/win/ap_Win32Dialog_Options.h 1999/11/11 03:12:32 1.4 +++ src/wp/ap/win/ap_Win32Dialog_Options.h 2000/02/27 04:09:57 @@ -58,7 +58,8 @@ SET_GATHER (ViewShowRuler, UT_Bool ); SET_GATHER (ViewRulerUnits, UT_Dimension); SET_GATHER (ViewCursorBlink, UT_Bool); - SET_GATHER (ViewShowToolbars, UT_Bool ); + SET_GATHER (ViewShowFormatToolbar, UT_Bool ); + SET_GATHER (ViewShowButtonToolbar, UT_Bool ); SET_GATHER (ViewAll, UT_Bool ); SET_GATHER (ViewHiddenText, UT_Bool ); Index: src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 =================================================================== RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_DlgOptions.rc2,v retrieving revision 1.3 diff -u -r1.3 ap_Win32Res_DlgOptions.rc2 --- src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 2000/01/31 20:46:10 1.3 +++ src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 2000/02/27 04:09:57 @@ -50,11 +50,12 @@ #define AP_RID_DIALOG_OPTIONS_BTN_IGNOREDEDIT 1022 #define AP_RID_DIALOG_OPTIONS_CHK_PrefsAutoSave 1023 #define AP_RID_DIALOG_OPTIONS_CHK_ViewShowRuler 1024 -#define AP_RID_DIALOG_OPTIONS_CHK_ViewShowToolbars 1025 -#define AP_RID_DIALOG_OPTIONS_CHK_ViewAll 1026 +#define AP_RID_DIALOG_OPTIONS_CHK_ViewShowFormatToolbar 1025 +#define AP_RID_DIALOG_OPTIONS_CHK_ViewAll 1026 #define AP_RID_DIALOG_OPTIONS_CHK_ViewHiddenText 1027 #define AP_RID_DIALOG_OPTIONS_CHK_ViewUnprintable 1028 #define AP_RID_DIALOG_OPTIONS_CHK_ViewCursorBlink 1029 +#define AP_RID_DIALOG_OPTIONS_CHK_ViewShowButtonToolbar 1030 #ifdef RC_INVOKED Index: src/wp/ap/xp/ap_Dialog_Options.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Dialog_Options.cpp,v retrieving revision 1.8 diff -u -r1.8 ap_Dialog_Options.cpp --- src/wp/ap/xp/ap_Dialog_Options.cpp 1999/12/08 22:15:33 1.8 +++ src/wp/ap/xp/ap_Dialog_Options.cpp 2000/02/27 04:09:57 @@ -106,6 +106,8 @@ Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_SpellCheckInternet, _gatherSpellInternet() ); Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_RulerVisible, _gatherViewShowRuler() ); + Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_FormatToolbarVisible, _gatherViewShowFormatToolbar() ); + Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_ButtonToolbarVisible, _gatherViewShowButtonToolbar() ); Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_CursorBlink, _gatherViewCursorBlink() ); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -116,9 +118,8 @@ // allow XAP_Prefs to notify all the listeners of changes // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // TODO: change to snprintf XML_Char szBuffer[40]; - sprintf( szBuffer, "%i", _gatherNotebookPageNum() ); + snprintf( szBuffer, 39, "%i", _gatherNotebookPageNum() ); pPrefsScheme->setValue( AP_PREF_KEY_OptionsTabNumber, szBuffer ); // allow the prefListeners to receive their calls @@ -175,6 +176,12 @@ if (pPrefs->getPrefsValueBool(AP_PREF_KEY_RulerVisible,&b)) _setViewShowRuler (b); + if (pPrefs->getPrefsValueBool(AP_PREF_KEY_FormatToolbarVisible,&b)) + _setViewShowFormatToolbar (b); + + if (pPrefs->getPrefsValueBool(AP_PREF_KEY_ButtonToolbarVisible,&b)) + _setViewShowButtonToolbar (b); + if (pPrefs->getPrefsValueBool(AP_PREF_KEY_CursorBlink,&b)) _setViewCursorBlink (b); @@ -225,7 +232,8 @@ _controlEnable( id_COMBO_PREFS_SCHEME, UT_FALSE ); // view - _controlEnable( id_CHECK_VIEW_SHOW_TOOLBARS, UT_FALSE ); + _controlEnable( id_CHECK_VIEW_SHOW_FORMAT_TOOLBAR, UT_FALSE ); + _controlEnable( id_CHECK_VIEW_SHOW_BUTTON_TOOLBAR, UT_FALSE ); _controlEnable( id_CHECK_VIEW_ALL, UT_FALSE ); _controlEnable( id_CHECK_VIEW_HIDDEN_TEXT, UT_FALSE ); _controlEnable( id_CHECK_VIEW_UNPRINTABLE, UT_FALSE ); Index: src/wp/ap/xp/ap_Dialog_Options.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Dialog_Options.h,v retrieving revision 1.5 diff -u -r1.5 ap_Dialog_Options.h --- src/wp/ap/xp/ap_Dialog_Options.h 1999/11/17 20:21:33 1.5 +++ src/wp/ap/xp/ap_Dialog_Options.h 2000/02/27 04:09:57 @@ -50,7 +50,7 @@ id_CHECK_PREFS_AUTO_SAVE, id_COMBO_PREFS_SCHEME, id_CHECK_VIEW_SHOW_RULER, id_LIST_VIEW_RULER_UNITS, - id_CHECK_VIEW_CURSOR_BLINK, id_CHECK_VIEW_SHOW_TOOLBARS, + id_CHECK_VIEW_CURSOR_BLINK, id_CHECK_VIEW_SHOW_FORMAT_TOOLBAR, id_CHECK_VIEW_SHOW_BUTTON_TOOLBAR, id_CHECK_VIEW_ALL, id_CHECK_VIEW_HIDDEN_TEXT, id_CHECK_VIEW_UNPRINTABLE, @@ -97,7 +97,8 @@ SET_GATHER (ViewShowRuler, UT_Bool); SET_GATHER (ViewRulerUnits, UT_Dimension); SET_GATHER (ViewCursorBlink, UT_Bool); - SET_GATHER (ViewShowToolbars, UT_Bool); + SET_GATHER (ViewShowFormatToolbar, UT_Bool); + SET_GATHER (ViewShowButtonToolbar, UT_Bool); SET_GATHER (ViewAll, UT_Bool); SET_GATHER (ViewHiddenText, UT_Bool); Index: src/wp/ap/xp/ap_Prefs_SchemeIds.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Prefs_SchemeIds.h,v retrieving revision 1.12 diff -u -r1.12 ap_Prefs_SchemeIds.h --- src/wp/ap/xp/ap_Prefs_SchemeIds.h 2000/02/18 06:51:13 1.12 +++ src/wp/ap/xp/ap_Prefs_SchemeIds.h 2000/02/27 04:09:57 @@ -90,6 +90,12 @@ #define AP_PREF_KEY_StringSetDirectory "StringSetDirectory" /* where we find StringSets */ #define AP_PREF_DEFAULT_StringSetDirectory "strings" /* if relative, use prefix "getAbiSuiteAppDir()" */ +#define AP_PREF_KEY_FormatToolbarVisible "FunctionToolbarVisible" +#define AP_PREF_DEFAULT_FormatToolbarVisible "1" + +#define AP_PREF_KEY_ButtonToolbarVisible "ButtonToolbarVisible" +#define AP_PREF_DEFAULT_ButtonToolbarVisible "1" + #else /* AP_PREFS_SCHEMEIDS_H */ #ifdef dcl @@ -108,6 +114,8 @@ dcl(MenuLabelSet) dcl(ToolbarLabelSet) dcl(ToolbarLayouts) +dcl(FormatToolbarVisible) +dcl(ButtonToolbarVisible) dcl(SpellDirectory) dcl(StringSetDirectory) Index: src/wp/ap/xp/ap_String_Id.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_String_Id.h,v retrieving revision 1.30 diff -u -r1.30 ap_String_Id.h --- src/wp/ap/xp/ap_String_Id.h 2000/02/15 07:28:05 1.30 +++ src/wp/ap/xp/ap_String_Id.h 2000/02/27 04:09:57 @@ -167,7 +167,8 @@ dcl(DLG_Options_Label_ViewRuler, "&Ruler") dcl(DLG_Options_Label_ViewUnits, "&units:") dcl(DLG_Options_Label_ViewCursorBlink, "Cursor &blink") -dcl(DLG_Options_Label_ViewToolbars, "&Toolbars") +dcl(DLG_Options_Label_ViewFormatToolbar, "&Formatting Toolbar") +dcl(DLG_Options_Label_ViewButtonToolbar, "&Button Toolbar") dcl(DLG_Options_Label_ViewViewFrame, "View...") dcl(DLG_Options_Label_ViewAll, "&All") dcl(DLG_Options_Label_ViewHiddenText, "&Hidden Text")