summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/sc.hrc9
-rw-r--r--sc/source/ui/inc/anyrefdg.hxx11
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx62
-rw-r--r--sc/source/ui/src/sc.src59
-rw-r--r--sc/source/ui/src/toolbox.src10
5 files changed, 77 insertions, 74 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index ff757ca229d0..bf6aada5f1ab 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: sc.hrc,v $
*
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
- * last change: $Author: dr $ $Date: 2002-05-30 14:31:30 $
+ * last change: $Author: dr $ $Date: 2002-05-31 11:12:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1138,6 +1138,8 @@
#define RID_IMAGELIST_NAVCONT (SC_RESOURCE_START+52)
#define RID_DRAW_OBJECTBAR (SC_RESOURCE_START+53)
#define RID_GRAPHIC_OBJECTBAR (SC_RESOURCE_START+54)
+#define RID_BMP_REFBTN1_H (SC_RESOURCE_START+55)
+#define RID_BMP_REFBTN2_H (SC_RESOURCE_START+56)
#define STR_START (SC_RESOURCE_START+100)
@@ -1507,6 +1509,9 @@
#define STD_MASKCOLOR Color { Red=0xC000; Green=0xC000; Blue=0xC000; }
#endif
+// mask color for high contrast
+#define SC_HC_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
+
#endif
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index e1f29a087129..d44ec38212b0 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: anyrefdg.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: dr $ $Date: 2002-03-13 11:43:13 $
+ * last change: $Author: dr $ $Date: 2002-05-31 11:15:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -126,12 +126,19 @@ private:
Image aImgRefDone; // Symbol fuer Ref.-Eingabe beenden
ScAnyRefDlg* pAnyRefDlg; // parent dialog
ScRefEdit* pRefEdit; // zugeordnetes Edit-Control
+ sal_Bool bIsStartImage; /// TRUE = Start image, FALSE = End image.
+
+ /** Sets normal or HC images, depending on current settings. */
+ void InitImages();
+ /** Activates start (TRUE) or end (FALSE) image. */
+ void ShowImage( sal_Bool bStartImage );
protected:
virtual void Click();
virtual void KeyInput( const KeyEvent& rKEvt );
virtual void GetFocus();
virtual void LoseFocus();
+ virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
ScRefButton( ScAnyRefDlg* pParent, const ResId& rResId, ScRefEdit* pEdit );
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 99d5640e82e0..751b356e123b 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: anyrefdg.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: dr $ $Date: 2002-03-13 11:44:14 $
+ * last change: $Author: dr $ $Date: 2002-05-31 11:15:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -277,23 +277,45 @@ IMPL_LINK( ScRefEdit, UpdateHdl, Timer*, pTi )
//----------------------------------------------------------------------------
ScRefButton::ScRefButton( ScAnyRefDlg* pParent, const ResId& rResId, ScRefEdit* pEdit ) :
- ImageButton ( pParent, rResId ),
- aImgRefStart( ScResId( RID_BMP_REFBTN1 ) ),
- aImgRefDone ( ScResId( RID_BMP_REFBTN2 ) ),
- pAnyRefDlg ( pParent ),
- pRefEdit ( pEdit )
+ ImageButton( pParent, rResId ),
+ pAnyRefDlg( pParent ),
+ pRefEdit( pEdit ),
+ bIsStartImage( sal_True )
{
- SetStartImage();
+ InitImages();
}
ScRefButton::ScRefButton( Window *pParent, const ResId& rResId ) :
- ImageButton ( pParent, rResId ),
- aImgRefStart( ScResId( RID_BMP_REFBTN1 ) ),
- aImgRefDone ( ScResId( RID_BMP_REFBTN2 ) ),
- pAnyRefDlg ( NULL ),
- pRefEdit ( NULL )
+ ImageButton( pParent, rResId ),
+ pAnyRefDlg( NULL ),
+ pRefEdit( NULL ),
+ bIsStartImage( sal_True )
+{
+ InitImages();
+}
+
+void ScRefButton::InitImages()
+{
+ sal_Bool bDark = GetDisplayBackground().GetColor().IsDark();
+ aImgRefStart = Image( ScResId( bDark ? RID_BMP_REFBTN1_H : RID_BMP_REFBTN1 ) );
+ aImgRefDone = Image( ScResId( bDark ? RID_BMP_REFBTN2_H : RID_BMP_REFBTN2 ) );
+ ShowImage( bIsStartImage );
+}
+
+void ScRefButton::ShowImage( sal_Bool bStartImage )
+{
+ SetImage( bStartImage ? aImgRefStart : aImgRefDone );
+ bIsStartImage = bStartImage;
+}
+
+void ScRefButton::SetStartImage()
+{
+ ShowImage( sal_True );
+}
+
+void ScRefButton::SetEndImage()
{
- SetStartImage();
+ ShowImage( sal_False );
}
void ScRefButton::SetReferences( ScAnyRefDlg* pDlg, ScRefEdit* pEdit )
@@ -302,7 +324,6 @@ void ScRefButton::SetReferences( ScAnyRefDlg* pDlg, ScRefEdit* pEdit )
pRefEdit = pEdit;
}
-
//----------------------------------------------------------------------------
void ScRefButton::Click()
@@ -334,14 +355,11 @@ void ScRefButton::LoseFocus()
pRefEdit->Modify();
}
-void ScRefButton::SetStartImage()
-{
- SetImage( aImgRefStart );
-}
-
-void ScRefButton::SetEndImage()
+void ScRefButton::DataChanged( const DataChangedEvent& rDCEvt )
{
- SetImage( aImgRefDone );
+ if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
+ InitImages();
+ ImageButton::DataChanged( rDCEvt );
}
diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src
index 486042b8ce2d..7a89c6a2b455 100644
--- a/sc/source/ui/src/sc.src
+++ b/sc/source/ui/src/sc.src
@@ -2,9 +2,9 @@
*
* $RCSfile: sc.src,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: kz $ $Date: 2001-11-16 23:21:25 $
+ * last change: $Author: dr $ $Date: 2002-05-31 11:17:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,7 +62,7 @@
// StarCalc Applikations Resource
//
// (C) 1994 StarDivision GmbH, Hamburg, Germany
- // $Author: kz $ $Date: 2001-11-16 23:21:25 $ $Revision: 1.12 $
+ // $Author: dr $ $Date: 2002-05-31 11:17:06 $ $Revision: 1.13 $
// $Logfile: T:/sc/source/ui/src/sc.srv $ $Workfile: sc.src $
//==================================================================
@@ -105,35 +105,29 @@ String RID_APPTITLE
Text[ turkish ] = "%PRODUCTNAME Calc";
Text[ language_user1 ] = " ";
Text[ catalan ] = "%PRODUCTNAME Calc";
+ Text[ thai ] = "%PRODUCTNAME Calc";
};
// About-Dialog --------------------------------------------------------------
// Icons & Bitmaps: ----------------------------------------------------------
-
- //Bitmap RID_DEFAULTINTRO { File = "scintro.bmp"; };
- //Bitmap RID_DROPDOWNBITMAP { File = "dropdown.bmp"; };
- //Bitmap RID_BLUEDROPDOWNBITMAP { File = "dropblue.bmp"; };
-//Bitmap RID_ANCHORBITMAP { File = "anchor.bmp" ; };
-//Bitmap RID_GRAYANCHORBITMAP { File = "anchor.bmp" ; }; //! andere Bitmap !!!
-
-// Bitmap RID_BMP_REFBTN1 { File = "refinp1.bmp" ; };
-// Bitmap RID_BMP_REFBTN2 { File = "refinp2.bmp" ; };
-
Image RID_BMP_REFBTN1
{
ImageBitmap = Bitmap
{
File = "refinp1.bmp";
};
+ MaskColor = STD_MASKCOLOR;
+};
- MaskColor = Color
+Image RID_BMP_REFBTN1_H
+{
+ ImageBitmap = Bitmap
{
- Red = 0xC000 ;
- Green = 0xC000 ;
- Blue = 0xC000 ;
+ File = "refinp1_h.bmp";
};
+ MaskColor = SC_HC_MASKCOLOR;
};
Image RID_BMP_REFBTN2
@@ -142,13 +136,16 @@ Image RID_BMP_REFBTN2
{
File = "refinp2.bmp";
};
+ MaskColor = STD_MASKCOLOR;
+};
- MaskColor = Color
+Image RID_BMP_REFBTN2_H
+{
+ ImageBitmap = Bitmap
{
- Red = 0xC000 ;
- Green = 0xC000 ;
- Blue = 0xC000 ;
+ File = "refinp2_h.bmp";
};
+ MaskColor = SC_HC_MASKCOLOR;
};
@@ -157,23 +154,3 @@ String 30001 { Text = "Dummy1" ; };
String 30002 { Text = "Dummy2" ; };
String 30006 { Text = "Dummy3" ; };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
index ec004335b0bb..383b84826495 100644
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.src
@@ -2,9 +2,9 @@
*
* $RCSfile: toolbox.src,v $
*
- * $Revision: 1.39 $
+ * $Revision: 1.40 $
*
- * last change: $Author: nn $ $Date: 2002-05-29 15:02:21 $
+ * last change: $Author: dr $ $Date: 2002-05-31 11:17:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,7 +62,7 @@
// Toolbox - Resourcen
//
// (C) 1994 StarDivision GmbH, Hamburg, Germany
- // $Author: nn $ $Date: 2002-05-29 15:02:21 $ $Revision: 1.39 $
+ // $Author: dr $ $Date: 2002-05-31 11:17:06 $ $Revision: 1.40 $
// $Logfile: T:/sc/source/ui/src/toolbox.srv $ $Workfile: TOOLBOX.SRC $
//==================================================================
@@ -1722,10 +1722,6 @@ FloatingWindow RID_TBXCTL_INSOBJ
};
-// mask color for high contrast
-#define SC_HC_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
-
-
ImageList RID_DEFAULTIMAGELIST_SC
{
ImageBitmap = Bitmap
generated by cgit (git 2.34.1) at 2025-03-17 01:50:27 +0000