Re: CVS: commit uwog abi/src/wp/ap/xp ap_Dialog_Options.cpp ap_Dialog_Options.h

> Remove hebrew shaping cruft
> Remove smart quotes option, which never worked

Could other platforms remove this too ? Note: I want to backport it to
have this in 2.4.3 too.

Thanks,
  Marc

>
>
> Index: ap_Dialog_Options.cpp
> ===================================================================
> RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Dialog_Options.cpp,v
> retrieving revision 1.72
> retrieving revision 1.73
> diff -u -d -r1.72 -r1.73
> --- ap_Dialog_Options.cpp 25 Feb 2006 15:00:02 -0000 1.72
> +++ ap_Dialog_Options.cpp 1 Mar 2006 14:49:37 -0000 1.73
> @@ -117,8 +117,6 @@
> #ifndef HAVE_HILDON
> Save_Pref_Bool(pPrefsScheme, AP_PREF_KEY_ShowSplash,_gatherShowSplash());
> #endif
> - Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_SmartQuotesEnable, _gatherSmartQuotesEnable() );
> -
> Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_CursorBlink, _gatherViewCursorBlink() );
>
> // Not implemented for UNIX or Win32. No need for it.
> @@ -139,7 +137,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_UseHebrewContextGlyphs, _gatherOtherHebrewContextGlyphs() );
> Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_ChangeLanguageWithKeyboard, _gatherLanguageWithKeyboard() );
> Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_DirMarkerAfterClosingParenthesis, _gatherDirMarkerAfterClosingParenthesis());
>
> @@ -296,21 +293,11 @@
> _gatherSpellNumbers());
> break;
>
> - case id_CHECK_SMART_QUOTES_ENABLE:
> - Save_Pref_Bool (pPrefsScheme, XAP_PREF_KEY_SmartQuotesEnable,
> - _gatherSmartQuotesEnable());
> - break;
> -
> case id_CHECK_OTHER_DEFAULT_DIRECTION_RTL:
> Save_Pref_Bool (pPrefsScheme, AP_PREF_KEY_DefaultDirectionRtl,
> _gatherOtherDirectionRtl());
> break;
>
> - case id_CHECK_OTHER_HEBREW_CONTEXT_GLYPHS:
> - Save_Pref_Bool (pPrefsScheme, XAP_PREF_KEY_UseHebrewContextGlyphs,
> - _gatherOtherHebrewContextGlyphs() );
> - break;
> -
> case id_CHECK_AUTO_SAVE_FILE:
> UT_DEBUGMSG(("Saving Auto Save File [%i]\n", _gatherAutoSaveFile()));
> Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_AutoSaveFile, _gatherAutoSaveFile() );
> @@ -493,10 +480,6 @@
> if (pPrefs->getPrefsValueBool((XML_Char*)AP_PREF_KEY_AutoGrammarCheck,&b))
> _setGrammarCheck (b);
>
> - // ------------ Smart Quotes
> - if (pPrefs->getPrefsValueBool((XML_Char*)XAP_PREF_KEY_SmartQuotesEnable,&b))
> - _setSmartQuotesEnable (b);
> -
> // ------------ Prefs
> _setPrefsAutoSave( pPrefs->getAutoSavePrefs() );
> #ifndef HAVE_HILDON
> @@ -571,8 +554,6 @@
> //------------- other
> if (pPrefs->getPrefsValueBool(AP_PREF_KEY_DefaultDirectionRtl,&b))
> _setOtherDirectionRtl (b);
> - if (pPrefs->getPrefsValueBool(XAP_PREF_KEY_UseHebrewContextGlyphs,&b))
> - _setOtherHebrewContextGlyphs (b);
>
> if (pPrefs->getPrefsValueBool(XAP_PREF_KEY_ChangeLanguageWithKeyboard,&b))
> _setLanguageWithKeyboard (b);
> @@ -739,8 +720,6 @@
> m_BOData[bo_DirectionRTL ].m_original = bValue;
> if (m_pPrefsScheme->getValueBool(XAP_PREF_KEY_SaveContextGlyphs, &bValue))
> m_BOData[bo_GlyphSaveVisual ].m_original = bValue;
> - if (m_pPrefsScheme->getValueBool(XAP_PREF_KEY_UseHebrewContextGlyphs, &bValue))
> - m_BOData[bo_GlyphShaping ].m_original = bValue;
>
> // NOT (YET?) IMPLEMENTED: if (m_pPrefsScheme->getValueBool("",&bValue)) m_BOData[bo_HighlightMisspelled].m_original = bValue;
>
> @@ -764,8 +743,6 @@
>
> // TODO: if (m_pPrefsScheme->getValueBool("",&bValue)) m_BOData[bo_ScreenColor ].m_original = bValue;
>
> - if (m_pPrefsScheme->getValueBool(XAP_PREF_KEY_SmartQuotesEnable, &bValue))
> - m_BOData[bo_SmartQuotes ].m_original = bValue;
> if (m_pPrefsScheme->getValueBool( AP_PREF_KEY_ShowSplash, &bValue))
> m_BOData[bo_Splash ].m_original = bValue;
> if (m_pPrefsScheme->getValueBool( AP_PREF_KEY_StatusBarVisible, &bValue))
> @@ -975,10 +952,6 @@
> if (m_BOData[bo].m_current != m_BOData[bo].m_original)
> m_pPrefsScheme->setValueBool(XAP_PREF_KEY_SaveContextGlyphs, m_BOData[bo].m_current);
>
> - bo = bo_GlyphShaping;
> - if (m_BOData[bo].m_current != m_BOData[bo].m_original)
> - m_pPrefsScheme->setValueBool(XAP_PREF_KEY_UseHebrewContextGlyphs, m_BOData[bo].m_current);
> -
> // NOT (YET?) IMPLEMENTED: m_pPrefsScheme->setValueBool("", m_BOData[bo_HighlightMisspelled ].m_current);
>
> bo = bo_IgnoreNumbered;
> @@ -1011,10 +984,6 @@
>
> // TODO: m_pPrefsScheme->setValueBool("", m_BOData[bo_ScreenColor ].m_current);
>
> - bo = bo_SmartQuotes;
> - if (m_BOData[bo].m_current != m_BOData[bo].m_original)
> - m_pPrefsScheme->setValueBool(XAP_PREF_KEY_SmartQuotesEnable, m_BOData[bo].m_current);
> -
> bo = bo_Splash;
> if (m_BOData[bo].m_current != m_BOData[bo].m_original)
> m_pPrefsScheme->setValueBool( AP_PREF_KEY_ShowSplash, m_BOData[bo].m_current);
> @@ -1194,7 +1163,6 @@
> pScheme->getValueBool(XAP_PREF_KEY_DirMarkerAfterClosingParenthesis, &(m_BOData[bo_DirectionMarkers ].m_default));
> pScheme->getValueBool( AP_PREF_KEY_DefaultDirectionRtl, &(m_BOData[bo_DirectionRTL ].m_default));
> pScheme->getValueBool(XAP_PREF_KEY_SaveContextGlyphs, &(m_BOData[bo_GlyphSaveVisual ].m_default));
> - pScheme->getValueBool(XAP_PREF_KEY_UseHebrewContextGlyphs, &(m_BOData[bo_GlyphShaping ].m_default));
> // NOT (YET?) IMPLEMENTED: pScheme->getValueBool("",&(m_BOData[bo_HighlightMisspelled ].m_default));
> pScheme->getValueBool( AP_PREF_KEY_SpellCheckNumbers, &(m_BOData[bo_IgnoreNumbered ].m_default)); // TODO: Is this reversed?
> pScheme->getValueBool( AP_PREF_KEY_SpellCheckCaps, &(m_BOData[bo_IgnoreUppercase ].m_default)); // TODO: Is this reversed?
> @@ -1205,7 +1173,6 @@
> pScheme->getValueBool( AP_PREF_KEY_RulerVisible, &(m_BOData[bo_Ruler ].m_default));
> // NOT (YET?) IMPLEMENTED: pScheme->getValueBool("",&(m_BOData[bo_SaveScheme ].m_default));
> // TODO: pScheme->getValueBool("",&(m_BOData[bo_ScreenColor ].m_default));
> - pScheme->getValueBool(XAP_PREF_KEY_SmartQuotesEnable, &(m_BOData[bo_SmartQuotes ].m_default));
> pScheme->getValueBool( AP_PREF_KEY_ShowSplash, &(m_BOData[bo_Splash ].m_default));
> pScheme->getValueBool( AP_PREF_KEY_StatusBarVisible, &(m_BOData[bo_StatusBar ].m_default));
> // NOT (YET?) IMPLEMENTED: pScheme->getValueBool("",&(m_BOData[bo_SuggestCorrections ].m_default));
>
> Index: ap_Dialog_Options.h
> ===================================================================
> RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Dialog_Options.h,v
> retrieving revision 1.50
> retrieving revision 1.51
> diff -u -d -r1.50 -r1.51
> --- ap_Dialog_Options.h 6 Nov 2005 18:43:02 -0000 1.50
> +++ ap_Dialog_Options.h 1 Mar 2006 14:49:37 -0000 1.51
> @@ -53,10 +53,7 @@
> id_BUTTON_SPELL_AUTOREPLACE,
> id_CHECK_GRAMMAR_CHECK,
>
> - id_CHECK_SMART_QUOTES_ENABLE,
> -
> id_CHECK_OTHER_DEFAULT_DIRECTION_RTL,
> - id_CHECK_OTHER_HEBREW_CONTEXT_GLYPHS,
>
> id_CHECK_AUTO_SAVE_FILE,
> id_TEXT_AUTO_SAVE_FILE_EXT,
> @@ -139,8 +136,6 @@
> #ifndef HAVE_HILDON
> SET_GATHER (ShowSplash,bool);
> #endif
> - SET_GATHER (SmartQuotesEnable, bool);
> -
> SET_GATHER (PrefsAutoSave, bool);
>
> #if !defined (XP_UNIX_TARGET_GTK) && !defined(XP_TARGET_COCOA)
> @@ -162,7 +157,6 @@
> SET_GATHER (AutoLoadPlugins, bool);
>
> SET_GATHER (OtherDirectionRtl, bool);
> - SET_GATHER (OtherHebrewContextGlyphs, bool);
>
> SET_GATHER (AutoSaveFile, bool);
> virtual void _gatherAutoSaveFilePeriod(UT_String &stRetVal) = 0;
> @@ -249,7 +243,6 @@
> bo_Ruler,
> bo_SaveScheme, // NOT (YET?) IMPLEMENTED
> bo_ScreenColor,
> - bo_SmartQuotes,
> bo_Splash,
> bo_StatusBar,
> bo_SuggestCorrections, // NOT (YET?) IMPLEMENTED
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the word
> unsubscribe in the message body.
Received on Wed Mar 1 15:53:06 2006