[Libreoffice-commits] .: Branch 'feature/gsoc2011_wizards' - wizards/com
Xisco Fauli
xfauli at kemper.freedesktop.org
Sat Jul 16 10:16:39 PDT 2011
wizards/com/sun/star/wizards/common/FileAccess.py | 6
wizards/com/sun/star/wizards/common/Helper.py | 2
wizards/com/sun/star/wizards/document/OfficeDocument.py | 16
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py | 42 -
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py | 1
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py | 267 ++++------
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 1
wizards/com/sun/star/wizards/text/TextDocument.py | 2
wizards/com/sun/star/wizards/ui/UnoDialog.py | 226 --------
wizards/com/sun/star/wizards/ui/UnoDialog2.py | 61 --
wizards/com/sun/star/wizards/ui/WizardDialog.py | 24
11 files changed, 179 insertions(+), 469 deletions(-)
New commits:
commit 535cb65f18b3c3d4bc27f9797106cec940d2d635
Author: Xisco Fauli <anistenis at gmail.com>
Date: Sat Jul 16 19:16:02 2011 +0200
Clean up
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py
index 3397d71..5f92d8a 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -715,10 +715,10 @@ class FileAccess(object):
def connectURLs(self, urlFolder, urlFilename):
stringFolder = ""
stringFileName = urlFilename
- if not urlFolder.endsWith("/"):
+ if not urlFolder.endswith("/"):
stringFolder = "/"
- if urlFilename.startsWith("/"):
- stringFileName = urlFilename.substring(1)
+ if urlFilename.startswith("/"):
+ stringFileName = urlFilename[1:]
return urlFolder + stringFolder + stringFileName
@classmethod
diff --git a/wizards/com/sun/star/wizards/common/Helper.py b/wizards/com/sun/star/wizards/common/Helper.py
index 45923cf..eaa615d 100644
--- a/wizards/com/sun/star/wizards/common/Helper.py
+++ b/wizards/com/sun/star/wizards/common/Helper.py
@@ -157,7 +157,7 @@ class Helper(object):
class DateUtils(object):
def __init__(self, xmsf, document):
- defaults = document.createInstance("com.sun.star.text.Defaults")
+ defaults = xmsf.createInstance("com.sun.star.text.Defaults")
l = Helper.getUnoStructValue(defaults, "CharLocale")
self.formatSupplier = document
formatSettings = self.formatSupplier.getNumberFormatSettings()
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py
index f2fc2cb..7831512 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.py
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py
@@ -270,24 +270,8 @@ class OfficeDocument(object):
def getSlideCount(self, model):
return model.getDrawPages().getCount()
- def getDocumentProperties(self, document):
- return document.getDocumentProperties()
-
def showMessageBox(
self, xMSF, windowServiceName, windowAttribute, MessageText):
return SystemDialog.showMessageBox(
xMSF, windowServiceName, windowAttribute, MessageText)
-
- def getWindowPeer(self):
- return self.xWindowPeer
-
- '''
- @param windowPeer The xWindowPeer to set.
- Should be called as soon as a Windowpeer of a wizard dialog is available
- The windowpeer is needed to call a Messagebox
- '''
-
- def setWindowPeer(self, windowPeer):
- self.xWindowPeer = windowPeer
-
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index e040f24..e4295a0 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -86,7 +86,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(True, 12, LSTPRIVATESTYLE_HID, 180, 95, 1,
4, 74), self)
- self.lblBusinessStyle = self.insertLabel("lblBusinessStyle",
+ self.insertLabel("lblBusinessStyle",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -97,7 +97,7 @@ class FaxWizardDialog(WizardDialog):
(8, self.resources.reslblBusinessStyle_value,
110, 42, 1, 32, 60))
- self.lblTitle1 = self.insertLabel("lblTitle1",
+ self.insertLabel("lblTitle1",
("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -108,7 +108,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle1_value,
True, 91, 8, 1, 37, 212))
- self.lblPrivateStyle = self.insertLabel("lblPrivateStyle",
+ self.insertLabel("lblPrivateStyle",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -117,7 +117,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblPrivateStyle_value, 110, 95, 1, 50, 60))
- self.lblIntroduction = self.insertLabel("lblIntroduction",
+ self.insertLabel("lblIntroduction",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -264,7 +264,7 @@ class FaxWizardDialog(WizardDialog):
(8, CHKUSEFOOTER_HID,
self.resources.reschkUseFooter_value, 97, 163,
0, 2, 14, 212), self)
- self.lblTitle3 = self.insertLabel("lblTitle3",
+ self.insertLabel("lblTitle3",
("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -397,7 +397,7 @@ class FaxWizardDialog(WizardDialog):
(8, OPTRECEIVERDATABASE_HID,
self.resources.resoptReceiverDatabase_value, 104, 160, 3,
24, 200), self)
- self.lblSenderAddress = self.insertLabel("lblSenderAddress",
+ self.insertLabel("lblSenderAddress",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -406,14 +406,14 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblSenderAddress_value, 97, 28, 3, 46, 136))
- self.FixedLine2 = self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
+ self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_POSITION_X,
PropertyNames.PROPERTY_POSITION_Y,
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(5, 90, 126, 3, 51, 212))
- self.lblSenderName = self.insertLabel("lblSenderName",
+ self.insertLabel("lblSenderName",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -423,7 +423,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblSenderName_value, 113, 69, 3,
52, 68))
- self.lblSenderStreet = self.insertLabel("lblSenderStreet",
+ self.insertLabel("lblSenderStreet",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -433,7 +433,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblSenderStreet_value, 113, 82, 3,
53, 68))
- self.lblPostCodeCity = self.insertLabel("lblPostCodeCity",
+ self.insertLabel("lblPostCodeCity",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -443,7 +443,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblPostCodeCity_value,
113, 97, 3, 54, 68))
- self.lblTitle4 = self.insertLabel("lblTitle4",
+ self.insertLabel("lblTitle4",
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -455,7 +455,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle4_value,
True, 91, 8, 3, 60, 212))
- self.Label1 = self.insertLabel("lblSenderFax",
+ self.insertLabel("lblSenderFax",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -464,7 +464,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.resLabel1_value, 113, 111, 3, 68, 68))
- self.Label2 = self.insertLabel("Label2",
+ self.insertLabel("Label2",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -514,7 +514,7 @@ class FaxWizardDialog(WizardDialog):
(8, CHKFOOTERPAGENUMBERS_HID,
self.resources.reschkFooterPageNumbers_value, 97, 106,
0, 4, 27, 201), self)
- self.lblFooter = self.insertLabel("lblFooter",
+ self.insertLabel("lblFooter",
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -525,7 +525,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor4, 8, self.resources.reslblFooter_value,
97, 28, 4, 33, 116))
- self.lblTitle5 = self.insertLabel("lblTitle5",
+ self.insertLabel("lblTitle5",
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -576,7 +576,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, OPTMAKECHANGES_HID, self.resources.resoptMakeChanges_value,
104, 123, 5, 31, 198), self)
- self.lblFinalExplanation1 = self.insertLabel("lblFinalExplanation1",
+ self.insertLabel("lblFinalExplanation1",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -587,7 +587,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(28, self.resources.reslblFinalExplanation1_value,
True, 97, 28, 5, 34, 205))
- self.lblProceed = self.insertLabel("lblProceed",
+ self.insertLabel("lblProceed",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -597,7 +597,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblProceed_value, 97, 100, 5,
35, 204))
- self.lblFinalExplanation2 = self.insertLabel("lblFinalExplanation2",
+ self.insertLabel("lblFinalExplanation2",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -608,7 +608,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(33, self.resources.reslblFinalExplanation2_value, True, 104, 145, 5,
36, 199))
- self.ImageControl2 = self.insertImage("ImageControl2",
+ self.insertImage("ImageControl2",
("Border",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_IMAGEURL,
@@ -620,7 +620,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(0, 10, UIConsts.INFOIMAGEURL, 92, 145,
False, 5, 47, 10))
- self.lblTemplateName = self.insertLabel("lblTemplateName",
+ self.insertLabel("lblTemplateName",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -631,7 +631,7 @@ class FaxWizardDialog(WizardDialog):
(8, self.resources.reslblTemplateName_value, 97, 58, 5,
57, 101))
- self.lblTitle6 = self.insertLabel("lblTitle6",
+ self.insertLabel("lblTitle6",
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index 864112f..bbf6921 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -1,7 +1,6 @@
from common.Resource import Resource
class FaxWizardDialogResources(Resource):
- UNIT_NAME = "dbwizres"
MODULE_NAME = "dbw"
RID_FAXWIZARDDIALOG_START = 3200
RID_FAXWIZARDCOMMUNICATION_START = 3270
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index 35158a3..8f740cd 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -12,18 +12,18 @@ class LetterWizardDialog(WizardDialog):
self.resources = LetterWizardDialogResources(xmsf)
Helper.setUnoPropertyValues(
self.xDialogModel,
- ("Closeable",
+ ("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),
+ "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,
+ "LetterWizardDialog", 104, 52, 1, 1,
self.resources.resLetterWizardDialog_title, 310))
self.fontDescriptor1 = \
uno.createUnoStruct('com.sun.star.awt.FontDescriptor')
@@ -41,7 +41,7 @@ class LetterWizardDialog(WizardDialog):
def buildStep1(self):
self.optBusinessLetter = self.insertRadioButton(
- "optBusinessLetter", OPTBUSINESSLETTER_ITEM_CHANGED,
+ "optBusinessLetter", OPTBUSINESSLETTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -51,11 +51,11 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (8, HelpIds.getHelpIdString(HID + 1),
+ (8, HelpIds.getHelpIdString(HID + 1),
self.resources.resoptBusinessLetter_value,
"optBusinessLetter", 97, 28, 1, 1, 184), self)
self.optPrivOfficialLetter = self.insertRadioButton(
- "optPrivOfficialLetter", OPTPRIVOFFICIALLETTER_ITEM_CHANGED,
+ "optPrivOfficialLetter", OPTPRIVOFFICIALLETTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -65,11 +65,11 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (8, HelpIds.getHelpIdString(HID + 2),
- self.resources.resoptPrivOfficialLetter_value,
+ (8, HelpIds.getHelpIdString(HID + 2),
+ self.resources.resoptPrivOfficialLetter_value,
"optPrivOfficialLetter", 97, 74, 1, 2, 184), self)
self.optPrivateLetter = self.insertRadioButton(
- "optPrivateLetter", OPTPRIVATELETTER_ITEM_CHANGED,
+ "optPrivateLetter", OPTPRIVATELETTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -79,11 +79,11 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (8, HelpIds.getHelpIdString(HID + 3),
- self.resources.resoptPrivateLetter_value,
+ (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", LSTBUSINESSSTYLE_ACTION_PERFORMED,
LSTBUSINESSSTYLE_ITEM_CHANGED,
("Dropdown",
PropertyNames.PROPERTY_HEIGHT,
@@ -98,7 +98,7 @@ class LetterWizardDialog(WizardDialog):
"lstBusinessStyle",
180, 40, 1, 4, 74), self)
self.chkBusinessPaper = self.insertCheckBox(
- "chkBusinessPaper", CHKBUSINESSPAPER_ITEM_CHANGED,
+ "chkBusinessPaper", CHKBUSINESSPAPER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -109,11 +109,11 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (8, HelpIds.getHelpIdString(HID + 5),
- self.resources.reschkBusinessPaper_value,
+ (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", LSTPRIVOFFICIALSTYLE_ACTION_PERFORMED,
LSTPRIVOFFICIALSTYLE_ITEM_CHANGED,
("Dropdown",
PropertyNames.PROPERTY_HEIGHT,
@@ -124,7 +124,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (True, 12, HelpIds.getHelpIdString(HID + 6),
+ (True, 12, HelpIds.getHelpIdString(HID + 6),
"lstPrivOfficialStyle", 180, 86, 1, 6, 74), self)
self.lstPrivateStyle = self.insertListBox(
"lstPrivateStyle", LSTPRIVATESTYLE_ACTION_PERFORMED,
@@ -138,10 +138,9 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (True, 12, HelpIds.getHelpIdString(HID + 7),
+ (True, 12, HelpIds.getHelpIdString(HID + 7),
"lstPrivateStyle", 180, 118, 1, 7, 74), self)
- self.lblBusinessStyle = self.insertLabel(
- "lblBusinessStyle",
+ self.insertLabel("lblBusinessStyle",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -150,10 +149,9 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (8, self.resources.reslblBusinessStyle_value,
+ (8, self.resources.reslblBusinessStyle_value,
"lblBusinessStyle", 110, 42, 1, 48, 60))
- self.lblPrivOfficialStyle = self.insertLabel(
- "lblPrivOfficialStyle",
+ self.insertLabel("lblPrivOfficialStyle",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -164,11 +162,10 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblPrivOfficialStyle_value,
"lblPrivOfficialStyle", 110, 88, 1, 49, 60))
- self.lblTitle1 = self.insertLabel(
- "lblTitle1",
+ self.insertLabel("lblTitle1",
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
- PropertyNames.PROPERTY_LABEL,
+ PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
PropertyNames.PROPERTY_NAME,
PropertyNames.PROPERTY_POSITION_X,
@@ -176,11 +173,10 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (self.fontDescriptor6, 16,
- self.resources.reslblTitle1_value, True,
+ (self.fontDescriptor6, 16,
+ self.resources.reslblTitle1_value, True,
"lblTitle1", 91, 8, 1, 55, 212))
- self.lblPrivateStyle = self.insertLabel(
- "lblPrivateStyle",
+ self.insertLabel("lblPrivateStyle",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -191,8 +187,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblPrivateStyle_value,
"lblPrivateStyle", 110, 120, 1, 74, 60))
- self.lblIntroduction = self.insertLabel(
- "lblIntroduction",
+ self.insertLabel("lblIntroduction",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -202,7 +197,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (39, self.resources.reslblIntroduction_value,
+ (39, self.resources.reslblIntroduction_value,
True,
"lblIntroduction", 104, 145, 1, 80, 199))
self.ImageControl3 = self.insertInfoImage(92, 145, 1)
@@ -210,7 +205,7 @@ class LetterWizardDialog(WizardDialog):
def buildStep2(self):
self.chkPaperCompanyLogo = self.insertCheckBox(
"chkPaperCompanyLogo",
- CHKPAPERCOMPANYLOGO_ITEM_CHANGED,
+ CHKPAPERCOMPANYLOGO_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -222,11 +217,11 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, HelpIds.getHelpIdString(HID + 8),
- self.resources.reschkPaperCompanyLogo_value,
+ self.resources.reschkPaperCompanyLogo_value,
"chkPaperCompanyLogo", 97, 28, 0, 2, 8, 68), self)
self.numLogoHeight = self.insertNumericField(
"numLogoHeight",
- NUMLOGOHEIGHT_TEXT_CHANGED,
+ NUMLOGOHEIGHT_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -241,7 +236,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 9),
"numLogoHeight", 138, 40, True, 2, True, 9, 3, 30), self)
self.numLogoX = self.insertNumericField(
- "numLogoX", NUMLOGOX_TEXT_CHANGED,
+ "numLogoX", NUMLOGOX_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -255,7 +250,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 10),
"numLogoX", 266, 40, True, 2, 10, 0, 30), self)
self.numLogoWidth = self.insertNumericField(
- "numLogoWidth", NUMLOGOWIDTH_TEXT_CHANGED,
+ "numLogoWidth", NUMLOGOWIDTH_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -269,7 +264,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 11),
"numLogoWidth", 138, 56, True, 2, 11, 3.8, 30), self)
self.numLogoY = self.insertNumericField(
- "numLogoY", NUMLOGOY_TEXT_CHANGED,
+ "numLogoY", NUMLOGOY_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -280,10 +275,10 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
"Value",
PropertyNames.PROPERTY_WIDTH),
- (12, HelpIds.getHelpIdString(HID + 12),
+ (12, HelpIds.getHelpIdString(HID + 12),
"numLogoY", 266, 56, True, 2, 12, -3.4, 30), self)
self.chkPaperCompanyAddress = self.insertCheckBox(
- "chkPaperCompanyAddress", CHKPAPERCOMPANYADDRESS_ITEM_CHANGED,
+ "chkPaperCompanyAddress", CHKPAPERCOMPANYADDRESS_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -298,7 +293,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkPaperCompanyAddress_value,
"chkPaperCompanyAddress", 98, 84, 0, 2, 13, 68), self)
self.numAddressHeight = self.insertNumericField(
- "numAddressHeight", NUMADDRESSHEIGHT_TEXT_CHANGED,
+ "numAddressHeight", NUMADDRESSHEIGHT_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -313,7 +308,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 14),
"numAddressHeight", 138, 96, True, 2, True, 14, 3, 30), self)
self.numAddressX = self.insertNumericField(
- "numAddressX", NUMADDRESSX_TEXT_CHANGED,
+ "numAddressX", NUMADDRESSX_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -327,7 +322,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 15),
"numAddressX", 266, 96, True, 2, 15, 3.8, 30), self)
self.numAddressWidth = self.insertNumericField(
- "numAddressWidth", NUMADDRESSWIDTH_TEXT_CHANGED,
+ "numAddressWidth", NUMADDRESSWIDTH_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -341,7 +336,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 16),
"numAddressWidth", 138, 112, True, 2, 16, 13.8, 30), self)
self.numAddressY = self.insertNumericField(
- "numAddressY", NUMADDRESSY_TEXT_CHANGED,
+ "numAddressY", NUMADDRESSY_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -355,7 +350,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 17),
"numAddressY", 266, 112, True, 2, 17, -3.4, 30), self)
self.chkCompanyReceiver = self.insertCheckBox(
- "chkCompanyReceiver", CHKCOMPANYRECEIVER_ITEM_CHANGED,
+ "chkCompanyReceiver", CHKCOMPANYRECEIVER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -369,7 +364,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkCompanyReceiver_value,
"chkCompanyReceiver", 103, 131, 0, 2, 18, 185), self)
self.chkPaperFooter = self.insertCheckBox(
- "chkPaperFooter", CHKPAPERFOOTER_ITEM_CHANGED,
+ "chkPaperFooter", CHKPAPERFOOTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -380,11 +375,11 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (8, HelpIds.getHelpIdString(HID + 19),
+ (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,
+ "numFooterHeight", NUMFOOTERHEIGHT_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -397,8 +392,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(12, HelpIds.getHelpIdString(HID + 20),
"numFooterHeight", 236, 156, True, 2, 20, 5, 30), self)
- self.lblLogoHeight = self.insertLabel(
- "lblLogoHeight",
+ self.insertLabel("lblLogoHeight",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -409,8 +403,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblLogoHeight_value,
"lblLogoHeight", 103, 42, 2, 68, 32))
- self.lblLogoWidth = self.insertLabel(
- "lblLogoWidth",
+ self.insertLabel("lblLogoWidth",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -421,8 +414,8 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblLogoWidth_value,
"lblLogoWidth", 103, 58, 2, 69, 32))
- self.FixedLine5 = self.insertFixedLine(
- "FixedLine5",
+ self.insertFixedLine(
+ "FixedLine5",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_NAME,
PropertyNames.PROPERTY_POSITION_X,
@@ -432,8 +425,8 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(2,
"FixedLine5", 90, 78, 2, 70, 215))
- self.FixedLine6 = self.insertFixedLine(
- "FixedLine6",
+ self.insertFixedLine(
+ "FixedLine6",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_NAME,
PropertyNames.PROPERTY_POSITION_X,
@@ -443,8 +436,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(2,
"FixedLine6", 90, 150, 2, 71, 215))
- self.lblFooterHeight = self.insertLabel(
- "lblFooterHeight",
+ self.insertLabel("lblFooterHeight",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -455,8 +447,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblFooterHeight_value,
"lblFooterHeight", 200, 158, 2, 72, 32))
- self.lblLogoX = self.insertLabel(
- "lblLogoX",
+ self.insertLabel("lblLogoX",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -467,8 +458,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblLogoX_value,
"lblLogoX", 170, 42, 2, 84, 94))
- self.lblLogoY = self.insertLabel(
- "lblLogoY",
+ self.insertLabel("lblLogoY",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -479,8 +469,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblLogoY_value,
"lblLogoY", 170, 58, 2, 85, 94))
- self.lblAddressHeight = self.insertLabel(
- "lblAddressHeight",
+ self.insertLabel("lblAddressHeight",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -491,8 +480,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblAddressHeight_value,
"lblAddressHeight", 103, 98, 2, 86, 32))
- self.lblAddressWidth = self.insertLabel(
- "lblAddressWidth",
+ self.insertLabel("lblAddressWidth",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -503,8 +491,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblAddressWidth_value,
"lblAddressWidth", 103, 114, 2, 87, 32))
- self.lblAddressX = self.insertLabel(
- "lblAddressX",
+ self.insertLabel("lblAddressX",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -515,8 +502,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblAddressX_value,
"lblAddressX", 170, 98, 2, 88, 94))
- self.lblAddressY = self.insertLabel(
- "lblAddressY",
+ self.insertLabel("lblAddressY",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -527,9 +513,8 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblAddressY_value,
"lblAddressY", 170, 114, 2, 89, 94))
- self.lblTitle2 = self.insertLabel(
- "lblTitle2",
- ("FontDescriptor",
+ self.insertLabel("lblTitle2",
+ ("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -545,8 +530,8 @@ class LetterWizardDialog(WizardDialog):
def buildStep3(self):
self.lstLetterNorm = self.insertListBox(
- "lstLetterNorm",
- LSTLETTERNORM_ACTION_PERFORMED,
+ "lstLetterNorm",
+ LSTLETTERNORM_ACTION_PERFORMED,
LSTLETTERNORM_ITEM_CHANGED,
("Dropdown",
PropertyNames.PROPERTY_HEIGHT,
@@ -560,13 +545,13 @@ class LetterWizardDialog(WizardDialog):
(True, 12, HelpIds.getHelpIdString(HID + 21),
"lstLetterNorm", 210, 34, 3, 21, 74), self)
self.chkUseLogo = self.insertCheckBox(
- "chkUseLogo", CHKUSELOGO_ITEM_CHANGED,
+ "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_POSITION_Y,
PropertyNames.PROPERTY_STATE,
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
@@ -575,14 +560,14 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkUseLogo_value,
"chkUseLogo", 97, 54, 0, 3, 22, 212), self)
self.chkUseAddressReceiver = self.insertCheckBox(
- "chkUseAddressReceiver",
- CHKUSEADDRESSRECEIVER_ITEM_CHANGED,
+ "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_POSITION_Y,
PropertyNames.PROPERTY_STATE,
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
@@ -591,7 +576,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkUseAddressReceiver_value,
"chkUseAddressReceiver", 97, 69, 0, 3, 23, 212), self)
self.chkUseSigns = self.insertCheckBox(
- "chkUseSigns", CHKUSESIGNS_ITEM_CHANGED,
+ "chkUseSigns", CHKUSESIGNS_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -606,7 +591,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkUseSigns_value,
"chkUseSigns", 97, 82, 0, 3, 24, 212), self)
self.chkUseSubject = self.insertCheckBox(
- "chkUseSubject", CHKUSESUBJECT_ITEM_CHANGED,
+ "chkUseSubject", CHKUSESUBJECT_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -621,7 +606,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkUseSubject_value,
"chkUseSubject", 97, 98, 0, 3, 25, 212), self)
self.chkUseSalutation = self.insertCheckBox(
- "chkUseSalutation", CHKUSESALUTATION_ITEM_CHANGED,
+ "chkUseSalutation", CHKUSESALUTATION_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -652,7 +637,7 @@ class LetterWizardDialog(WizardDialog):
(True, 12, HelpIds.getHelpIdString(HID + 27),
"lstSalutation", 210, 110, 3, 27, 74), self)
self.chkUseBendMarks = self.insertCheckBox(
- "chkUseBendMarks", CHKUSEBENDMARKS_ITEM_CHANGED,
+ "chkUseBendMarks", CHKUSEBENDMARKS_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -667,7 +652,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkUseBendMarks_value,
"chkUseBendMarks", 97, 127, 0, 3, 28, 212), self)
self.chkUseGreeting = self.insertCheckBox(
- "chkUseGreeting", CHKUSEGREETING_ITEM_CHANGED,
+ "chkUseGreeting", CHKUSEGREETING_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -696,13 +681,13 @@ class LetterWizardDialog(WizardDialog):
(True, 12, HelpIds.getHelpIdString(HID + 30),
"lstGreeting", 210, 141, 3, 30, 74), self)
self.chkUseFooter = self.insertCheckBox(
- "chkUseFooter", CHKUSEFOOTER_ITEM_CHANGED,
+ "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_POSITION_Y,
PropertyNames.PROPERTY_STATE,
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
@@ -710,8 +695,7 @@ class LetterWizardDialog(WizardDialog):
(8, HelpIds.getHelpIdString(HID + 31),
self.resources.reschkUseFooter_value,
"chkUseFooter", 97, 158, 0, 3, 31, 212), self)
- self.lblLetterNorm = self.insertLabel(
- "lblLetterNorm",
+ self.insertLabel("lblLetterNorm",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -723,8 +707,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(16, self.resources.reslblLetterNorm_value, True,
"lblLetterNorm", 97, 28, 3, 50, 109))
- self.lblTitle3 = self.insertLabel(
- "lblTitle3",
+ self.insertLabel("lblTitle3",
(
"FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -741,7 +724,7 @@ class LetterWizardDialog(WizardDialog):
def buildStep4(self):
self.optSenderPlaceholder = self.insertRadioButton(
- "optSenderPlaceholder", OPTSENDERPLACEHOLDER_ITEM_CHANGED,
+ "optSenderPlaceholder", OPTSENDERPLACEHOLDER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -755,7 +738,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptSenderPlaceholder_value,
"optSenderPlaceholder", 104, 42, 4, 32, 149), self)
self.optSenderDefine = self.insertRadioButton(
- "optSenderDefine", OPTSENDERDEFINE_ITEM_CHANGED,
+ "optSenderDefine", OPTSENDERDEFINE_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -769,7 +752,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptSenderDefine_value,
"optSenderDefine", 104, 54, 4, 33, 149), self)
self.txtSenderName = self.insertTextField(
- "txtSenderName", TXTSENDERNAME_TEXT_CHANGED,
+ "txtSenderName", TXTSENDERNAME_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -781,7 +764,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 34),
"txtSenderName", 182, 67, 4, 34, 119), self)
self.txtSenderStreet = self.insertTextField(
- "txtSenderStreet", TXTSENDERSTREET_TEXT_CHANGED,
+ "txtSenderStreet", TXTSENDERSTREET_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -793,7 +776,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 35),
"txtSenderStreet", 182, 81, 4, 35, 119), self)
self.txtSenderPostCode = self.insertTextField(
- "txtSenderPostCode", TXTSENDERPOSTCODE_TEXT_CHANGED,
+ "txtSenderPostCode", TXTSENDERPOSTCODE_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -805,7 +788,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 36),
"txtSenderPostCode", 182, 95, 4, 36, 25), self)
self.txtSenderState = self.insertTextField(
- "txtSenderState", TXTSENDERSTATE_TEXT_CHANGED,
+ "txtSenderState", TXTSENDERSTATE_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -817,7 +800,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 37),
"txtSenderState", 211, 95, 4, 37, 21), self)
self.txtSenderCity = self.insertTextField(
- "txtSenderCity", TXTSENDERCITY_TEXT_CHANGED,
+ "txtSenderCity", TXTSENDERCITY_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -829,7 +812,7 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 38),
"txtSenderCity", 236, 95, 4, 38, 65), self)
self.optReceiverPlaceholder = self.insertRadioButton(
- "optReceiverPlaceholder", OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
+ "optReceiverPlaceholder", OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -843,7 +826,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptReceiverPlaceholder_value,
"optReceiverPlaceholder", 104, 145, 4, 39, 200), self)
self.optReceiverDatabase = self.insertRadioButton(
- "optReceiverDatabase", OPTRECEIVERDATABASE_ITEM_CHANGED,
+ "optReceiverDatabase", OPTRECEIVERDATABASE_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -856,8 +839,7 @@ class LetterWizardDialog(WizardDialog):
(8, HelpIds.getHelpIdString(HID + 40),
self.resources.resoptReceiverDatabase_value,
"optReceiverDatabase", 104, 157, 4, 40, 200), self)
- self.lblSenderAddress = self.insertLabel(
- "lblSenderAddress",
+ self.insertLabel("lblSenderAddress",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -868,8 +850,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblSenderAddress_value,
"lblSenderAddress", 97, 28, 4, 64, 136))
- self.FixedLine2 = self.insertFixedLine(
- "FixedLine2",
+ self.insertFixedLine("FixedLine2",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_NAME,
PropertyNames.PROPERTY_POSITION_X,
@@ -879,8 +860,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(5,
"FixedLine2", 90, 126, 4, 75, 212))
- self.lblReceiverAddress = self.insertLabel(
- "lblReceiverAddress",
+ self.insertLabel("lblReceiverAddress",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -891,8 +871,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblReceiverAddress_value,
"lblReceiverAddress", 97, 134, 4, 76, 136))
- self.lblSenderName = self.insertLabel(
- "lblSenderName",
+ self.insertLabel("lblSenderName",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -903,8 +882,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblSenderName_value,
"lblSenderName", 113, 69, 4, 77, 68))
- self.lblSenderStreet = self.insertLabel(
- "lblSenderStreet",
+ self.insertLabel("lblSenderStreet",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -915,8 +893,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblSenderStreet_value,
"lblSenderStreet", 113, 82, 4, 78, 68))
- self.lblPostCodeCity = self.insertLabel(
- "lblPostCodeCity",
+ self.insertLabel("lblPostCodeCity",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -927,10 +904,8 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblPostCodeCity_value,
"lblPostCodeCity", 113, 97, 4, 79, 68))
- self.lblTitle4 = self.insertLabel(
- "lblTitle4",
- (
- "FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
+ self.insertLabel("lblTitle4",
+ ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
PropertyNames.PROPERTY_NAME,
@@ -945,7 +920,7 @@ class LetterWizardDialog(WizardDialog):
def buildStep5(self):
self.txtFooter = self.insertTextField(
- "txtFooter", TXTFOOTER_TEXT_CHANGED,
+ "txtFooter", TXTFOOTER_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_MULTILINE,
@@ -958,7 +933,7 @@ class LetterWizardDialog(WizardDialog):
(47, HelpIds.getHelpIdString(HID + 41), True,
"txtFooter", 97, 40, 5, 41, 203), self)
self.chkFooterNextPages = self.insertCheckBox(
- "chkFooterNextPages", CHKFOOTERNEXTPAGES_ITEM_CHANGED,
+ "chkFooterNextPages", CHKFOOTERNEXTPAGES_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -973,7 +948,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkFooterNextPages_value,
"chkFooterNextPages", 97, 92, 0, 5, 42, 202), self)
self.chkFooterPageNumbers = self.insertCheckBox(
- "chkFooterPageNumbers", CHKFOOTERPAGENUMBERS_ITEM_CHANGED,
+ "chkFooterPageNumbers", CHKFOOTERPAGENUMBERS_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -987,10 +962,8 @@ class LetterWizardDialog(WizardDialog):
(8, HelpIds.getHelpIdString(HID + 43),
self.resources.reschkFooterPageNumbers_value,
"chkFooterPageNumbers", 97, 106, 0, 5, 43, 201), self)
- self.lblFooter = self.insertLabel(
- "lblFooter",
- (
- "FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
+ self.insertLabel("lblFooter",
+ ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
PropertyNames.PROPERTY_POSITION_X,
@@ -1000,10 +973,8 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 8, self.resources.reslblFooter_value,
"lblFooter", 97, 28, 5, 52, 116))
- self.lblTitle5 = self.insertLabel(
- "lblTitle5",
- (
- "FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
+ self.insertLabel("lblTitle5",
+ ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
PropertyNames.PROPERTY_NAME,
@@ -1018,7 +989,7 @@ class LetterWizardDialog(WizardDialog):
def buildStep6(self):
self.txtTemplateName = self.insertTextField(
- "txtTemplateName", TXTTEMPLATENAME_TEXT_CHANGED,
+ "txtTemplateName", TXTTEMPLATENAME_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -1032,7 +1003,7 @@ class LetterWizardDialog(WizardDialog):
"txtTemplateName", 202, 56, 6, 44,
self.resources.restxtTemplateName_value, 100), self)
self.optCreateLetter = self.insertRadioButton(
- "optCreateLetter", OPTCREATELETTER_ITEM_CHANGED,
+ "optCreateLetter", OPTCREATELETTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -1046,7 +1017,7 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptCreateLetter_value,
"optCreateLetter", 104, 111, 6, 50, 198), self)
self.optMakeChanges = self.insertRadioButton(
- "optMakeChanges", OPTMAKECHANGES_ITEM_CHANGED,
+ "optMakeChanges", OPTMAKECHANGES_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -1059,8 +1030,7 @@ class LetterWizardDialog(WizardDialog):
(8, HelpIds.getHelpIdString(HID + 46),
self.resources.resoptMakeChanges_value,
"optMakeChanges", 104, 123, 6, 51, 198), self)
- self.lblFinalExplanation1 = self.insertLabel(
- "lblFinalExplanation1",
+ self.insertLabel("lblFinalExplanation1",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -1072,8 +1042,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(26, self.resources.reslblFinalExplanation1_value, True,
"lblFinalExplanation1", 97, 28, 6, 52, 205))
- self.lblProceed = self.insertLabel(
- "lblProceed",
+ self.insertLabel("lblProceed",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -1084,8 +1053,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblProceed_value,
"lblProceed", 97, 100, 6, 53, 204))
- self.lblFinalExplanation2 = self.insertLabel(
- "lblFinalExplanation2",
+ self.insertLabel("lblFinalExplanation2",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -1097,7 +1065,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(33, self.resources.reslblFinalExplanation2_value, True,
"lblFinalExplanation2", 104, 145, 6, 54, 199))
- self.ImageControl2 = self.insertImage(
+ self.insertImage(
"ImageControl2",
(
"Border", PropertyNames.PROPERTY_HEIGHT,
@@ -1112,8 +1080,7 @@ class LetterWizardDialog(WizardDialog):
(0, 10,
"private:resource/dbu/image/19205",
"ImageControl2", 92, 145, False, 6, 66, 10))
- self.lblTemplateName = self.insertLabel(
- "lblTemplateName",
+ self.insertLabel("lblTemplateName",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_NAME,
@@ -1124,10 +1091,8 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblTemplateName_value,
"lblTemplateName", 97, 58, 6, 82, 101))
- self.lblTitle6 = self.insertLabel(
- "lblTitle6",
- (
- "FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
+ self.insertLabel("lblTitle6",
+ ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
PropertyNames.PROPERTY_NAME,
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index d25c0c2..5324e1c 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -1,7 +1,6 @@
from common.Resource import Resource
class LetterWizardDialogResources(Resource):
- UNIT_NAME = "dbwizres"
MODULE_NAME = "dbw"
RID_LETTERWIZARDDIALOG_START = 3000
RID_LETTERWIZARDGREETING_START = 3080
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py
index 9a4e741..60b4c08 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.py
+++ b/wizards/com/sun/star/wizards/text/TextDocument.py
@@ -92,7 +92,7 @@ class TextDocument(object):
def init(self):
self.xWindowPeer = self.xFrame.getComponentWindow()
- self.m_xDocProps = TextDocument.xTextDocument.getDocumentProperties()
+ self.m_xDocProps = TextDocument.xTextDocument.DocumentProperties
self.CharLocale = Helper.getUnoStructValue(
TextDocument.xTextDocument, "CharLocale")
self.xText = TextDocument.xTextDocument.Text
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py b/wizards/com/sun/star/wizards/ui/UnoDialog.py
index fbc1984..2c7e993 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py
@@ -124,206 +124,6 @@ class UnoDialog(object):
if iSelIndex != -1:
xListBox.selectItemPos(iSelIndex, True)
- def insertLabel(self, sName, sPropNames, oPropValues):
- try:
- oFixedText = self.insertControlModel(
- "com.sun.star.awt.UnoControlFixedTextModel",
- sName, sPropNames, oPropValues)
- oFixedText.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
- oLabel = self.xUnoDialog.getControl(sName)
- return oLabel
- except Exception, ex:
- traceback.print_exc()
- return None
-
- def insertButton(
- self, sName, iControlKey, xActionListener, sProperties, sValues):
- oButtonModel = self.insertControlModel(
- "com.sun.star.awt.UnoControlButtonModel",
- sName, sProperties, sValues)
- xPSet.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
- xButton = self.xUnoDialog.getControl(sName)
- if xActionListener != None:
- xButton.addActionListener(
- ActionListenerProcAdapter(xActionListener))
-
- ControlKey = iControlKey
- if self.ControlList != None:
- self.ControlList.put(sName, ControlKey)
-
- return xButton
-
- def insertCheckBox(
- self, sName, iControlKey, xItemListener, sProperties, sValues):
- oButtonModel = self.insertControlModel(
- "com.sun.star.awt.UnoControlCheckBoxModel",
- sName, sProperties, sValues)
- oButtonModel.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
- xCheckBox = self.xUnoDialog.getControl(sName)
- if xItemListener != None:
- xCheckBox.addItemListener(
- ItemListenerProcAdapter(xItemListener))
-
- ControlKey = iControlKey
- if self.ControlList != None:
- self.ControlList.put(sName, ControlKey)
-
- def insertNumericField(
- self, sName, iControlKey, xTextListener, sProperties, sValues):
- oNumericFieldModel = self.insertControlModel(
- "com.sun.star.awt.UnoControlNumericFieldModel",
- sName, sProperties, sValues)
- oNumericFieldModel.setPropertyValue(
- PropertyNames.PROPERTY_NAME, sName)
- xNumericField = self.xUnoDialog.getControl(sName)
- if xTextListener != None:
- xNumericField.addTextListener(
- TextListenerProcAdapter(xTextListener))
-
- ControlKey = iControlKey
- if self.ControlList != None:
- self.ControlList.put(sName, ControlKey)
-
- def insertScrollBar(
- self, sName, iControlKey, xAdjustmentListener, sProperties, sValues):
- try:
- oScrollModel = self.insertControlModel(
- "com.sun.star.awt.UnoControlScrollBarModel",
- sName, sProperties, sValues)
- oScrollModel.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
- xScrollBar = self.xUnoDialog.getControl(sName)
- if xAdjustmentListener != None:
- xScrollBar.addAdjustmentListener(xAdjustmentListener)
-
- ControlKey = iControlKey
- if self.ControlList != None:
- self.ControlList.put(sName, ControlKey)
-
- return xScrollBar
- except com.sun.star.uno.Exception, exception:
- traceback.print_exc()
- return None
-
- def insertTextField(
- self, sName, iControlKey, xTextListener, sProperties, sValues):
- xTextBox = insertEditField(
- "com.sun.star.awt.UnoControlEditModel", sName, iControlKey,
- xTextListener, sProperties, sValues)
- return xTextBox
-
- def insertFormattedField(
- self, sName, iControlKey, xTextListener, sProperties, sValues):
- xTextBox = insertEditField(
- "com.sun.star.awt.UnoControlFormattedFieldModel", sName,
- iControlKey, xTextListener, sProperties, sValues)
- return xTextBox
-
- def insertEditField(
- self, ServiceName, sName, iControlKey,
- xTextListener, sProperties, sValues):
-
- try:
- xTextModel = self.insertControlModel(
- ServiceName, sName, sProperties, sValues)
- xTextModel.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
- xTextBox = self.xUnoDialog.getControl(sName)
- if xTextListener != None:
- xTextBox.addTextListener(TextListenerProcAdapter(xTextListener))
-
- ControlKey = iControlKey
- self.ControlList.put(sName, ControlKey)
- return xTextBox
- except com.sun.star.uno.Exception, exception:
- traceback.print_exc()
- return None
-
- def insertListBox(
- self, sName, iControlKey, xActionListener,
- xItemListener, sProperties, sValues):
- xListBoxModel = self.insertControlModel(
- "com.sun.star.awt.UnoControlListBoxModel",
- sName, sProperties, sValues)
- xListBoxModel.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
- xListBox = self.xUnoDialog.getControl(sName)
- if xItemListener != None:
- xListBox.addItemListener(ItemListenerProcAdapter(xItemListener))
-
- if xActionListener != None:
- xListBox.addActionListener(
- ActionListenerProcAdapter(xActionListener))
-
- ControlKey = iControlKey
- self.ControlList.put(sName, ControlKey)
- return xListBox
-
- def insertComboBox(
- self, sName, iControlKey, xActionListener, xTextListener,
- xItemListener, sProperties, sValues):
- xComboBoxModel = self.insertControlModel(
- "com.sun.star.awt.UnoControlComboBoxModel",
- sName, sProperties, sValues)
- xComboBoxModel.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
- xComboBox = self.xUnoDialog.getControl(sName)
- if xItemListener != None:
- xComboBox.addItemListener(ItemListenerProcAdapter(xItemListener))
-
- if xTextListener != None:
- xComboBox.addTextListener(TextListenerProcAdapter(xTextListener))
-
- if xActionListener != None:
- xComboBox.addActionListener(
- ActionListenerProcAdapter(xActionListener))
-
- ControlKey = iControlKey
- self.ControlList.put(sName, ControlKey)
- return xComboBox
-
- def insertRadioButton(
- self, sName, iControlKey, xItemListener, sProperties, sValues):
- try:
- xRadioButton = insertRadioButton(
- sName, iControlKey, sProperties, sValues)
- if xItemListener != None:
- xRadioButton.addItemListener(
- ItemListenerProcAdapter(xItemListener))
-
- return xRadioButton
- except com.sun.star.uno.Exception, exception:
- traceback.print_exc()
- return None
-
- def insertRadioButton(
- self, sName, iControlKey, xActionListener, sProperties, sValues):
- try:
- xButton = insertRadioButton(
- sName, iControlKey, sProperties, sValues)
- if xActionListener != None:
- xButton.addActionListener(
- ActionListenerProcAdapter(xActionListener))
-
- return xButton
- except com.sun.star.uno.Exception, exception:
- traceback.print_exc()
- return None
-
- def insertRadioButton(self, sName, iControlKey, sProperties, sValues):
- xRadioButton = insertRadioButton(sName, sProperties, sValues)
- ControlKey = iControlKey
- self.ControlList.put(sName, ControlKey)
- return xRadioButton
-
- def insertRadioButton(self, sName, sProperties, sValues):
- try:
- oRadioButtonModel = self.insertControlModel(
- "com.sun.star.awt.UnoControlRadioButtonModel",
- sName, sProperties, sValues)
- oRadioButtonModel.setPropertyValue(
- PropertyNames.PROPERTY_NAME, sName)
- xRadioButton = self.xUnoDialog.getControl(sName)
- return xRadioButton
- except com.sun.star.uno.Exception, exception:
- traceback.print_exc()
- return None
'''
The problem with setting the visibility of controls
is that changing the current step of a dialog will automatically
@@ -375,7 +175,6 @@ class UnoDialog(object):
# repaints the currentDialogStep
-
def repaintDialogStep(self):
try:
ncurstep = int(Helper.getUnoPropertyValue(
@@ -387,15 +186,20 @@ class UnoDialog(object):
except com.sun.star.uno.Exception, exception:
traceback.print_exc()
- def insertControlModel(self, ServiceName, sName, sProperties, sValues):
+ def insertControlModel(
+ self, serviceName, componentName, sPropNames, oPropValues):
try:
- xControlModel = self.xDialogModel.createInstance(ServiceName)
- Helper.setUnoPropertyValues(xControlModel, sProperties, sValues)
- self.xDialogModel.insertByName(sName, xControlModel)
- return xControlModel
- except Exception, exception:
+ xControlModel = self.xDialogModel.createInstance(serviceName)
+ Helper.setUnoPropertyValues(
+ xControlModel, sPropNames, oPropValues)
+ self.xDialogModel.insertByName(componentName, xControlModel)
+ Helper.setUnoPropertyValue(xControlModel,
+ PropertyNames.PROPERTY_NAME, componentName)
+ except Exception, ex:
traceback.print_exc()
- return None
+
+ aObj = self.xUnoDialog.getControl(componentName)
+ return aObj
def setFocus(self, ControlName):
oFocusControl = self.xUnoDialog.getControl(ControlName)
@@ -544,9 +348,3 @@ class UnoDialog(object):
def addResourceHandler(self, _Unit, _Module):
self.m_oResource = Resource(self.xMSF, _Unit, _Module)
-
- def setInitialTabindex(self, _istep):
- return (short)(_istep * 100)
-
- def getListBoxLineCount(self):
- return 20
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.py b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
index 0bf8686..8986b3a 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
@@ -25,7 +25,7 @@ class UnoDialog2(UnoDialog):
def insertButton(
self, sName, actionPerformed, sPropNames, oPropValues, listener):
- xButton = self.insertControlModel2(
+ xButton = self.insertControlModel(
"com.sun.star.awt.UnoControlButtonModel",
sName, sPropNames, oPropValues)
if actionPerformed is not None:
@@ -37,7 +37,7 @@ class UnoDialog2(UnoDialog):
def insertImageButton(
self, sName, actionPerformed, sPropNames, oPropValues, listener):
- xButton = self.insertControlModel2(
+ xButton = self.insertControlModel(
"com.sun.star.awt.UnoControlButtonModel",
sName, sPropNames, oPropValues)
if actionPerformed is not None:
@@ -49,7 +49,7 @@ class UnoDialog2(UnoDialog):
def insertCheckBox(
self, sName, itemChanged, sPropNames, oPropValues, listener):
- xCheckBox = self.insertControlModel2(
+ xCheckBox = self.insertControlModel(
"com.sun.star.awt.UnoControlCheckBoxModel",
sName, sPropNames, oPropValues)
if itemChanged is not None:
@@ -61,7 +61,7 @@ class UnoDialog2(UnoDialog):
def insertComboBox(
self, sName, actionPerformed, itemChanged,
textChanged, sPropNames, oPropValues, listener):
- xComboBox = self.insertControlModel2(
+ xComboBox = self.insertControlModel(
"com.sun.star.awt.UnoControlComboBoxModel",
sName, sPropNames, oPropValues)
if actionPerformed is not None:
@@ -82,7 +82,7 @@ class UnoDialog2(UnoDialog):
def insertListBox(
self, sName, actionPerformed, itemChanged,
sPropNames, oPropValues, listener):
- xListBox = self.insertControlModel2(
+ xListBox = self.insertControlModel(
"com.sun.star.awt.UnoControlListBoxModel",
sName, sPropNames, oPropValues)
@@ -98,7 +98,7 @@ class UnoDialog2(UnoDialog):
def insertRadioButton(
self, sName, itemChanged, sPropNames, oPropValues, listener):
- xRadioButton = self.insertControlModel2(
+ xRadioButton = self.insertControlModel(
"com.sun.star.awt.UnoControlRadioButtonModel",
sName, sPropNames, oPropValues)
if itemChanged is not None:
@@ -106,11 +106,10 @@ class UnoDialog2(UnoDialog):
xRadioButton.addItemListener(
ItemListenerProcAdapter(itemChanged))
-
return xRadioButton
def insertTitledBox(self, sName, sPropNames, oPropValues):
- oTitledBox = self.insertControlModel2(
+ oTitledBox = self.insertControlModel(
"com.sun.star.awt.UnoControlGroupBoxModel",
sName, sPropNames, oPropValues)
return oTitledBox
@@ -122,7 +121,7 @@ class UnoDialog2(UnoDialog):
sPropNames, oPropValues, listener)
def insertImage(self, sName, sPropNames, oPropValues):
- return self.insertControlModel2(
+ return self.insertControlModel(
"com.sun.star.awt.UnoControlImageControlModel",
sName, sPropNames, oPropValues)
@@ -147,12 +146,11 @@ class UnoDialog2(UnoDialog):
def insertEditField(
self, sName, sTextChanged, sModelClass,
sPropNames, oPropValues, listener):
- xField = self.insertControlModel2(sModelClass,
+ xField = self.insertControlModel(sModelClass,
sName, sPropNames, oPropValues)
if sTextChanged is not None:
sTextChanged = getattr(listener, sTextChanged)
xField.addTextListener(TextListenerProcAdapter(sTextChanged))
-
return xField
def insertFileControl(
@@ -203,55 +201,36 @@ class UnoDialog2(UnoDialog):
sPropNames, oPropValues, listener)
def insertFixedLine(self, sName, sPropNames, oPropValues):
- oLine = self.insertControlModel2(
+ oLine = self.insertControlModel(
"com.sun.star.awt.UnoControlFixedLineModel",
sName, sPropNames, oPropValues)
return oLine
+
+ def insertLabel(self, sName, sPropNames, oPropValues):
+ oFixedText = self.insertControlModel(
+ "com.sun.star.awt.UnoControlFixedTextModel",
+ sName, sPropNames, oPropValues)
+ return oFixedText
+
def insertScrollBar(self, sName, sPropNames, oPropValues):
- oScrollBar = self.insertControlModel2(
+ oScrollBar = self.insertControlModel(
"com.sun.star.awt.UnoControlScrollBarModel",
sName, sPropNames, oPropValues)
return oScrollBar
def insertProgressBar(self, sName, sPropNames, oPropValues):
- oProgressBar = self.insertControlModel2(
+ oProgressBar = self.insertControlModel(
"com.sun.star.awt.UnoControlProgressBarModel",
sName, sPropNames, oPropValues)
return oProgressBar
def insertGroupBox(self, sName, sPropNames, oPropValues):
- oGroupBox = self.insertControlModel2(
+ oGroupBox = self.insertControlModel(
"com.sun.star.awt.UnoControlGroupBoxModel",
sName, sPropNames, oPropValues)
return oGroupBox
- def insertControlModel2(
- self, serviceName, componentName, sPropNames, oPropValues):
- try:
- xControlModel = self.insertControlModel(
- serviceName, componentName, (), ())
- Helper.setUnoPropertyValues(
- xControlModel, sPropNames, oPropValues)
- Helper.setUnoPropertyValue(xControlModel,
- PropertyNames.PROPERTY_NAME, componentName)
- except Exception, ex:
- traceback.print_exc()
-
- aObj = self.xUnoDialog.getControl(componentName)
- return aObj
-
- def setControlPropertiesDebug(self, model, names, values):
- i = 0
- while i < len(names):
- print " Settings: ", names[i]
- Helper.setUnoPropertyValue(model, names[i], values[i])
- i += 1
-
- def getControlModel(self, unoControl):
- obj = unoControl.Model
- return obj
-
def showMessageBox(self, windowServiceName, windowAttribute, MessageText):
return SystemDialog.showMessageBox(
xMSF, self.xControl.Peer,
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index ee0f7c6..9487d40 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -43,7 +43,6 @@ class WizardDialog(UnoDialog2):
self.sMsgEndAutopilot = self.__oWizardResource.getResText(
UIConsts.RID_DB_COMMON + 33)
self.oRoadmap = None
- #self.vetos = VetoableChangeSupport.VetoableChangeSupport_unknown(this)
def getResource(self):
return self.__oWizardResource
@@ -74,7 +73,7 @@ class WizardDialog(UnoDialog2):
return False
def setCurrentRoadmapItemID(self, ID):
- if self.oRoadmap != None:
+ if self.oRoadmap is not None:
nCurItemID = self.getCurrentRoadmapItemID()
if nCurItemID != ID:
Helper.setUnoPropertyValue(self.oRoadmap, "CurrentItemID",ID)
@@ -95,7 +94,8 @@ class WizardDialog(UnoDialog2):
# the roadmap control has got no real TabIndex ever
# that is not correct, but changing this would need time,
# so it is used without TabIndex as before
- self.oRoadmap = self.insertControlModel(
+
+ xRoadmapControl = self.insertControlModel(
"com.sun.star.awt.UnoControlRoadmapModel",
"rdmNavi",
(PropertyNames.PROPERTY_HEIGHT,
@@ -106,12 +106,9 @@ class WizardDialog(UnoDialog2):
PropertyNames.PROPERTY_WIDTH),
((iDialogHeight - 26), 0, 0, 0,
0, True, 85))
- self.oRoadmap.setPropertyValue(
- PropertyNames.PROPERTY_NAME, "rdmNavi")
-
- self.xRoadmapControl = self.xUnoDialog.getControl("rdmNavi")
+ self.oRoadmap = xRoadmapControl.Model
method = getattr(self, "itemStateChanged")
- self.xRoadmapControl.addItemListener(
+ xRoadmapControl.addItemListener(
ItemListenerProcAdapter(method))
Helper.setUnoPropertyValue(
@@ -146,9 +143,6 @@ class WizardDialog(UnoDialog2):
traceback.print_exc()
return -1
- def getRMItemCount(self):
- return self.oRoadmap.Count
-
def getRoadmapItemByID(self, _ID):
try:
getByIndex = self.oRoadmap.getByIndex
@@ -202,12 +196,6 @@ class WizardDialog(UnoDialog2):
self.enableNextButton(self.getNextAvailableStep() > 0)
self.enableBackButton(nNewStep != 1)
- def iscompleted(self, _ndialogpage):
- return False
-
- def ismodified(self, _ndialogpage):
- return False
-
def drawNaviBar(self):
try:
curtabindex = UIConsts.SOFIRSTWIZARDNAVITABINDEX
@@ -388,9 +376,7 @@ class WizardDialog(UnoDialog2):
while i <= self.nMaxStep:
if self.isStepEnabled(i):
return i
-
i += 1
-
return -1
def gotoNextAvailableStep(self):
More information about the Libreoffice-commits
mailing list