diff options
| -rw-r--r-- | starmath/sdi/smslots.sdi | 5 | ||||
| -rw-r--r-- | starmath/source/smdll.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/typemap.cxx | 1 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 26 | ||||
| -rw-r--r-- | starmath/uiconfig/smath/statusbar/statusbar.xml | 5 |
5 files changed, 37 insertions, 2 deletions
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi index 710442350f41..5db0d631a25b 100644 --- a/starmath/sdi/smslots.sdi +++ b/starmath/sdi/smslots.sdi @@ -283,6 +283,11 @@ interface FormulaView ExecMethod = Execute ; StateMethod = GetState ; ] + SID_ATTR_ZOOMSLIDER + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] //idlpp kein Menueeintrag , also keine Texte SID_TEXTSTATUS //idlpp ole : no , status : no [ diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx index e25dca417e30..f1a1bc6a7d6d 100644 --- a/starmath/source/smdll.cxx +++ b/starmath/source/smdll.cxx @@ -21,6 +21,7 @@ #include <svx/svxids.hrc> #include <svx/modctrl.hxx> #include <svx/zoomctrl.hxx> +#include <svx/zoomsliderctrl.hxx> #include <sfx2/docfac.hxx> #include <svx/lboxctrl.hxx> #include <sfx2/docfile.hxx> @@ -67,6 +68,7 @@ namespace SmViewShell::RegisterFactory(1); SvxZoomStatusBarControl::RegisterControl(SID_ATTR_ZOOM, pModule); + SvxZoomSliderControl::RegisterControl(SID_ATTR_ZOOMSLIDER, pModule); SvxModifyControl::RegisterControl(SID_TEXTSTATUS, pModule); SvxUndoRedoControl::RegisterControl(SID_UNDO, pModule); SvxUndoRedoControl::RegisterControl(SID_REDO, pModule); diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx index c53224d1efc3..2d354f7450c6 100644 --- a/starmath/source/typemap.cxx +++ b/starmath/source/typemap.cxx @@ -21,6 +21,7 @@ #include <svl/stritem.hxx> #include <svl/eitem.hxx> #include <sfx2/zoomitem.hxx> +#include <svx/zoomslideritem.hxx> #include <svx/svxids.hrc> #include <svl/slstitm.hxx> diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index d144dde573e9..997908d786da 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -51,6 +51,7 @@ #include <svl/undo.hxx> #include <svl/whiter.hxx> #include <svx/dialogs.hrc> +#include <svx/zoomslideritem.hxx> #include <editeng/editeng.hxx> #include <svx/svxdlg.hxx> #include <sfx2/zoomitem.hxx> @@ -613,7 +614,10 @@ void SmGraphicWindow::SetZoom(sal_uInt16 Factor) SetTotalSize(); SmViewShell *pViewSh = GetView(); if (pViewSh) + { pViewSh->GetViewFrame()->GetBindings().Invalidate(SID_ATTR_ZOOM); + pViewSh->GetViewFrame()->GetBindings().Invalidate(SID_ATTR_ZOOMSLIDER); + } Invalidate(); } @@ -1853,6 +1857,19 @@ void SmViewShell::Execute(SfxRequest& rReq) } break; + case SID_ATTR_ZOOMSLIDER: + { + const SfxItemSet *pArgs = rReq.GetArgs(); + const SfxPoolItem* pItem; + + if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, &pItem ) ) + { + const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue(); + aGraphic.SetZoom( nCurrentZoom ); + } + } + break; + case SID_TOOLBOX: { GetViewFrame()->ToggleChildWindow( SmToolBoxWrapper::GetChildWindowId() ); @@ -1936,6 +1953,15 @@ void SmViewShell::GetState(SfxItemSet &rSet) rSet.DisableItem( nWh ); break; + case SID_ATTR_ZOOMSLIDER : + { + const sal_uInt16 nCurrentZoom = aGraphic.GetZoom(); + SvxZoomSliderItem aZoomSliderItem( nCurrentZoom, MINZOOM, MAXZOOM ); + aZoomSliderItem.AddSnappingPoint( 100 ); + rSet.Put( aZoomSliderItem ); + } + break; + case SID_NEXTERR: case SID_PREVERR: case SID_NEXTMARK: diff --git a/starmath/uiconfig/smath/statusbar/statusbar.xml b/starmath/uiconfig/smath/statusbar/statusbar.xml index 134507e2d462..ca57ace7e24e 100644 --- a/starmath/uiconfig/smath/statusbar/statusbar.xml +++ b/starmath/uiconfig/smath/statusbar/statusbar.xml @@ -18,8 +18,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink"> - <statusbar:statusbaritem xlink:href=".uno:TextStatus" statusbar:align="left" statusbar:width="300"/> - <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="54"/> + <statusbar:statusbaritem xlink:href=".uno:TextStatus" statusbar:align="left" statusbar:autosize="true" statusbar:width="300"/> <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9"/> <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/> + <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="right" statusbar:ownerdraw="true" statusbar:width="130"/> + <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="54"/> </statusbar:statusbar> |