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

6 files changed, 18 insertions, 14 deletions

diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx
index f02109b44c53..f2873bef7570 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/classes/bmkmenu.cxx
@@ -175,14 +175,15 @@ void BmkMenu::Initialize()
         aDynamicMenuEntries = SvtDynamicMenuOptions().GetMenu( E_NEWMENU );
     else if ( m_nType == BmkMenu::BMK_WIZARDMENU )
         aDynamicMenuEntries = SvtDynamicMenuOptions().GetMenu( E_WIZARDMENU );
-    BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+
+    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
+    BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
 
     ::rtl::OUString aTitle;
     ::rtl::OUString aURL;
     ::rtl::OUString aTargetFrame;
     ::rtl::OUString aImageId;
 
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark();
 
     UINT32 i, nCount = aDynamicMenuEntries.getLength();
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 45e638f56d41..af764dd6af1c 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -160,7 +160,7 @@ MenuManager::MenuManager(
 
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     m_bWasHiContrast    = rSettings.GetMenuColor().IsDark();
-    m_bShowMenuImages   = SvtMenuOptions().IsMenuIconsEnabled();
+    m_bShowMenuImages   = rSettings.GetUseImagesInMenus();
 
     sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
     ::std::vector< USHORT > aQueryLabelItemIdVector;
@@ -1150,7 +1150,8 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
     {
         // set/unset hiding disabled menu entries
         sal_Bool bDontHide          = SvtMenuOptions().IsEntryHidingEnabled();
-        sal_Bool bShowMenuImages    = SvtMenuOptions().IsMenuIconsEnabled();
+        const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
+        sal_Bool bShowMenuImages    = rSettings.GetUseImagesInMenus();
 
         sal_uInt16 nFlag = pMenu->GetMenuFlags();
         if ( bDontHide )
@@ -1181,7 +1182,6 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
             UpdateSpecialWindowMenu( pMenu );
 
         // Check if some modes have changed so we have to update our menu images
-        const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
         sal_Bool bIsHiContrast = rSettings.GetMenuColor().IsDark();
 
         if ( m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages )
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index a9df17558f4d..6b3edfb22a6b 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -229,7 +229,8 @@ ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Refer
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     m_bWasHiContrast    = rSettings.GetMenuColor().IsDark();
-    m_bShowMenuImages   = SvtMenuOptions().IsMenuIconsEnabled();
+    m_bShowMenuImages   = rSettings.GetUseImagesInMenus();
+
 }
 
 ControlMenuController::~ControlMenuController()
@@ -404,7 +405,7 @@ void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) thro
         // Check if some modes have changed so we have to update our menu images
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
         sal_Bool bIsHiContrast      = rSettings.GetMenuColor().IsDark();
-        sal_Bool bShowMenuImages    = SvtMenuOptions().IsMenuIconsEnabled();
+        sal_Bool bShowMenuImages    = rSettings.GetUseImagesInMenus();
         sal_Bool bUpdateImages      = (( m_bWasHiContrast != bIsHiContrast ) || ( bShowMenuImages != m_bShowMenuImages ));
 
         if ( bUpdateImages )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index c29ab54c9869..351089260d89 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1060,7 +1060,8 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
     {
         // set/unset hiding disabled menu entries
         sal_Bool bDontHide           = SvtMenuOptions().IsEntryHidingEnabled();
-        sal_Bool bShowMenuImages     = SvtMenuOptions().IsMenuIconsEnabled();
+        const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
+        sal_Bool bShowMenuImages     = rSettings.GetUseImagesInMenus();
         sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED );
 
         ResetableGuard aGuard( m_aLock );
@@ -1084,7 +1085,6 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
             UpdateSpecialWindowMenu( pMenu );
 
         // Check if some modes have changed so we have to update our menu images
-        const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
         sal_Bool bIsHiContrast = rSettings.GetMenuColor().IsDark();
         sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle();
 
@@ -1592,7 +1592,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
 
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     m_bWasHiContrast    = rSettings.GetMenuColor().IsDark();
-    m_bShowMenuImages   = SvtMenuOptions().IsMenuIconsEnabled();
+    m_bShowMenuImages   = rSettings.GetUseImagesInMenus();
     m_bRetrieveImages   = sal_False;
 
     sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index ca66eefdbaaf..5162f812ef58 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -491,7 +491,7 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R
         if ( pPopupMenu )
         {
             const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-            sal_Bool bShowImages( SvtMenuOptions().IsMenuIconsEnabled() );
+            sal_Bool bShowImages( rSettings.GetUseImagesInMenus() );
             sal_Bool bHiContrast( rSettings.GetMenuColor().IsDark() );
 
             PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
@@ -617,10 +617,12 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments )
             m_xFrame        = xFrame;
             m_aCommandURL   = aCommandURL;
             m_bInitialized  = sal_True;
-            m_bShowImages   = SvtMenuOptions().IsMenuIconsEnabled();
 
             const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-            m_bHiContrast   = rSettings.GetMenuColor().IsDark();
+
+            m_bShowImages   = rSettings.GetUseImagesInMenus();
+        m_bHiContrast   = rSettings.GetMenuColor().IsDark();
+
             m_bNewMenu      = m_aCommandURL.equalsAscii( ".uno:AddDirect" );
         }
     }
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index de73862b3596..ab2c72425223 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -213,7 +213,7 @@ void ToolbarsMenuController::addCommand(
     Image                aImage;
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
-    if ( SvtMenuOptions().IsMenuIconsEnabled() )
+    if ( rSettings.GetUseImagesInMenus() )
         aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE, rSettings.GetMenuColor().IsDark() );
 
     VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( rPopupMenu );