Index: src/af/xap/xp/xap_Prefs_SchemeIds.h =================================================================== --- src/af/xap/xp/xap_Prefs_SchemeIds.h (revision 24865) +++ src/af/xap/xp/xap_Prefs_SchemeIds.h (working copy) @@ -144,15 +144,9 @@ #define XAP_PREF_KEY_ZoomPercentage "ZoomPercentage" #define XAP_PREF_DEFAULT_ZoomPercentage "100" -#define XAP_PREF_KEY_AllowCustomToolbars "AllowCustomToolbars" -#define XAP_PREF_DEFAULT_AllowCustomToolbars "0" - #define XAP_PREF_KEY_EnableSmoothScrolling "EnableSmoothScrolling" #define XAP_PREF_DEFAULT_EnableSmoothScrolling "1" -#define XAP_PREF_KEY_HaveCustomToolbars "HaveCustomToolbars" -#define XAP_PREF_DEFAULT_HaveCustomToolbars "0" - #define XAP_PREF_KEY_AutoLoadPlugins "AutoLoadPlugins" #define XAP_PREF_DEFAULT_AutoLoadPlugins "1" @@ -215,9 +209,7 @@ dcl(ColorForRevision8) dcl(ColorForRevision9) dcl(ColorForRevision10) -dcl(AllowCustomToolbars) dcl(EnableSmoothScrolling) -dcl(HaveCustomToolbars) dcl(AutoLoadPlugins) dcl(ZoomType) dcl(ZoomPercentage) Index: src/af/xap/xp/xap_App.cpp =================================================================== --- src/af/xap/xp/xap_App.cpp (revision 24865) +++ src/af/xap/xp/xap_App.cpp (working copy) @@ -333,23 +333,6 @@ m_pDict->load(); clearIdTable(); // -// Reload toolbar configuration from prefs -// - bool bAllowCustom = true; - getPrefsValueBool(XAP_PREF_KEY_AllowCustomToolbars, &bAllowCustom); - if(bAllowCustom) - setToolbarsCustomizable(true); - else - { - setToolbarsCustomizable(false); - setToolbarsCustomized(false); - } - m_pToolbarFactory->restoreToolbarsFromCurrentScheme(); - if(!bAllowCustom) - { - m_pToolbarFactory->resetAllToolbarsToDefault(); - } -// // Set Smooth Scrolling // bool bEnableSmooth = true; @@ -531,53 +514,11 @@ } -void XAP_App::resetToolbarsToDefault(void) -{ - // - // Set all the frames to default toolbars - // - m_pToolbarFactory->resetAllToolbarsToDefault(); - UT_uint32 count = m_vecFrames.getItemCount(); - UT_GenericVector vClones; - UT_uint32 i = 0; - for(i=0; i< count; i++) - { - XAP_Frame * pFrame = m_vecFrames.getNthItem(i); - if(pFrame->getViewNumber() > 0) - { - getClones(&vClones,pFrame); - UT_uint32 j=0; - for(j=0; j < vClones.getItemCount(); j++) - { - XAP_Frame * f = vClones.getNthItem(j); - f->rebuildAllToolbars(); - } - } - else - { - pFrame->rebuildAllToolbars(); - } - } - setToolbarsCustomized (true); -} - void XAP_App::setEnableSmoothScrolling(bool b) { m_bEnableSmoothScrolling = b; } -void XAP_App::setToolbarsCustomizable(bool b) -{ - if(m_bAllowCustomizing != b) - m_bAllowCustomizing = b; -} - -void XAP_App::setToolbarsCustomized(bool b) -{ - if(m_bAreCustomized != b) - m_bAreCustomized = b; -} - const char * XAP_App::getApplicationTitleForTitleBar() const { static char _title[512]; Index: src/af/xap/xp/xap_Toolbar_Layouts.h =================================================================== --- src/af/xap/xp/xap_Toolbar_Layouts.h (revision 24865) +++ src/af/xap/xp/xap_Toolbar_Layouts.h (working copy) @@ -91,8 +91,6 @@ XAP_Toolbar_Id newId); bool removeIcon(const char * szName, XAP_Toolbar_Id nukeId); - bool resetToolbarToDefault(const char * szName); - bool resetAllToolbarsToDefault(void); bool saveToolbarsInCurrentScheme(void); bool restoreToolbarsFromCurrentScheme(void); const UT_Vector & getToolbarNames(void); Index: src/af/xap/xp/xap_App.h =================================================================== --- src/af/xap/xp/xap_App.h (revision 24865) +++ src/af/xap/xp/xap_App.h (working copy) @@ -218,11 +218,6 @@ typedef enum {BIDI_SUPPORT_NONE, BIDI_SUPPORT_GUI, BIDI_SUPPORT_FULL} BidiSupportType; virtual BidiSupportType theOSHasBidiSupport() const {return BIDI_SUPPORT_NONE;} - bool areToolbarsCustomizable(void) const { return m_bAllowCustomizing; } - bool areToolbarsCustomized(void) const { return m_bAreCustomized; } - void resetToolbarsToDefault(void); - void setToolbarsCustomizable(bool b); - void setToolbarsCustomized(bool b); void setEnableSmoothScrolling(bool b); bool isSmoothScrollingEnabled(void) { return m_bEnableSmoothScrolling; } Index: src/af/xap/xp/xap_Frame.cpp =================================================================== --- src/af/xap/xp/xap_Frame.cpp (revision 24865) +++ src/af/xap/xp/xap_Frame.cpp (working copy) @@ -980,75 +980,6 @@ m_bHasDroppedTB = true; } -/* - * Actually do the toolbar(s) rebuild from the info recorded. - */ -void XAP_Frame::dragEnd(XAP_Toolbar_Id srcId) -{ - UT_UNUSED(srcId); - UT_ASSERT(m_isrcId == srcId); - if(!XAP_App::getApp()->areToolbarsCustomizable()) - { - return; - } -// -// Drop to icon -// - if(m_bisDragging && m_bHasDropped) - { - if(m_isrcId != m_idestId) - { - const char * szTBSrcName = reinterpret_cast(m_pFrameImpl->m_vecToolbarLayoutNames.getNthItem(m_isrcTBNr)); - XAP_App::getApp()->getToolbarFactory()->removeIcon(szTBSrcName,m_isrcId); - const char * szTBDestName = reinterpret_cast(m_pFrameImpl->m_vecToolbarLayoutNames.getNthItem(m_idestTBNr)); - XAP_App::getApp()->getToolbarFactory()->addIconBefore(szTBDestName,m_isrcId,m_idestId); - m_pFrameImpl->_rebuildToolbar(m_isrcTBNr); - if(m_isrcTBNr != m_idestTBNr) - { - m_pFrameImpl->_rebuildToolbar(m_idestTBNr); - } - XAP_App::getApp()->setToolbarsCustomized(true); - } - } -// -// Drop to Toolbar -// - if(m_bisDragging && m_bHasDroppedTB) - { - const char * szTBSrcName = reinterpret_cast(m_pFrameImpl->m_vecToolbarLayoutNames.getNthItem(m_isrcTBNr)); - XAP_App::getApp()->getToolbarFactory()->removeIcon(szTBSrcName,m_isrcId); - const char * szTBDestName = reinterpret_cast(m_pFrameImpl->m_vecToolbarLayoutNames.getNthItem(m_idestTBNr)); - XAP_App::getApp()->getToolbarFactory()->addIconAtEnd(szTBDestName,m_isrcId); - m_pFrameImpl->_rebuildToolbar(m_isrcTBNr); - if(m_isrcTBNr != m_idestTBNr) - { - m_pFrameImpl->_rebuildToolbar(m_idestTBNr); - } - } -// -// Remove icon -// - if(m_bisDragging && !m_bHasDroppedTB && !m_bHasDropped) - { -// -// Ask if icon should be removed. -// - if(XAP_Dialog_MessageBox::a_YES == showMessageBox(XAP_STRING_ID_DLG_Remove_Icon,XAP_Dialog_MessageBox::b_YN,XAP_Dialog_MessageBox::a_NO)) - { - const char * szTBSrcName = reinterpret_cast(m_pFrameImpl->m_vecToolbarLayoutNames.getNthItem(m_isrcTBNr)); - XAP_App::getApp()->getToolbarFactory()->removeIcon(szTBSrcName,m_isrcId); - m_pFrameImpl->_rebuildToolbar(m_isrcTBNr); - } - } - m_isrcId = 0; - m_isrcTBNr = 0; - m_idestId = 0; - m_idestTBNr = 0; - m_bisDragging = true; - m_bHasDropped = false; - m_bHasDroppedTB = false; -} - UT_uint32 XAP_Frame::getTimeSinceSave() const { return m_pDoc->getTimeSinceSave(); Index: src/af/ev/gtk/ev_UnixToolbar.cpp =================================================================== --- src/af/ev/gtk/ev_UnixToolbar.cpp (revision 24865) +++ src/af/ev/gtk/ev_UnixToolbar.cpp (working copy) @@ -396,15 +396,6 @@ pFrame->dragDropToTB(wdSrc->m_id,pTBsrc,pTBdest); }; - static void s_drag_end(GtkWidget *widget, - GdkDragContext */*context*/) - { - _wd * wd = static_cast<_wd *>(g_object_get_data(G_OBJECT(widget),"wd_pointer")); - - XAP_Frame * pFrame = static_cast(wd->m_pUnixToolbar->getFrame()); - pFrame->dragEnd(wd->m_id); - }; - /*! * Only accept numeric input in the toolbar's font size combo. */ @@ -866,17 +857,6 @@ //m_wHSizeGroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); m_wVSizeGroup = gtk_size_group_new(GTK_SIZE_GROUP_VERTICAL); -#if defined(EMBEDDED_TARGET) && EMBEDDED_TARGET == EMBEDDED_TARGET_HILDON -#else -// -// Make the toolbar a destination for drops -// - gtk_drag_dest_set(m_wToolbar,static_cast(GTK_DEST_DEFAULT_ALL), - s_AbiTBTargets,1, - GDK_ACTION_COPY); - g_signal_connect(G_OBJECT(m_wToolbar),"drag_drop",G_CALLBACK(_wd::s_drag_drop_toolbar),this); -#endif - for (UT_uint32 k=0; (k < nrLabelItemsInLayout); k++) { EV_Toolbar_LayoutItem * pLayoutItem = m_pToolbarLayout->getLayoutItem(k); @@ -954,7 +934,6 @@ GDK_ACTION_COPY); g_signal_connect(G_OBJECT(wd->m_widget),"drag_begin",G_CALLBACK(_wd::s_drag_begin), wd); g_signal_connect(G_OBJECT(wd->m_widget),"drag_drop",G_CALLBACK(_wd::s_drag_drop), wd); - g_signal_connect(G_OBJECT(wd->m_widget),"drag_end",G_CALLBACK(_wd::s_drag_end), wd); #endif } break; @@ -998,7 +977,6 @@ GDK_ACTION_COPY); g_signal_connect(G_OBJECT(wd->m_widget),"drag_begin",G_CALLBACK(_wd::s_drag_begin), wd); g_signal_connect(G_OBJECT(wd->m_widget),"drag_drop",G_CALLBACK(_wd::s_drag_drop), wd); - g_signal_connect(G_OBJECT(wd->m_widget),"drag_end",G_CALLBACK(_wd::s_drag_end), wd); } break; Index: src/wp/ap/cocoa/ap_CocoaApp.cpp =================================================================== --- src/wp/ap/cocoa/ap_CocoaApp.cpp (revision 24865) +++ src/wp/ap/cocoa/ap_CocoaApp.cpp (working copy) @@ -457,13 +457,6 @@ */ bool AP_CocoaApp::shutdown(void) { -// -// Save our toolbars if we're customizable -// - if(areToolbarsCustomizable()) - { - m_pToolbarFactory->saveToolbarsInCurrentScheme(); - } if (m_prefs->getAutoSavePrefs()) m_prefs->savePrefsFile(); Index: src/wp/ap/gtk/hildon/ap_UnixHildonDialog_Options.glade =================================================================== --- src/wp/ap/gtk/hildon/ap_UnixHildonDialog_Options.glade (revision 24865) +++ src/wp/ap/gtk/hildon/ap_UnixHildonDialog_Options.glade (working copy) @@ -191,28 +191,6 @@ - - True - True - Allow c_ustom toolbars - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 3 - 4 - fill - - - - - True False Index: src/wp/ap/gtk/ap_UnixApp.cpp =================================================================== --- src/wp/ap/gtk/ap_UnixApp.cpp (revision 24865) +++ src/wp/ap/gtk/ap_UnixApp.cpp (working copy) @@ -414,14 +414,6 @@ */ bool AP_UnixApp::shutdown(void) { -// Save our toolbars if we're customizable -// feature is off, the GtkToolItem based toolbars don't support that -#if 0 - if(areToolbarsCustomizable()) - { - m_pToolbarFactory->saveToolbarsInCurrentScheme(); - } -#endif if(!isBonoboRunning()) { if (m_prefs->getAutoSavePrefs()) Index: src/wp/ap/gtk/ap_UnixDialog_Options.glade =================================================================== --- src/wp/ap/gtk/ap_UnixDialog_Options.glade (revision 24865) +++ src/wp/ap/gtk/ap_UnixDialog_Options.glade (working copy) @@ -161,28 +161,6 @@ - - True - True - Allow c_ustom toolbars - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 1 - 2 - fill - - - - - True False Index: src/wp/ap/gtk/ap_UnixDialog_Options.cpp =================================================================== --- src/wp/ap/gtk/ap_UnixDialog_Options.cpp (revision 24865) +++ src/wp/ap/gtk/ap_UnixDialog_Options.cpp (working copy) @@ -316,10 +316,6 @@ tmp = WID ( "lblUserInterface" ); localizeLabelMarkup ( tmp, pSS, AP_STRING_ID_DLG_Options_Label_UI ); - m_checkbuttonAllowCustomToolbars = WID ( "chkCustomToolbars" ); - localizeButtonUnderline ( m_checkbuttonAllowCustomToolbars, pSS, - AP_STRING_ID_DLG_Options_Label_CheckAllowCustomToolbars ); - tmp = WID ( "lblUnits" ); localizeLabelUnderline ( tmp, pSS, AP_STRING_ID_DLG_Options_Label_ViewUnits ); @@ -454,15 +450,6 @@ ////////////////////////////////////////////////////////////////// -// -// Have to reset the toolbar is the result of a toggle is to turn off -// custom toolbars -// - g_signal_connect ( G_OBJECT ( m_checkbuttonAllowCustomToolbars ), - "toggled", - G_CALLBACK ( s_toolbars_toggled ), - static_cast ( this ) ); - // to enable/disable other controls (hide errors) g_signal_connect ( G_OBJECT ( m_checkbuttonSpellCheckAsType ), "toggled", @@ -632,9 +619,6 @@ case id_LIST_VIEW_RULER_UNITS: return m_menuUnits; - case id_CHECK_ALLOW_CUSTOM_TOOLBARS: - return m_checkbuttonAllowCustomToolbars; - case id_CHECK_AUTO_LOAD_PLUGINS: return m_checkbuttonAutoLoadPlugins; @@ -849,7 +833,7 @@ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void AP_UnixDialog_Options::_setViewRulerUnits ( UT_Dimension dim ) +void AP_UnixDialog_Options::_setViewRulerUnits ( UT_Dimension dim ) { UT_ASSERT ( m_menuUnits && GTK_IS_OPTION_MENU ( m_menuUnits ) ); @@ -881,7 +865,6 @@ } } -DEFINE_GET_SET_BOOL ( AllowCustomToolbars ) DEFINE_GET_SET_BOOL ( AutoLoadPlugins ) #undef DEFINE_GET_SET_BOOL @@ -892,35 +875,12 @@ return gtk_notebook_get_current_page ( GTK_NOTEBOOK ( m_notebook ) ); } -void AP_UnixDialog_Options::_setNotebookPageNum ( int pn ) +void AP_UnixDialog_Options::_setNotebookPageNum ( int pn ) { UT_ASSERT ( m_notebook && GTK_IS_NOTEBOOK ( m_notebook ) ); gtk_notebook_set_current_page ( GTK_NOTEBOOK ( m_notebook ), pn ); } -/*****************************************************************/ -// -// Reset custom toolbars -// -/* static */ void AP_UnixDialog_Options::s_toolbars_toggled ( GtkWidget * widget, gpointer data ) -{ - AP_UnixDialog_Options * dlg = static_cast ( data ); - UT_ASSERT ( widget && dlg ); - if ( dlg->isInitialPopulationHappenning() ) - { - return; - } - -// -// If the toolbar preference is now off, reset to default. -// - if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( widget ) ) == FALSE ) - { - XAP_App * pApp = XAP_App::getApp(); - pApp->resetToolbarsToDefault(); - } -} - /*static*/ void AP_UnixDialog_Options::s_defaults_clicked ( GtkWidget *widget, gpointer data ) { AP_UnixDialog_Options * dlg = static_cast ( data ); @@ -959,8 +919,8 @@ } -// these function will allow multiple widget to tie into the same logic -// function (at the AP level) to enable/disable stuff +// These functions will allow multiple widgets to tie into the +// same logic functions (at the AP level) to enable/disable stuff. /*static*/ void AP_UnixDialog_Options::s_checkbutton_toggle ( GtkWidget *w, gpointer data ) { AP_UnixDialog_Options * dlg = static_cast ( data ); Index: src/wp/ap/gtk/ap_UnixDialog_Options.h =================================================================== --- src/wp/ap/gtk/ap_UnixDialog_Options.h (revision 24865) +++ src/wp/ap/gtk/ap_UnixDialog_Options.h (working copy) @@ -66,7 +66,6 @@ // User Interface - SET_GATHER (AllowCustomToolbars, bool); SET_GATHER (ViewRulerUnits, UT_Dimension); // not implemented @@ -74,6 +73,7 @@ virtual void _setViewCursorBlink(const bool) {} // Application Startup + SET_GATHER (AutoLoadPlugins, bool); // Documents @@ -153,7 +153,6 @@ // User Interface - GtkWidget *m_checkbuttonAllowCustomToolbars; GtkWidget *m_pushbuttonNewTransparentColor; GtkWidget *m_menuUnits; @@ -217,7 +216,6 @@ private: // Unix call back handlers static void s_control_changed (GtkWidget *, gpointer); - static void s_toolbars_toggled (GtkWidget *, gpointer); static void s_apply_clicked (GtkWidget *, gpointer); static void s_defaults_clicked (GtkWidget *, gpointer); static void s_chooseTransparentColor (GtkWidget *, gpointer); Index: src/wp/ap/xp/ap_Toolbar_Layouts.cpp =================================================================== --- src/wp/ap/xp/ap_Toolbar_Layouts.cpp (revision 24865) +++ src/wp/ap/xp/ap_Toolbar_Layouts.cpp (working copy) @@ -504,69 +504,6 @@ return true; } -bool XAP_Toolbar_Factory::resetAllToolbarsToDefault(void) -{ - UT_uint32 count = m_vecTT.getItemCount(); // NO toolabrs - UT_uint32 i = 0; - XAP_Toolbar_Factory_vec * pVec = NULL; - for (i=0; i < count; i++) - { - pVec = (XAP_Toolbar_Factory_vec *) m_vecTT.getNthItem(i); - const char * szCurName = pVec->getToolbarName(); - resetToolbarToDefault(szCurName); - } - return true; -} - -bool XAP_Toolbar_Factory::resetToolbarToDefault(const char * szName) -{ - UT_uint32 count = m_vecTT.getItemCount(); // NO toolabrs - UT_uint32 i = 0; - bool bFound = false; - const char * szCurName = NULL; - XAP_Toolbar_Factory_vec * pVec = NULL; - for (i=0; !bFound && (i < count); i++) - { - pVec = (XAP_Toolbar_Factory_vec *) m_vecTT.getNthItem(i); - szCurName = g_strdup(pVec->getToolbarName()); - if (g_ascii_strcasecmp(szName,szCurName)==0) - { - bFound = true; - break; - } - else - { - FREEP( szCurName ); - } - } - UT_ASSERT_HARMLESS(bFound); - if(!bFound) - { - return false; - } - DELETEP(pVec); - UT_uint32 j = 0; - count = G_N_ELEMENTS(s_ttTable); - bFound = false; - for(j=0; !bFound &&( j < count); j++) - { - if(g_ascii_strcasecmp(szCurName,s_ttTable[j].m_name)== 0) - { - bFound = true; - break; - } - } - FREEP(szCurName); - UT_ASSERT_HARMLESS(bFound); - if(!bFound) - { - return false; - } - pVec = new XAP_Toolbar_Factory_vec(&s_ttTable[j]); - m_vecTT.setNthItem(i, (void *) pVec, NULL); - return true; -} - /*! * This method saves the current toolbar layouts in the current preference * scheme. There are 3 generic keys. Index: src/wp/ap/xp/ap_String_Id.h =================================================================== --- src/wp/ap/xp/ap_String_Id.h (revision 24865) +++ src/wp/ap/xp/ap_String_Id.h (working copy) @@ -433,7 +433,6 @@ dcl(DLG_Options_Label_ViewAll, "&All") dcl(DLG_Options_Label_ViewHiddenText, "&Hidden Text") dcl(DLG_Options_Label_ViewUnprintable, "Invisible &Layout Marks") -dcl(DLG_Options_Label_CheckAllowCustomToolbars, "Allow Custom Toolbars") dcl(DLG_Options_Label_CheckEnableSmoothScrolling, "Enable Smooth Scrolling") dcl(DLG_Options_Label_CheckWhiteForTransparent, "Allow screen colors other than white") Index: src/wp/ap/xp/ap_Dialog_Options.cpp =================================================================== --- src/wp/ap/xp/ap_Dialog_Options.cpp (revision 24865) +++ src/wp/ap/xp/ap_Dialog_Options.cpp (working copy) @@ -134,7 +134,6 @@ #endif Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_ParaVisible, _gatherViewUnprintable() ); - Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_AllowCustomToolbars, _gatherAllowCustomToolbars() ); #if defined(TOOLKIT_GTK) Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_EnableSmoothScrolling, _gatherEnableSmoothScrolling() ); #endif @@ -213,11 +212,6 @@ pView->setShowPara(pFrameData->m_bShowPara); } - - if ( _gatherAllowCustomToolbars() != XAP_App::getApp()->areToolbarsCustomizable() ) - { - XAP_App::getApp()->setToolbarsCustomizable(_gatherAllowCustomToolbars()); - } #if defined(TOOLKIT_GTK) if ( _gatherEnableSmoothScrolling() != XAP_App::getApp()->isSmoothScrollingEnabled() ) { @@ -388,11 +382,6 @@ _gatherViewUnprintable()); break; - case id_CHECK_ALLOW_CUSTOM_TOOLBARS: - Save_Pref_Bool (pPrefsScheme, XAP_PREF_KEY_AllowCustomToolbars, - _gatherAllowCustomToolbars()); - break; - case id_CHECK_ENABLE_SMOOTH_SCROLLING: #if defined(TOOLKIT_GTK) Save_Pref_Bool (pPrefsScheme, XAP_PREF_KEY_EnableSmoothScrolling, @@ -542,9 +531,6 @@ if (pPrefs->getPrefsValueBool((gchar*)AP_PREF_KEY_CursorBlink,&b)) _setViewCursorBlink (b); - if (pPrefs->getPrefsValueBool((gchar*)XAP_PREF_KEY_AllowCustomToolbars,&b)) - _setAllowCustomToolbars(b); - #if defined(TOOLKIT_GTK) if (pPrefs->getPrefsValueBool((gchar*)XAP_PREF_KEY_EnableSmoothScrolling,&b)) _setEnableSmoothScrolling(b); Index: src/wp/ap/xp/ap_EditMethods.cpp =================================================================== --- src/wp/ap/xp/ap_EditMethods.cpp (revision 24865) +++ src/wp/ap/xp/ap_EditMethods.cpp (working copy) @@ -9850,14 +9850,7 @@ XAP_PrefsScheme * pScheme = pPrefs->getCurrentScheme(true); UT_return_val_if_fail(pScheme, false); - bool b; - b = pApp->areToolbarsCustomizable(); - - pApp->setToolbarsCustomizable (!b); - - pScheme->setValueBool(static_cast(XAP_PREF_KEY_AllowCustomToolbars), !b); - return true; } @@ -9877,9 +9870,6 @@ if (pFrameData->m_bIsFullScreen) return false; - pApp->resetToolbarsToDefault(); - pApp->setToolbarsCustomized(false); - // we don't want to change their visibility, just the layout pFrame->toggleBar(0, pFrameData->m_bShowBar[0]); pFrame->toggleBar(1, pFrameData->m_bShowBar[1]); Index: src/wp/ap/xp/ap_Dialog_Options.h =================================================================== --- src/wp/ap/xp/ap_Dialog_Options.h (revision 24865) +++ src/wp/ap/xp/ap_Dialog_Options.h (working copy) @@ -80,7 +80,6 @@ id_BUTTON_SAVE, id_BUTTON_DEFAULTS, id_BUTTON_OK, id_BUTTON_CANCEL, id_BUTTON_APPLY, - id_CHECK_ALLOW_CUSTOM_TOOLBARS, id_CHECK_ENABLE_SMOOTH_SCROLLING, id_CHECK_AUTO_LOAD_PLUGINS, id_LIST_VIEW_TOOLBARS, // this is needed for the Cocoa front-end to fetch the control @@ -158,7 +157,6 @@ SET_GATHER (ViewAll, bool); SET_GATHER (ViewHiddenText, bool); SET_GATHER (ViewUnprintable, bool); - SET_GATHER (AllowCustomToolbars, bool); #if defined(TOOLKIT_GTK) SET_GATHER (EnableSmoothScrolling, bool); #endif Index: src/wp/ap/xp/ap_Menu_Functions.cpp =================================================================== --- src/wp/ap/xp/ap_Menu_Functions.cpp (revision 24865) +++ src/wp/ap/xp/ap_Menu_Functions.cpp (working copy) @@ -1172,14 +1172,10 @@ s = EV_MIS_ZERO; break; case AP_MENU_ID_VIEW_LOCK_TB_LAYOUT: - if ( !pApp->areToolbarsCustomizable() ) - s = EV_MIS_Toggled; - else - s = EV_MIS_ZERO; + s = EV_MIS_Toggled; break; case AP_MENU_ID_VIEW_DEFAULT_TB_LAYOUT: - if ( !pApp->areToolbarsCustomizable() || !pApp->areToolbarsCustomized() ) - s = EV_MIS_Gray; + s = EV_MIS_Gray; break; case AP_MENU_ID_VIEW_STATUSBAR: if ( pFrameData->m_bShowStatusBar && Index: src/wp/ap/win/ap_Win32Dialog_Options.cpp =================================================================== --- src/wp/ap/win/ap_Win32Dialog_Options.cpp (revision 24865) +++ src/wp/ap/win/ap_Win32Dialog_Options.cpp (working copy) @@ -108,8 +108,6 @@ { _controlEnable( id_CHECK_LANG_WITH_KEYBOARD, true); _controlEnable( id_CHECK_DIR_MARKER_AFTER_CLOSING_PARENTHESIS,_gatherLanguageWithKeyboard()); - //TODO: remove the following line when Windows has support for custom toolbars (Bug 1717) - EnableWindow(GetDlgItem((HWND)getPage(PG_GENERAL),AP_RID_DIALOG_OPTIONS_CHK_AllowCustomToolbars),false); } @@ -218,16 +216,10 @@ EnableWindow(GetDlgItem((HWND)getPage(PG_GENERAL),AP_RID_DIALOG_OPTIONS_CHK_LanguageWithKeyboard),value); return; - case id_CHECK_ALLOW_CUSTOM_TOOLBARS: - //TODO: enable this when Windows has support for custom toolbars (Bug 1717) - //EnableWindow(GetDlgItem((HWND)getPage(PG_GENERAL),AP_RID_DIALOG_OPTIONS_CHK_AllowCustomToolbars),value); - return; - case id_CHECK_AUTO_LOAD_PLUGINS: EnableWindow(GetDlgItem((HWND)getPage(PG_GENERAL),AP_RID_DIALOG_OPTIONS_CHK_AutoLoadPlugins),value); return; - case id_CHECK_AUTO_SAVE_FILE: EnableWindow(GetDlgItem((HWND)getPage(PG_DOCUMENT),AP_RID_DIALOG_OPTIONS_CHK_AutoSaveFile),value); return; @@ -235,8 +227,6 @@ case id_CHECK_OTHER_DEFAULT_DIRECTION_RTL: EnableWindow(GetDlgItem((HWND)getPage(PG_DOCUMENT),AP_RID_DIALOG_OPTIONS_CHK_OtherDirectionRtl),value); return; - - case id_CHECK_SPELL_CHECK_AS_TYPE: EnableWindow(GetDlgItem((HWND)getPage(PG_SPELL),AP_RID_DIALOG_OPTIONS_CHK_SpellCheckAsType),value); @@ -307,7 +297,6 @@ } DEFINE_GET_SET_BOOL(PG_GENERAL,LanguageWithKeyboard) -DEFINE_GET_SET_BOOL(PG_GENERAL,AllowCustomToolbars) DEFINE_GET_SET_BOOL(PG_GENERAL,AutoLoadPlugins) DEFINE_GET_SET_BOOL(PG_DOCUMENT,OtherDirectionRtl) @@ -720,7 +709,6 @@ // localize controls _DS2(OPTIONS_LBL_UNITS, DLG_Options_Label_ViewUnits); _DS2(OPTIONS_BTN_BGColor, DLG_Options_Label_ChooseForTransparent); - _DS2(OPTIONS_CHK_AllowCustomToolbars, DLG_Options_Label_CheckAllowCustomToolbars); _DS2(OPTIONS_CHK_AutoLoadPlugins, DLG_Options_Label_CheckAutoLoadPlugins); _DS2(OPTIONS_STATIC_UI, DLG_Options_Label_UI); _DS2(OPTIONS_STATIC_APPSTARTUP, DLG_Options_Label_AppStartup); Index: src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 (revision 24865) +++ src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 (working copy) @@ -60,7 +60,6 @@ #define AP_RID_DIALOG_OPTIONS_LBL_UNITS 1302 #define AP_RID_DIALOG_OPTIONS_COMBO_UNITS 1303 #define AP_RID_DIALOG_OPTIONS_BTN_BGColor 1305 -#define AP_RID_DIALOG_OPTIONS_CHK_AllowCustomToolbars 1306 #define AP_RID_DIALOG_OPTIONS_CHK_AutoLoadPlugins 1308 #define AP_RID_DIALOG_OPTIONS_STATIC_UI 1309 #define AP_RID_DIALOG_OPTIONS_STATIC_APPSTARTUP 1310 @@ -146,9 +145,6 @@ 15,70,90,14 LTEXT "User Interface",AP_RID_DIALOG_OPTIONS_STATIC_UI,7,15, 127,8 - CONTROL "Allow Custom Toolbars", - AP_RID_DIALOG_OPTIONS_CHK_AllowCustomToolbars,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,14,31,175,10 LTEXT "Application Startup", AP_RID_DIALOG_OPTIONS_STATIC_APPSTARTUP,10,98,127,8 CONTROL "Plugins",AP_RID_DIALOG_OPTIONS_CHK_AutoLoadPlugins, Index: src/wp/ap/win/ap_Win32Dialog_Options.h =================================================================== --- src/wp/ap/win/ap_Win32Dialog_Options.h (revision 24865) +++ src/wp/ap/win/ap_Win32Dialog_Options.h (working copy) @@ -200,7 +200,6 @@ SET_GATHER (SpellNumbers, bool ); SET_GATHER (GrammarCheck, bool); SET_GATHER (ViewRulerUnits, UT_Dimension); - SET_GATHER (AllowCustomToolbars, bool); SET_GATHER (AutoLoadPlugins, bool); SET_GATHER (OtherDirectionRtl, bool ); SET_GATHER (AutoSaveFile, bool);