? src/wp/ap/unix-NEU 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.18 diff -u -r1.18 ap_BeOSDialog_Options.h --- src/wp/ap/beos/ap_BeOSDialog_Options.h 13 Feb 2004 07:03:55 -0000 1.18 +++ src/wp/ap/beos/ap_BeOSDialog_Options.h 8 Apr 2004 12:55:14 -0000 @@ -79,7 +79,6 @@ SET_GATHER (AutoLoadPlugins, bool); SET_GATHER (OtherDirectionRtl, bool); - SET_GATHER (OtherSaveContextGlyphs, bool); SET_GATHER (OtherHebrewContextGlyphs, bool); SET_GATHER (AutoSaveFile, bool); Index: src/wp/ap/cocoa/ap_CocoaDialog_Options.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/cocoa/ap_CocoaDialog_Options.h,v retrieving revision 1.12 diff -u -r1.12 ap_CocoaDialog_Options.h --- src/wp/ap/cocoa/ap_CocoaDialog_Options.h 9 Dec 2003 23:50:06 -0000 1.12 +++ src/wp/ap/cocoa/ap_CocoaDialog_Options.h 8 Apr 2004 12:55:14 -0000 @@ -171,7 +171,6 @@ SET_GATHER (NotebookPageNum, int ); SET_GATHER (OtherDirectionRtl, bool); - SET_GATHER (OtherSaveContextGlyphs, bool); SET_GATHER (OtherHebrewContextGlyphs, bool); SET_GATHER (AutoSaveFile, bool); Index: src/wp/ap/cocoa/ap_CocoaDialog_Options.mm =================================================================== RCS file: /cvsroot/abi/src/wp/ap/cocoa/ap_CocoaDialog_Options.mm,v retrieving revision 1.18 diff -u -r1.18 ap_CocoaDialog_Options.mm --- src/wp/ap/cocoa/ap_CocoaDialog_Options.mm 9 Dec 2003 23:50:07 -0000 1.18 +++ src/wp/ap/cocoa/ap_CocoaDialog_Options.mm 8 Apr 2004 12:55:14 -0000 @@ -336,7 +336,6 @@ DEFINE_GET_SET_BOOL(SmartQuotesEnable, id_CHECK_SMART_QUOTES_ENABLE); DEFINE_GET_SET_BOOL(OtherDirectionRtl, id_CHECK_OTHER_DEFAULT_DIRECTION_RTL); -DEFINE_GET_SET_BOOL(OtherSaveContextGlyphs, id_CHECK_OTHER_SAVE_CONTEXT_GLYPHS); DEFINE_GET_SET_BOOL(OtherHebrewContextGlyphs, id_CHECK_OTHER_HEBREW_CONTEXT_GLYPHS); DEFINE_GET_SET_BOOL(AutoSaveFile, id_CHECK_AUTO_SAVE_FILE); @@ -551,7 +550,6 @@ LocalizeControl(m_prefsCurrentSetLabel, pSS, AP_STRING_ID_DLG_Options_Label_PrefsCurrentScheme); LocalizeControl(m_prefsBidiBox, pSS, AP_STRING_ID_DLG_Options_Label_BiDiOptions); LocalizeControl(m_prefsDefaultToRTLBtn, pSS, AP_STRING_ID_DLG_Options_Label_DirectionRtl); - //LocalizeControl(m_spellResetDictBtn, pSS, AP_STRING_ID_DLG_Options_Label_SaveContextGlyphs); LocalizeControl(m_prefsOtherHebrwContextGlyphBtn, pSS, AP_STRING_ID_DLG_Options_Label_HebrewContextGlyphs); LocalizeControl(m_prefsAutoSaveBox, pSS, AP_STRING_ID_DLG_Options_Label_AutoSave); LocalizeControl(m_prefsAutoSaveCurrentBtn, pSS, AP_STRING_ID_DLG_Options_Label_AutoSaveCurrent); @@ -605,10 +603,6 @@ case AP_Dialog_Options::id_CHECK_OTHER_DEFAULT_DIRECTION_RTL: return m_prefsDefaultToRTLBtn; -/* FIXME. Currently not implemented according to the ap_UnixDialog. - case AP_Dialog_Options::id_CHECK_OTHER_SAVE_CONTEXT_GLYPHS: - return m_checkbuttonOtherSaveContextGlyphs; -*/ case AP_Dialog_Options::id_CHECK_OTHER_HEBREW_CONTEXT_GLYPHS: return m_prefsOtherHebrwContextGlyphBtn; 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.37 diff -u -r1.37 ap_QNXDialog_Options.cpp --- src/wp/ap/qnx/ap_QNXDialog_Options.cpp 16 Dec 2003 12:10:01 -0000 1.37 +++ src/wp/ap/qnx/ap_QNXDialog_Options.cpp 8 Apr 2004 12:55:19 -0000 @@ -332,7 +332,6 @@ PtWidget_t *checkbuttonViewHidden; PtWidget_t *checkbuttonViewUnprintable; PtWidget_t *checkbuttonOtherDirectionRtl; - PtWidget_t *checkbuttonOtherSaveContextGlyphs; PtWidget_t *checkbuttonOtherHebrewContextGlyphs; @@ -673,11 +672,6 @@ checkbuttonOtherDirectionRtl = PtCreateWidget(PtToggleButton, vmiscgroup, n, args); n = 0; -PtSetArg(&args[n++],Pt_ARG_TEXT_STRING,TR(pSS->getValueUTF8(AP_STRING_ID_DLG_Options_Label_SaveContextGlyphs).utf8_str()),0); - PtSetArg(&args[n++],Pt_ARG_WIDTH,2*ABI_DEFAULT_BUTTON_WIDTH,0); - checkbuttonOtherSaveContextGlyphs = PtCreateWidget(PtToggleButton,vmiscgroup,n,args); - - n = 0; PtSetArg(&args[n++],Pt_ARG_TEXT_STRING,TR(pSS->getValueUTF8(AP_STRING_ID_DLG_Options_Label_HebrewContextGlyphs).utf8_str()),0); PtSetArg(&args[n++],Pt_ARG_WIDTH, 2* ABI_DEFAULT_BUTTON_WIDTH,0); checkbuttonOtherHebrewContextGlyphs=PtCreateWidget(PtToggleButton,vmiscgroup,n,args); @@ -723,7 +717,6 @@ m_notebook = notebook1 = NULL; m_checkbuttonOtherDirectionRtl = checkbuttonOtherDirectionRtl; - m_checkbuttonOtherSaveContextGlyphs = checkbuttonOtherSaveContextGlyphs; m_checkbuttonOtherHebrewContextGlyphs = checkbuttonOtherHebrewContextGlyphs; m_checkbuttonSpellCheckAsType = checkbuttonSpellCheckAsType; @@ -825,8 +818,6 @@ case id_CHECK_OTHER_DEFAULT_DIRECTION_RTL: return m_checkbuttonOtherDirectionRtl; - case id_CHECK_OTHER_SAVE_CONTEXT_GLYPHS: - return m_checkbuttonOtherSaveContextGlyphs; case id_CHECK_OTHER_HEBREW_CONTEXT_GLYPHS: return m_checkbuttonOtherHebrewContextGlyphs; @@ -944,7 +935,6 @@ DEFINE_GET_SET_BOOL(ViewShowStatusBar); DEFINE_GET_SET_BOOL(OtherDirectionRtl); -DEFINE_GET_SET_BOOL(OtherSaveContextGlyphs); DEFINE_GET_SET_BOOL(OtherHebrewContextGlyphs); /* File save options related stuff */ 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.21 diff -u -r1.21 ap_QNXDialog_Options.h --- src/wp/ap/qnx/ap_QNXDialog_Options.h 16 Dec 2003 12:10:01 -0000 1.21 +++ src/wp/ap/qnx/ap_QNXDialog_Options.h 8 Apr 2004 12:55:19 -0000 @@ -87,7 +87,6 @@ SET_GATHER (OtherDirectionRtl, bool); SET_GATHER (AutoSaveFile, bool); - SET_GATHER (OtherSaveContextGlyphs, bool); SET_GATHER (OtherHebrewContextGlyphs, bool); virtual void _gatherAutoSaveFilePeriod(UT_String &stRetVal); virtual void _setAutoSaveFilePeriod(const UT_String &stPeriod); @@ -155,7 +154,6 @@ PtWidget_t * m_checkbuttonShowSplash; PtWidget_t * m_checkbuttonOtherDirectionRtl; - PtWidget_t * m_checkbuttonOtherSaveContextGlyphs; PtWidget_t * m_checkbuttonOtherHebrewContextGlyphs; 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.73 diff -u -r1.73 ap_UnixDialog_Options.cpp --- src/wp/ap/unix/ap_UnixDialog_Options.cpp 9 Dec 2003 23:50:09 -0000 1.73 +++ src/wp/ap/unix/ap_UnixDialog_Options.cpp 8 Apr 2004 12:55:20 -0000 @@ -340,7 +340,6 @@ GtkWidget *frame42; GtkWidget *vbox59; GtkWidget *rtl_dominant; - GtkWidget *save_context_glyphs; GtkWidget *hebrew_context_glyphs; mainWindow = m_windowMain; @@ -804,14 +803,6 @@ gtk_widget_show (rtl_dominant); gtk_box_pack_start (GTK_BOX (vbox59), rtl_dominant, FALSE, FALSE, 0); - // this is not implemented at the moment - save_context_glyphs = gtk_check_button_new_with_label (pSS->getValueUTF8(AP_STRING_ID_DLG_Options_Label_SaveContextGlyphs).utf8_str()); -#if 0 - // currently not implemented - gtk_widget_show (save_context_glyphs); -#endif - gtk_box_pack_start (GTK_BOX (vbox59), save_context_glyphs, FALSE, FALSE, 0); - hebrew_context_glyphs = gtk_check_button_new_with_label (pSS->getValueUTF8(AP_STRING_ID_DLG_Options_Label_HebrewContextGlyphs).utf8_str()); gtk_widget_show (hebrew_context_glyphs); gtk_box_pack_start (GTK_BOX (vbox59), hebrew_context_glyphs, FALSE, FALSE, 0); @@ -887,7 +878,6 @@ m_notebook = notebook1; m_checkbuttonOtherDirectionRtl = rtl_dominant; - m_checkbuttonOtherSaveContextGlyphs = save_context_glyphs; m_checkbuttonOtherHebrewContextGlyphs = hebrew_context_glyphs; m_checkbuttonAutoSaveFile = autosave_cb; m_textAutoSaveFileExt = autosave_ext; @@ -1083,9 +1073,6 @@ case id_CHECK_OTHER_DEFAULT_DIRECTION_RTL: return m_checkbuttonOtherDirectionRtl; - case id_CHECK_OTHER_SAVE_CONTEXT_GLYPHS: - return m_checkbuttonOtherSaveContextGlyphs; - case id_CHECK_OTHER_HEBREW_CONTEXT_GLYPHS: return m_checkbuttonOtherHebrewContextGlyphs; @@ -1229,7 +1216,6 @@ DEFINE_GET_SET_BOOL(SmartQuotesEnable); DEFINE_GET_SET_BOOL(OtherDirectionRtl); -DEFINE_GET_SET_BOOL(OtherSaveContextGlyphs); DEFINE_GET_SET_BOOL(OtherHebrewContextGlyphs); DEFINE_GET_SET_BOOL(AutoSaveFile); 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.37 diff -u -r1.37 ap_UnixDialog_Options.h --- src/wp/ap/unix/ap_UnixDialog_Options.h 9 Dec 2003 23:50:09 -0000 1.37 +++ src/wp/ap/unix/ap_UnixDialog_Options.h 8 Apr 2004 12:55:20 -0000 @@ -82,7 +82,6 @@ SET_GATHER (NotebookPageNum, int); SET_GATHER (OtherDirectionRtl, bool); - SET_GATHER (OtherSaveContextGlyphs, bool); SET_GATHER (OtherHebrewContextGlyphs, bool); SET_GATHER (AutoSaveFile, bool); @@ -145,7 +144,6 @@ GtkWidget * m_checkbuttonViewUnprintable; GtkWidget * m_checkbuttonOtherDirectionRtl; - GtkWidget * m_checkbuttonOtherSaveContextGlyphs; GtkWidget * m_checkbuttonOtherHebrewContextGlyphs; GtkWidget * m_checkbuttonAutoSaveFile; 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.65 diff -u -r1.65 ap_Win32Dialog_Options.cpp --- src/wp/ap/win/ap_Win32Dialog_Options.cpp 3 Apr 2004 17:42:08 -0000 1.65 +++ src/wp/ap/win/ap_Win32Dialog_Options.cpp 8 Apr 2004 12:55:21 -0000 @@ -255,10 +255,6 @@ EnableWindow(GetDlgItem((HWND)getPage(PG_PREF),AP_RID_DIALOG_OPTIONS_CHK_ShowSplash),value); return; - case id_CHECK_OTHER_SAVE_CONTEXT_GLYPHS: - EnableWindow(GetDlgItem((HWND)getPage(PG_LANG),AP_RID_DIALOG_OPTIONS_CHK_OtherSaveContextGlyphs),value); - return; - case id_CHECK_OTHER_HEBREW_CONTEXT_GLYPHS: EnableWindow(GetDlgItem((HWND)getPage(PG_LANG),AP_RID_DIALOG_OPTIONS_CHK_OtherHebrewContextGlyphs),value); return; @@ -317,7 +313,6 @@ DEFINE2_GET_SET_BOOL(PG_PREF,PrefsAutoSave); DEFINE2_GET_SET_BOOL(PG_PREF,ShowSplash); DEFINE2_GET_SET_BOOL(PG_LANG,OtherDirectionRtl); -DEFINE2_GET_SET_BOOL(PG_LANG,OtherSaveContextGlyphs); DEFINE2_GET_SET_BOOL(PG_LANG,OtherHebrewContextGlyphs); DEFINE2_GET_SET_BOOL(PG_LANG,LanguageWithKeyboard); DEFINE2_GET_SET_BOOL(PG_LANG,DirMarkerAfterClosingParenthesis); @@ -820,7 +815,6 @@ _DS2(OPTIONS_FRM_BidiOptions, DLG_Options_Label_BiDiOptions); _DS2(OPTIONS_CHK_OtherDirectionRtl, DLG_Options_Label_DirectionRtl); - _DS2(OPTIONS_CHK_OtherSaveContextGlyphs, DLG_Options_Label_SaveContextGlyphs); _DS2(OPTIONS_CHK_OtherHebrewContextGlyphs, DLG_Options_Label_HebrewContextGlyphs); _DSX2(OPTIONS_CHK_LanguageWithKeyboard, DLG_Options_Label_LangWithKeyboard); @@ -1002,7 +996,6 @@ pParent->_enableDisableLogic(AP_Dialog_Options::id_CHECK_OTHER_DEFAULT_DIRECTION_RTL); return; - case AP_RID_DIALOG_OPTIONS_CHK_OtherSaveContextGlyphs: pParent->_enableDisableLogic(AP_Dialog_Options::id_CHECK_OTHER_SAVE_CONTEXT_GLYPHS);return; case AP_RID_DIALOG_OPTIONS_CHK_OtherHebrewContextGlyphs: pParent->_enableDisableLogic(AP_Dialog_Options::id_CHECK_OTHER_HEBREW_CONTEXT_GLYPHS);return; case AP_RID_DIALOG_OPTIONS_CHK_AutoSaveFile: pParent->_enableDisableLogic(AP_Dialog_Options::id_CHECK_AUTO_SAVE_FILE); 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.37 diff -u -r1.37 ap_Win32Dialog_Options.h --- src/wp/ap/win/ap_Win32Dialog_Options.h 13 Dec 2003 18:38:54 -0000 1.37 +++ src/wp/ap/win/ap_Win32Dialog_Options.h 8 Apr 2004 12:55:21 -0000 @@ -244,7 +244,6 @@ SET_GATHER (AutoLoadPlugins, bool); SET_GATHER (OtherDirectionRtl, bool ); - SET_GATHER (OtherSaveContextGlyphs,bool ); SET_GATHER (OtherHebrewContextGlyphs,bool ); SET_GATHER (AutoSaveFile, 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.34 diff -u -r1.34 ap_Win32Res_DlgOptions.rc2 --- src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 13 Dec 2003 18:38:54 -0000 1.34 +++ src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 8 Apr 2004 12:55:21 -0000 @@ -81,7 +81,6 @@ #define AP_RID_DIALOG_OPTIONS_COMBO_CURRENTSCHEME 1403 #define AP_RID_DIALOG_OPTIONS_FRM_BidiOptions 1404 #define AP_RID_DIALOG_OPTIONS_CHK_OtherDirectionRtl 1405 -#define AP_RID_DIALOG_OPTIONS_CHK_OtherSaveContextGlyphs 1407 #define AP_RID_DIALOG_OPTIONS_FRM_AutoSaveOptions 1408 #define AP_RID_DIALOG_OPTIONS_CHK_AutoSaveFile 1409 #define AP_RID_DIALOG_OPTIONS_TXT_AutoSavePeriod 1410 @@ -265,9 +264,6 @@ CONTROL "Use glyph shaping for Hebrew:", AP_RID_DIALOG_OPTIONS_CHK_OtherHebrewContextGlyphs, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,78,280,10 - CONTROL "Save visual glyphs", - AP_RID_DIALOG_OPTIONS_CHK_OtherSaveContextGlyphs,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,5,89,280,10 CONTROL "Auto-insert direction marker", AP_RID_DIALOG_OPTIONS_CHK_DirMarkerAfterClosingParenthesis, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,100,280,10 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.55 diff -u -r1.55 ap_Dialog_Options.cpp --- src/wp/ap/xp/ap_Dialog_Options.cpp 3 Apr 2004 17:45:31 -0000 1.55 +++ src/wp/ap/xp/ap_Dialog_Options.cpp 8 Apr 2004 12:55:21 -0000 @@ -125,7 +125,6 @@ #endif Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_AutoLoadPlugins, _gatherAutoLoadPlugins() ); Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_DefaultDirectionRtl, _gatherOtherDirectionRtl() ); - Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_SaveContextGlyphs, _gatherOtherSaveContextGlyphs() ); Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_UseHebrewContextGlyphs, _gatherOtherHebrewContextGlyphs() ); Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_ChangeLanguageWithKeyboard, _gatherLanguageWithKeyboard() ); Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_DirMarkerAfterClosingParenthesis, _gatherDirMarkerAfterClosingParenthesis()); @@ -352,8 +351,6 @@ //------------- other if (pPrefs->getPrefsValueBool(AP_PREF_KEY_DefaultDirectionRtl,&b)) _setOtherDirectionRtl (b); - if (pPrefs->getPrefsValueBool(XAP_PREF_KEY_SaveContextGlyphs,&b)) - _setOtherSaveContextGlyphs (b); if (pPrefs->getPrefsValueBool(XAP_PREF_KEY_UseHebrewContextGlyphs,&b)) _setOtherHebrewContextGlyphs (b); @@ -371,8 +368,6 @@ void AP_Dialog_Options::_enableDisableLogic( tControl id ) { - UT_DEBUGMSG(("_enableDisableLogic: id %d, myId %d\n", id,id_CHECK_OTHER_USE_CONTEXT_GLYPHS)); - switch (id) { @@ -418,8 +413,6 @@ // id_CHECK_DIR_MARKER... in the bidi controls !!!) _controlEnable( id_CHECK_LANG_WITH_KEYBOARD, false ); - // bidi controls - _controlEnable( id_CHECK_OTHER_SAVE_CONTEXT_GLYPHS, false); // not // implemented _controlEnable( id_CHECK_DIR_MARKER_AFTER_CLOSING_PARENTHESIS,_gatherLanguageWithKeyboard()); // 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.41 diff -u -r1.41 ap_Dialog_Options.h --- src/wp/ap/xp/ap_Dialog_Options.h 9 Dec 2003 23:50:11 -0000 1.41 +++ src/wp/ap/xp/ap_Dialog_Options.h 8 Apr 2004 12:55:21 -0000 @@ -55,8 +55,6 @@ id_CHECK_SMART_QUOTES_ENABLE, id_CHECK_OTHER_DEFAULT_DIRECTION_RTL, - id_CHECK_OTHER_USE_CONTEXT_GLYPHS, - id_CHECK_OTHER_SAVE_CONTEXT_GLYPHS, id_CHECK_OTHER_HEBREW_CONTEXT_GLYPHS, id_CHECK_AUTO_SAVE_FILE, @@ -157,7 +155,6 @@ SET_GATHER (AutoLoadPlugins, bool); SET_GATHER (OtherDirectionRtl, bool); - SET_GATHER (OtherSaveContextGlyphs, bool); SET_GATHER (OtherHebrewContextGlyphs, bool); SET_GATHER (AutoSaveFile, bool); 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.282 diff -u -r1.282 ap_String_Id.h --- src/wp/ap/xp/ap_String_Id.h 1 Apr 2004 19:01:11 -0000 1.282 +++ src/wp/ap/xp/ap_String_Id.h 8 Apr 2004 12:55:21 -0000 @@ -367,7 +367,6 @@ dcl(DLG_Options_Label_DirectionRtl, "Default to right-to-left direction of text") dcl(DLG_Options_Label_BiDiOptions, "Bi-Directional Options") -dcl(DLG_Options_Label_SaveContextGlyphs, "Save visual glyph shapes") dcl(DLG_Options_Label_HebrewContextGlyphs, "Use glyph shaping for Hebrew") dcl(DLG_Options_Label_UILang, "User Interface Language")