diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-04-30 10:31:00 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2013-04-30 10:33:15 +0200 |
commit | f60424b29622033ae02491bda328c304ae1bc05d (patch) | |
tree | 0bb6ba356685ecefa6d757fd60e4daf9eb1fb4e4 | |
parent | f486c562816fc59dc4d341d0a32a65b1e65eeb92 (diff) |
bnc#816516: Implement easy access to the recent documents.
This adds a dropdown to the 'Open' toolbar tool.
Change-Id: I5b4aa99476e721c1479152b46bbc79cc0b095318
-rw-r--r-- | include/sfx2/tbxctrl.hxx | 19 | ||||
-rw-r--r-- | sc/sdi/scalc.sdi | 3 | ||||
-rw-r--r-- | sc/source/ui/app/scdll.cxx | 2 | ||||
-rw-r--r-- | sfx2/sdi/sfx.sdi | 3 | ||||
-rw-r--r-- | sfx2/source/appl/appreg.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 56 | ||||
-rw-r--r-- | sw/sdi/swriter.sdi | 3 | ||||
-rw-r--r-- | sw/source/ui/app/swmodule.cxx | 2 |
8 files changed, 88 insertions, 1 deletions
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 6c12947a3333..e50527f31086 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -162,7 +162,7 @@ public: #define SFX_DECL_TOOLBOX_CONTROL() \ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ - static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) + static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) /* For special ToolBox controls, such as a font selection box or toolbox tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl @@ -351,6 +351,23 @@ private: sal_Bool m_bShowMenuImages; }; +/** Toolbox that implements recent files menu for the Open file toolbar button. + +To use that, the appropriate Sfx*Item (like Open, OpenFromCalc, or +OpenFromWriter) has to have SlotType = SfxStringItem, and the appropriate +module initialization has to call RegisterControl(). +*/ +class SfxRecentFilesToolBoxControl : public SfxToolBoxControl +{ +public: + SFX_DECL_TOOLBOX_CONTROL(); + SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); + virtual ~SfxRecentFilesToolBoxControl(); + +protected: + virtual SfxPopupWindow* CreatePopupWindow(); +}; + class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl { protected: diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 7ab61a12038b..27803019b573 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -8333,6 +8333,9 @@ SfxVoidItem OpenFromCalc SID_OPEN_CALC RecordPerSet; Synchron; + /* status: */ + SlotType = SfxStringItem + /* config: */ AccelConfig = TRUE, MenuConfig = TRUE, diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 3220463f686a..9ed0e3ac069b 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -172,6 +172,8 @@ void ScDLL::Init() ScMediaShell ::RegisterInterface(pMod); ScPageBreakShell ::RegisterInterface(pMod); + SfxRecentFilesToolBoxControl::RegisterControl(SID_OPEN_CALC, pMod); + // eigene Controller ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSERT, pMod); ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSCELLS, pMod); diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 0fe9cdc2f21e..ad70c3ad1157 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4358,6 +4358,9 @@ SfxObjectItem Open SID_OPENDOC RecordPerSet; Asynchron; + /* status: */ + SlotType = SfxStringItem + /* config: */ AccelConfig = TRUE, MenuConfig = TRUE, diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index 0c54aa81fe97..f3e736566aaf 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -64,6 +64,7 @@ void SfxApplication::Registrations_Impl() SfxURLToolBoxControl_Impl::RegisterControl(SID_OPENURL); SfxAppToolBoxControl_Impl::RegisterControl( SID_NEWDOCDIRECT ); SfxAppToolBoxControl_Impl::RegisterControl( SID_AUTOPILOTMENU ); + SfxRecentFilesToolBoxControl::RegisterControl( SID_OPENDOC ); }; //-------------------------------------------------------------------- diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index a9e786f30644..8085dccbb643 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -25,7 +25,9 @@ #include <string> // prevent conflict with STL includes #include <com/sun/star/uno/Reference.h> #include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/awt/XPopupMenu.hpp> #include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> @@ -38,6 +40,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> +#include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/status/ItemStatus.hpp> #include <com/sun/star/frame/status/ItemState.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> @@ -92,6 +95,7 @@ #include "virtmenu.hxx" #include "sfx2/imagemgr.hxx" +using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::frame::status; @@ -105,6 +109,7 @@ using namespace ::com::sun::star::ui; SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, sal_True); SFX_IMPL_TOOLBOX_CONTROL(SfxAppToolBoxControl_Impl, SfxStringItem); +SFX_IMPL_TOOLBOX_CONTROL(SfxRecentFilesToolBoxControl, SfxStringItem); static Window* GetTopMostParentSystemWindow( Window* pWindow ) { @@ -1741,4 +1746,55 @@ void SfxAppToolBoxControl_Impl::Click( ) { } +//-------------------------------------------------------------------- + +SfxRecentFilesToolBoxControl::SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ) + : SfxToolBoxControl( nSlotId, nId, rBox ) +{ + rBox.SetItemBits( nId, rBox.GetItemBits( nId ) | TIB_DROPDOWN); +} + +SfxRecentFilesToolBoxControl::~SfxRecentFilesToolBoxControl() +{ +} + +SfxPopupWindow* SfxRecentFilesToolBoxControl::CreatePopupWindow() +{ + ToolBox& rBox = GetToolBox(); + sal_uInt16 nItemId = GetId(); + ::Rectangle aRect( rBox.GetItemRect( nItemId ) ); + + Sequence< Any > aArgs( 2 ); + PropertyValue aPropValue; + + aPropValue.Name = "CommandURL"; + aPropValue.Value <<= OUString( ".uno:RecentFileList" ); + aArgs[0] <<= aPropValue; + + aPropValue.Name = "Frame"; + aPropValue.Value <<= m_xFrame; + aArgs[1] <<= aPropValue; + + uno::Reference< frame::XPopupMenuController > xPopupController( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( + "com.sun.star.comp.framework.RecentFilesMenuController", aArgs, m_xContext ), UNO_QUERY ); + + uno::Reference< awt::XPopupMenu > xPopupMenu( m_xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.awt.PopupMenu", m_xContext ), uno::UNO_QUERY ); + + if ( xPopupController.is() && xPopupMenu.is() ) + { + xPopupController->setPopupMenu( xPopupMenu ); + + rBox.SetItemDown( nItemId, sal_True ); + Reference< awt::XWindowPeer > xPeer( getParent(), uno::UNO_QUERY ); + + if ( xPeer.is() ) + xPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 ); + + rBox.SetItemDown( nItemId, sal_False ); + } + + return 0; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 28ffe24a7e49..7601a52a0ffa 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -10401,6 +10401,9 @@ SfxVoidItem OpenFromWriter FN_OPEN_FILE RecordPerSet; Synchron; + /* status: */ + SlotType = SfxStringItem + /* config: */ AccelConfig = TRUE, MenuConfig = TRUE, diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index dc820bb493f7..7161248dd171 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -292,6 +292,8 @@ void SwDLL::RegisterInterfaces() void SwDLL::RegisterControls() { SwModule* pMod = SW_MOD(); + + SfxRecentFilesToolBoxControl::RegisterControl( FN_OPEN_FILE, pMod ); SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod ); SvxTbxCtlAlign::RegisterControl(SID_OBJECT_ALIGN, pMod ); SwTbxAnchor::RegisterControl(FN_TOOL_ANCHOR, pMod ); |