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

4 files changed, 47 insertions, 29 deletions

diff --git a/svx/source/dialog/optgdlg.cxx b/svx/source/dialog/optgdlg.cxx
index 0c9c0abe5693..9e6cd3b5a7f8 100644
--- a/svx/source/dialog/optgdlg.cxx
+++ b/svx/source/dialog/optgdlg.cxx
@@ -678,7 +678,8 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
     aAAPointLimitUnits  ( this, SVX_RES( FT_POINTLIMIT_UNIT )),
 #endif
     aMenuFL             ( this, SVX_RES( FL_MENU ) ),
-    aMenuIconsCB        ( this, SVX_RES( CB_MENU_ICONS )),
+    aMenuIconsFT        ( this, SVX_RES( FT_MENU_ICONS )),
+    aMenuIconsLB        ( this, SVX_RES( LB_MENU_ICONS )),
     aFontListsFL        ( this, SVX_RES( FL_FONTLISTS) ),
     aFontShowCB         ( this, SVX_RES( CB_FONT_SHOW ) ),
     aFontHistoryCB      ( this, SVX_RES( CB_FONT_HISTORY ) ),
@@ -733,8 +734,8 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
     // (in the resource, the coordinates are calculated for the AA options beeing present)
     Control* pMiscOptions[] =
     {
-        &aMenuFL, &aFontShowCB,
-        &aFontListsFL, &aFontHistoryCB, &aMenuIconsCB
+        &aMenuFL, &aMenuIconsFT, &aMenuIconsLB,
+        &aFontListsFL, &aFontShowCB, &aFontHistoryCB
     };
 
     // temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos)
@@ -915,23 +916,18 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
     }
 #endif
 
-    if ( bAppearanceChanged )
-    {
-        pAppearanceCfg->Commit();
-        pAppearanceCfg->SetApplicationDefaults ( GetpApp() );
-    }
-
     if ( aFontShowCB.IsChecked() != aFontShowCB.GetSavedValue() )
     {
         aFontOpt.EnableFontWYSIWYG( aFontShowCB.IsChecked() );
         bModified = TRUE;
     }
 
-    if(aMenuIconsCB.IsChecked() != aMenuIconsCB.GetSavedValue())
+    if(aMenuIconsLB.GetSelectEntryPos() != aMenuIconsLB.GetSavedValue())
     {
-        aMenuOpt.SetMenuIconsState( aMenuIconsCB.IsChecked() );
+        aMenuOpt.SetMenuIconsState( aMenuIconsLB.GetSelectEntryPos() == 0 ? 2 : aMenuIconsLB.GetSelectEntryPos() - 1);
         bModified = TRUE;
         bMenuOptModified = TRUE;
+        bAppearanceChanged = TRUE;
     }
 
     if ( aFontHistoryCB.IsChecked() != aFontHistoryCB.GetSavedValue() )
@@ -984,7 +980,6 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
         // Set changed settings to the application instance
         AllSettings aAllSettings = Application::GetSettings();
         StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
-        aStyleSettings.SetUseImagesInMenus( aMenuIconsCB.IsChecked() );
         if( m_aSystemFont.IsEnabled() )
             aStyleSettings.SetUseSystemUIFonts( m_aSystemFont.IsChecked() );
         aAllSettings.SetStyleSettings(aStyleSettings);
@@ -992,6 +987,12 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
         Application::SetSettings(aAllSettings);
     }
 
+    if ( bAppearanceChanged )
+    {
+        pAppearanceCfg->Commit();
+        pAppearanceCfg->SetApplicationDefaults ( GetpApp() );
+    }
+
     return bModified;
 }
 
@@ -1049,8 +1050,8 @@ void OfaViewTabPage::Reset( const SfxItemSet& )
     SvtFontOptions aFontOpt;
     aFontShowCB.Check( aFontOpt.IsFontWYSIWYGEnabled() );
     SvtMenuOptions aMenuOpt;
-    aMenuIconsCB.Check(aMenuOpt.IsMenuIconsEnabled());
-    aMenuIconsCB.SaveValue();
+    aMenuIconsLB.SelectEntryPos(aMenuOpt.GetMenuIconsState() == 2 ? 0 : aMenuOpt.GetMenuIconsState() + 1);
+    aMenuIconsLB.SaveValue();
     aFontHistoryCB.Check( aFontOpt.IsFontHistoryEnabled() );
 
     { // #i95644# HW accel (unified to disable mechanism)
diff --git a/svx/source/dialog/optgdlg.hrc b/svx/source/dialog/optgdlg.hrc
index b2d27bf7704d..b8dc903879ed 100644
--- a/svx/source/dialog/optgdlg.hrc
+++ b/svx/source/dialog/optgdlg.hrc
@@ -72,8 +72,10 @@
 #define ROW_NF_AA_POINTLIMIT    (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
 
 #define ROW_FL_MENU             (ROW_NF_AA_POINTLIMIT+RSC_CD_DROPDOWN_HEIGHT+RSC_SP_FLGR_SPACE_X)
-#define ROW_CB_MENU_ICONS       (ROW_FL_MENU + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE)
-#define ROW_FL_FONTLISTS        (ROW_CB_MENU_ICONS + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_FLGR_SPACE_X)
+#define ROW_FT_MENU_ICONS       (ROW_FL_MENU + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE)
+#define ROW_LB_MENU_ICONS       (ROW_FT_MENU_ICONS + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE)
+
+#define ROW_FL_FONTLISTS        (ROW_LB_MENU_ICONS + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_FLGR_SPACE_X)
 #define ROW_CB_FONT_SHOW        (ROW_FL_FONTLISTS + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE)
 #define ROW_CB_FONT_HISTORY     (ROW_CB_FONT_SHOW + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE)
 
@@ -125,15 +127,16 @@
 #define FT_MOUSEMIDDLE              33
 #define LB_MOUSEMIDDLE              34
 
-#define CB_MENU_ICONS               40
-#define FL_MENU                     41
-#define FL_FONTLISTS                42
+#define FT_MENU_ICONS               40
+#define LB_MENU_ICONS               41
+#define FL_MENU                     42
+#define FL_FONTLISTS                43
 
-#define LB_ICONSIZE                 53
-#define FT_ICONSIZESTYLE            54
-#define LB_ICONSTYLE                55
-#define CB_SYSTEM_FONT              56
-#define STR_ICONSIZE                        57
+#define LB_ICONSIZE                 54
+#define FT_ICONSIZESTYLE            55
+#define LB_ICONSTYLE                56
+#define CB_SYSTEM_FONT              57
+#define STR_ICONSIZE                58
 
 #define CB_FONT_SHOW                60
 #define CB_FONT_HISTORY             62
diff --git a/svx/source/dialog/optgdlg.hxx b/svx/source/dialog/optgdlg.hxx
index a4ee154e0160..c44087708b31 100644
--- a/svx/source/dialog/optgdlg.hxx
+++ b/svx/source/dialog/optgdlg.hxx
@@ -112,7 +112,8 @@ private:
 #endif
 
     FixedLine       aMenuFL;
-    CheckBox        aMenuIconsCB;
+    FixedText       aMenuIconsFT;
+    ListBox         aMenuIconsLB;
 
     FixedLine       aFontListsFL;
     CheckBox        aFontShowCB;
diff --git a/svx/source/dialog/optgdlg.src b/svx/source/dialog/optgdlg.src
index 966df6cb5320..7f3ad6968079 100644
--- a/svx/source/dialog/optgdlg.src
+++ b/svx/source/dialog/optgdlg.src
@@ -298,12 +298,25 @@ TabPage OFA_TP_VIEW
         Size = MAP_APPFONT ( 120 , 8 ) ;
         Text [ en-US ] = "Menu" ;
     };
-    CheckBox CB_MENU_ICONS
+    FixedText FT_MENU_ICONS
     {
+        Pos = MAP_APPFONT ( 12 , ROW_FT_MENU_ICONS ) ;
+        Size = MAP_APPFONT ( 114 , 8 ) ;
+        Text [ en-US ] = "Icons in menus" ;
+    };
+    ListBox LB_MENU_ICONS
+    {
+        Pos = MAP_APPFONT ( 12 , ROW_LB_MENU_ICONS ) ;
+        Size = MAP_APPFONT ( 114 , 60 ) ;
+        DropDown = TRUE ;
+        Border = TRUE ;
         TabStop = TRUE ;
-        Pos = MAP_APPFONT ( 12 , ROW_CB_MENU_ICONS ) ;
-        Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "Show icons in menus";
+        StringList [ en-US ] =
+        {
+            < "Automatic" ; > ;
+            < "Hide" ; > ;
+            < "Show" ; > ;
+        };
     };
     FixedLine FL_FONTLISTS
     {