diff options
author | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-11-11 21:47:01 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-11-11 20:53:53 +0000 |
commit | 355770eff40acc07e9cd46fa4dcfb39e6a86166e (patch) | |
tree | c9a8ae748bca761596712c4c482b90be337e366b /svx/source | |
parent | 93b34d091756de6fc3e5424aa45e00397146cc51 (diff) |
fdo82708 Add missing tooltips to Writer Statusbar
Change-Id: Ie44b8de69b98ebfa789cc8f9a1d8a60b698fc154
Reviewed-on: https://gerrit.libreoffice.org/12368
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/stbctrls/stbctrls.src | 20 | ||||
-rw-r--r-- | svx/source/stbctrls/zoomctrl.cxx | 1 | ||||
-rw-r--r-- | svx/source/stbctrls/zoomsliderctrl.cxx | 24 |
3 files changed, 41 insertions, 4 deletions
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index a9e98a7c775c..3a997bc060fc 100644 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src @@ -121,6 +121,26 @@ String RID_SVXSTR_FIT_SLIDE Text [ en-US ] = "Fit slide to current window."; }; +String RID_SVXSTR_ZOOMTOOL_HINT +{ + Text [ en-US ] = "Zoom level. Click for dialog box and right-click for zoom list"; +}; + +String RID_SVXSTR_ZOOM +{ + Text [ en-US ] = "Adjust zoom level"; +}; + +String RID_SVXSTR_ZOOM_IN +{ + Text [ en-US ] = "Zoom in"; +}; + +String RID_SVXSTR_ZOOM_OUT +{ + Text [ en-US ] = "Zoom out"; +}; + // PopupMenu ------------------------------------------------------------- Menu RID_SVXMNU_ZOOM { diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 01a69242eb81..63210fee20b4 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -103,6 +103,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId, nZoom( 100 ), nValueSet( SVX_ZOOM_ENABLE_ALL ) { + GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOMTOOL_HINT)); } void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 6f5b400ca7a7..8ea241bbdc82 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -351,14 +351,13 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) return true; const short nButtons = rEvt.GetButtons(); + const Rectangle aControlRect = getControlRect(); + const Point aPoint = rEvt.GetPosPixel(); + const sal_Int32 nXDiff = aPoint.X() - aControlRect.Left(); // check mouse move with button pressed if ( 1 == nButtons ) { - const Rectangle aControlRect = getControlRect(); - const Point aPoint = rEvt.GetPosPixel(); - const sal_Int32 nXDiff = aPoint.X() - aControlRect.Left(); - if ( nXDiff >= nSliderXOffset && nXDiff <= aControlRect.GetWidth() - nSliderXOffset ) { mpImpl->mnCurrentZoom = Offset2Zoom( nXDiff ); @@ -367,6 +366,23 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) } } + // Tooltips + + long nIncDecWidth = mpImpl->maIncreaseButton.GetSizePixel().Width(); + + const long nButtonLeftOffset = (nSliderXOffset - nIncDecWidth)/2; + const long nButtonRightOffset = (nSliderXOffset + nIncDecWidth)/2; + + // click to - button + if ( nXDiff >= nButtonLeftOffset && nXDiff <= nButtonRightOffset ) + GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM_OUT)); + // click to + button + else if ( nXDiff >= aControlRect.GetWidth() - nSliderXOffset + nButtonLeftOffset && + nXDiff <= aControlRect.GetWidth() - nSliderXOffset + nButtonRightOffset ) + GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM_IN)); + else + GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM)); + return true; } |