pyagenda: rework AgendaTemplate.py. Still some work to do

Change-Id: Ife802611e8aef10e5d06f04617662753d6f2ee21

wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py

@@ -57,7 +57,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
                 "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext"
             xLocMSF = Desktop.connect(ConnectStr)
             lw = AgendaWizardDialogImpl(xLocMSF)
-            lw.startWizard()
+            lw.startWizard(xLocMSF)
         except Exception as e:
             print ("Wizard failure exception " + str(type(e)) +
                    " message " + str(e) + " args " + str(e.args) +

wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py

@@ -166,5 +166,53 @@ class AgendaWizardDialogResources(Resource):
         self.resButtonDown = self.getResText(
             AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 71)
 
+        #Create a dictionary for localising the template placeholders
+        self.dictTemplatePlaceHolders = {
+            "<title>" : self.resPlaceHolderTitle,
+            "<date>" : self.resPlaceHolderDate,
+            "<time>" : self.resPlaceHolderTime,
+            "<location>" : self.resPlaceHolderLocation,
+            "<meeting-type>" : self.reschkMeetingTitle_value,
+            "<bring>" : self.reschkBring_value,
+            "<read>" : self.reschkRead_value,
+            "<notes>" : self.reschkNotes_value,
+            "<called-by>" : self.itemCalledBy,
+            "<facilitator>" : self.itemFacilitator,
+            "<attendees>" : self.itemAttendees,
+            "<notetaker>" : self.itemNotetaker,
+            "<timekeeper>" : self.itemTimekeeper,
+            "<observers>" : self.itemObservers,
+            "<resource-persons>" : self.itemResource,
+            "<num>" : "",
+            "<topic>" : "",
+            "<responsible>" : "",
+            "<topic-time>" : "",
+            "<mnum>" : "",
+            "<mtopic>" : "",
+            "<mresponsible>" : "",
+            "<mtime>" : ""}            
+            
+        '''
+        section name <b>prefix</b> for sections that contain items.
+        this is also used as table name prefix, since each items section
+        must contain a table whos name is identical name to the section's name.
+        '''
+        SECTION_ITEMS = "AGENDA_ITEMS"
+        '''
+        the name of the section which contains the topics.
+        '''
+        SECTION_TOPICS = "AGENDA_TOPICS"
+        '''
+        the name of the parent minutes section.
+        '''
+        SECTION_MINUTES_ALL = "MINUTES_ALL"
+        '''
+        the name of the child nimutes section.
+        This section will be duplicated for each topic.
+        '''
+        SECTION_MINUTES = "MINUTES"
+
+
+        #Common Resources
         self.resOverwriteWarning = self.getResText(
             AgendaWizardDialogResources.RID_COMMON_START + 19)

wizards/com/sun/star/wizards/agenda/TemplateConsts.py

-#
-# 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 .
-#
-FILLIN_TITLE = "<title>"
-FILLIN_TITLE = "<title>"
-FILLIN_DATE = "<date>"
-FILLIN_TIME = "<time>"
-FILLIN_LOCATION = "<location>"
-'''
-section name <b>prefix</b> for sections that contain items.
-this is also used as table name prefix, since each items section
-must contain a table whos name is identical name to the section's name.
-'''
-SECTION_ITEMS = "AGENDA_ITEMS"
-'''
-the name of the section which contains the topics.
-'''
-SECTION_TOPICS = "AGENDA_TOPICS"
-'''
-the name of the parent minutes section.
-'''
-SECTION_MINUTES_ALL = "MINUTES_ALL"
-'''
-the name of the child nimutes section.
-This section will be duplicated for each topic.
-'''
-SECTION_MINUTES = "MINUTES"
-'''
-taged headings and names.
-These will be searched in item tables (in the template) and will be
-replaced with resource strings.
-
-headings...
-'''
-FILLIN_MEETING_TYPE = "<meeting-type>"
-FILLIN_BRING = "<bring>"
-FILLIN_READ = "<read>"
-FILLIN_NOTES = "<notes>"
-'''
-names...
-'''
-FILLIN_CALLED_BY = "<called-by>"
-FILLIN_FACILITATOR = "<facilitator>"
-FILLIN_PARTICIPANTS = "<attendees>"
-FILLIN_NOTETAKER = "<notetaker>"
-FILLIN_TIMEKEEPER = "<timekeeper>"
-FILLIN_OBSERVERS = "<observers>"
-FILLIN_RESOURCE_PERSONS = "<resource-persons>"
-
-'''
-Fillins for the topic table.
-These strings will be searched inside the topic table as
-part of detecting its structure.
-'''
-FILLIN_TOPIC_NUMBER = "<num>"
-FILLIN_TOPIC_TOPIC = "<topic>"
-FILLIN_TOPIC_RESPONSIBLE = "<responsible>"
-FILLIN_TOPIC_TIME = "<topic-time>"
-'''
-fillins for minutes.
-These will be searched in the minutes section and will be replaced
-with the appropriate data.
-'''
-FILLIN_MINUTES_TITLE = "<minutes-title>"
-FILLIN_MINUTES_LOCATION = "<minutes-location>"
-FILLIN_MINUTES_DATE = "<minutes-date>"
-FILLIN_MINUTES_TIME = "<minutes-time>"
-'''
-Minutes-topic fillins
-These will be searched in the minutes-child-section, and
-will be replaced with topic data.
-'''
-FILLIN_MINUTE_NUM = "<mnum>"
-FILLIN_MINUTE_TOPIC = "<mtopic>"
-FILLIN_MINUTE_RESPONSIBLE = "<mresponsible>"
-FILLIN_MINUTE_TIME = "<mtime>"

wizards/com/sun/star/wizards/common/TextElement.py

@@ -30,7 +30,7 @@ class TextElement(object):
 
     def write(self):
         try:
-            if self.item is not None:
+            if self.item is not None and not self.placeHolderText:
                 self.item.String = ""
                 cursor = self.item.Text.createTextCursorByRange(
                     self.item.Start)