diff options
| author | Release Engineers <releng@openoffice.org> | 2009-04-14 17:47:15 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-04-14 17:47:15 +0000 |
| commit | 7dce08951e498a6e0200f6bc68afff8017a665b4 (patch) | |
| tree | fdb5d67b182b4ca8e4976aad9bd123e95458773f /desktop | |
| parent | 32715d925a37abe02e4b6abb891cd91f2ade9de8 (diff) | |
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
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 85ca479d6d..e9fad3f16d 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -123,6 +123,7 @@ #include <svtools/languageoptions.hxx> #include <svtools/internaloptions.hxx> #include <svtools/miscopt.hxx> +#include <svtools/menuoptions.hxx> #include <svtools/syslocaleoptions.hxx> #include <svtools/folderrestriction.hxx> #include <unotools/tempfile.hxx> @@ -1772,6 +1773,24 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* ) hMouseSettings.SetFollow( aAppearanceCfg.IsMenuMouseFollow() ? (nFollow|MOUSE_FOLLOW_MENU) : (nFollow&~MOUSE_FOLLOW_MENU)); rSettings.SetMouseSettings(hMouseSettings); + BOOL bUseImagesInMenus = hStyleSettings.GetUseImagesInMenus(); + + SvtMenuOptions aMenuOpt; + nGet = aMenuOpt.GetMenuIconsState(); + switch ( nGet ) + { + case 0: + bUseImagesInMenus = FALSE; + break; + case 1: + bUseImagesInMenus = TRUE; + break; + case 2: + default: + break; + } + hStyleSettings.SetUseImagesInMenus(bUseImagesInMenus); + sal_uInt16 nTabStyle = hStyleSettings.GetTabControlStyle(); nTabStyle &= ~STYLE_TABCONTROL_SINGLELINE; if( aAppearanceCfg.IsSingleLineTabCtrl() ) |