#99281# HC images and handling for GalleryBrowser2

2 files changed, 23 insertions, 14 deletions

diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 155a854378cb..311fadab0322 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galbrws2.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: ka $ $Date: 2002-08-01 10:29:39 $
+ *  last change: $Author: gt $ $Date: 2002-09-03 10:26:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -388,16 +388,11 @@ GalleryBrowser2::~GalleryBrowser2()
 
 void GalleryBrowser2::InitSettings()
 {
-    Image aIconImage( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_ICON ) );
-    Image aListImage( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_LIST ) );
+    BOOL  bHC = GALLERY_DLG_COLOR.IsDark();
+    Image aIconImage( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_ICON_HC : RID_SVXIMG_GALLERY_VIEW_ICON ) );
+    Image aListImage( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_LIST_HC : RID_SVXIMG_GALLERY_VIEW_LIST ) );
     Font  aInfoFont( maInfoBar.GetControlFont() );
 
-    if( Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        aIconImage = aIconImage.GetColorTransformedImage( IMAGECOLORTRANSFORM_HIGHCONTRAST );
-        aListImage = aListImage.GetColorTransformedImage( IMAGECOLORTRANSFORM_HIGHCONTRAST );
-    }
-
     maViewBox.SetItemImage( TBX_ID_ICON, aIconImage );
     maViewBox.SetItemImage( TBX_ID_LIST, aListImage );
 
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index f76e08497254..5dfb1014816c 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gallery.src,v $
  *
- *  $Revision: 1.59 $
+ *  $Revision: 1.60 $
  *
- *  last change: $Author: gt $ $Date: 2002-09-02 13:37:02 $
+ *  last change: $Author: gt $ $Date: 2002-09-03 10:26:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,8 @@
 
 /******************************************************************************/
 
+#define MASKCOLOR   MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+
 DockingWindow RID_SVXDLG_GALLERYBROWSER
 {
     HelpId = SID_GALLERY;
@@ -2252,13 +2254,25 @@ Bitmap RID_SVXBMP_GALLERY_SOUND_7
 Image RID_SVXIMG_GALLERY_VIEW_ICON
 {
     ImageBitmap = Bitmap { File = "galicon.bmp"; };
-    MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+    MASKCOLOR
 };
 
 Image RID_SVXIMG_GALLERY_VIEW_LIST
 {
     ImageBitmap = Bitmap { File = "gallist.bmp"; };
-    MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+    MASKCOLOR
+};
+
+Image RID_SVXIMG_GALLERY_VIEW_ICON_HC
+{
+    ImageBitmap = Bitmap { File = "galicon_h.bmp"; };
+    MASKCOLOR
+};
+
+Image RID_SVXIMG_GALLERY_VIEW_LIST_HC
+{
+    ImageBitmap = Bitmap { File = "gallist_h.bmp"; };
+    MASKCOLOR
 };