[Libreoffice-commits] core.git: wizards/com wizards/Pyuno_web.mk
wizards/Pyuno_web.mk |1 wizards/com/sun/star/wizards/README |5 - wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py | 14 --- wizards/com/sun/star/wizards/agenda/CallWizard.py | 16 +++ wizards/com/sun/star/wizards/common/Resource.py |3 wizards/com/sun/star/wizards/fax/CallWizard.py| 18 +++- wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 14 --- wizards/com/sun/star/wizards/letter/CallWizard.py | 16 +++ wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 14 --- wizards/com/sun/star/wizards/ui/WizardDialog.py |2 wizards/com/sun/star/wizards/web/CallWizard.py| 17 +++ wizards/com/sun/star/wizards/web/WWD_Events.py| 12 -- wizards/com/sun/star/wizards/web/WebWizard.py | 43 -- wizards/com/sun/star/wizards/web/WebWizardDialogResources.py | 12 ++ 14 files changed, 74 insertions(+), 113 deletions(-) New commits: commit 574773ac298153b97237b3432b601a83938eaf6b Author: Xisco Fauli aniste...@gmail.com Date: Fri Jan 24 22:40:45 2014 +0100 pywizards: update callRemote methods Change-Id: Id4a335b19f48738d0f2a02e3660e57701bbc7ef2 diff --git a/wizards/Pyuno_web.mk b/wizards/Pyuno_web.mk index 6b56a4d..a8e1519 100644 --- a/wizards/Pyuno_web.mk +++ b/wizards/Pyuno_web.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Pyuno_add_files,web,wizards/web,\ WWD_General.py \ WWD_Startup.py \ WWHID.py \ - WebWizard.py \ WebWizardConst.py \ WebWizardDialog.py \ WebWizardDialogResources.py \ diff --git a/wizards/com/sun/star/wizards/README b/wizards/com/sun/star/wizards/README index 473282f..c0351e9 100644 --- a/wizards/com/sun/star/wizards/README +++ b/wizards/com/sun/star/wizards/README @@ -14,6 +14,5 @@ To call a wizard remotely you need to: - Launch the wizard from wizards parent folder: python -#Fax wizard -from wizards.fax.FaxWizardDialogImpl import FaxWizardDialogImpl -FaxWizardDialogImpl.main() +from wizards.[Wizard's folder].CallWizard import CallWizard +CallWizard.callRemote() diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py index 8b21e7e..014159e 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py @@ -53,20 +53,6 @@ class AgendaWizardDialogImpl(AgendaWizardDialog): def leaveStep(self, OldStep, NewStep): pass -@classmethod -def main(self): -#Call the wizard remotely(see README) -try: -ConnectStr = \ - uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext -xLocMSF = Desktop.connect(ConnectStr) -lw = AgendaWizardDialogImpl(xLocMSF) -lw.startWizard(xLocMSF) -except Exception as e: -print (Wizard failure exception + str(type(e)) + -message + str(e) + args + str(e.args) + - traceback.format_exc()) - def startWizard(self, xMSF): self.running = True try: diff --git a/wizards/com/sun/star/wizards/agenda/CallWizard.py b/wizards/com/sun/star/wizards/agenda/CallWizard.py index 5c76249..9ca75f1 100644 --- a/wizards/com/sun/star/wizards/agenda/CallWizard.py +++ b/wizards/com/sun/star/wizards/agenda/CallWizard.py @@ -18,7 +18,7 @@ import unohelper import traceback -from .AgendaWizardDialogImpl import AgendaWizardDialogImpl +from .AgendaWizardDialogImpl import AgendaWizardDialogImpl, Desktop from com.sun.star.task import XJobExecutor @@ -38,6 +38,20 @@ class CallWizard(unohelper.Base, XJobExecutor): message + str(e) + args + str(e.args) + traceback.format_exc()) +@classmethod +def callRemote(self): +#Call the wizard remotely(see README) +try: +ConnectStr = \ + uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext +xLocMSF = Desktop.connect(ConnectStr) +lw = AgendaWizardDialogImpl(xLocMSF) +lw.startWizard(xLocMSF) +except Exception as e: +print (Wizard failure exception + str(type(e)) + +message + str(e) + args + str(e.args) + + traceback.format_exc()) + # pythonloader looks for a static g_ImplementationHelper variable g_ImplementationHelper = unohelper.ImplementationHelper() diff --git a/wizards/com/sun/star/wizards/common/Resource.py b/wizards/com/sun/star/wizards/common/Resource.py index e35820c..472f054 100644 --- a/wizards/com/sun/star/wizards/common/Resource.py +++ b/wizards/com/sun/star/wizards/common/Resource.py @@ -16,7 +16,8 @@ # the License at
[Libreoffice-commits] core.git: wizards/com wizards/Pyuno_web.mk
wizards/Pyuno_web.mk| 80 +++ wizards/com/sun/star/wizards/web/WebConfigSet.py| 209 wizards/com/sun/star/wizards/web/data/CGContent.py |6 wizards/com/sun/star/wizards/web/data/CGExporter.py |4 wizards/com/sun/star/wizards/web/data/CGSession.py |6 wizards/com/sun/star/wizards/web/data/CGSettings.py | 18 - 6 files changed, 306 insertions(+), 17 deletions(-) New commits: commit 6db890bfbb4cc86d0963599b70033b4eb32ff154 Author: Javier Fernandez jfernan...@igalia.com Date: Fri Mar 8 12:56:16 2013 + Ugly Hack: using our own WebConfigSet while the Topic stuff is not integrated. Change-Id: I0df92af6b01e5eab99212bb1587f7165c70fd59b diff --git a/wizards/Pyuno_web.mk b/wizards/Pyuno_web.mk new file mode 100644 index 000..93b312f --- /dev/null +++ b/wizards/Pyuno_web.mk @@ -0,0 +1,80 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2011 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Pyuno_Pyuno,web,$(SRCDIR)/wizards/com/sun/star/wizards/web)) + +$(eval $(call gb_Pyuno_add_files,web,\ + CallWizard.py \ + BackgroundsDialog.py \ + ErrorHandler.py \ + AbstractErrorHandler.py \ + FTPDialog.py \ + FTPDialogResources.py \ + IconsDialog.py \ + ImageListDialog.py \ + LogTaskListener.py \ + Process.py \ + ProcessErrorHandler.py \ + ProcessErrors.py \ + ProcessStatusRenderer.py \ + StatusDialog.py \ + StylePreview.py \ + TOCPreview.py \ + WWD_Events.py \ + WWD_General.py \ + WWD_Startup.py \ + WWHID.py \ + WebWizard.py \ + WebWizardConst.py \ + WebWizardDialog.py \ + WebWizardDialogResources.py \ + TypeDetection.py \ + ExtensionVerifier.py\ + WebConfigSet.py\ + __init__.py \ + data/CGArgument.py \ + data/CGContent.py \ + data/CGDesign.py \ + data/CGDocument.py \ + data/CGExporter.py \ + data/CGFilter.py \ + data/CGGeneralInfo.py \ + data/CGIconSet.py \ + data/CGImage.py \ + data/CGLayout.py \ + data/CGPublish.py \ + data/CGSession.py \ + data/CGSessionName.py \ + data/CGSettings.py \ + data/CGStyle.py\ + data/__init__.py \ + export/Exporter.py \ + export/AbstractExporter.py \ + export/CopyExporter.py \ + export/__init__.py \ +)) +$(eval $(call gb_Pyuno_set_componentfile_full,web,wizards/com/sun/star/wizards/web/web,vnd.openoffice.pymodule:wizards.web,.CallWizard)) diff --git a/wizards/com/sun/star/wizards/web/WebConfigSet.py b/wizards/com/sun/star/wizards/web/WebConfigSet.py new file mode 100644 index 000..88b49f2 --- /dev/null +++ b/wizards/com/sun/star/wizards/web/WebConfigSet.py @@ -0,0 +1,209 @@ +# +# This file is part of the LibreOffice project. +# +# 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/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the License); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# +import traceback +from ..common.ConfigGroup import ConfigGroup +from ..common.Configuration import Configuration +from ..common.XMLProvider import XMLProvider + +class WebConfigSet(ConfigGroup): +''' +After reading the configuration set items, +the ConfigSet
