[Libreoffice-commits] core.git: 2 commits - icon-themes/galaxy idl/source include/svx sd/source sd/uiconfig svx/source
Caolán McNamara
caolanm at redhat.com
Thu May 8 06:48:55 PDT 2014
icon-themes/galaxy/svx/res/zoom_page_statusbar.png |binary
idl/source/objects/object.cxx | 2
include/svx/dialogs.hrc | 6 +-
include/svx/zoomctrl.hxx | 15 +++++-
sd/source/ui/app/sddll.cxx | 1
sd/uiconfig/simpress/statusbar/statusbar.xml | 1
svx/source/stbctrls/modctrl.cxx | 7 ---
svx/source/stbctrls/stbctrls.src | 13 +++++
svx/source/stbctrls/zoomctrl.cxx | 46 +++++++++++++++++----
9 files changed, 71 insertions(+), 20 deletions(-)
New commits:
commit d6f5d4ee2cd0654497f1af37421d788411db762c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 8 14:27:53 2014 +0100
add a status bar icon to fit slide to window
Change-Id: I2c1d1fc7425b0aaad2a2445e0ac71ddc38410fdb
diff --git a/icon-themes/galaxy/svx/res/zoom_page_statusbar.png b/icon-themes/galaxy/svx/res/zoom_page_statusbar.png
new file mode 100644
index 0000000..5fb2d59
Binary files /dev/null and b/icon-themes/galaxy/svx/res/zoom_page_statusbar.png differ
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index fb417e6..09a122d 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -981,12 +981,14 @@
#define RID_SVXSTR_DOC_LOAD (SVX_OOO_BUILD_START + 6) // 1236
#define RID_SVXSTR_ERR_OLD_PASSWD (SVX_OOO_BUILD_START + 7) // 1237
#define RID_SVXSTR_ERR_REPEAT_PASSWD (SVX_OOO_BUILD_START + 8) // 1238
+#define RID_SVXBMP_ZOOM_PAGE (SVX_OOO_BUILD_START + 9) // 1239
+#define RID_SVXSTR_FIT_SLIDE (SVX_OOO_BUILD_START + 10) // 1240
// sidebar-related resources (defined in the appropriate .hrc's)
-#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1240)
+#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1241)
// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!!
-#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1270)
+#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1271)
// if we have _a_lot_ time, we should group the resource ids by type, instead
diff --git a/include/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx
index 29d9472..c6937ee 100644
--- a/include/svx/zoomctrl.hxx
+++ b/include/svx/zoomctrl.hxx
@@ -21,8 +21,7 @@
#include <sfx2/stbitem.hxx>
#include <svx/svxdllapi.h>
-
-// class SvxZoomToolBoxControl -------------------------------------------
+#include <vcl/image.hxx>
class SVX_DLLPUBLIC SvxZoomStatusBarControl : public SfxStatusBarControl
{
@@ -42,6 +41,18 @@ public:
};
+class SVX_DLLPUBLIC SvxZoomPageStatusBarControl : public SfxStatusBarControl
+{
+private:
+ Image maImage;
+public:
+ virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE;
+ virtual bool MouseButtonDown( const MouseEvent & rEvt ) SAL_OVERRIDE;
+
+ SFX_DECL_STATUSBAR_CONTROL();
+
+ SvxZoomPageStatusBarControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb);
+};
#endif
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 7b6b89c..26db281 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -239,6 +239,7 @@ void SdDLL::RegisterControllers()
SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
// register StatusBarControls
+ SvxZoomPageStatusBarControl::RegisterControl( SID_ZOOM_ENTIRE_PAGE, pMod );
SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pMod );
SvxPosSizeStatusBarControl::RegisterControl( SID_ATTR_SIZE, pMod );
SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod );
diff --git a/sd/uiconfig/simpress/statusbar/statusbar.xml b/sd/uiconfig/simpress/statusbar/statusbar.xml
index 24224fe..78042ef 100644
--- a/sd/uiconfig/simpress/statusbar/statusbar.xml
+++ b/sd/uiconfig/simpress/statusbar/statusbar.xml
@@ -24,6 +24,7 @@
<statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
<statusbar:statusbaritem xlink:href=".uno:PageStatus" statusbar:align="left" statusbar:width="124"/>
<statusbar:statusbaritem xlink:href=".uno:LayoutStatus" statusbar:align="left" statusbar:autosize="true" statusbar:width="54"/>
+ <statusbar:statusbaritem xlink:href=".uno:ZoomPage" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9"/>
<statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130"/>
<statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="36"/>
</statusbar:statusbar>
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 15bc693..63d50fd 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -136,10 +136,6 @@ void SvxModifyControl::_repaint()
GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
}
-
-
-namespace {
-
/**
* Given a bounding rectangle and an image, determine the top-left position
* of the image so that the image would look centered both horizontally and
@@ -161,9 +157,6 @@ Point centerImage(const Rectangle& rBoundingRect, const Image& rImg)
return aPt;
}
-}
-
-
void SvxModifyControl::Paint( const UserDrawEvent& rUsrEvt )
{
OutputDevice* pDev = rUsrEvt.GetDevice();
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index cb868bd..c4908e3 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -116,6 +116,11 @@ String RID_SVXSTR_DOC_LOAD
Text [ en-US ] = "Loading document...";
};
+String RID_SVXSTR_FIT_SLIDE
+{
+ Text [ en-US ] = "Fit slide to current window.";
+};
+
// PopupMenu -------------------------------------------------------------
Menu RID_SVXMNU_ZOOM
{
@@ -333,5 +338,13 @@ Image RID_SVXBMP_DOC_MODIFIED_FEEDBACK
};
MaskColor = STD_MASKCOLOR;
};
+Image RID_SVXBMP_ZOOM_PAGE
+{
+ ImageBitmap = Bitmap
+ {
+ File = "zoom_page_statusbar.png" ;
+ };
+ MaskColor = STD_MASKCOLOR;
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 1a10bc8..cd711eb 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -28,7 +28,8 @@
#include <svx/dialogs.hrc>
-#include "svx/zoomctrl.hxx"
+#include <svx/zoomctrl.hxx>
+#include <svx/zoomslideritem.hxx>
#include <sfx2/zoomitem.hxx>
#include "stbctrls.h"
#include <svx/dialmgr.hxx>
@@ -97,7 +98,6 @@ void ZoomPopup_Impl::Select()
}
// class SvxZoomStatusBarControl ------------------------------------------
-
SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId,
sal_uInt16 _nId,
StatusBar& rStb ) :
@@ -108,8 +108,6 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId,
{
}
-
-
void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState,
const SfxPoolItem* pState )
{
@@ -138,16 +136,12 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState,
}
}
-
-
void SvxZoomStatusBarControl::Paint( const UserDrawEvent& )
{
OUString aStr(unicode::formatPercent(nZoom, Application::GetSettings().GetUILanguageTag()));
GetStatusBar().SetItemText( GetId(), aStr );
}
-
-
void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
{
if ( COMMAND_CONTEXTMENU & rCEvt.GetCommand() && 0 != nValueSet )
@@ -184,5 +178,41 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
SfxStatusBarControl::Command( rCEvt );
}
+SFX_IMPL_STATUSBAR_CONTROL(SvxZoomPageStatusBarControl,SfxVoidItem);
+
+SvxZoomPageStatusBarControl::SvxZoomPageStatusBarControl(sal_uInt16 _nSlotId,
+ sal_uInt16 _nId, StatusBar& rStb)
+ : SfxStatusBarControl(_nSlotId, _nId, rStb)
+ , maImage(SVX_RES(RID_SVXBMP_ZOOM_PAGE))
+{
+ GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_FIT_SLIDE));
+}
+
+extern Point centerImage(const Rectangle& rBoundingRect, const Image& rImg);
+
+void SvxZoomPageStatusBarControl::Paint(const UserDrawEvent& rUsrEvt)
+{
+ OutputDevice* pDev = rUsrEvt.GetDevice();
+ Rectangle aRect = rUsrEvt.GetRect();
+ Point aPt = centerImage(aRect, maImage);
+ pDev->DrawImage(aPt, maImage);
+}
+
+bool SvxZoomPageStatusBarControl::MouseButtonDown(const MouseEvent&)
+{
+ SvxZoomItem aZoom( SVX_ZOOM_WHOLEPAGE, 0, GetId() );
+
+ ::com::sun::star::uno::Any a;
+ INetURLObject aObj( m_aCommandURL );
+
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 );
+ aArgs[0].Name = aObj.GetURLPath();
+ aZoom.QueryValue( a );
+ aArgs[0].Value = a;
+
+ execute( aArgs );
+
+ return true;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6cf148baf9e0b98ce99ea75ba328b350c876842d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 8 12:14:50 2014 +0100
translate to English
Change-Id: Ieb7ee3f8eb192612e76d5ad928389445e82ef90e
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 81716c2..fa3224f 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -324,7 +324,7 @@ bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
// values have to match
if( pS->GetSlotId().GetValue() != rAttr.GetSlotId().GetValue() )
{
- OSL_FAIL( "Gleicher Name in MetaClass : " );
+ OSL_FAIL( "Same Name in MetaClass : " );
OSL_FAIL( pS->GetName().getString().getStr() );
OSL_FAIL( pS->GetSlotId().getString().getStr() );
OSL_FAIL( rAttr.GetSlotId().getString().getStr() );
More information about the Libreoffice-commits
mailing list