Revert most of r1203218 and r1203215: the second one seems to be causing a build breakage in Macbook: 'hicontrast.flag not found'. Reported by Pavel.

4 files changed, 13 insertions, 8 deletions

diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index d78ecf2ba295..3699b54a10f9 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -47,7 +47,7 @@
 
 #define TB_LARGEIMAGESIZE            26
 #define TB_LARGEIMAGESIZE_INDUSTRIAL 24
-#define TB_LARGEIMAGESIZE_TANGO      22
+#define TB_LARGEIMAGESIZE_CRYSTAL    22
 
 class Window;
 
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 65de79a362e0..85e1885a96ab 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -486,9 +486,10 @@ private:
 #define STYLE_SYMBOLS_DEFAULT       ((sal_uLong)1)
 #define STYLE_SYMBOLS_HICONTRAST    ((sal_uLong)2)
 #define STYLE_SYMBOLS_INDUSTRIAL    ((sal_uLong)3)
-#define STYLE_SYMBOLS_TANGO     ((sal_uLong)4)
-#define STYLE_SYMBOLS_CLASSIC       ((sal_uLong)5)
-#define STYLE_SYMBOLS_THEMES_MAX    ((sal_uLong)6)
+#define STYLE_SYMBOLS_CRYSTAL       ((sal_uLong)4)
+#define STYLE_SYMBOLS_TANGO     ((sal_uLong)5)
+#define STYLE_SYMBOLS_CLASSIC       ((sal_uLong)6)
+#define STYLE_SYMBOLS_THEMES_MAX    ((sal_uLong)7)
 #define STYLE_CURSOR_NOBLINKTIME    ((sal_uLong)0xFFFFFFFF)
 
 class VCL_DLLPUBLIC StyleSettings
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 88266d97745d..35f915a44508 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -695,6 +695,7 @@ void StyleSettings::Set3DColors( const Color& rColor )
         case STYLE_SYMBOLS_DEFAULT:    return ::rtl::OUString::createFromAscii( "default" );
         case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString::createFromAscii( "hicontrast" );
         case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString::createFromAscii( "industrial" );
+        case STYLE_SYMBOLS_CRYSTAL:    return ::rtl::OUString::createFromAscii( "crystal" );
         case STYLE_SYMBOLS_TANGO:      return ::rtl::OUString::createFromAscii( "tango" );
         case STYLE_SYMBOLS_CLASSIC:    return ::rtl::OUString::createFromAscii( "classic" );
     }
@@ -712,6 +713,8 @@ sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName )
         return STYLE_SYMBOLS_HICONTRAST;
     else if ( rName == ::rtl::OUString::createFromAscii( "industrial" ) )
         return STYLE_SYMBOLS_INDUSTRIAL;
+    else if ( rName == ::rtl::OUString::createFromAscii( "crystal" ) )
+        return STYLE_SYMBOLS_CRYSTAL;
     else if ( rName == ::rtl::OUString::createFromAscii( "tango" ) )
         return STYLE_SYMBOLS_TANGO;
     else if ( rName == ::rtl::OUString::createFromAscii( "classic" ) )
@@ -801,9 +804,10 @@ sal_uLong StyleSettings::GetAutoSymbolsStyle() const
 
     if( bCont )
     {
-        if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
-            rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
+        if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
             nRet = STYLE_SYMBOLS_TANGO;
+        else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
+            nRet = STYLE_SYMBOLS_CRYSTAL;
     }
 
     // falback to any existing style
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 68b8ded91198..96936519cf26 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -988,8 +988,8 @@ const Size& ToolBox::GetDefaultImageSize() const
             case STYLE_SYMBOLS_INDUSTRIAL:
                 aLargeButtonSize = Size( TB_LARGEIMAGESIZE_INDUSTRIAL, TB_LARGEIMAGESIZE_INDUSTRIAL );
                 break;
-            case STYLE_SYMBOLS_TANGO:
-                aLargeButtonSize = Size( TB_LARGEIMAGESIZE_TANGO, TB_LARGEIMAGESIZE_TANGO );
+            case STYLE_SYMBOLS_CRYSTAL:
+                aLargeButtonSize = Size( TB_LARGEIMAGESIZE_CRYSTAL, TB_LARGEIMAGESIZE_CRYSTAL );
                 break;
             default:
                 aLargeButtonSize = Size( TB_LARGEIMAGESIZE, TB_LARGEIMAGESIZE );