CWS-TOOLING: integrate CWS gtkmenuimages

2009-04-03 14:02:10 +0200 jsk  r270485 : #i100820
2009-04-02 17:03:55 +0200 pl  r270425 : CWS-TOOLING: rebase CWS gtkmenuimages to trunk@270033 (milestone: DEV300:m45)
2009-03-06 16:39:53 +0100 cmc  r269021 : #i95318# pretty dialog up
2009-03-05 21:01:40 +0100 cmc  r268944 : #i95318# pretty dialog up
2009-03-03 15:03:28 +0100 cmc  r268731 : #i95318# pretty dialog up
2009-03-03 15:02:52 +0100 cmc  r268730 : #i95318# pretty dialog up
2009-02-04 18:09:37 +0100 cmc  r267397 : #i95318# follow system theme for defaults for icons on or off in menus

3 files changed, 10 insertions, 13 deletions

diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 6462f1dde2..1974c4e59a 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -452,7 +452,7 @@ SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     m_nSymbolsStyle         = rSettings.GetSymbolsStyle();
     m_bWasHiContrastMode    = rSettings.GetMenuColor().IsDark();
-    m_bShowMenuImages		= SvtMenuOptions().IsMenuIconsEnabled();
+    m_bShowMenuImages		= rSettings.GetUseImagesInMenus();
 
     Reference<com::sun::star::lang::XMultiServiceFactory> aXMultiServiceFactory(::comphelper::getProcessServiceFactory());
     ::framework::MenuConfiguration aConf( aXMultiServiceFactory );
@@ -478,7 +478,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
         ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
         BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark();
-        BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+        BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
 
         if (( nSymbolsStyle != m_nSymbolsStyle ) ||
             ( bIsHiContrastMode != m_bWasHiContrastMode ) ||
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index c0059805cf..5c42c0ef42 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -443,7 +443,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
                 pMnuCtrl->Bind( this, nSlotId, pSVMenu->GetItemText(nSlotId),
                                 pSVMenu->GetHelpText(nSlotId), *pBindings);
 
-                if (  aOptions.IsMenuIconsEnabled() )
+                if (  Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
@@ -540,7 +540,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
                         pMnuCtrl->Bind( this, nSlotId, pSVMenu->GetItemText(nSlotId), pSVMenu->GetHelpText(nSlotId), *pBindings);
                     }
 
-                    if ( aOptions.IsMenuIconsEnabled() )
+                    if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
                     {
                         Image aImage;
                         if ( bIsAddonPopupMenu || framework::AddonMenuManager::IsAddonMenuId( nSlotId ))
@@ -611,10 +611,9 @@ IMPL_LINK( SfxVirtualMenu, Highlight, Menu *, pMenu )
 
 IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
 {
-    SvtMenuOptions aOptions;
     USHORT nItemCount = pSVMenu->GetItemCount();
     SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame();
-    BOOL bIcons = aOptions.IsMenuIconsEnabled();
+    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
     BOOL bIsHiContrastMode = IsHiContrastMode();
     Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame()->GetFrameInterface() );
 
@@ -681,8 +680,7 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
 
 void SfxVirtualMenu::UpdateImages()
 {
-    SvtMenuOptions aOptions;
-    BOOL bIcons = aOptions.IsMenuIconsEnabled();
+    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
 
     if ( bIcons )
     {
@@ -731,10 +729,9 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
     if ( !pMenu )
         return;
 
-    SvtMenuOptions				aOptions;
     framework::AddonsOptions	aAddonOptions;
 
-    BOOL bIcons = aOptions.IsMenuIconsEnabled();
+    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
     if ( bIcons )
     {
         BOOL			bIsHiContrastMode	= IsHiContrastMode();
@@ -929,7 +926,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
         pMenu->InsertItem( SID_ADDONS, aAddonsTitle );
         pMenu->SetPopupMenu( SID_ADDONS, pAddonMenu );
 
-        if ( SvtMenuOptions().IsMenuIconsEnabled() )
+        if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
         {
                rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS ));
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 7058e86e27..f0ebaf48aa 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1511,7 +1511,7 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     m_nSymbolsStyle         = rSettings.GetSymbolsStyle();
     m_bWasHiContrastMode	= rSettings.GetMenuColor().IsDark();
-    m_bShowMenuImages		= SvtMenuOptions().IsMenuIconsEnabled();
+    m_bShowMenuImages		= rSettings.GetUseImagesInMenus();
 
     SetImage( String() );
 }
@@ -1787,7 +1787,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
         ULONG nSymbolsStyle     = rSettings.GetSymbolsStyle();
         BOOL bIsHiContrastMode  = rSettings.GetMenuColor().IsDark();
-        BOOL bShowMenuImages	= SvtMenuOptions().IsMenuIconsEnabled();
+        BOOL bShowMenuImages	= rSettings.GetUseImagesInMenus();
 
         if (( nSymbolsStyle != m_nSymbolsStyle ) ||
             ( bIsHiContrastMode != m_bWasHiContrastMode ) ||