From edef1887ff9373b29228e51c44ae091f675a94aa Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 5 Mar 2013 12:32:25 +0000 Subject: make RefButton quick help toggle saying shrink/expand Change-Id: Id5b5518a0cb3982ebc398e57499c5c240ee7d683 --- formula/inc/formula/funcutl.hxx | 2 ++ formula/source/ui/dlg/formdlgs.src | 10 ++++++++++ formula/source/ui/dlg/funcutl.cxx | 6 ++++++ formula/source/ui/inc/ForResId.hrc | 3 ++- 4 files changed, 20 insertions(+), 1 deletion(-) (limited to 'formula') diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx index 24729eb1d403..7144350ae149 100644 --- a/formula/inc/formula/funcutl.hxx +++ b/formula/inc/formula/funcutl.hxx @@ -72,6 +72,8 @@ class FORMULA_DLLPUBLIC RefButton : public ImageButton private: Image aImgRefStart; /// Start reference input Image aImgRefDone; /// Stop reference input + OUString aShrinkQuickHelp; + OUString aExpandQuickHelp; IControlReferenceHandler* pAnyRefDlg; // parent dialog RefEdit* pRefEdit; // zugeordnetes Edit-Control diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src index e624e2d0c40d..6d0ecfd503f2 100644 --- a/formula/source/ui/dlg/formdlgs.src +++ b/formula/source/ui/dlg/formdlgs.src @@ -455,6 +455,11 @@ Image RID_BMP_REFBTN1 MaskColor = STD_MASKCOLOR; }; +String RID_STR_SHRINK +{ + Text [ en-US ] = "Shrink" ; +}; + Image RID_BMP_REFBTN2 { ImageBitmap = Bitmap @@ -463,3 +468,8 @@ Image RID_BMP_REFBTN2 }; MaskColor = STD_MASKCOLOR; }; + +String RID_STR_EXPAND +{ + Text [ en-US ] = "Expand" ; +}; diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 36b3f04e60d1..489e6718ac17 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -950,6 +950,8 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId) : ImageButton( _pParent, rResId ), aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ), aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ), + aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ), + aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ), pAnyRefDlg( NULL ), pRefEdit( NULL ) { @@ -960,6 +962,8 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, ICo ImageButton( _pParent, rResId ), aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ), aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ), + aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ), + aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ), pAnyRefDlg( _pDlg ), pRefEdit( pEdit ) { @@ -969,11 +973,13 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, ICo void RefButton::SetStartImage() { SetModeImage( aImgRefStart ); + SetQuickHelpText( aShrinkQuickHelp ); } void RefButton::SetEndImage() { SetModeImage( aImgRefDone ); + SetQuickHelpText( aExpandQuickHelp ); } void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ) diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index 0a9f7ae9f898..b00b7ef0d1ec 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -39,12 +39,13 @@ // Dialog Control Id's ----------------------------------------------------------- // strings +#define RID_STR_SHRINK (RID_STRING_START + 0) +#define RID_STR_EXPAND (RID_STRING_START + 1) // bitmap #define RID_BMP_REFBTN1 (RID_BITMAP_START + 0) #define RID_BMP_REFBTN2 (RID_BITMAP_START + 2) - // pages #define RID_FORMULATAB_STRUCT (RID_PAGE_START + 0) #define RID_FORMULATAB_FUNCTION (RID_PAGE_START + 1) -- cgit