[Libreoffice-commits] .: Branch 'feature/gsoc2011_wizards' - 2 commits - wizards/com

Xisco Fauli xfauli at kemper.freedesktop.org
Mon Jul 4 07:11:33 PDT 2011


 wizards/com/sun/star/wizards/fax/FaxDocument.py                    |   48 
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py            |   14 
 wizards/com/sun/star/wizards/letter/LetterDocument.py              |  231 +
 wizards/com/sun/star/wizards/letter/LetterWizardDialog.py          | 1184 +++++++++-
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py      | 1018 +++++---
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py |  243 +-
 wizards/com/sun/star/wizards/text/TextDocument.py                  |   63 
 wizards/com/sun/star/wizards/text/ViewHandler.py                   |    2 
 8 files changed, 2201 insertions(+), 602 deletions(-)

New commits:
commit 3c235ae20e5907f674212b46163792ee3df43270
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Mon Jul 4 15:10:53 2011 +0200

    Handle the letterhead layouts properly

diff --git a/wizards/com/sun/star/wizards/letter/LetterDocument.py b/wizards/com/sun/star/wizards/letter/LetterDocument.py
index b5a172f..517d0c6 100644
--- a/wizards/com/sun/star/wizards/letter/LetterDocument.py
+++ b/wizards/com/sun/star/wizards/letter/LetterDocument.py
@@ -156,104 +156,106 @@ class LetterDocument(TextDocument):
         except Exception:
             traceback.print_exc()
 
-    class BusinessPaperObject(object):
+class BusinessPaperObject(object):
 
-        xFrame = None
-
-        def __init__(self, FrameText, Width, Height, XPos, YPos):
-            self.iWidth = Width
-            self.iHeight = Height
-            self.iXPos = XPos
-            self.iYPos = YPos
-            try:
-                LetterDocument.BusinessPaperObject.xFrame = \
-                    TextDocument.xTextDocument.createInstance(
-                        "com.sun.star.text.TextFrame")
-                self.setFramePosition()
-                Helper.setUnoPropertyValue(
-                    LetterDocument.BusinessPaperObject.xFrame,
-                    "AnchorType", AT_PAGE)
-                Helper.setUnoPropertyValue(
-                    LetterDocument.BusinessPaperObject.xFrame,
-                    "SizeType", FIX)
+    def __init__(self, FrameText, Width, Height, XPos, YPos):
+        self.iWidth = Width
+        self.iHeight = Height
+        self.iXPos = XPos
+        self.iYPos = YPos
+        self.xFrame = None
+        try:
+            self.xFrame = \
+                TextDocument.xTextDocument.createInstance(
+                    "com.sun.star.text.TextFrame")
+            self.setFramePosition()
+            Helper.setUnoPropertyValue(
+                self.xFrame,
+                "AnchorType", AT_PAGE)
+            Helper.setUnoPropertyValue(
+                self.xFrame,
+                "SizeType", FIX)
 
-                Helper.setUnoPropertyValue(
-                    LetterDocument.BusinessPaperObject.xFrame,
-                    "TextWrap", THROUGHT)
-                Helper.setUnoPropertyValue(
-                    LetterDocument.BusinessPaperObject.xFrame,
-                    "Opaque", True);
-                Helper.setUnoPropertyValue(
-                    LetterDocument.BusinessPaperObject.xFrame,
-                    "BackColor", 15790320)
+            Helper.setUnoPropertyValue(
+                self.xFrame,
+                "TextWrap", THROUGHT)
+            Helper.setUnoPropertyValue(
+                self.xFrame,
+                "Opaque", True);
+            Helper.setUnoPropertyValue(
+                self.xFrame,
+                "BackColor", 15790320)
 
-                myBorder = BorderLine()
-                myBorder.OuterLineWidth = 0
-                Helper.setUnoPropertyValue(
-                    LetterDocument.BusinessPaperObject.xFrame,
-                    "LeftBorder", myBorder)
-                Helper.setUnoPropertyValue(
-                    LetterDocument.BusinessPaperObject.xFrame,
-                    "RightBorder", myBorder)
-                Helper.setUnoPropertyValue(
-                    LetterDocument.BusinessPaperObject.xFrame,
-                    "TopBorder", myBorder)
-                Helper.setUnoPropertyValue(
-                    LetterDocument.BusinessPaperObject.xFrame,
-                    "BottomBorder", myBorder)
-                Helper.setUnoPropertyValue(
-                    LetterDocument.BusinessPaperObject.xFrame,
-                    "Print", False)
+            myBorder = BorderLine()
+            myBorder.OuterLineWidth = 0
+            Helper.setUnoPropertyValue(
+                self.xFrame,
+                "LeftBorder", myBorder)
+            Helper.setUnoPropertyValue(
+                self.xFrame,
+                "RightBorder", myBorder)
+            Helper.setUnoPropertyValue(
+                self.xFrame,
+                "TopBorder", myBorder)
+            Helper.setUnoPropertyValue(
+                self.xFrame,
+                "BottomBorder", myBorder)
+            Helper.setUnoPropertyValue(
+                self.xFrame,
+                "Print", False)
 
-                xTextCursor = \
-                    TextDocument.xTextDocument.Text.createTextCursor()
-                xTextCursor.gotoEnd(True)
-                xText = TextDocument.xTextDocument.Text
-                xText.insertTextContent(
-                    xTextCursor, LetterDocument.BusinessPaperObject.xFrame,
-                    False)
+            xTextCursor = \
+                TextDocument.xTextDocument.Text.createTextCursor()
+            xTextCursor.gotoEnd(True)
+            xText = TextDocument.xTextDocument.Text
+            xText.insertTextContent(
+                xTextCursor, self.xFrame,
+                False)
 
-                xFrameText = LetterDocument.BusinessPaperObject.xFrame.Text
-                xFrameCursor = xFrameText.createTextCursor()
-                xFrameCursor.setPropertyValue("CharWeight", BOLD)
-                xFrameCursor.setPropertyValue("CharColor", 16777215)
-                xFrameCursor.setPropertyValue("CharFontName", "Albany")
-                xFrameCursor.setPropertyValue("CharHeight", 18)
+            xFrameText = self.xFrame.Text
+            xFrameCursor = xFrameText.createTextCursor()
+            xFrameCursor.setPropertyValue("CharWeight", BOLD)
+            xFrameCursor.setPropertyValue("CharColor", 16777215)
+            xFrameCursor.setPropertyValue("CharFontName", "Albany")
+            xFrameCursor.setPropertyValue("CharHeight", 18)
 
-                xFrameText.insertString(xFrameCursor, FrameText, False)
-            except Exception:
-                traceback.print_exc()
+            xFrameText.insertString(xFrameCursor, FrameText, False)
+        except Exception:
+            traceback.print_exc()
 
-        def setFramePosition(self):
+    def setFramePosition(self):
+        try:
             Helper.setUnoPropertyValue(
-                LetterDocument.BusinessPaperObject.xFrame,
+                self.xFrame,
                 "HoriOrient", NONEHORI)
             Helper.setUnoPropertyValue(
-                LetterDocument.BusinessPaperObject.xFrame,
+                self.xFrame,
                 "VertOrient", NONEVERT)
             Helper.setUnoPropertyValue(
-                LetterDocument.BusinessPaperObject.xFrame,
+                self.xFrame,
                 PropertyNames.PROPERTY_HEIGHT, self.iHeight)
             Helper.setUnoPropertyValue(
-                LetterDocument.BusinessPaperObject.xFrame,
+                self.xFrame,
                 PropertyNames.PROPERTY_WIDTH, self.iWidth)
             Helper.setUnoPropertyValue(
-                LetterDocument.BusinessPaperObject.xFrame,
+                self.xFrame,
                 "HoriOrientPosition", self.iXPos)
             Helper.setUnoPropertyValue(
-                LetterDocument.BusinessPaperObject.xFrame,
+                self.xFrame,
                 "VertOrientPosition", self.iYPos)
             Helper.setUnoPropertyValue(
-                LetterDocument.BusinessPaperObject.xFrame,
+                self.xFrame,
                 "HoriOrientRelation", PAGE_FRAME)
             Helper.setUnoPropertyValue(
-                LetterDocument.BusinessPaperObject.xFrame,
+                self.xFrame,
                 "VertOrientRelation", PAGE_FRAME)
+        except Exception:
+            traceback.print_exc()
 
-        def removeFrame(self):
-            if LetterDocument.BusinessPaperObject.xFrame is not None:
-                try:
-                    TextDocument.xTextDocument.Text.removeTextContent(
-                        LetterDocument.BusinessPaperObject.xFrame)
-                except Exception:
-                    traceback.print_exc()
+    def removeFrame(self):
+        if self.xFrame is not None:
+            try:
+                TextDocument.xTextDocument.Text.removeTextContent(
+                    self.xFrame)
+            except Exception:
+                traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index f1eb6af..d247286 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -405,39 +405,39 @@ class LetterWizardDialogImpl(LetterWizardDialog):
         self.activate()
 
     def numLogoHeightTextChanged(self):
-        self.BusCompanyLogo.iHeight = numLogoHeight.Value * 1000
+        self.BusCompanyLogo.iHeight = int(self.numLogoHeight.Value * 1000)
         self.BusCompanyLogo.setFramePosition()
 
     def numLogoWidthTextChanged(self):
-        self.BusCompanyLogo.iWidth = numLogoWidth.Value * 1000
+        self.BusCompanyLogo.iWidth = int(self.numLogoWidth.Value * 1000)
         self.BusCompanyLogo.setFramePosition()
 
     def numLogoXTextChanged(self):
-        self.BusCompanyLogo.iXPos = numLogoX.Value * 1000
+        self.BusCompanyLogo.iXPos = int(self.numLogoX.Value * 1000)
         self.BusCompanyLogo.setFramePosition()
 
     def numLogoYTextChanged(self):
-        self.BusCompanyLogo.iYPos = numLogoY.Value * 1000
+        self.BusCompanyLogo.iYPos = int(self.numLogoY.Value * 1000)
         self.BusCompanyLogo.setFramePosition()
 
     def numAddressWidthTextChanged(self):
-        self.BusCompanyAddress.iWidth = self.numAddressWidth.Value * 1000
+        self.BusCompanyAddress.iWidth = int(self.numAddressWidth.Value * 1000)
         self.BusCompanyAddress.setFramePosition()
 
     def numAddressXTextChanged(self):
-        self.BusCompanyAddress.iXPos = self.numAddressX.Value * 1000
+        self.BusCompanyAddress.iXPos = int(self.numAddressX.Value * 1000)
         self.BusCompanyAddress.setFramePosition()
 
     def numAddressYTextChanged(self):
-        self.BusCompanyAddress.iYPos = self.numAddressY.Value * 1000
+        self.BusCompanyAddress.iYPos = int(self.numAddressY.Value * 1000)
         self.BusCompanyAddress.setFramePosition()
 
     def numAddressHeightTextChanged(self):
-        self.BusCompanyAddress.iHeight = self.numAddressHeight.Value * 1000
+        self.BusCompanyAddress.iHeight = int(self.numAddressHeight.Value * 1000)
         self.BusCompanyAddress.setFramePosition()
 
     def numFooterHeightTextChanged(self):
-        self.BusFooter.iHeight = self.numFooterHeight.Value * 1000
+        self.BusFooter.iHeight = int(self.numFooterHeight.Value * 1000)
         self.BusFooter.iYPos = \
             self.myLetterDoc.DocSize.Height - self.BusFooter.iHeight
         self.BusFooter.setFramePosition()
@@ -449,9 +449,10 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 
             if self.numLogoHeight.Value == 0:
                 self.numLogoHeight.Value = 0.1
-            self.BusCompanyLogo = LetterDocument.BusinessPaperObject(
-                "Company Logo", self.numLogoWidth.Value * 1000,
-                self.numLogoHeight.Value * 1000, self.numLogoX.Value * 1000,
+            self.BusCompanyLogo = BusinessPaperObject(
+                "Company Logo", int(self.numLogoWidth.Value * 1000),
+                int(self.numLogoHeight.Value * 1000),
+                int(self.numLogoX.Value * 1000),
                 self.numLogoY.Value * 1000)
             self.setControlProperty(
             "numLogoHeight", PropertyNames.PROPERTY_ENABLED, True)
@@ -500,10 +501,11 @@ class LetterWizardDialogImpl(LetterWizardDialog):
             if self.numAddressHeight.Value == 0:
                 self.numAddressHeight.Value = 0.1
 
-            self.BusCompanyAddress = LetterDocument.BusinessPaperObject(
-                "Company Address", self.numAddressWidth.Value * 1000,
-                self.numAddressHeight.Value * 1000,
-                self.numAddressX.Value * 1000, self.numAddressY.Value * 1000)
+            self.BusCompanyAddress = BusinessPaperObject(
+                "Company Address", int(self.numAddressWidth.Value * 1000),
+                int(self.numAddressHeight.Value * 1000),
+                int(self.numAddressX.Value * 1000),
+                int(self.numAddressY.Value * 1000))
             self.setControlProperty(
             "self.numAddressHeight", PropertyNames.PROPERTY_ENABLED, True)
             self.setControlProperty(
@@ -571,10 +573,9 @@ class LetterWizardDialogImpl(LetterWizardDialog):
                 iFrameY = int(Helper.getUnoPropertyValue(
                     xReceiverFrame, "VertOrientPosition"))
                 iReceiverHeight = int(0.5 * 1000)
-                self.BusCompanyAddressReceiver = \
-                    LetterDocument.BusinessPaperObject(
-                        " ", iFrameWidth, iReceiverHeight, iFrameX,
-                        iFrameY - iReceiverHeight)
+                self.BusCompanyAddressReceiver = BusinessPaperObject(
+                    " ", iFrameWidth, iReceiverHeight, iFrameX,
+                    iFrameY - iReceiverHeight)
                 self.setPossibleAddressReceiver(False)
             except NoSuchElementException:
                 traceback.print_exc()
@@ -601,11 +602,11 @@ class LetterWizardDialogImpl(LetterWizardDialog):
             if self.numFooterHeight.Value == 0:
                 self.numFooterHeight.Value = 0.1
 
-            self.BusFooter = LetterDocument.BusinessPaperObject(
+            self.BusFooter = BusinessPaperObject(
                 "Footer", self.myLetterDoc.DocSize.Width,
-                self.numFooterHeight.Value * 1000, 0,
-                self.myLetterDoc.DocSize.Height - \
-                    (self.numFooterHeight.Value * 1000))
+                int(self.numFooterHeight.Value * 1000), 0,
+                int(self.myLetterDoc.DocSize.Height - \
+                    (self.numFooterHeight.Value * 1000)))
             self.setControlProperty(
             "self.numFooterHeight", PropertyNames.PROPERTY_ENABLED, True)
             self.setControlProperty(
@@ -619,7 +620,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
             "self.numFooterHeight", PropertyNames.PROPERTY_ENABLED, False)
             self.setControlProperty(
             "lblFooterHeight", PropertyNames.PROPERTY_ENABLED, False)
-            setPossibleFooter(True)
+            self.setPossibleFooter(True)
 
     def chkUseLogoItemChanged(self):
         try:
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py
index ebff4a4..9a4e741 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.py
+++ b/wizards/com/sun/star/wizards/text/TextDocument.py
@@ -251,6 +251,7 @@ class TextDocument(object):
     def removeTextContent(self, oTextContent):
         try:
             self.xText.removeTextContent(oxTextContent)
+            print "remove"
             return True
         except NoSuchElementException, e:
             traceback.print_exc()
commit 6ae4e4b6445c186e1591d413008596a702dd3aaa
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Mon Jul 4 12:01:08 2011 +0200

    apply python style and fix some minor things

diff --git a/wizards/com/sun/star/wizards/fax/FaxDocument.py b/wizards/com/sun/star/wizards/fax/FaxDocument.py
index a744a7c..9ee53cd 100644
--- a/wizards/com/sun/star/wizards/fax/FaxDocument.py
+++ b/wizards/com/sun/star/wizards/fax/FaxDocument.py
@@ -20,29 +20,30 @@ class FaxDocument(TextDocument):
     def switchElement(self, sElement, bState):
         try:
             mySectionHandler = TextSectionHandler(self.xMSF,
-                self.xTextDocument)
+                TextDocument.xTextDocument)
             oSection = \
                 mySectionHandler.xTextDocument.TextSections.getByName(sElement)
             Helper.setUnoPropertyValue(oSection,"IsVisible",bState)
-        except Exception, exception:
+        except Exception:
             traceback.print_exc()
 
     def updateDateFields(self):
-        FH = TextFieldHandler(self.xTextDocument, self.xTextDocument)
+        FH = TextFieldHandler(
+            TextDocument.xTextDocument, TextDocument.xTextDocument)
         FH.updateDateFields()
 
     def switchFooter(self, sPageStyle, bState, bPageNumber, sText):
-        if self.xTextDocument is not None:
-            self.xTextDocument.lockControllers()
+        if TextDocument.xTextDocument is not None:
+            TextDocument.xTextDocument.lockControllers()
             try:
-
                 xPageStyleCollection = \
-                    self.xTextDocument.StyleFamilies.getByName("PageStyles")
+                    TextDocument.xTextDocument.StyleFamilies.getByName("PageStyles")
                 xPageStyle = xPageStyleCollection.getByName(sPageStyle)
 
                 if bState:
                     xPageStyle.setPropertyValue("FooterIsOn", True)
-                    xFooterText = Helper.getUnoPropertyValue(xPageStyle, "FooterText")
+                    xFooterText = \
+                        Helper.getUnoPropertyValue(xPageStyle, "FooterText")
                     xFooterText.String = sText
 
                     if bPageNumber:
@@ -53,8 +54,9 @@ class FaxDocument(TextDocument):
                             PARAGRAPH_BREAK, False)
                         myCursor.setPropertyValue("ParaAdjust", CENTER )
 
-                        xPageNumberField = self.xTextDocument.createInstance(
-                            "com.sun.star.text.TextField.PageNumber")
+                        xPageNumberField = \
+                            TextDocument.xTextDocument.createInstance(
+                                "com.sun.star.text.TextField.PageNumber")
                         xPageNumberField.setPropertyValue("SubType", CURRENT)
                         xPageNumberField.NumberingType = ARABIC
                         xFooterText.insertTextContent(xFooterText.End,
@@ -63,20 +65,21 @@ class FaxDocument(TextDocument):
                     Helper.setUnoPropertyValue(xPageStyle, "FooterIsOn",
                         False)
 
-                self.xTextDocument.unlockControllers()
-            except Exception, exception:
+                TextDocument.xTextDocument.unlockControllers()
+            except Exception:
                 traceback.print_exc()
 
     def hasElement(self, sElement):
-        if self.xTextDocument is not None:
+        if TextDocument.xTextDocument is not None:
             mySectionHandler = TextSectionHandler(self.xMSF,
-                self.xTextDocument)
+                TextDocument.xTextDocument)
             return mySectionHandler.hasTextSectionByName(sElement)
         else:
             return False
 
     def switchUserField(self, sFieldName, sNewContent, bState):
-        myFieldHandler = TextFieldHandler(self.xMSF, self.xTextDocument)
+        myFieldHandler = TextFieldHandler(
+            self.xMSF, TextDocument.xTextDocument)
         if bState:
             myFieldHandler.changeUserFieldContent(sFieldName, sNewContent)
         else:
@@ -84,8 +87,8 @@ class FaxDocument(TextDocument):
 
     def fillSenderWithUserData(self):
         try:
-            myFieldHandler = TextFieldHandler(self.xTextDocument,
-                self.xTextDocument)
+            myFieldHandler = TextFieldHandler(TextDocument.xTextDocument,
+                TextDocument.xTextDocument)
             oUserDataAccess = Configuration.getConfigurationRoot(
                 self.xMSF, "org.openoffice.UserProfile/Data", False)
             myFieldHandler.changeUserFieldContent("Company",
@@ -102,26 +105,27 @@ class FaxDocument(TextDocument):
             myFieldHandler.changeUserFieldContent("Fax",
                 Helper.getUnoObjectbyName(oUserDataAccess,
                 "facsimiletelephonenumber"))
-        except Exception, exception:
+        except Exception:
             traceback.print_exc()
 
     def killEmptyUserFields(self):
-        myFieldHandler = TextFieldHandler(self.xMSF, self.xTextDocument)
+        myFieldHandler = TextFieldHandler(
+            self.xMSF, TextDocument.xTextDocument)
         myFieldHandler.removeUserFieldByContent("")
 
     def killEmptyFrames(self):
         try:
             if not self.keepLogoFrame:
                 xTF = self.getFrameByName("Company Logo",
-                self.xTextDocument)
+                TextDocument.xTextDocument)
                 if xTF is not None:
                     xTF.dispose()
 
             if not self.keepTypeFrame:
                 xTF = self.getFrameByName("Communication Type",
-                self.xTextDocument)
+                TextDocument.xTextDocument)
                 if xTF is not None:
                     xTF.dispose()
 
-        except Exception, e:
+        except Exception:
             traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 5564283..f4495e2 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -164,7 +164,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             self.myFaxDoc.keepTypeFrame = \
                 (self.chkUseCommunicationType.State is not 0)
             self.myFaxDoc.killEmptyFrames()
-            self.bSaveSuccess = OfficeDocument.store(self.xMSF, self.xTextDocument,
+            self.bSaveSuccess = OfficeDocument.store(self.xMSF, TextDocument.xTextDocument,
                 self.sPath, "writer8_template")
             if self.bSaveSuccess:
                 self.saveConfiguration()
@@ -440,7 +440,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.__enableSenderReceiver()
         self.__setPossibleFooter(True)
     def lstBusinessStyleItemChanged(self):
-        self.xTextDocument = self.myFaxDoc.loadAsPreview( \
+        TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( \
             self.BusinessFiles[1][self.lstBusinessStyle.SelectedItemPos],
                 False)
         self.initializeElements()
@@ -462,14 +462,14 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.__setPossibleFooter(False)
 
     def lstPrivateStyleItemChanged(self):
-        self.xTextDocument = self.myFaxDoc.loadAsPreview( \
+        TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( \
             self.PrivateFiles[1][self.lstPrivateStyle.SelectedItemPos],
                 False)
         self.initializeElements()
         self.setElements()
 
     def txtTemplateNameTextChanged(self):
-        xDocProps = self.xTextDocument.DocumentProperties
+        xDocProps = TextDocument.xTextDocument.DocumentProperties
         xDocProps.Title = self.txtTemplateName.Text
 
     def optSenderPlaceholderItemChanged(self):
@@ -518,7 +518,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             PropertyNames.PROPERTY_ENABLED, True)
 
         self.myFieldHandler = TextFieldHandler(self.myFaxDoc.xMSF,
-            self.xTextDocument)
+            TextDocument.xTextDocument)
         self.txtSenderNameTextChanged()
         self.txtSenderStreetTextChanged()
         self.txtSenderPostCodeTextChanged()
@@ -527,11 +527,11 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.txtSenderFaxTextChanged()
 
     def optReceiverPlaceholderItemChanged(self):
-        OfficeDocument.attachEventCall(self.xTextDocument, "OnNew",
+        OfficeDocument.attachEventCall(TextDocument.xTextDocument, "OnNew",
             "StarBasic", "macro:#/Template.Correspondence.Placeholder()")
 
     def optReceiverDatabaseItemChanged(self):
-        OfficeDocument.attachEventCall(self.xTextDocument, "OnNew",
+        OfficeDocument.attachEventCall(TextDocument.xTextDocument, "OnNew",
             "StarBasic", "macro:#/Template.Correspondence.Database()")
 
     def optCreateFaxItemChanged(self):
diff --git a/wizards/com/sun/star/wizards/letter/LetterDocument.py b/wizards/com/sun/star/wizards/letter/LetterDocument.py
index 2d630ae..b5a172f 100644
--- a/wizards/com/sun/star/wizards/letter/LetterDocument.py
+++ b/wizards/com/sun/star/wizards/letter/LetterDocument.py
@@ -1,14 +1,25 @@
 from text.TextDocument import *
 from text.TextSectionHandler import TextSectionHandler
+from text.TextFieldHandler import TextFieldHandler
+from com.sun.star.table import BorderLine
 from common.PropertyNames import PropertyNames
 
 from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
 from com.sun.star.style.ParagraphAdjust import CENTER
 from com.sun.star.text.PageNumberType import CURRENT
 from com.sun.star.style.NumberingType import ARABIC
+from com.sun.star.text.HoriOrientation import NONE as NONEHORI
+from com.sun.star.text.VertOrientation import NONE as NONEVERT
+from com.sun.star.text.RelOrientation import PAGE_FRAME
+from com.sun.star.text.TextContentAnchorType import AT_PAGE
+from com.sun.star.text.SizeType import FIX
+from com.sun.star.text.WrapTextMode import THROUGHT
+from com.sun.star.awt.FontWeight import BOLD
 
 class LetterDocument(TextDocument):
 
+    TextDocument = None
+
     def __init__(self, xMSF, listener):
         super(LetterDocument,self).__init__(xMSF, listener, None,
             "WIZARD_LIVE_PREVIEW")
@@ -20,53 +31,65 @@ class LetterDocument(TextDocument):
 
     def switchElement(self, sElement, bState):
         try:
-            mySectionHandler = TextSectionHandler(self.xMSF, self.xTextDocument)
-            oSection = mySectionHandler.xTextDocument.TextSections.getByName(sElement)
+            mySectionHandler = TextSectionHandler(
+                self.xMSF, TextDocument.xTextDocument)
+            oSection = \
+                mySectionHandler.xTextDocument.TextSections.getByName(sElement)
             Helper.setUnoPropertyValue(oSection, "IsVisible", bState)
-        except Exception, exception:
+        except Exception:
             traceback.print_exc()
 
     def updateDateFields(self):
-        FH = TextFieldHandler(self.xTextDocument, self.xTextDocument)
+        FH = TextFieldHandler(
+            TextDocument.xTextDocument, TextDocument.xTextDocument)
         FH.updateDateFields()
 
     def switchFooter(self, sPageStyle, bState, bPageNumber, sText):
-        if self.xTextDocument is not None:
-            self.xTextDocument.lockControllers()
+        if TextDocument.xTextDocument != None:
             try:
-                xNameAccess = self.xTextDocument.StyleFamilies
+                TextDocument.xTextDocument.lockControllers()
+                xNameAccess = TextDocument.xTextDocument.StyleFamilies
                 xPageStyleCollection = xNameAccess.getByName("PageStyles")
                 xPageStyle = xPageStyleCollection.getByName(sPageStyle)
                 if bState:
-                    Helper.setUnoPropertyValue(xPageStyle, "FooterIsOn",True)
-                    xFooterText = Helper.getUnoPropertyValue(xPageStyle, "FooterText")
+                    Helper.setUnoPropertyValue(xPageStyle, "FooterIsOn", True)
+                    xFooterText = \
+                        Helper.getUnoPropertyValue(xPageStyle, "FooterText")
                     xFooterText.String = sText
                     if bPageNumber:
                         #Adding the Page Number
-                        myCursor = xFooterText.createTextCursor()
+                        myCursor = xFooterText.Text.createTextCursor()
                         myCursor.gotoEnd(False)
-                        xFooterText.insertControlCharacter(myCursor, PARAGRAPH_BREAK, False)
-                        myCursor.setPropertyValue("ParaAdjust", CENTER)
-                        xPageNumberField = self.xTextDocument.createInstance("com.sun.star.text.TextField.PageNumber")
+                        xFooterText.insertControlCharacter(myCursor,
+                            PARAGRAPH_BREAK, False)
+                        myCursor.setPropertyValue("ParaAdjust", CENTER )
+
+                        xPageNumberField = \
+                            TextDocument.xTextDocument.createInstance(
+                                "com.sun.star.text.TextField.PageNumber")
                         xPageNumberField.setPropertyValue("SubType", CURRENT)
-                        xPageNumberField.setPropertyValue("NumberingType", ARABIC)
-                        xFooterText.insertTextContent(xFooterText.getEnd(), xPageNumberField, False)
+                        xPageNumberField.NumberingType = ARABIC
+                        xFooterText.insertTextContent(xFooterText.End,
+                            xPageNumberField, False)
+
                 else:
-                    Helper.setUnoPropertyValue(xPageStyle, "FooterIsOn", False)
+                    Helper.setUnoPropertyValue(
+                        xPageStyle, "FooterIsOn", False)
 
-                self.xTextDocument.unlockControllers()
-            except Exception, exception:
+                TextDocument.xTextDocument.unlockControllers()
+            except Exception:
                 traceback.print_exc()
 
     def hasElement(self, sElement):
-        if self.xTextDocument is not None:
-            SH = TextSectionHandler(self.xMSF, self.xTextDocument)
+        if TextDocument.xTextDocument != None:
+            SH = TextSectionHandler(self.xMSF, TextDocument.xTextDocument)
             return SH.hasTextSectionByName(sElement)
         else:
             return False
 
     def switchUserField(self, sFieldName, sNewContent, bState):
-        myFieldHandler = TextFieldHandler(self.xMSF, self.xTextDocument)
+        myFieldHandler = TextFieldHandler(
+            self.xMSF, TextDocument.xTextDocument)
         if bState:
             myFieldHandler.changeUserFieldContent(sFieldName, sNewContent)
         else:
@@ -74,107 +97,163 @@ class LetterDocument(TextDocument):
 
     def fillSenderWithUserData(self):
         try:
-            myFieldHandler = TextFieldHandler(self.xMSF, self.xTextDocument)
-            oUserDataAccess = Configuration.getConfigurationRoot(self.xMSF, "org.openoffice.UserProfile/Data", False)
-            myFieldHandler.changeUserFieldContent("Company", Helper.getUnoObjectbyName(oUserDataAccess, "o"))
-            myFieldHandler.changeUserFieldContent("Street", Helper.getUnoObjectbyName(oUserDataAccess, "street"))
-            myFieldHandler.changeUserFieldContent("PostCode", Helper.getUnoObjectbyName(oUserDataAccess, "postalcode"))
-            myFieldHandler.changeUserFieldContent("City", Helper.getUnoObjectbyName(oUserDataAccess, "l"))
-            myFieldHandler.changeUserFieldContent(PropertyNames.PROPERTY_STATE, Helper.getUnoObjectbyName(oUserDataAccess, "st"))
-        except Exception, exception:
+            myFieldHandler = TextFieldHandler(
+                TextDocument.xTextDocument, TextDocument.xTextDocument)
+            oUserDataAccess = Configuration.getConfigurationRoot(
+                self.xMSF, "org.openoffice.UserProfile/Data", False)
+            myFieldHandler.changeUserFieldContent(
+                "Company", Helper.getUnoObjectbyName(oUserDataAccess, "o"))
+            myFieldHandler.changeUserFieldContent(
+                "Street", Helper.getUnoObjectbyName(oUserDataAccess, "street"))
+            myFieldHandler.changeUserFieldContent(
+                "PostCode",
+                Helper.getUnoObjectbyName(oUserDataAccess, "postalcode"))
+            myFieldHandler.changeUserFieldContent(
+                "City", Helper.getUnoObjectbyName(oUserDataAccess, "l"))
+            myFieldHandler.changeUserFieldContent(
+                PropertyNames.PROPERTY_STATE,
+                Helper.getUnoObjectbyName(oUserDataAccess, "st"))
+        except Exception:
             traceback.print_exc()
 
     def killEmptyUserFields(self):
-        myFieldHandler = TextFieldHandle(self.xMSF, self.xTextDocument)
+        myFieldHandler = TextFieldHandler(
+            self.xMSF, TextDocument.xTextDocument)
         myFieldHandler.removeUserFieldByContent("")
 
     def killEmptyFrames(self):
         try:
             if not self.keepLogoFrame:
-                xTF = TextFrameHandler.getFrameByName("Company Logo", self.xTextDocument)
-            if xTF is not None:
-                xTF.dispose()
+                xTF = self.getFrameByName(
+                    "Company Logo", TextDocument.xTextDocument)
+                if xTF != None:
+                    xTF.dispose()
 
             if not self.keepBendMarksFrame:
-                xTF = TextFrameHandler.getFrameByName("Bend Marks", self.xTextDocument)
-            if xTF is not None:
-                xTF.dispose()
+                xTF = self.getFrameByName(
+                    "Bend Marks", TextDocument.xTextDocument)
+                if xTF != None:
+                    xTF.dispose()
 
             if not self.keepLetterSignsFrame:
-                xTF = TextFrameHandler.getFrameByName("Letter Signs", self.xTextDocument)
-            if xTF is not None:
-                xTF.dispose()
+                xTF = self.getFrameByName(
+                    "Letter Signs", TextDocument.xTextDocument)
+                if xTF != None:
+                    xTF.dispose()
 
             if not self.keepSenderAddressRepeatedFrame:
-                xTF = TextFrameHandler.getFrameByName("Sender Address Repeated", self.xTextDocument)
-            if xTF is not None:
-                xTF.dispose()
+                xTF = self.getFrameByName(
+                    "Sender Address Repeated", TextDocument.xTextDocument)
+                if xTF != None:
+                    xTF.dispose()
 
             if not self.keepAddressFrame:
-                xTF = TextFrameHandler.getFrameByName("Sender Address", self.xTextDocument)
-            if xTF is not None:
-                xTF.dispose()
+                xTF = self.getFrameByName(
+                    "Sender Address", TextDocument.xTextDocument)
+                if xTF != None:
+                    xTF.dispose()
 
-        except Exception, e:
+        except Exception:
             traceback.print_exc()
 
-class BusinessPaperObject(object):
+    class BusinessPaperObject(object):
 
-    def __init__(self, FrameText, Width, Height, XPos, YPos):
-        self.iWidth = Width
-        self.iHeight = Height
-        self.iXPos = XPos
-        self.iYPos = YPos
+        xFrame = None
 
-        try:
-            xFrame = self.xTextDocument.createInstance("com.sun.star.text.TextFrame")
-            self.setFramePosition()
-            Helper.setUnoPropertyValue(xFrame, "AnchorType", TextContentAnchorType.AT_PAGE)
-            Helper.setUnoPropertyValue(xFrame, "SizeType", SizeType.FIX)
-
-            Helper.setUnoPropertyValue(xFrame, "TextWrap", WrapTextMode.THROUGHT)
-            Helper.setUnoPropertyValue(xFrame, "Opaque", Boolean.TRUE)
-            Helper.setUnoPropertyValue(xFrame, "BackColor", 15790320)
-
-            myBorder = BorderLine()
-            myBorder.OuterLineWidth = 0
-            Helper.setUnoPropertyValue(xFrame, "LeftBorder", myBorder)
-            Helper.setUnoPropertyValue(xFrame, "RightBorder", myBorder)
-            Helper.setUnoPropertyValue(xFrame, "TopBorder", myBorder)
-            Helper.setUnoPropertyValue(xFrame, "BottomBorder", myBorder)
-            Helper.setUnoPropertyValue(xFrame, "Print", False)
-
-            xTextCursor = self.xTextDocument.Text.createTextCursor()
-            xTextCursor.gotoEnd(True)
-            xText = self.xTextDocument.Text
-            xText.insertTextContent(xTextCursor, xFrame, False)
-
-            xFrameText = xFrame.Text
-            xFrameCursor = xFrameText.createTextCursor()
-            xFrameCursor.setPropertyValue("CharWeight", com.sun.star.awt.FontWeight.BOLD)
-            xFrameCursor.setPropertyValue("CharColor", 16777215)
-            xFrameCursor.setPropertyValue("CharFontName", "Albany")
-            xFrameCursor.setPropertyValue("CharHeight", 18)
-
-            xFrameText.insertString(xFrameCursor, FrameText, False)
+        def __init__(self, FrameText, Width, Height, XPos, YPos):
+            self.iWidth = Width
+            self.iHeight = Height
+            self.iXPos = XPos
+            self.iYPos = YPos
+            try:
+                LetterDocument.BusinessPaperObject.xFrame = \
+                    TextDocument.xTextDocument.createInstance(
+                        "com.sun.star.text.TextFrame")
+                self.setFramePosition()
+                Helper.setUnoPropertyValue(
+                    LetterDocument.BusinessPaperObject.xFrame,
+                    "AnchorType", AT_PAGE)
+                Helper.setUnoPropertyValue(
+                    LetterDocument.BusinessPaperObject.xFrame,
+                    "SizeType", FIX)
 
-        except Exception:
-            traceback.print_exc()
+                Helper.setUnoPropertyValue(
+                    LetterDocument.BusinessPaperObject.xFrame,
+                    "TextWrap", THROUGHT)
+                Helper.setUnoPropertyValue(
+                    LetterDocument.BusinessPaperObject.xFrame,
+                    "Opaque", True);
+                Helper.setUnoPropertyValue(
+                    LetterDocument.BusinessPaperObject.xFrame,
+                    "BackColor", 15790320)
 
-    def setFramePosition(self):
-        Helper.setUnoPropertyValue(xFrame, "HoriOrient", HoriOrientation.NONE)
-        Helper.setUnoPropertyValue(xFrame, "VertOrient", VertOrientation.NONE)
-        Helper.setUnoPropertyValue(xFrame, PropertyNames.PROPERTY_HEIGHT, iHeight)
-        Helper.setUnoPropertyValue(xFrame, PropertyNames.PROPERTY_WIDTH, iWidth)
-        Helper.setUnoPropertyValue(xFrame, "HoriOrientPosition", iXPos)
-        Helper.setUnoPropertyValue(xFrame, "VertOrientPosition", iYPos)
-        Helper.setUnoPropertyValue(xFrame, "HoriOrientRelation", RelOrientation.PAGE_FRAME)
-        Helper.setUnoPropertyValue(xFrame, "VertOrientRelation", RelOrientation.PAGE_FRAME)
-
-    def removeFrame(self):
-        if xFrame is not None:
-            try:
-                self.xTextDocument.Text.removeTextContent(xFrame)
+                myBorder = BorderLine()
+                myBorder.OuterLineWidth = 0
+                Helper.setUnoPropertyValue(
+                    LetterDocument.BusinessPaperObject.xFrame,
+                    "LeftBorder", myBorder)
+                Helper.setUnoPropertyValue(
+                    LetterDocument.BusinessPaperObject.xFrame,
+                    "RightBorder", myBorder)
+                Helper.setUnoPropertyValue(
+                    LetterDocument.BusinessPaperObject.xFrame,
+                    "TopBorder", myBorder)
+                Helper.setUnoPropertyValue(
+                    LetterDocument.BusinessPaperObject.xFrame,
+                    "BottomBorder", myBorder)
+                Helper.setUnoPropertyValue(
+                    LetterDocument.BusinessPaperObject.xFrame,
+                    "Print", False)
+
+                xTextCursor = \
+                    TextDocument.xTextDocument.Text.createTextCursor()
+                xTextCursor.gotoEnd(True)
+                xText = TextDocument.xTextDocument.Text
+                xText.insertTextContent(
+                    xTextCursor, LetterDocument.BusinessPaperObject.xFrame,
+                    False)
+
+                xFrameText = LetterDocument.BusinessPaperObject.xFrame.Text
+                xFrameCursor = xFrameText.createTextCursor()
+                xFrameCursor.setPropertyValue("CharWeight", BOLD)
+                xFrameCursor.setPropertyValue("CharColor", 16777215)
+                xFrameCursor.setPropertyValue("CharFontName", "Albany")
+                xFrameCursor.setPropertyValue("CharHeight", 18)
+
+                xFrameText.insertString(xFrameCursor, FrameText, False)
             except Exception:
                 traceback.print_exc()
 
+        def setFramePosition(self):
+            Helper.setUnoPropertyValue(
+                LetterDocument.BusinessPaperObject.xFrame,
+                "HoriOrient", NONEHORI)
+            Helper.setUnoPropertyValue(
+                LetterDocument.BusinessPaperObject.xFrame,
+                "VertOrient", NONEVERT)
+            Helper.setUnoPropertyValue(
+                LetterDocument.BusinessPaperObject.xFrame,
+                PropertyNames.PROPERTY_HEIGHT, self.iHeight)
+            Helper.setUnoPropertyValue(
+                LetterDocument.BusinessPaperObject.xFrame,
+                PropertyNames.PROPERTY_WIDTH, self.iWidth)
+            Helper.setUnoPropertyValue(
+                LetterDocument.BusinessPaperObject.xFrame,
+                "HoriOrientPosition", self.iXPos)
+            Helper.setUnoPropertyValue(
+                LetterDocument.BusinessPaperObject.xFrame,
+                "VertOrientPosition", self.iYPos)
+            Helper.setUnoPropertyValue(
+                LetterDocument.BusinessPaperObject.xFrame,
+                "HoriOrientRelation", PAGE_FRAME)
+            Helper.setUnoPropertyValue(
+                LetterDocument.BusinessPaperObject.xFrame,
+                "VertOrientRelation", PAGE_FRAME)
+
+        def removeFrame(self):
+            if LetterDocument.BusinessPaperObject.xFrame is not None:
+                try:
+                    TextDocument.xTextDocument.Text.removeTextContent(
+                        LetterDocument.BusinessPaperObject.xFrame)
+                except Exception:
+                    traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index f2fa2f5..ac87206 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -10,7 +10,21 @@ class LetterWizardDialog(WizardDialog):
         super(LetterWizardDialog, self).__init__(xmsf, HIDMAIN )
 
         self.resources = LetterWizardDialogResources(xmsf)
-        Helper.setUnoPropertyValues(self.xDialogModel, ("Closeable", PropertyNames.PROPERTY_HEIGHT, "Moveable", PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Title", PropertyNames.PROPERTY_WIDTH), (True, 210, True, "LetterWizardDialog", 104, 52, 1, 1, self.resources.resLetterWizardDialog_title, 310))
+        Helper.setUnoPropertyValues(
+            self.xDialogModel,
+            ("Closeable",
+                PropertyNames.PROPERTY_HEIGHT,
+                "Moveable",
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                "Title",
+                PropertyNames.PROPERTY_WIDTH),
+            (True, 210, True,
+                "LetterWizardDialog", 104, 52, 1, 1,
+                self.resources.resLetterWizardDialog_title, 310))
         self.fontDescriptor1 = \
             uno.createUnoStruct('com.sun.star.awt.FontDescriptor')
         self.fontDescriptor2 = \
@@ -26,94 +40,1102 @@ class LetterWizardDialog(WizardDialog):
         self.fontDescriptor6.Weight = 150
 
     def buildStep1(self):
-        self.optBusinessLetter = self.insertRadioButton("optBusinessLetter", OPTBUSINESSLETTER_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 1), self.resources.resoptBusinessLetter_value, "optBusinessLetter", 97, 28, 1, 1, 184), self)
-        self.optPrivOfficialLetter = self.insertRadioButton("optPrivOfficialLetter", OPTPRIVOFFICIALLETTER_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 2), self.resources.resoptPrivOfficialLetter_value, "optPrivOfficialLetter", 97, 74, 1, 2, 184), self)
-        self.optPrivateLetter = self.insertRadioButton("optPrivateLetter", OPTPRIVATELETTER_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 3), self.resources.resoptPrivateLetter_value, "optPrivateLetter", 97, 106, 1, 3, 184), self)
-        self.lstBusinessStyle = self.insertListBox("lstBusinessStyle", LSTBUSINESSSTYLE_ACTION_PERFORMED, LSTBUSINESSSTYLE_ITEM_CHANGED, ("Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (True, 12, HelpIds.getHelpIdString(HID + 4), "lstBusinessStyle", 180, 40, 1, 4, 74), self)
-        self.chkBusinessPaper = self.insertCheckBox("chkBusinessPaper", CHKBUSINESSPAPER_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 5), self.resources.reschkBusinessPaper_value, "chkBusinessPaper", 110, 56, 0, 1, 5, 168), self)
-        self.lstPrivOfficialStyle = self.insertListBox("lstPrivOfficialStyle", LSTPRIVOFFICIALSTYLE_ACTION_PERFORMED, LSTPRIVOFFICIALSTYLE_ITEM_CHANGED, ("Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (True, 12, HelpIds.getHelpIdString(HID + 6), "lstPrivOfficialStyle", 180, 86, 1, 6, 74), self)
-        self.lstPrivateStyle = self.insertListBox("lstPrivateStyle", LSTPRIVATESTYLE_ACTION_PERFORMED, LSTPRIVATESTYLE_ITEM_CHANGED, ("Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (True, 12, HelpIds.getHelpIdString(HID + 7), "lstPrivateStyle", 180, 118, 1, 7, 74), self)
-        self.lblBusinessStyle = self.insertLabel("lblBusinessStyle", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblBusinessStyle_value, "lblBusinessStyle", 110, 42, 1, 48, 60))
-        self.lblPrivOfficialStyle = self.insertLabel("lblPrivOfficialStyle", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblPrivOfficialStyle_value, "lblPrivOfficialStyle", 110, 88, 1, 49, 60))
-        self.lblTitle1 = self.insertLabel("lblTitle1", ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (self.fontDescriptor6, 16, self.resources.reslblTitle1_value, True, "lblTitle1", 91, 8, 1, 55, 212))
-        self.lblPrivateStyle = self.insertLabel("lblPrivateStyle", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblPrivateStyle_value, "lblPrivateStyle", 110, 120, 1, 74, 60))
-        self.lblIntroduction = self.insertLabel("lblIntroduction", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (39, self.resources.reslblIntroduction_value, True, "lblIntroduction", 104, 145, 1, 80, 199))
+        self.optBusinessLetter = self.insertRadioButton(
+            "optBusinessLetter", OPTBUSINESSLETTER_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 1),
+                self.resources.resoptBusinessLetter_value,
+                "optBusinessLetter", 97, 28, 1, 1, 184), self)
+        self.optPrivOfficialLetter = self.insertRadioButton(
+            "optPrivOfficialLetter", OPTPRIVOFFICIALLETTER_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 2),
+                self.resources.resoptPrivOfficialLetter_value,
+                "optPrivOfficialLetter", 97, 74, 1, 2, 184), self)
+        self.optPrivateLetter = self.insertRadioButton(
+            "optPrivateLetter", OPTPRIVATELETTER_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 3),
+                self.resources.resoptPrivateLetter_value,
+                "optPrivateLetter", 97, 106, 1, 3, 184), self)
+        self.lstBusinessStyle = self.insertListBox(
+            "lstBusinessStyle", LSTBUSINESSSTYLE_ACTION_PERFORMED,
+                LSTBUSINESSSTYLE_ITEM_CHANGED,
+            ("Dropdown",
+                PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (True, 12, HelpIds.getHelpIdString(HID + 4),
+                "lstBusinessStyle",
+                180, 40, 1, 4, 74), self)
+        self.chkBusinessPaper = self.insertCheckBox(
+            "chkBusinessPaper", CHKBUSINESSPAPER_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 5),
+                self.resources.reschkBusinessPaper_value,
+                "chkBusinessPaper", 110, 56, 0, 1, 5, 168), self)
+        self.lstPrivOfficialStyle = self.insertListBox(
+            "lstPrivOfficialStyle", LSTPRIVOFFICIALSTYLE_ACTION_PERFORMED,
+                LSTPRIVOFFICIALSTYLE_ITEM_CHANGED,
+            ("Dropdown",
+                PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (True, 12, HelpIds.getHelpIdString(HID + 6),
+                "lstPrivOfficialStyle", 180, 86, 1, 6, 74), self)
+        self.lstPrivateStyle = self.insertListBox(
+            "lstPrivateStyle", LSTPRIVATESTYLE_ACTION_PERFORMED,
+                LSTPRIVATESTYLE_ITEM_CHANGED,
+            ("Dropdown",
+                PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (True, 12, HelpIds.getHelpIdString(HID + 7),
+                "lstPrivateStyle", 180, 118, 1, 7, 74), self)
+        self.lblBusinessStyle = self.insertLabel(
+            "lblBusinessStyle",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblBusinessStyle_value,
+                "lblBusinessStyle", 110, 42, 1, 48, 60))
+        self.lblPrivOfficialStyle = self.insertLabel(
+            "lblPrivOfficialStyle",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblPrivOfficialStyle_value,
+                "lblPrivOfficialStyle", 110, 88, 1, 49, 60))
+        self.lblTitle1 = self.insertLabel(
+            "lblTitle1",
+            ("FontDescriptor",
+                PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_MULTILINE,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (self.fontDescriptor6, 16,
+                self.resources.reslblTitle1_value, True,
+                "lblTitle1", 91, 8, 1, 55, 212))
+        self.lblPrivateStyle = self.insertLabel(
+            "lblPrivateStyle",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblPrivateStyle_value,
+                "lblPrivateStyle", 110, 120, 1, 74, 60))
+        self.lblIntroduction = self.insertLabel(
+            "lblIntroduction",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_MULTILINE,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (39, self.resources.reslblIntroduction_value,
+                True,
+                "lblIntroduction", 104, 145, 1, 80, 199))
         self.ImageControl3 = self.insertInfoImage(92, 145, 1)
 
     def buildStep2(self):
-        self.chkPaperCompanyLogo = self.insertCheckBox("chkPaperCompanyLogo", CHKPAPERCOMPANYLOGO_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 8), self.resources.reschkPaperCompanyLogo_value, "chkPaperCompanyLogo", 97, 28, 0, 2, 8, 68), self)
-        self.numLogoHeight = self.insertNumericField("numLogoHeight", NUMLOGOHEIGHT_TEXT_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "Spin", PropertyNames.PROPERTY_STEP, "StrictFormat", PropertyNames.PROPERTY_TABINDEX, "Value", PropertyNames.PROPERTY_WIDTH), (12, HelpIds.getHelpIdString(HID + 9), "numLogoHeight", 138, 40, True, 2, True, 9, 3, 30), self)
-        self.numLogoX = self.insertNumericField("numLogoX", NUMLOGOX_TEXT_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "Spin", PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Value", PropertyNames.PROPERTY_WIDTH), (12, HelpIds.getHelpIdString(HID + 10), "numLogoX", 266, 40, True, 2, 10, 0, 30), self)
-        self.numLogoWidth = self.insertNumericField("numLogoWidth", NUMLOGOWIDTH_TEXT_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "Spin", PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Value", PropertyNames.PROPERTY_WIDTH), (12, HelpIds.getHelpIdString(HID + 11), "numLogoWidth", 138, 56, True, 2, 11, 3.8, 30), self)
-        self.numLogoY = self.insertNumericField("numLogoY", NUMLOGOY_TEXT_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "Spin", PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Value", PropertyNames.PROPERTY_WIDTH), (12, HelpIds.getHelpIdString(HID + 12), "numLogoY", 266, 56, True, 2, 12, -3.4, 30), self)
-        self.chkPaperCompanyAddress = self.insertCheckBox("chkPaperCompanyAddress", CHKPAPERCOMPANYADDRESS_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 13), self.resources.reschkPaperCompanyAddress_value, "chkPaperCompanyAddress", 98, 84, 0, 2, 13, 68), self)
-        self.numAddressHeight = self.insertNumericField("numAddressHeight", NUMADDRESSHEIGHT_TEXT_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "Spin", PropertyNames.PROPERTY_STEP, "StrictFormat", PropertyNames.PROPERTY_TABINDEX, "Value", PropertyNames.PROPERTY_WIDTH), (12, HelpIds.getHelpIdString(HID + 14), "numAddressHeight", 138, 96, True, 2, True, 14, 3, 30), self)
-        self.numAddressX = self.insertNumericField("numAddressX", NUMADDRESSX_TEXT_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "Spin", PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Value", PropertyNames.PROPERTY_WIDTH), (12, HelpIds.getHelpIdString(HID + 15), "numAddressX", 266, 96, True, 2, 15, 3.8, 30), self)
-        self.numAddressWidth = self.insertNumericField("numAddressWidth", NUMADDRESSWIDTH_TEXT_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "Spin", PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Value", PropertyNames.PROPERTY_WIDTH), (12, HelpIds.getHelpIdString(HID + 16), "numAddressWidth", 138, 112, True, 2, 16, 13.8, 30), self)
-        self.numAddressY = self.insertNumericField("numAddressY", NUMADDRESSY_TEXT_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "Spin", PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Value", PropertyNames.PROPERTY_WIDTH), (12, HelpIds.getHelpIdString(HID + 17), "numAddressY", 266, 112, True, 2, 17, -3.4, 30), self)
-        self.chkCompanyReceiver = self.insertCheckBox("chkCompanyReceiver", CHKCOMPANYRECEIVER_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 18), self.resources.reschkCompanyReceiver_value, "chkCompanyReceiver", 103, 131, 0, 2, 18, 185), self)
-        self.chkPaperFooter = self.insertCheckBox("chkPaperFooter", CHKPAPERFOOTER_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 19), self.resources.reschkPaperFooter_value, "chkPaperFooter", 97, 158, 0, 2, 19, 68), self)
-        self.numFooterHeight = self.insertNumericField("numFooterHeight", NUMFOOTERHEIGHT_TEXT_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "Spin", PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Value", PropertyNames.PROPERTY_WIDTH), (12, HelpIds.getHelpIdString(HID + 20), "numFooterHeight", 236, 156, True, 2, 20, 5, 30), self)
-        self.lblLogoHeight = self.insertLabel("lblLogoHeight", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblLogoHeight_value, "lblLogoHeight", 103, 42, 2, 68, 32))
-        self.lblLogoWidth = self.insertLabel("lblLogoWidth", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblLogoWidth_value, "lblLogoWidth", 103, 58, 2, 69, 32))
-        self.FixedLine5 = self.insertFixedLine("FixedLine5", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (2, "FixedLine5", 90, 78, 2, 70, 215))
-        self.FixedLine6 = self.insertFixedLine("FixedLine6", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (2, "FixedLine6", 90, 150, 2, 71, 215))
-        self.lblFooterHeight = self.insertLabel("lblFooterHeight", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblFooterHeight_value, "lblFooterHeight", 200, 158, 2, 72, 32))
-        self.lblLogoX = self.insertLabel("lblLogoX", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblLogoX_value, "lblLogoX", 170, 42, 2, 84, 94))
-        self.lblLogoY = self.insertLabel("lblLogoY", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblLogoY_value, "lblLogoY", 170, 58, 2, 85, 94))
-        self.lblAddressHeight = self.insertLabel("lblAddressHeight", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblAddressHeight_value, "lblAddressHeight", 103, 98, 2, 86, 32))
-        self.lblAddressWidth = self.insertLabel("lblAddressWidth", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblAddressWidth_value, "lblAddressWidth", 103, 114, 2, 87, 32))
-        self.lblAddressX = self.insertLabel("lblAddressX", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblAddressX_value, "lblAddressX", 170, 98, 2, 88, 94))
-        self.lblAddressY = self.insertLabel("lblAddressY", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, self.resources.reslblAddressY_value, "lblAddressY", 170, 114, 2, 89, 94))
-        self.lblTitle2 = self.insertLabel("lblTitle2", ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (self.fontDescriptor6, 16, self.resources.reslblTitle2_value, True, "lblTitle2", 91, 8, 2, 91, 212))
+        self.chkPaperCompanyLogo = self.insertCheckBox(
+            "chkPaperCompanyLogo",
+            CHKPAPERCOMPANYLOGO_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 8),
+                self.resources.reschkPaperCompanyLogo_value,
+                "chkPaperCompanyLogo", 97, 28, 0, 2, 8, 68), self)
+        self.numLogoHeight = self.insertNumericField(
+            "numLogoHeight",
+            NUMLOGOHEIGHT_TEXT_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                "Spin",
+                PropertyNames.PROPERTY_STEP,
+                "StrictFormat",
+                PropertyNames.PROPERTY_TABINDEX,
+                "Value",
+                PropertyNames.PROPERTY_WIDTH),
+            (12, HelpIds.getHelpIdString(HID + 9),
+                "numLogoHeight", 138, 40, True, 2, True, 9, 3, 30), self)
+        self.numLogoX = self.insertNumericField(
+            "numLogoX", NUMLOGOX_TEXT_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                "Spin",
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                "Value",
+                PropertyNames.PROPERTY_WIDTH),
+            (12, HelpIds.getHelpIdString(HID + 10),
+            "numLogoX", 266, 40, True, 2, 10, 0, 30), self)
+        self.numLogoWidth = self.insertNumericField(
+            "numLogoWidth", NUMLOGOWIDTH_TEXT_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                "Spin",
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                "Value",
+                PropertyNames.PROPERTY_WIDTH),
+            (12, HelpIds.getHelpIdString(HID + 11),
+                "numLogoWidth", 138, 56, True, 2, 11, 3.8, 30), self)
+        self.numLogoY = self.insertNumericField(
+            "numLogoY", NUMLOGOY_TEXT_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                "Spin",
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                "Value",
+                PropertyNames.PROPERTY_WIDTH),
+            (12, HelpIds.getHelpIdString(HID + 12),
+                "numLogoY", 266, 56, True, 2, 12, -3.4, 30), self)
+        self.chkPaperCompanyAddress = self.insertCheckBox(
+            "chkPaperCompanyAddress", CHKPAPERCOMPANYADDRESS_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 13),
+                self.resources.reschkPaperCompanyAddress_value,
+                "chkPaperCompanyAddress", 98, 84, 0, 2, 13, 68), self)
+        self.numAddressHeight = self.insertNumericField(
+                "numAddressHeight", NUMADDRESSHEIGHT_TEXT_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                "Spin",
+                PropertyNames.PROPERTY_STEP,
+                "StrictFormat",
+                PropertyNames.PROPERTY_TABINDEX,
+                "Value",
+                PropertyNames.PROPERTY_WIDTH),
+            (12, HelpIds.getHelpIdString(HID + 14),
+                "numAddressHeight", 138, 96, True, 2, True, 14, 3, 30), self)
+        self.numAddressX = self.insertNumericField(
+                "numAddressX", NUMADDRESSX_TEXT_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                "Spin",
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                "Value",
+                PropertyNames.PROPERTY_WIDTH),
+            (12, HelpIds.getHelpIdString(HID + 15),
+                "numAddressX", 266, 96, True, 2, 15, 3.8, 30), self)
+        self.numAddressWidth = self.insertNumericField(
+                "numAddressWidth", NUMADDRESSWIDTH_TEXT_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                "Spin",
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                "Value",
+                PropertyNames.PROPERTY_WIDTH),
+            (12, HelpIds.getHelpIdString(HID + 16),
+                "numAddressWidth", 138, 112, True, 2, 16, 13.8, 30), self)
+        self.numAddressY = self.insertNumericField(
+                "numAddressY", NUMADDRESSY_TEXT_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                "Spin",
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                "Value",
+                PropertyNames.PROPERTY_WIDTH),
+            (12, HelpIds.getHelpIdString(HID + 17),
+                "numAddressY", 266, 112, True, 2, 17, -3.4, 30), self)
+        self.chkCompanyReceiver = self.insertCheckBox(
+            "chkCompanyReceiver", CHKCOMPANYRECEIVER_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 18),
+                self.resources.reschkCompanyReceiver_value,
+                "chkCompanyReceiver", 103, 131, 0, 2, 18, 185), self)
+        self.chkPaperFooter = self.insertCheckBox(
+            "chkPaperFooter", CHKPAPERFOOTER_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 19),
+                self.resources.reschkPaperFooter_value,
+                "chkPaperFooter", 97, 158, 0, 2, 19, 68), self)
+        self.numFooterHeight = self.insertNumericField(
+            "numFooterHeight", NUMFOOTERHEIGHT_TEXT_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                "Spin",
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                "Value",
+                PropertyNames.PROPERTY_WIDTH),
+            (12, HelpIds.getHelpIdString(HID + 20),
+                "numFooterHeight", 236, 156, True, 2, 20, 5, 30), self)
+        self.lblLogoHeight = self.insertLabel(
+            "lblLogoHeight",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblLogoHeight_value,
+                "lblLogoHeight", 103, 42, 2, 68, 32))
+        self.lblLogoWidth = self.insertLabel(
+            "lblLogoWidth",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblLogoWidth_value,
+                "lblLogoWidth", 103, 58, 2, 69, 32))
+        self.FixedLine5 = self.insertFixedLine(
+            "FixedLine5",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (2,
+                "FixedLine5", 90, 78, 2, 70, 215))
+        self.FixedLine6 = self.insertFixedLine(
+            "FixedLine6",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (2,
+                "FixedLine6", 90, 150, 2, 71, 215))
+        self.lblFooterHeight = self.insertLabel(
+            "lblFooterHeight",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblFooterHeight_value,
+                "lblFooterHeight", 200, 158, 2, 72, 32))
+        self.lblLogoX = self.insertLabel(
+            "lblLogoX",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblLogoX_value,
+                "lblLogoX", 170, 42, 2, 84, 94))
+        self.lblLogoY = self.insertLabel(
+            "lblLogoY",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblLogoY_value,
+                "lblLogoY", 170, 58, 2, 85, 94))
+        self.lblAddressHeight = self.insertLabel(
+            "lblAddressHeight",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblAddressHeight_value,
+                "lblAddressHeight", 103, 98, 2, 86, 32))
+        self.lblAddressWidth = self.insertLabel(
+            "lblAddressWidth",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblAddressWidth_value,
+                "lblAddressWidth", 103, 114, 2, 87, 32))
+        self.lblAddressX = self.insertLabel(
+            "lblAddressX",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblAddressX_value,
+                "lblAddressX", 170, 98, 2, 88, 94))
+        self.lblAddressY = self.insertLabel(
+            "lblAddressY",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, self.resources.reslblAddressY_value,
+                "lblAddressY", 170, 114, 2, 89, 94))
+        self.lblTitle2 = self.insertLabel(
+            "lblTitle2",
+            ("FontDescriptor",
+                PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_MULTILINE,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (self.fontDescriptor6, 16,
+                self.resources.reslblTitle2_value, True,
+                "lblTitle2", 91, 8, 2, 91, 212))
 
     def buildStep3(self):
-        self.lstLetterNorm = self.insertListBox("lstLetterNorm", LSTLETTERNORM_ACTION_PERFORMED, LSTLETTERNORM_ITEM_CHANGED, ("Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (True, 12, HelpIds.getHelpIdString(HID + 21), "lstLetterNorm", 210, 34, 3, 21, 74), self)
-        self.chkUseLogo = self.insertCheckBox("chkUseLogo", CHKUSELOGO_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 22), self.resources.reschkUseLogo_value, "chkUseLogo", 97, 54, 0, 3, 22, 212), self)
-        self.chkUseAddressReceiver = self.insertCheckBox("chkUseAddressReceiver", CHKUSEADDRESSRECEIVER_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 23), self.resources.reschkUseAddressReceiver_value, "chkUseAddressReceiver", 97, 69, 0, 3, 23, 212), self)
-        self.chkUseSigns = self.insertCheckBox("chkUseSigns", CHKUSESIGNS_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 24), self.resources.reschkUseSigns_value, "chkUseSigns", 97, 82, 0, 3, 24, 212), self)
-        self.chkUseSubject = self.insertCheckBox("chkUseSubject", CHKUSESUBJECT_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 25), self.resources.reschkUseSubject_value, "chkUseSubject", 97, 98, 0, 3, 25, 212), self)
-        self.chkUseSalutation = self.insertCheckBox("chkUseSalutation", CHKUSESALUTATION_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 26), self.resources.reschkUseSalutation_value, "chkUseSalutation", 97, 113, 0, 3, 26, 66), self)
-        self.lstSalutation = self.insertComboBox("lstSalutation", LSTSALUTATION_ACTION_PERFORMED, LSTSALUTATION_ITEM_CHANGED, LSTSALUTATION_TEXT_CHANGED, ("Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (True, 12, HelpIds.getHelpIdString(HID + 27), "lstSalutation", 210, 110, 3, 27, 74), self)
-        self.chkUseBendMarks = self.insertCheckBox("chkUseBendMarks", CHKUSEBENDMARKS_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 28), self.resources.reschkUseBendMarks_value, "chkUseBendMarks", 97, 127, 0, 3, 28, 212), self)
-        self.chkUseGreeting = self.insertCheckBox("chkUseGreeting", CHKUSEGREETING_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 29), self.resources.reschkUseGreeting_value, "chkUseGreeting", 97, 142, 0, 3, 29, 66), self)
-        self.lstGreeting = self.insertComboBox("lstGreeting", LSTGREETING_ACTION_PERFORMED, LSTGREETING_ITEM_CHANGED, LSTGREETING_TEXT_CHANGED, ("Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (True, 12, HelpIds.getHelpIdString(HID + 30), "lstGreeting", 210, 141, 3, 30, 74), self)
-        self.chkUseFooter = self.insertCheckBox("chkUseFooter", CHKUSEFOOTER_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (8, HelpIds.getHelpIdString(HID + 31), self.resources.reschkUseFooter_value, "chkUseFooter", 97, 158, 0, 3, 31, 212), self)
-        self.lblLetterNorm = self.insertLabel("lblLetterNorm", (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (16, self.resources.reslblLetterNorm_value, True, "lblLetterNorm", 97, 28, 3, 50, 109))
-        self.lblTitle3 = self.insertLabel("lblTitle3", ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (self.fontDescriptor6, 16, self.resources.reslblTitle3_value, True, "lblTitle3", 91, 8, 3, 90, 212))
+        self.lstLetterNorm = self.insertListBox(
+            "lstLetterNorm",
+            LSTLETTERNORM_ACTION_PERFORMED,
+            LSTLETTERNORM_ITEM_CHANGED,
+            ("Dropdown",
+                PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (True, 12, HelpIds.getHelpIdString(HID + 21),
+                "lstLetterNorm", 210, 34, 3, 21, 74), self)
+        self.chkUseLogo = self.insertCheckBox(
+            "chkUseLogo", CHKUSELOGO_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 22),
+                self.resources.reschkUseLogo_value,
+                "chkUseLogo", 97, 54, 0, 3, 22, 212), self)
+        self.chkUseAddressReceiver = self.insertCheckBox(
+            "chkUseAddressReceiver",
+            CHKUSEADDRESSRECEIVER_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 23),
+                self.resources.reschkUseAddressReceiver_value,
+                "chkUseAddressReceiver", 97, 69, 0, 3, 23, 212), self)
+        self.chkUseSigns = self.insertCheckBox(
+            "chkUseSigns", CHKUSESIGNS_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 24),
+                self.resources.reschkUseSigns_value,
+                "chkUseSigns", 97, 82, 0, 3, 24, 212), self)
+        self.chkUseSubject = self.insertCheckBox(
+            "chkUseSubject", CHKUSESUBJECT_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 25),
+                self.resources.reschkUseSubject_value,
+                "chkUseSubject", 97, 98, 0, 3, 25, 212), self)
+        self.chkUseSalutation = self.insertCheckBox(
+            "chkUseSalutation", CHKUSESALUTATION_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 26),
+                self.resources.reschkUseSalutation_value,
+                "chkUseSalutation", 97, 113, 0, 3, 26, 66), self)
+        self.lstSalutation = self.insertComboBox(
+            "lstSalutation",
+            LSTSALUTATION_ACTION_PERFORMED,
+            LSTSALUTATION_ITEM_CHANGED,
+            LSTSALUTATION_TEXT_CHANGED,
+            ("Dropdown",
+                PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (True, 12, HelpIds.getHelpIdString(HID + 27),
+                "lstSalutation", 210, 110, 3, 27, 74), self)
+        self.chkUseBendMarks = self.insertCheckBox(
+            "chkUseBendMarks", CHKUSEBENDMARKS_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 28),
+                self.resources.reschkUseBendMarks_value,
+                "chkUseBendMarks", 97, 127, 0, 3, 28, 212), self)
+        self.chkUseGreeting = self.insertCheckBox(
+            "chkUseGreeting", CHKUSEGREETING_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 29),
+                self.resources.reschkUseGreeting_value,
+                "chkUseGreeting", 97, 142, 0, 3, 29, 66), self)
+        self.lstGreeting = self.insertComboBox(
+            "lstGreeting", LSTGREETING_ACTION_PERFORMED,
+            LSTGREETING_ITEM_CHANGED, LSTGREETING_TEXT_CHANGED,
+            ("Dropdown",
+                PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (True, 12, HelpIds.getHelpIdString(HID + 30),
+                "lstGreeting", 210, 141, 3, 30, 74), self)
+        self.chkUseFooter = self.insertCheckBox(
+            "chkUseFooter", CHKUSEFOOTER_ITEM_CHANGED,
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_HELPURL,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_NAME,
+                PropertyNames.PROPERTY_POSITION_X,
+                PropertyNames.PROPERTY_POSITION_Y,
+                PropertyNames.PROPERTY_STATE,
+                PropertyNames.PROPERTY_STEP,
+                PropertyNames.PROPERTY_TABINDEX,
+                PropertyNames.PROPERTY_WIDTH),
+            (8, HelpIds.getHelpIdString(HID + 31),
+                self.resources.reschkUseFooter_value,
+                "chkUseFooter", 97, 158, 0, 3, 31, 212), self)
+        self.lblLetterNorm = self.insertLabel(
+            "lblLetterNorm",
+            (PropertyNames.PROPERTY_HEIGHT,
+                PropertyNames.PROPERTY_LABEL,
+                PropertyNames.PROPERTY_MULTILINE,
+                PropertyNames.PROPERTY_NAME,

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list