framework/uiconfig/startmodule/menubar/menubar.xml | 1 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5 sd/uiconfig/sdraw/menubar/menubar.xml | 1 sd/uiconfig/simpress/menubar/menubar.xml | 1 sfx2/AllLangResTarget_sfx2.mk | 11 - sfx2/Library_sfx.mk | 7 - sfx2/inc/sfx2/sfxcommands.h | 1 sfx2/inc/sfx2/sfxsids.hrc | 4 sfx2/inc/templatedlg.hxx | 41 ++++++ sfx2/sdi/appslots.sdi | 4 sfx2/sdi/sfx.sdi | 24 +++ sfx2/source/appl/appserv.cxx | 9 + sfx2/source/doc/doc.hrc | 1 sfx2/source/doc/templatedlg.cxx | 55 ++++++++ sfx2/source/doc/templatedlg.hrc | 13 ++ sfx2/source/doc/templatedlg.src | 62 ++++++++++ sw/uiconfig/sglobal/menubar/menubar.xml | 1 sw/uiconfig/sweb/menubar/menubar.xml | 1 sw/uiconfig/swform/menubar/menubar.xml | 1 sw/uiconfig/swreport/menubar/menubar.xml | 1 sw/uiconfig/swriter/menubar/menubar.xml | 1 sw/uiconfig/swxform/menubar/menubar.xml | 1 22 files changed, 237 insertions(+), 9 deletions(-)
New commits: commit 0102a95559f3b6e20ae869986716bf1723b72a9b Author: Rafael Dominguez <[email protected]> Date: Mon May 28 20:53:01 2012 -0430 Implement template manager dialog. - Handle command in appserver - Add all the necessary defines for the command and slot. - Create TemplateManagerDlg class and resource files. - Add basic buttons to display different templates with their handlers. Change-Id: I557576a49f722c6f54d74922bac8bc4ebd5760c3 diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index bce3085..4019fb2 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -37,10 +37,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,sfx,\ $(eval $(call gb_SrsTarget_SrsTarget,sfx/res)) $(eval $(call gb_SrsTarget_use_packages,sfx/res,\ - sfx2_inc \ - svl_inc \ - svtools_inc \ - tools_inc \ + sfx2_inc \ + svl_inc \ + svtools_inc \ + tools_inc \ )) $(eval $(call gb_SrsTarget_set_include,sfx/res,\ @@ -81,6 +81,7 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\ sfx2/source/doc/graphhelp.src \ sfx2/source/doc/new.src \ sfx2/source/doc/templatelocnames.src \ + sfx2/source/doc/templatedlg.src \ sfx2/source/menu/menu.src \ sfx2/source/view/view.src \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index f9d848b..0a97789 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx)) $(eval $(call gb_Library_use_api,sfx,\ - udkapi \ - offapi \ + udkapi \ + offapi \ )) $(eval $(call gb_Library_set_include,sfx,\ @@ -214,6 +214,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/sfxbasemodel \ sfx2/source/doc/sfxmodelfactory \ sfx2/source/doc/syspath \ + sfx2/source/doc/templatedlg \ sfx2/source/explorer/nochaos \ sfx2/source/inet/inettbc \ sfx2/source/menu/mnuitem \ diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h index 31109d5..3cd7d85 100644 --- a/sfx2/inc/sfx2/sfxcommands.h +++ b/sfx2/inc/sfx2/sfxcommands.h @@ -193,6 +193,7 @@ #define CMD_SID_OPENTEMPLATE ".uno:OpenTemplate" #define CMD_SID_OPENURL ".uno:OpenUrl" #define CMD_SID_OPTIONS ".uno:Options" +#define CMD_SID_TEMPLATE_MANAGER ".uno:TemplateManager" #define CMD_SID_ORGANIZER ".uno:Organizer" #define CMD_SID_STYLE_FAMILY4 ".uno:PageStyle" #define CMD_SID_STYLE_FAMILY2 ".uno:ParaStyle" diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index fbd8995..ee1b54f 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -317,7 +317,7 @@ #define SID_PASSWORDINTERACTION (SID_SFX_START + 1723) #define SID_GOTOLINE (SID_SFX_START + 1724) #define SID_SHOWLINES (SID_SFX_START + 1725) -#define SID_SFX_free_START (SID_SFX_START + 1726) +#define SID_SFX_free_START (SID_SFX_START + 1727) #define SID_SFX_free_END (SID_SFX_START + 3999) #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) @@ -382,6 +382,8 @@ // Floating Window Template #define SID_STYLE_DESIGNER (SID_SFX_START + 539) +#define SID_TEMPLATE_MANAGER (SID_SFX_START + 1726) + // Organizer #define SID_ORGANIZER (SID_SFX_START + 540) #define SID_TEMPLATE_ADDRESSBOKSOURCE (SID_SFX_START + 1655) diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx new file mode 100644 index 0000000..a0e893d --- /dev/null +++ b/sfx2/inc/templatedlg.hxx @@ -0,0 +1,41 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Copyright 2012 LibreOffice contributors. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef TEMPLATEDLG_HXX +#define TEMPLATEDLG_HXX + +#include <vcl/dialog.hxx> +#include <vcl/button.hxx> + +class SfxTemplateManagerDlg : public ModalDialog +{ +public: + + SfxTemplateManagerDlg (Window *parent = NULL); + + ~SfxTemplateManagerDlg (); + + DECL_LINK(ViewAllHdl, void*); + DECL_LINK(ViewDocsHdl, void*); + DECL_LINK(ViewPresentsHdl, void*); + DECL_LINK(ViewSheetsHdl, void*); + DECL_LINK(ViewDrawsHdl, void*); + +private: + + PushButton aButtonAll; + PushButton aButtonDocs; + PushButton aButtonPresents; + PushButton aButtonSheets; + PushButton aButtonDraws; +}; + +#endif // TEMPLATEDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index d6d4a85..11d7e3a 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -127,6 +127,10 @@ interface Application ExecMethod = MiscExec_Impl ; StateMethod = MiscState_Impl ; ] + SID_TEMPLATE_MANAGER // ole(no) api(final/play/rec) + [ + ExecMethod = MiscExec_Impl ; + ] SID_ORGANIZER // ole(no) api(final/play/rec) [ ExecMethod = MiscExec_Impl ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 396fbb7..4ba1db7 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4419,6 +4419,30 @@ SfxVoidItem Options SID_OPTIONS GroupId = GID_OPTIONS; ] +SfxVoidItem TemplateManager SID_TEMPLATE_MANAGER +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = TRUE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_APPLICATION; +] + //-------------------------------------------------------------------------- SfxVoidItem Organizer SID_ORGANIZER () diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 1287df6..ad6012f 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -124,6 +124,7 @@ #include <sfx2/dialogs.hrc> #include "sorgitm.hxx" #include "sfx2/sfxhelp.hxx" +#include "templatedlg.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -547,6 +548,14 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) break; } + case SID_TEMPLATE_MANAGER: + { + SfxTemplateManagerDlg dlg; + dlg.Execute(); + bDone = true; + break; + } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_ORGANIZER: { diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc index aca8a3a..e93bac1 100644 --- a/sfx2/source/doc/doc.hrc +++ b/sfx2/source/doc/doc.hrc @@ -52,6 +52,7 @@ #define DLG_NEW_FILE (RID_SFX_DOC_START+1) #define DLG_DOC_TEMPLATE (RID_SFX_DOC_START+2) #define DLG_ORGANIZE (RID_SFX_DOC_START+3) +#define DLG_TEMPLATE_MANAGER (RID_SFX_DOC_START+4) #define BMP_STYLES_CLOSED (RID_SFX_DOC_START+ 0) #define BMP_STYLES_OPENED (RID_SFX_DOC_START+ 1) diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx new file mode 100644 index 0000000..00d955d --- /dev/null +++ b/sfx2/source/doc/templatedlg.cxx @@ -0,0 +1,55 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Copyright 2012 LibreOffice contributors. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <sfx2/sfxresid.hxx> + +#include "templatedlg.hxx" + +#include "doc.hrc" +#include "templatedlg.hrc" + +SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) + : ModalDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)), + aButtonAll(this,SfxResId(BTN_SELECT_ALL)), + aButtonDocs(this,SfxResId(BTN_SELECT_DOCS)), + aButtonPresents(this,SfxResId(BTN_SELECT_PRESENTATIONS)), + aButtonSheets(this,SfxResId(BTN_SELECT_SHEETS)), + aButtonDraws(this,SfxResId(BTN_SELECT_DRAWS)) +{ + aButtonAll.SetClickHdl(LINK(this,SfxTemplateManagerDlg,ViewAllHdl)); + aButtonDocs.SetClickHdl(LINK(this,SfxTemplateManagerDlg,ViewDocsHdl)); + + FreeResource(); +} + +SfxTemplateManagerDlg::~SfxTemplateManagerDlg () +{ +} + +IMPL_LINK_NOARG(SfxTemplateManagerDlg,ViewAllHdl) +{ + return 0; +} + +IMPL_LINK_NOARG(SfxTemplateManagerDlg,ViewDocsHdl) +{ + return 0; +} + +IMPL_LINK_NOARG(SfxTemplateManagerDlg,ViewPresentsHdl) +{ + return 0; +} + +IMPL_LINK_NOARG(SfxTemplateManagerDlg,ViewDrawsHdl) +{ + return 0; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/templatedlg.hrc b/sfx2/source/doc/templatedlg.hrc new file mode 100644 index 0000000..5f0a277 --- /dev/null +++ b/sfx2/source/doc/templatedlg.hrc @@ -0,0 +1,13 @@ +/* + * Copyright 2012 LibreOffice contributors. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#define BTN_SELECT_ALL 1 +#define BTN_SELECT_DOCS 2 +#define BTN_SELECT_PRESENTATIONS 3 +#define BTN_SELECT_SHEETS 4 +#define BTN_SELECT_DRAWS 5 diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src new file mode 100644 index 0000000..220a61d --- /dev/null +++ b/sfx2/source/doc/templatedlg.src @@ -0,0 +1,62 @@ +/* + * Copyright 2012 LibreOffice contributors. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "doc.hrc" +#include "templatedlg.hrc" +#include "helpid.hrc" + +ModalDialog DLG_TEMPLATE_MANAGER +{ + HelpId = CMD_SID_TEMPLATE_MANAGER; + OutputSize = TRUE; + SVLook = TRUE; + Moveable = TRUE; + Size = MAP_APPFONT ( 271 , 162 ); + Text [en-US] = "Template Manager"; + + PushButton BTN_SELECT_ALL + { + Pos = MAP_APPFONT(10,5); + Size = MAP_APPFONT(50,14); + TabStop = TRUE; + DefButton = TRUE; + Text [en-US] = "All"; + }; + + PushButton BTN_SELECT_DOCS + { + Pos = MAP_APPFONT(60,5); + Size = MAP_APPFONT(50,14); + TabStop = TRUE; + Text [en-US] = "Documents"; + }; + + PushButton BTN_SELECT_PRESENTATIONS + { + Pos = MAP_APPFONT(110,5); + Size = MAP_APPFONT(50,14); + TabStop = TRUE; + Text [en-US] = "Presentations"; + }; + + PushButton BTN_SELECT_SHEETS + { + Pos = MAP_APPFONT(160,5); + Size = MAP_APPFONT(50,14); + TabStop = TRUE; + Text [en-US] = "Spreedsheets"; + }; + + PushButton BTN_SELECT_DRAWS + { + Pos = MAP_APPFONT(210,5); + Size = MAP_APPFONT(50,14); + TabStop = TRUE; + Text [en-US] = "Drawings"; + }; +}; commit a7ddff1b801ef645bf2dfe36aacf125b4cd98c46 Author: Rafael Dominguez <[email protected]> Date: Mon May 28 20:21:44 2012 -0430 Add TemplateManager entry to File menu. - Add to startmodule, writer, impress and draw. Change-Id: I9a688861f77982b00462e997ed10d3e7d090536d diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index 055810b..d73d9aa 100755 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -14,6 +14,7 @@ <menu:menuitem menu:id=".uno:SaveAll"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:SendMail"/> + <menu:menuitem menu:id=".uno:TemplateManager"/> <menu:menu menu:id=".uno:TemplateMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:Organizer"/> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 58ad5be..b745ae0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2321,6 +2321,11 @@ <value>1</value> </prop> </node> + <node oor:name=".uno:TemplateManager" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Template Manager</value> + </prop> + </node> <node oor:name=".uno:Organizer" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">~Organize...</value> diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 965d14c..510835d 100755 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -27,6 +27,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetDocumentProperties"/> <menu:menuitem menu:id=".uno:Signature"/> + <menu:menuitem menu:id=".uno:TemplateManager"/> <menu:menu menu:id=".uno:TemplateMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:Organizer"/> diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 7c75737..f145d49 100755 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -29,6 +29,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetDocumentProperties"/> <menu:menuitem menu:id=".uno:Signature"/> + <menu:menuitem menu:id=".uno:TemplateManager"/> <menu:menu menu:id=".uno:TemplateMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:Organizer"/> diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index 25e1f8f..cf614e4 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -35,6 +35,7 @@ </menu:menu> <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetDocumentProperties"/> + <menu:menuitem menu:id=".uno:TemplateManager"/> <menu:menu menu:id=".uno:TemplateMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:Organizer"/> diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index 902e890..0825945 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -23,6 +23,7 @@ </menu:menu> <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetDocumentProperties"/> + <menu:menuitem menu:id=".uno:TemplateManager"/> <menu:menu menu:id=".uno:TemplateMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:Organizer"/> diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index e69afcd..8415bfb 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -37,6 +37,7 @@ </menu:menu> <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetDocumentProperties"/> + <menu:menuitem menu:id=".uno:TemplateManager"/> <menu:menu menu:id=".uno:TemplateMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:Organizer"/> diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index e69afcd..8415bfb 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -37,6 +37,7 @@ </menu:menu> <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetDocumentProperties"/> + <menu:menuitem menu:id=".uno:TemplateManager"/> <menu:menu menu:id=".uno:TemplateMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:Organizer"/> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 206af98..9cab1ae 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -38,6 +38,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetDocumentProperties"/> <menu:menuitem menu:id=".uno:Signature"/> + <menu:menuitem menu:id=".uno:TemplateManager"/> <menu:menu menu:id=".uno:TemplateMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:Organizer"/> diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 077a3f9..785feb2 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -38,6 +38,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetDocumentProperties"/> <menu:menuitem menu:id=".uno:Signature"/> + <menu:menuitem menu:id=".uno:TemplateManager"/> <menu:menu menu:id=".uno:TemplateMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:Organizer"/> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
