[Libreoffice-commits] core.git: 4 commits - wizards/com
Xisco Fauli
anistenis at gmail.com
Thu Feb 13 19:19:34 CET 2014
wizards/com/sun/star/wizards/README | 4
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py | 2
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py | 17
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py | 185 +++---
wizards/com/sun/star/wizards/common/Desktop.py | 5
wizards/com/sun/star/wizards/common/Resource.py | 11
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py | 2
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 5
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py | 161 ++---
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py | 2
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 8
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 178 ++----
wizards/com/sun/star/wizards/ui/UnoDialog.py | 6
wizards/com/sun/star/wizards/ui/WizardDialog.py | 81 +-
wizards/com/sun/star/wizards/web/FTPDialog.py | 4
wizards/com/sun/star/wizards/web/FTPDialogResources.py | 75 +-
wizards/com/sun/star/wizards/web/WWD_General.py | 2
wizards/com/sun/star/wizards/web/WWD_Startup.py | 12
wizards/com/sun/star/wizards/web/WebWizardDialog.py | 4
wizards/com/sun/star/wizards/web/WebWizardDialogResources.py | 283 ++++------
20 files changed, 477 insertions(+), 570 deletions(-)
New commits:
commit 146d182a3e489d840c0d753666725ebe2c90368a
Author: Xisco Fauli <anistenis at gmail.com>
Date: Thu Feb 13 19:04:49 2014 +0100
pywizards: Let's do it always the same way
Change-Id: I8302bffea68a7e2a167e159cf14ad16a0267e8a4
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
index d0fd320..99aced7 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
@@ -190,13 +190,8 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
def insertRoadmap(self):
self.addRoadmap()
-
self.insertRoadMapItems(
- [True, True, True, True, True, True],
- [self.resources.resStep1, self.resources.resStep2,
- self.resources.resStep3, self.resources.resStep4,
- self.resources.resStep5, self.resources.resStep6])
-
+ self.resources.RoadmapLabels, [True, True, True, True, True, True])
self.setRoadmapInteractive(True)
self.setRoadmapComplete(True)
self.setCurrentRoadmapItemID(1)
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
index a13c4c1..4f2fe2b 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
@@ -19,6 +19,7 @@
class AgendaWizardDialogResources(object):
RID_AGENDAWIZARDDIALOG_START = 5000
+ RID_AGENDAWIZARDROADMAP_START = 5049
RID_COMMON_START = 500
SECTION_ITEMS = "AGENDA_ITEMS"
SECTION_TOPICS = "AGENDA_TOPICS"
@@ -121,18 +122,6 @@ class AgendaWizardDialogResources(object):
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 47)
self.resPlaceHolderHint = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 48)
- self.resStep1 = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 50)
- self.resStep2 = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 51)
- self.resStep3 = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 52)
- self.resStep4 = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 53)
- self.resStep5 = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 54)
- self.resStep6 = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 55)
self.resErrOpenTemplate = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 56)
self.itemMeetingType = oWizardResource.getResText(
@@ -204,3 +193,6 @@ class AgendaWizardDialogResources(object):
AgendaWizardDialogResources.RID_COMMON_START + 19)
self.resTemplateDescription = oWizardResource.getResText(
AgendaWizardDialogResources.RID_COMMON_START + 20)
+
+ self.RoadmapLabels = oWizardResource.getResArray(
+ AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 1 , 6)
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index ab62317..810ba80 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -219,7 +219,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
def insertRoadmap(self):
self.addRoadmap()
self.insertRoadMapItems(
- [True, True, True, False, True], self.resources.RoadmapLabels)
+ self.resources.RoadmapLabels, [True, True, True, False, True])
self.setRoadmapInteractive(True)
self.setRoadmapComplete(True)
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index 618d0ef..76866e7 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -843,11 +843,9 @@ class LetterWizardDialogImpl(LetterWizardDialog):
def insertRoadmap(self):
self.addRoadmap()
-
self.insertRoadMapItems(
- [True, False, True, True, False, True],
- self.resources.RoadmapLabels)
-
+ self.resources.RoadmapLabels,
+ [True, False, True, True, False, True])
self.setRoadmapInteractive(True)
self.setRoadmapComplete(True)
self.setCurrentRoadmapItemID(1)
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index b1bac2b..5df050f 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -145,18 +145,6 @@ class WizardDialog(UnoDialog2):
except Exception:
traceback.print_exc()
- def insertRoadmapItem(self, Index, _bEnabled, _sLabel, _CurItemID):
- try:
- if isinstance(_sLabel, int):
- _sLabel = self.sRMItemLabels(_sLabel)
- oRoadmapItem = self.oRoadmap.createInstance()
- oRoadmapItem.Label = _sLabel
- oRoadmapItem.Enabled = _bEnabled
- oRoadmapItem.ID = _CurItemID
- self.oRoadmap.insertByIndex(Index, oRoadmapItem)
- except Exception:
- traceback.print_exc()
-
def getRoadmapItemByID(self, _ID):
try:
getByIndex = self.oRoadmap.getByIndex
@@ -296,10 +284,17 @@ class WizardDialog(UnoDialog2):
except Exception:
traceback.print_exc()
- def insertRoadMapItems(self, enabled, items):
+ def insertRoadMapItems(self, items, enabled):
for index, item in enumerate(items):
- self.insertRoadmapItem(index, enabled[index], item, index + 1)
-
+ try:
+ oRoadmapItem = self.oRoadmap.createInstance()
+ oRoadmapItem.Label = item
+ oRoadmapItem.Enabled = enabled[index]
+ oRoadmapItem.ID = index + 1
+ self.oRoadmap.insertByIndex(index, oRoadmapItem)
+ except Exception:
+ traceback.print_exc()
+
def setStepEnabled(self, _nStep, bEnabled, enableNextButton=None):
xRoadmapItem = self.getRoadmapItemByID(_nStep)
if xRoadmapItem is not None:
diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.py b/wizards/com/sun/star/wizards/web/WWD_Startup.py
index 63c780d..6687478 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Startup.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Startup.py
@@ -194,13 +194,11 @@ class WWD_Startup(WWD_General):
Disables the finbihButton.
'''
- def addRoadMapItems(self):
+ def insertRoadmap(self):
+
self.insertRoadMapItems(
- [True, True, False, False, False, False, False],
- [self.resources.resStep1, self.resources.resStep2,
- self.resources.resStep3, self.resources.resStep4,
- self.resources.resStep5, self.resources.resStep6,
- self.resources.resStep7])
+ self.resources.RoadmapLabels,
+ [True, True, False, False, False, False, False])
self.setRoadmapInteractive(True)
self.setRoadmapComplete(True)
self.setCurrentRoadmapItemID(1)
@@ -232,7 +230,7 @@ class WWD_Startup(WWD_General):
xContainerWindow = self.myFrame.getComponentWindow()
self.createWindowPeer(xContainerWindow)
self.addRoadmap()
- self.addRoadMapItems()
+ self.insertRoadmap()
self.addStylePreview()
self.checkSteps()
self.executeDialogFromComponent(self.myFrame)
diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialogResources.py b/wizards/com/sun/star/wizards/web/WebWizardDialogResources.py
index fecf93f..3465dd6 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/web/WebWizardDialogResources.py
@@ -25,6 +25,7 @@ class WebWizardDialogResources(object):
RID_WEBWIZARDDIALOG_START = 4000
RID_COMMON_START = 500
RID_DB_COMMON_START = 1000
+ RID_WEBWIZARDROADMAP_START = 4121
def __init__(self, xmsf, oWizardResource):
try:
@@ -239,20 +240,6 @@ class WebWizardDialogResources(object):
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 120)
self.resDefaultArchiveFilename = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 121)
- self.resStep1 = oWizardResource.getResText(
- WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 122)
- self.resStep2 = oWizardResource.getResText(
- WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 123)
- self.resStep3 = oWizardResource.getResText(
- WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 124)
- self.resStep4 = oWizardResource.getResText(
- WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 125)
- self.resStep5 = oWizardResource.getResText(
- WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 126)
- self.resStep6 = oWizardResource.getResText(
- WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 127)
- self.resStep7 = oWizardResource.getResText(
- WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 128)
self.resDelSessionConfirm = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 130)
self.resPages = oWizardResource.getResText(
@@ -307,6 +294,11 @@ class WebWizardDialogResources(object):
WebWizardDialogResources.RID_COMMON_START + 18)
self.resHelp = oWizardResource.getResText(
WebWizardDialogResources.RID_COMMON_START + 15)
+
+
+ self.RoadmapLabels = oWizardResource.getResArray(
+ WebWizardDialogResources.RID_WEBWIZARDROADMAP_START + 1 , 7)
+
try:
self.prodName = Configuration.getProductName(xmsf)
self.resGifFiles = Properties.getPropertyValue(
commit 9e119c93d2a8bb42550bec6e09c383e9214ba66c
Author: Xisco Fauli <anistenis at gmail.com>
Date: Wed Feb 12 19:37:45 2014 +0100
pywizards: Don't need to instantiate Resource twice
Change-Id: I3b0c0218b6b019788316d09a1e1fef9b6a47c6e7
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
index b7f428e..86d3c8c 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
@@ -27,7 +27,7 @@ class AgendaWizardDialog(WizardDialog):
super(AgendaWizardDialog,self).__init__(xmsf, HID )
#Load Resources
- self.resources = AgendaWizardDialogResources(xmsf)
+ self.resources = AgendaWizardDialogResources(self.oWizardResource)
#set dialog properties...
uno.invoke(self.xDialogModel, "setPropertyValues",
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
index ddcbcc0..a13c4c1 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
@@ -15,11 +15,9 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-from ..common.Resource import Resource
-class AgendaWizardDialogResources(Resource):
+class AgendaWizardDialogResources(object):
- MODULE_NAME = "dbw"
RID_AGENDAWIZARDDIALOG_START = 5000
RID_COMMON_START = 500
SECTION_ITEMS = "AGENDA_ITEMS"
@@ -27,185 +25,182 @@ class AgendaWizardDialogResources(Resource):
SECTION_MINUTES_ALL = "MINUTES_ALL"
SECTION_MINUTES = "MINUTES"
- def __init__(self, xmsf):
- super(AgendaWizardDialogResources,self).__init__(xmsf,
- AgendaWizardDialogResources.MODULE_NAME)
- #Delete the String, uncomment the getResText method
- self.resAgendaWizardDialog_title = self.getResText(
+ def __init__(self, oWizardResource):
+ self.resAgendaWizardDialog_title = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 1)
- self.resoptMakeChanges_value = self.getResText(
+ self.resoptMakeChanges_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 2)
- self.reslblTemplateName_value = self.getResText(
+ self.reslblTemplateName_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 3)
- self.reslblTemplatePath_value = self.getResText(
+ self.reslblTemplatePath_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 4)
- self.reslblProceed_value = self.getResText(
+ self.reslblProceed_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 5)
- self.reslblTitle1_value = self.getResText(
+ self.reslblTitle1_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 6)
- self.reslblTitle3_value = self.getResText(
+ self.reslblTitle3_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 7)
- self.reslblTitle2_value = self.getResText(
+ self.reslblTitle2_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 8)
- self.reslblTitle4_value = self.getResText(
+ self.reslblTitle4_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 9)
- self.reslblTitle5_value = self.getResText(
+ self.reslblTitle5_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 10)
- self.reslblTitle6_value = self.getResText(
+ self.reslblTitle6_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 11)
- self.reschkMinutes_value = self.getResText(
+ self.reschkMinutes_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 12)
- self.reslblHelp1_value = self.getResText(
+ self.reslblHelp1_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 13)
- self.reslblTime_value = self.getResText(
+ self.reslblTime_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 14)
- self.reslblTitle_value = self.getResText(
+ self.reslblTitle_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 15)
- self.reslblLocation_value = self.getResText(
+ self.reslblLocation_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 16)
- self.reslblHelp2_value = self.getResText(
+ self.reslblHelp2_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 17)
- self.resbtnTemplatePath_value = self.getResText(
+ self.resbtnTemplatePath_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 18)
- self.resoptCreateAgenda_value = self.getResText(
+ self.resoptCreateAgenda_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 19)
- self.reslblHelp6_value = self.getResText(
+ self.reslblHelp6_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 20)
- self.reslblTopic_value = self.getResText(
+ self.reslblTopic_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 21)
- self.reslblResponsible_value = self.getResText(
+ self.reslblResponsible_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 22)
- self.reslblDuration_value = self.getResText(
+ self.reslblDuration_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 23)
- self.reschkConvenedBy_value = self.getResText(
+ self.reschkConvenedBy_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 24)
- self.reschkPresiding_value = self.getResText(
+ self.reschkPresiding_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 25)
- self.reschkNoteTaker_value = self.getResText(
+ self.reschkNoteTaker_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 26)
- self.reschkTimekeeper_value = self.getResText(
+ self.reschkTimekeeper_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 27)
- self.reschkAttendees_value = self.getResText(
+ self.reschkAttendees_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 28)
- self.reschkObservers_value = self.getResText(
+ self.reschkObservers_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 29)
- self.reschkResourcePersons_value = self.getResText(
+ self.reschkResourcePersons_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 30)
- self.reslblHelp4_value = self.getResText(
+ self.reslblHelp4_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 31)
- self.reschkMeetingTitle_value = self.getResText(
+ self.reschkMeetingTitle_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 32)
- self.reschkRead_value = self.getResText(
+ self.reschkRead_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 33)
- self.reschkBring_value = self.getResText(
+ self.reschkBring_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 34)
- self.reschkNotes_value = self.getResText(
+ self.reschkNotes_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 35)
- self.reslblHelp3_value = self.getResText(
+ self.reslblHelp3_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 36)
- self.reslblDate_value = self.getResText(
+ self.reslblDate_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 38)
- self.reslblHelpPg6_value = self.getResText(
+ self.reslblHelpPg6_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 39)
- self.reslblPageDesign_value = self.getResText(
+ self.reslblPageDesign_value = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 40)
- self.resDefaultFilename = self.getResText(
+ self.resDefaultFilename = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 41)
self.resDefaultFilename = self.resDefaultFilename[:-4] + ".ott"
- self.resDefaultTitle = self.getResText(
+ self.resDefaultTitle = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 42)
- self.resErrSaveTemplate = self.getResText(
+ self.resErrSaveTemplate = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 43)
- self.resPlaceHolderTitle = self.getResText(
+ self.resPlaceHolderTitle = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 44)
- self.resPlaceHolderDate = self.getResText(
+ self.resPlaceHolderDate = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 45)
- self.resPlaceHolderTime = self.getResText(
+ self.resPlaceHolderTime = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 46)
- self.resPlaceHolderLocation = self.getResText(
+ self.resPlaceHolderLocation = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 47)
- self.resPlaceHolderHint = self.getResText(
+ self.resPlaceHolderHint = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 48)
- self.resStep1 = self.getResText(
+ self.resStep1 = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 50)
- self.resStep2 = self.getResText(
+ self.resStep2 = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 51)
- self.resStep3 = self.getResText(
+ self.resStep3 = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 52)
- self.resStep4 = self.getResText(
+ self.resStep4 = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 53)
- self.resStep5 = self.getResText(
+ self.resStep5 = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 54)
- self.resStep6 = self.getResText(
+ self.resStep6 = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 55)
- self.resErrOpenTemplate = self.getResText(
+ self.resErrOpenTemplate = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 56)
- self.itemMeetingType = self.getResText(
+ self.itemMeetingType = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 57)
- self.itemBring = self.getResText(
+ self.itemBring = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 58)
- self.itemRead = self.getResText(
+ self.itemRead = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 59)
- self.itemNote = self.getResText(
+ self.itemNote = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 60)
- self.itemCalledBy = self.getResText(
+ self.itemCalledBy = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 61)
- self.itemFacilitator = self.getResText(
+ self.itemFacilitator = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 62)
- self.itemAttendees = self.getResText(
+ self.itemAttendees = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 63)
- self.itemNotetaker = self.getResText(
+ self.itemNotetaker = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 64)
- self.itemTimekeeper = self.getResText(
+ self.itemTimekeeper = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 65)
- self.itemObservers = self.getResText(
+ self.itemObservers = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 66)
- self.itemResource = self.getResText(
+ self.itemResource = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 67)
- self.resButtonInsert = self.getResText(
+ self.resButtonInsert = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 68)
- self.resButtonRemove = self.getResText(
+ self.resButtonRemove = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 69)
- self.resButtonUp = self.getResText(
+ self.resButtonUp = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 70)
- self.resButtonDown = self.getResText(
+ self.resButtonDown = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 71)
#Create a dictionary for localised string in the template
self.dictConstants = {
- "#datetitle#" : self.getResText(
+ "#datetitle#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 72),
- "#timetitle#" : self.getResText(
+ "#timetitle#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 73),
- "#locationtitle#" : self.getResText(
+ "#locationtitle#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 74),
- "#topics#" : self.getResText(
+ "#topics#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 75),
- "#num.#" : self.getResText(
+ "#num.#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 76),
- "#topicheader#" : self.getResText(
+ "#topicheader#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 77),
- "#responsibleheader#" : self.getResText(
+ "#responsibleheader#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 78),
- "#timeheader#" : self.getResText(
+ "#timeheader#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 79),
- "#additional-information#" : self.getResText(
+ "#additional-information#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 80),
- "#minutes-for#" : self.getResText(
+ "#minutes-for#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 81),
- "#discussion#" : self.getResText(
+ "#discussion#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 82),
- "#conclusion#" : self.getResText(
+ "#conclusion#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 83),
- "#to-do#" : self.getResText(
+ "#to-do#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 84),
- "#responsible-party#" : self.getResText(
+ "#responsible-party#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 85),
- "#deadline#" : self.getResText(
+ "#deadline#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 86)}
#Common Resources
- self.resOverwriteWarning = self.getResText(
+ self.resOverwriteWarning = oWizardResource.getResText(
AgendaWizardDialogResources.RID_COMMON_START + 19)
- self.resTemplateDescription = self.getResText(
+ self.resTemplateDescription = oWizardResource.getResText(
AgendaWizardDialogResources.RID_COMMON_START + 20)
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 308238b..323e71e 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -27,7 +27,7 @@ class FaxWizardDialog(WizardDialog):
super(FaxWizardDialog,self).__init__(xmsf, HIDMAIN )
#Load Resources
- self.resources = FaxWizardDialogResources(xmsf)
+ self.resources = FaxWizardDialogResources(self.oWizardResource)
#set dialog properties...
uno.invoke(self.xDialogModel, "setPropertyValues",
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index 57302dd..c9a176c 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -15,10 +15,9 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-from ..common.Resource import Resource
-class FaxWizardDialogResources(Resource):
- MODULE_NAME = "dbw"
+class FaxWizardDialogResources(object):
+
RID_FAXWIZARDDIALOG_START = 3200
RID_FAXWIZARDCOMMUNICATION_START = 3270
RID_FAXWIZARDGREETING_START = 3280
@@ -26,139 +25,137 @@ class FaxWizardDialogResources(Resource):
RID_FAXWIZARDROADMAP_START = 3300
RID_RID_COMMON_START = 500
- def __init__(self, xmsf):
- super(FaxWizardDialogResources,self).__init__(xmsf,
- FaxWizardDialogResources.MODULE_NAME)
+ def __init__(self, oWizardResource):
- self.resFaxWizardDialog_title = self.getResText(
+ self.resFaxWizardDialog_title = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 1)
- self.resoptBusinessFax_value = self.getResText(
+ self.resoptBusinessFax_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 3)
- self.resoptPrivateFax_value = self.getResText(
+ self.resoptPrivateFax_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 4)
- self.reschkUseLogo_value = self.getResText(
+ self.reschkUseLogo_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 5)
- self.reschkUseSubject_value = self.getResText(
+ self.reschkUseSubject_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 6)
- self.reschkUseSalutation_value = self.getResText(
+ self.reschkUseSalutation_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 7)
- self.reschkUseGreeting_value = self.getResText(
+ self.reschkUseGreeting_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 8)
- self.reschkUseFooter_value = self.getResText(
+ self.reschkUseFooter_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 9)
- self.resoptSenderPlaceholder_value = self.getResText(
+ self.resoptSenderPlaceholder_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 10)
- self.resoptSenderDefine_value = self.getResText(
+ self.resoptSenderDefine_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 11)
- self.restxtTemplateName_value = self.getResText(
+ self.restxtTemplateName_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 12)
- self.resoptCreateFax_value = self.getResText(
+ self.resoptCreateFax_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 13)
- self.resoptMakeChanges_value = self.getResText(
+ self.resoptMakeChanges_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 14)
- self.reslblBusinessStyle_value = self.getResText(
+ self.reslblBusinessStyle_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 15)
- self.reslblPrivateStyle_value = self.getResText(
+ self.reslblPrivateStyle_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 16)
- self.reslblIntroduction_value = self.getResText(
+ self.reslblIntroduction_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 17)
- self.reslblSenderAddress_value = self.getResText(
+ self.reslblSenderAddress_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 18)
- self.reslblSenderName_value = self.getResText(
+ self.reslblSenderName_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 19)
- self.reslblSenderStreet_value = self.getResText(
+ self.reslblSenderStreet_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 20)
- self.reslblPostCodeCity_value = self.getResText(
+ self.reslblPostCodeCity_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 21)
- self.reslblFooter_value = self.getResText(
+ self.reslblFooter_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 22)
- self.reslblFinalExplanation1_value = self.getResText(
+ self.reslblFinalExplanation1_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 23)
- self.reslblFinalExplanation2_value = self.getResText(
+ self.reslblFinalExplanation2_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 24)
- self.reslblTemplateName_value = self.getResText(
+ self.reslblTemplateName_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 25)
- self.reslblTemplatePath_value = self.getResText(
+ self.reslblTemplatePath_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 26)
- self.reslblProceed_value = self.getResText(
+ self.reslblProceed_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 27)
- self.reslblTitle1_value = self.getResText(
+ self.reslblTitle1_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 28)
- self.reslblTitle3_value = self.getResText(
+ self.reslblTitle3_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 29)
- self.reslblTitle4_value = self.getResText(
+ self.reslblTitle4_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 30)
- self.reslblTitle5_value = self.getResText(
+ self.reslblTitle5_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 31)
- self.reslblTitle6_value = self.getResText(
+ self.reslblTitle6_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 32)
- self.reschkFooterNextPages_value = self.getResText(
+ self.reschkFooterNextPages_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 33)
- self.reschkFooterPageNumbers_value = self.getResText(
+ self.reschkFooterPageNumbers_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 34)
- self.reschkUseDate_value = self.getResText(
+ self.reschkUseDate_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 35)
- self.reschkUseCommunicationType_value = self.getResText(
+ self.reschkUseCommunicationType_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 36)
- self.resLabel1_value = self.getResText(
+ self.resLabel1_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 37)
- self.resoptReceiverPlaceholder_value = self.getResText(
+ self.resoptReceiverPlaceholder_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 38)
- self.resoptReceiverDatabase_value = self.getResText(
+ self.resoptReceiverDatabase_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 39)
- self.resLabel2_value = self.getResText(
+ self.resLabel2_value = oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 40)
#Create a Dictionary for the constants values.
self.dictConstants = {
- "#to#" : self.getResText(
+ "#to#" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 41),
- "#from#" : self.getResText(
+ "#from#" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 42),
- "#faxconst#" : self.getResText(
+ "#faxconst#" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 43),
- "#telconst#" : self.getResText(
+ "#telconst#" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 44),
- "#emailconst#" : self.getResText(
+ "#emailconst#" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 45),
- "#consist1#" : self.getResText(
+ "#consist1#" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 46),
- "#consist2#" : self.getResText(
+ "#consist2#" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 47),
- "#consist3#" : self.getResText(
+ "#consist3#" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 48)}
#Create a dictionary for localising the private template
self.dictPrivateTemplate = {
- "Bottle" : self.getResText(
+ "Bottle" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 49),
- "Lines" : self.getResText(
+ "Lines" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 50),
- "Marine" : self.getResText(
+ "Marine" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 51)}
#Create a dictionary for localising the business template
self.dictBusinessTemplate = {
- "Classic Fax" : self.getResText(
+ "Classic Fax" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 52),
- "Classic Fax from Private" : self.getResText(
+ "Classic Fax from Private" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 53),
- "Modern Fax" : self.getResText(
+ "Modern Fax" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 54),
- "Modern Fax from Private" : self.getResText(
+ "Modern Fax from Private" : oWizardResource.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 55)}
#Common Resources
- self.resOverwriteWarning = self.getResText(
+ self.resOverwriteWarning = oWizardResource.getResText(
FaxWizardDialogResources.RID_RID_COMMON_START + 19)
- self.resTemplateDescription = self.getResText(
+ self.resTemplateDescription = oWizardResource.getResText(
FaxWizardDialogResources.RID_RID_COMMON_START + 20)
- self.RoadmapLabels = self.getResArray(
+ self.RoadmapLabels = oWizardResource.getResArray(
FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 1 , 5)
- self.SalutationLabels = self.getResArray(
+ self.SalutationLabels = oWizardResource.getResArray(
FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 1 , 4)
- self.GreetingLabels = self.getResArray(
+ self.GreetingLabels = oWizardResource.getResArray(
FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 1 , 4)
- self.CommunicationLabels = self.getResArray(
+ self.CommunicationLabels = oWizardResource.getResArray(
FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + 1 , 3)
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index 3176abd..b3da6e6 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -27,7 +27,7 @@ class LetterWizardDialog(WizardDialog):
def __init__(self, xmsf):
super(LetterWizardDialog, self).__init__(xmsf, HIDMAIN )
- self.resources = LetterWizardDialogResources(xmsf)
+ self.resources = LetterWizardDialogResources(self.oWizardResource)
uno.invoke(self.xDialogModel, "setPropertyValues",
(("Closeable",
PropertyNames.PROPERTY_HEIGHT,
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index 748a51b..3d29aeb 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -15,11 +15,9 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-from ..common.Resource import Resource
-class LetterWizardDialogResources(Resource):
+class LetterWizardDialogResources(object):
- MODULE_NAME = "dbw"
RID_LETTERWIZARDDIALOG_START = 3000
RID_LETTERWIZARDGREETING_START = 3080
RID_LETTERWIZARDSALUTATION_START = 3090
@@ -27,227 +25,225 @@ class LetterWizardDialogResources(Resource):
RID_LETTERWIZARDLANGUAGE_START = 3110
RID_RID_COMMON_START = 500
- def __init__(self, xmsf):
- super(LetterWizardDialogResources,self).__init__(
- xmsf, LetterWizardDialogResources.MODULE_NAME)
+ def __init__(self, oWizardResource):
self.resLetterWizardDialog_title = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 1)
self.resLabel9_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 2)
self.resoptBusinessLetter_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 3)
self.resoptPrivOfficialLetter_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 4)
self.resoptPrivateLetter_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 5)
self.reschkBusinessPaper_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 6)
self.reschkPaperCompanyLogo_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 7)
self.reschkPaperCompanyAddress_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 8)
self.reschkPaperFooter_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 9)
self.reschkCompanyReceiver_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 10)
self.reschkUseLogo_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 11)
self.reschkUseAddressReceiver_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 12)
self.reschkUseSigns_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 13)
self.reschkUseSubject_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 14)
self.reschkUseSalutation_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 15)
self.reschkUseBendMarks_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 16)
self.reschkUseGreeting_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 17)
self.reschkUseFooter_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 18)
self.resoptSenderPlaceholder_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 19)
self.resoptSenderDefine_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 20)
self.resoptReceiverPlaceholder_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 21)
self.resoptReceiverDatabase_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 22)
self.reschkFooterNextPages_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 23)
self.reschkFooterPageNumbers_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 24)
self.restxtTemplateName_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 25)
self.resoptCreateLetter_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 26)
self.resoptMakeChanges_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 27)
self.reslblBusinessStyle_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 28)
self.reslblPrivOfficialStyle_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 29)
self.reslblPrivateStyle_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 30)
self.reslblIntroduction_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 31)
self.reslblLogoHeight_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 32)
self.reslblLogoWidth_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 33)
self.reslblLogoX_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 34)
self.reslblLogoY_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 35)
self.reslblAddressHeight_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 36)
self.reslblAddressWidth_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 37)
self.reslblAddressX_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 38)
self.reslblAddressY_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 39)
self.reslblFooterHeight_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 40)
self.reslblSenderAddress_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 42)
self.reslblSenderName_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 43)
self.reslblSenderStreet_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 44)
self.reslblPostCodeCity_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 45)
self.reslblReceiverAddress_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 46)
self.reslblFooter_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 47)
self.reslblFinalExplanation1_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 48)
self.reslblFinalExplanation2_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 49)
self.reslblTemplateName_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 50)
self.reslblTemplatePath_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 51)
self.reslblProceed_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 52)
self.reslblTitle1_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 53)
self.reslblTitle3_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 54)
self.reslblTitle2_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 55)
self.reslblTitle4_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 56)
self.reslblTitle5_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 57)
self.reslblTitle6_value = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 58)
#Create a Dictionary for the constants values.
self.dictConstants = {
- "#subjectconst#" : self.getResText(
+ "#subjectconst#" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 59)}
#Create a dictionary for localising the bussiness templates
self.dictBusinessTemplate = {
- "Elegant" : self.getResText(
+ "Elegant" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 60),
- "Modern" : self.getResText(
+ "Modern" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 61),
- "Office" : self.getResText(
+ "Office" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 62)}
#Create a dictionary for localising the official templates
self.dictOfficialTemplate = {
- "Elegant" : self.getResText(
+ "Elegant" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 60),
- "Modern" : self.getResText(
+ "Modern" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 61),
- "Office" : self.getResText(
+ "Office" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 62)}
#Create a dictionary for localising the private templates
self.dictPrivateTemplate = {
- "Bottle" : self.getResText(
+ "Bottle" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 63),
- "Mail" : self.getResText(
+ "Mail" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 64),
- "Marine" : self.getResText(
+ "Marine" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 65),
- "RedLine" : self.getResText(
+ "RedLine" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 66)}
#Common Resources
self.resOverwriteWarning = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_RID_COMMON_START + 19)
self.resTemplateDescription = \
- self.getResText(
+ oWizardResource.getResText(
LetterWizardDialogResources.RID_RID_COMMON_START + 20)
- self.RoadmapLabels = self.getResArray(
+ self.RoadmapLabels = oWizardResource.getResArray(
LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 1, 6)
- self.SalutationLabels = self.getResArray(
+ self.SalutationLabels = oWizardResource.getResArray(
LetterWizardDialogResources.RID_LETTERWIZARDSALUTATION_START + 1, 3)
- self.GreetingLabels = self.getResArray(
+ self.GreetingLabels = oWizardResource.getResArray(
LetterWizardDialogResources.RID_LETTERWIZARDGREETING_START + 1, 3)
diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.py b/wizards/com/sun/star/wizards/web/FTPDialog.py
index 2ad850a..b7c8d3f 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialog.py
+++ b/wizards/com/sun/star/wizards/web/FTPDialog.py
@@ -95,7 +95,7 @@ class FTPDialog(UnoDialog2, UIConsts):
# @param p the publishert object that contains the data
# for this dialog
# @throws Exception
- def __init__(self, xmsf, p):
+ def __init__(self, xmsf, p, oWizardResource):
super(FTPDialog, self).__init__(xmsf)
self.publish = p
@@ -109,7 +109,7 @@ class FTPDialog(UnoDialog2, UIConsts):
self.password = ""
# Load Resources
- self.resources = FTPDialogResources(xmsf)
+ self.resources = FTPDialogResources(oWizardResource)
self.ucb = UCB(xmsf)
# set dialog properties...
diff --git a/wizards/com/sun/star/wizards/web/FTPDialogResources.py b/wizards/com/sun/star/wizards/web/FTPDialogResources.py
index 8785d08..399913c 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialogResources.py
+++ b/wizards/com/sun/star/wizards/web/FTPDialogResources.py
@@ -15,41 +15,58 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-from ..common.Resource import Resource
+class FTPDialogResources(object):
-class FTPDialogResources(Resource):
-
- UNIT_NAME = "dbwizres"
- MODULE_NAME = "dbw"
RID_FTPDIALOG_START = 4200
RID_COMMON_START = 500
- def __init__(self, xmsf):
+ def __init__(self, oWizardResource):
super(FTPDialogResources, self).__init__(xmsf, self.MODULE_NAME)
- # Delete the String, uncomment the getResText method
- self.resFTPDialog_title = self.getResText(self.RID_FTPDIALOG_START + 0)
- self.reslblUsername_value = self.getResText(self.RID_FTPDIALOG_START + 1)
- self.reslblPassword_value = self.getResText(self.RID_FTPDIALOG_START + 2)
- self.resbtnConnect_value = self.getResText(self.RID_FTPDIALOG_START + 3)
- self.resln1_value = self.getResText(self.RID_FTPDIALOG_START + 4)
- self.reslblFTPAddress_value = self.getResText(self.RID_FTPDIALOG_START + 5)
- self.resln2_value = self.getResText(self.RID_FTPDIALOG_START + 6)
- self.resln3_value = self.getResText(self.RID_FTPDIALOG_START + 7)
- self.resbtnDir_value = self.getResText(self.RID_FTPDIALOG_START + 8)
- self.resFTPDisconnected = self.getResText(self.RID_FTPDIALOG_START + 9)
- self.resFTPConnected = self.getResText(self.RID_FTPDIALOG_START + 10)
- self.resFTPUserPwdWrong = self.getResText(self.RID_FTPDIALOG_START + 11)
- self.resFTPServerNotFound = self.getResText(self.RID_FTPDIALOG_START + 12)
- self.resFTPRights = self.getResText(self.RID_FTPDIALOG_START + 13)
- self.resFTPHostUnreachable = self.getResText(self.RID_FTPDIALOG_START + 14)
- self.resFTPUnknownError = self.getResText(self.RID_FTPDIALOG_START + 15)
- self.resFTPDirectory = self.getResText(self.RID_FTPDIALOG_START + 16)
- self.resIllegalFolder = self.getResText(self.RID_FTPDIALOG_START + 17)
- self.resConnecting = self.getResText(self.RID_FTPDIALOG_START + 18)
+ self.resFTPDialog_title = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 0)
+ self.reslblUsername_value = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 1)
+ self.reslblPassword_value = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 2)
+ self.resbtnConnect_value = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 3)
+ self.resln1_value = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 4)
+ self.reslblFTPAddress_value = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 5)
+ self.resln2_value = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 6)
+ self.resln3_value = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 7)
+ self.resbtnDir_value = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 8)
+ self.resFTPDisconnected = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 9)
+ self.resFTPConnected = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 10)
+ self.resFTPUserPwdWrong = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 11)
+ self.resFTPServerNotFound = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 12)
+ self.resFTPRights = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 13)
+ self.resFTPHostUnreachable = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 14)
+ self.resFTPUnknownError = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 15)
+ self.resFTPDirectory = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 16)
+ self.resIllegalFolder = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 17)
+ self.resConnecting = oWizardResource.getResText(
+ self.RID_FTPDIALOG_START + 18)
- self.resbtnCancel_value = self.getResText(self.RID_COMMON_START + 11)
- self.resbtnOK_value = self.getResText(self.RID_COMMON_START + 18)
- self.resbtnHelp_value = self.getResText(self.RID_COMMON_START + 15)
+ self.resbtnCancel_value = oWizardResource.getResText(
+ self.RID_COMMON_START + 11)
+ self.resbtnOK_value = oWizardResource.getResText(
+ self.RID_COMMON_START + 18)
+ self.resbtnHelp_value = oWizardResource.getResText(
+ self.RID_COMMON_START + 15)
self.restxtDir_value = "/"
diff --git a/wizards/com/sun/star/wizards/web/WWD_General.py b/wizards/com/sun/star/wizards/web/WWD_General.py
index 58c3563..4cdbee6 100644
--- a/wizards/com/sun/star/wizards/web/WWD_General.py
+++ b/wizards/com/sun/star/wizards/web/WWD_General.py
@@ -85,7 +85,7 @@ class WWD_General(WebWizardDialog):
def getFTPDialog(self, pub):
if self.ftpDialog is None:
try:
- self.ftpDialog = FTPDialog(self.xMSF, pub)
+ self.ftpDialog = FTPDialog(self.xMSF, pub, self.oWizardResource)
self.ftpDialog.createWindowPeer(self.xUnoDialog.getPeer())
except Exception:
traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialog.py b/wizards/com/sun/star/wizards/web/WebWizardDialog.py
index 388cf01..76d3182 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardDialog.py
+++ b/wizards/com/sun/star/wizards/web/WebWizardDialog.py
@@ -84,8 +84,10 @@ class WebWizardDialog(WizardDialog):
def __init__(self, xmsf):
super(WebWizardDialog, self).__init__(xmsf, HID0_WEBWIZARD)
+
#Load Resources
- self.resources = WebWizardDialogResources(xmsf)
+ self.resources = WebWizardDialogResources(xmsf, self.oWizardResource)
+
#set dialog properties...
uno.invoke(self.xDialogModel, "setPropertyValues",(
("Closeable",
diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialogResources.py b/wizards/com/sun/star/wizards/web/WebWizardDialogResources.py
index 4d851b2..fecf93f 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/web/WebWizardDialogResources.py
@@ -16,21 +16,17 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
import traceback
-from ..common.Resource import Resource
from ..common.Configuration import Configuration
from ..common.Properties import Properties
from ..document.OfficeDocument import OfficeDocument
-class WebWizardDialogResources(Resource):
- UNIT_NAME = "dbwizres"
- MODULE_NAME = "dbw"
+class WebWizardDialogResources(object):
+
RID_WEBWIZARDDIALOG_START = 4000
RID_COMMON_START = 500
RID_DB_COMMON_START = 1000
- def __init__(self, xmsf):
- super(WebWizardDialogResources,self).__init__(xmsf,
- WebWizardDialogResources.MODULE_NAME)
+ def __init__(self, xmsf, oWizardResource):
try:
#python 3
self.resbtnDocUp_value = chr(8743)
@@ -40,277 +36,276 @@ class WebWizardDialogResources(Resource):
self.resbtnDocUp_value = unichr(8743)
self.resbtnDocDown_value = unichr(8744)
- #Delete the String, uncomment the getResText method
- self.resWebWizardDialog_title = self.getResText(
+ self.resWebWizardDialog_title = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 1)
- self.reslblIntroduction_value = self.getResText(
+ self.reslblIntroduction_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 2)
- self.resbtnDelSession_value = self.getResText(
+ self.resbtnDelSession_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 4)
- self.reslbIntroTitle_value = self.getResText(
+ self.reslbIntroTitle_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 5)
- self.reslblContentTitle_value = self.getResText(
+ self.reslblContentTitle_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 6)
- self.reslnDocsInfo_value = self.getResText(
+ self.reslnDocsInfo_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 8)
- self.reslblDocTitle_value = self.getResText(
+ self.reslblDocTitle_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 9)
- self.reslblDocInfo_value = self.getResText(
+ self.reslblDocInfo_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 10)
- self.reslblDocAuthor_value = self.getResText(
+ self.reslblDocAuthor_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 11)
- self.reslblDocExportFormat_value = self.getResText(
+ self.reslblDocExportFormat_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 12)
- self.reslblTitleGeneralPage_value = self.getResText(
+ self.reslblTitleGeneralPage_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 13)
- self.reslblSiteTitle_value = self.getResText(
+ self.reslblSiteTitle_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 14)
- self.reslblSiteDesc_value = self.getResText(
+ self.reslblSiteDesc_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 16)
- self.reslblSiteCreated_value = self.getResText(
+ self.reslblSiteCreated_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 18)
- self.reslblEmail_value = self.getResText(
+ self.reslblEmail_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 20)
- self.reslblCopyright_value = self.getResText(
+ self.reslblCopyright_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 21)
- self.reslblSiteUpdated_value = self.getResText(
+ self.reslblSiteUpdated_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 22)
- self.resbtnPreview_value = self.getResText(
+ self.resbtnPreview_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 24)
- self.reslblTitlePublish_value = self.getResText(
+ self.reslblTitlePublish_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 25)
- self.reslblCreateSite_value = self.getResText(
+ self.reslblCreateSite_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 26)
- self.reschkLocalDir_value = self.getResText(
+ self.reschkLocalDir_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 27)
- self.resbtnLocalDir_value = self.getResText(
+ self.resbtnLocalDir_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 28)
- self.reschkFTP_value = self.getResText(
+ self.reschkFTP_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 29)
- self.resbtnFTP_value = self.getResText(
+ self.resbtnFTP_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 31)
- self.reschkZip_value = self.getResText(
+ self.reschkZip_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 32)
- self.resbtnZip_value = self.getResText(
+ self.resbtnZip_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 33)
- self.reschkSaveSettings_value = self.getResText(
+ self.reschkSaveSettings_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 34)
- self.reslblSaveSettings_value = self.getResText(
+ self.reslblSaveSettings_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 35)
- self.reslblLoadSettings_value = self.getResText(
+ self.reslblLoadSettings_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 36)
- self.reslblSiteContent_value = self.getResText(
+ self.reslblSiteContent_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 37)
- self.resbtnAddDoc_value = self.getResText(
+ self.resbtnAddDoc_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 38)
- self.resbtnRemoveDoc_value = self.getResText(
+ self.resbtnRemoveDoc_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 39)
- self.reslblLayoutTitle_value = self.getResText(
+ self.reslblLayoutTitle_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 40)
- self.reslblStyleTitle_value = self.getResText(
+ self.reslblStyleTitle_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 41)
- self.reslblStyle_value = self.getResText(
+ self.reslblStyle_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 42)
- self.reslblLayouts_value = self.getResText(
+ self.reslblLayouts_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 48)
- self.reschbDocDesc_value = self.getResText(
+ self.reschbDocDesc_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 50)
- self.reschbDocAuthor_value = self.getResText(
+ self.reschbDocAuthor_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 51)
- self.reschkDocCreated_value = self.getResText(
+ self.reschkDocCreated_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 52)
- self.reschkDocChanged_value = self.getResText(
+ self.reschkDocChanged_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 53)
- self.reschkDocFilename_value = self.getResText(
+ self.reschkDocFilename_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 54)
- self.reschkDocFormat_value = self.getResText(
+ self.reschkDocFormat_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 55)
- self.reschkDocFormatIcon_value = self.getResText(
+ self.reschkDocFormatIcon_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 56)
- self.reschkDocPages_value = self.getResText(
+ self.reschkDocPages_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 57)
- self.reschkDocSize_value = self.getResText(
+ self.reschkDocSize_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 58)
- self.resFixedLine1_value = self.getResText(
+ self.resFixedLine1_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 59)
- self.reslblLayout2Title_value = self.getResText(
+ self.reslblLayout2Title_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 60)
- self.reslblDisplay_value = self.getResText(
+ self.reslblDisplay_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 61)
- self.reslblOptimizeFor_value = self.getResText(
+ self.reslblOptimizeFor_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 62)
- self.resoptOptimize640x480_value = self.getResText(
+ self.resoptOptimize640x480_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 64)
- self.resoptOptimize800x600_value = self.getResText(
+ self.resoptOptimize800x600_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 65)
- self.resoptOptimize1024x768_value = self.getResText(
+ self.resoptOptimize1024x768_value = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 66)
- self.resStatusDialogTitle = self.getResText(
+ self.resStatusDialogTitle = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 70)
- self.resCounter = self.getResText(
+ self.resCounter = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 71)
- self.resPublishDir = self.getResText(
+ self.resPublishDir = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 72)
- self.resFTPTargetExistsAsfile = self.getResText(
+ self.resFTPTargetExistsAsfile = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 73)
- self.resLocalTargetExistsAsfile = self.getResText(
+ self.resLocalTargetExistsAsfile = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 74)
- self.resZipTargetExists = self.getResText(
+ self.resZipTargetExists = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 75)
- self.resFTPTargetNotEmpty = self.getResText(
+ self.resFTPTargetNotEmpty = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 76)
- self.resLocalTragetNotEmpty = self.getResText(
+ self.resLocalTragetNotEmpty = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 77)
- self.resSessionExists = self.getResText(
+ self.resSessionExists = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 78)
- self.resTaskExportDocs = self.getResText(
+ self.resTaskExportDocs = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 79)
- self.resTaskExportPrepare = self.getResText(
+ self.resTaskExportPrepare = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 80)
- self.resTaskGenerateCopy = self.getResText(
+ self.resTaskGenerateCopy = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 81)
- self.resTaskGeneratePrepare = self.getResText(
+ self.resTaskGeneratePrepare = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 82)
- self.resTaskGenerateXsl = self.getResText(
+ self.resTaskGenerateXsl = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 83)
- self.resTaskPrepare = self.getResText(
+ self.resTaskPrepare = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 84)
- self.resTaskPublishPrepare = self.getResText(
+ self.resTaskPublishPrepare = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 86)
- self.resTaskPublishLocal = self.getResText(
+ self.resTaskPublishLocal = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 87)
- self.resTaskPublishFTP = self.getResText(
+ self.resTaskPublishFTP = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 88)
- self.resTaskPublishZip = self.getResText(
+ self.resTaskPublishZip = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 89)
- self.resTaskFinish = self.getResText(
+ self.resTaskFinish = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 90)
- self.resImages = self.getResText(
+ self.resImages = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 94)
- self.resAllFiles = self.getResText(
+ self.resAllFiles = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 95)
- self.resZipFiles = self.getResText(
+ self.resZipFiles = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 96)
- self.resBackgroundsDialog = self.getResText(
+ self.resBackgroundsDialog = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 98)
- self.resBackgroundsDialogCaption = self.getResText(
+ self.resBackgroundsDialogCaption = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 99)
- self.resIconsDialog = self.getResText(
+ self.resIconsDialog = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 100)
- self.resIconsDialogCaption = self.getResText(
+ self.resIconsDialogCaption = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 101)
- self.resOther = self.getResText(
+ self.resOther = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 102)
- self.resDeselect = self.getResText(
+ self.resDeselect = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 103)
- self.resFinishedSuccess = self.getResText(
+ self.resFinishedSuccess = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 104)
- self.resFinishedNoSuccess = self.getResText(
+ self.resFinishedNoSuccess = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 105)
- self.resErrTOC = self.getResText(
+ self.resErrTOC = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 106)
- self.resErrTOCMedia = self.getResText(
+ self.resErrTOCMedia = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 107)
- self.resErrDocInfo = self.getResText(
+ self.resErrDocInfo = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 108)
- self.resErrDocExport = self.getResText(
+ self.resErrDocExport = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 109)
- self.resErrMkDir = self.getResText(
+ self.resErrMkDir = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 110)
- self.resErrSecurity = self.getResText(
+ self.resErrSecurity = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 111)
- self.resErrExportIO = self.getResText(
+ self.resErrExportIO = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 112)
- self.resErrPublishMedia = self.getResText(
+ self.resErrPublishMedia = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 113)
- self.resErrPublish = self.getResText(
+ self.resErrPublish = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 114)
- self.resErrUnknown = self.getResText(
+ self.resErrUnknown = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 115)
- self.resErrDocValidate = self.getResText(
+ self.resErrDocValidate = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 116)
- self.resErrIsDirectory = self.getResText(
+ self.resErrIsDirectory = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 117)
- self.resLoadingSession = self.getResText(
+ self.resLoadingSession = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 118)
- self.resErrUnexpected = self.getResText(
+ self.resErrUnexpected = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 119)
- self.resValidatingDocuments = self.getResText(
+ self.resValidatingDocuments = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 120)
- self.resDefaultArchiveFilename = self.getResText(
+ self.resDefaultArchiveFilename = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 121)
- self.resStep1 = self.getResText(
+ self.resStep1 = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 122)
- self.resStep2 = self.getResText(
+ self.resStep2 = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 123)
- self.resStep3 = self.getResText(
+ self.resStep3 = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 124)
- self.resStep4 = self.getResText(
+ self.resStep4 = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 125)
- self.resStep5 = self.getResText(
+ self.resStep5 = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 126)
- self.resStep6 = self.getResText(
+ self.resStep6 = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 127)
- self.resStep7 = self.getResText(
+ self.resStep7 = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 128)
- self.resDelSessionConfirm = self.getResText(
+ self.resDelSessionConfirm = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 130)
- self.resPages = self.getResText(
+ self.resPages = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 131)
- self.resSlides = self.getResText(
+ self.resSlides = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 132)
- self.resCreatedTemplate = self.getResText(
+ self.resCreatedTemplate = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 133)
- self.resUpdatedTemplate = self.getResText(
+ self.resUpdatedTemplate = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 134)
- self.resSessionName = self.getResText(
+ self.resSessionName = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 135)
- self.reslblBackground = self.getResText(
+ self.reslblBackground = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 136)
- self.reslblIconset = self.getResText(
+ self.reslblIconset = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 137)
- self.reslblIconSetInfo = self.getResText(
+ self.reslblIconSetInfo = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 138)
- self.reslblMetaData = self.getResText(
+ self.reslblMetaData = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 139)
- self.resBtnChooseBackground = self.getResText(
+ self.resBtnChooseBackground = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 140)
- self.resBtnChooseIconset = self.getResText(
+ self.resBtnChooseIconset = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 141)
- self.resSessionNameNone = self.getResText(
+ self.resSessionNameNone = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 142)
- self.reslblFTPDisabled = self.getResText(
+ self.reslblFTPDisabled = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 143)
- self.resBackgroundNone = self.getResText(
+ self.resBackgroundNone = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 144)
- self.resIconsetNone = self.getResText(
+ self.resIconsetNone = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 145)
- self.resFTPTargetCouldNotCreate = self.getResText(
+ self.resFTPTargetCouldNotCreate = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 146)
- self.resFTPTargetCreate = self.getResText(
+ self.resFTPTargetCreate = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 147)
- self.resZipTargetIsDir = self.getResText(
+ self.resZipTargetIsDir = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 148)
- self.resLocalTargetCouldNotCreate = self.getResText(
+ self.resLocalTargetCouldNotCreate = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 149)
- self.resLocalTargetCreate = self.getResText(
+ self.resLocalTargetCreate = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 150)
- self.resSizeTemplate = self.getResText(
+ self.resSizeTemplate = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 151)
- self.resSpecifyNewFileLocation = self.getResText(
+ self.resSpecifyNewFileLocation = oWizardResource.getResText(
WebWizardDialogResources.RID_WEBWIZARDDIALOG_START + 152)
- self.resClose = self.getResText(
+ self.resClose = oWizardResource.getResText(
WebWizardDialogResources.RID_COMMON_START + 17)
- self.resCancel = self.getResText(
+ self.resCancel = oWizardResource.getResText(
WebWizardDialogResources.RID_COMMON_START + 11)
- self.resOK = self.getResText(
+ self.resOK = oWizardResource.getResText(
WebWizardDialogResources.RID_COMMON_START + 18)
- self.resHelp = self.getResText(
+ self.resHelp = oWizardResource.getResText(
WebWizardDialogResources.RID_COMMON_START + 15)
try:
self.prodName = Configuration.getProductName(xmsf)
commit facfee75fac0ac26c29ec5fc05413f64c6b76c61
Author: Xisco Fauli <anistenis at gmail.com>
Date: Wed Feb 12 00:19:17 2014 +0100
pywizards: use getResArray instead
Change-Id: I5afd7ad90c23e99be9b3cf81487da6bd7715b416
diff --git a/wizards/com/sun/star/wizards/common/Resource.py b/wizards/com/sun/star/wizards/common/Resource.py
index 750c507..a601b9c 100644
--- a/wizards/com/sun/star/wizards/common/Resource.py
+++ b/wizards/com/sun/star/wizards/common/Resource.py
@@ -22,7 +22,6 @@ from com.sun.star.awt.VclWindowPeerAttribute import OK
class Resource(object):
- @classmethod
def __init__(self, _xMSF, _Module):
self.xMSF = _xMSF
self.Module = _Module
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index d192a86..57302dd 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -29,10 +29,6 @@ class FaxWizardDialogResources(Resource):
def __init__(self, xmsf):
super(FaxWizardDialogResources,self).__init__(xmsf,
FaxWizardDialogResources.MODULE_NAME)
- self.RoadmapLabels = []
- self.SalutationLabels = []
- self.GreetingLabels = []
- self.CommunicationLabels = []
self.resFaxWizardDialog_title = self.getResText(
FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 1)
@@ -157,32 +153,12 @@ class FaxWizardDialogResources(Resource):
FaxWizardDialogResources.RID_RID_COMMON_START + 19)
self.resTemplateDescription = self.getResText(
FaxWizardDialogResources.RID_RID_COMMON_START + 20)
-
- self.loadRoadmapResources()
- self.loadSalutationResources()
- self.loadGreetingResources()
- self.loadCommunicationResources()
-
- def loadRoadmapResources(self):
- for i in range(5):
- self.RoadmapLabels.append(self.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + \
- + i + 1))
-
- def loadSalutationResources(self):
- for i in range(4):
- self.SalutationLabels.append(self.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + \
- i + 1))
-
- def loadGreetingResources(self):
- for i in range(4):
- self.GreetingLabels.append(self.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + \
- i + 1))
- def loadCommunicationResources(self):
- for i in range(3):
- self.CommunicationLabels.append(self.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + \
- i + 1))
+ self.RoadmapLabels = self.getResArray(
+ FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 1 , 5)
+ self.SalutationLabels = self.getResArray(
+ FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 1 , 4)
+ self.GreetingLabels = self.getResArray(
+ FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 1 , 4)
+ self.CommunicationLabels = self.getResArray(
+ FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + 1 , 3)
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index a59ba71..748a51b 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -30,9 +30,6 @@ class LetterWizardDialogResources(Resource):
def __init__(self, xmsf):
super(LetterWizardDialogResources,self).__init__(
xmsf, LetterWizardDialogResources.MODULE_NAME)
- self.RoadmapLabels = []
- self.SalutationLabels = []
- self.GreetingLabels = []
self.resLetterWizardDialog_title = \
self.getResText(
@@ -248,24 +245,9 @@ class LetterWizardDialogResources(Resource):
self.getResText(
LetterWizardDialogResources.RID_RID_COMMON_START + 20)
- self.loadRoadmapResources()
- self.loadSalutationResources()
- self.loadGreetingResources()
-
- def loadRoadmapResources(self):
- for i in range(6):
- self.RoadmapLabels.append(self.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + \
- i + 1))
-
- def loadSalutationResources(self):
- for i in range(3):
- self.SalutationLabels.append(self.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDSALUTATION_START + \
- i + 1))
-
- def loadGreetingResources(self):
- for i in range(3):
- self.GreetingLabels.append(self.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDGREETING_START + \
- i + 1))
+ self.RoadmapLabels = self.getResArray(
+ LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 1, 6)
+ self.SalutationLabels = self.getResArray(
+ LetterWizardDialogResources.RID_LETTERWIZARDSALUTATION_START + 1, 3)
+ self.GreetingLabels = self.getResArray(
+ LetterWizardDialogResources.RID_LETTERWIZARDGREETING_START + 1, 3)
commit 6beb51ac12ddf381520c745430fd646767c63889
Author: Xisco Fauli <anistenis at gmail.com>
Date: Tue Feb 11 23:36:35 2014 +0100
pywizards: remove unused code
Change-Id: I174ec6a1d307486d38ba4b98a5a158259c57151d
diff --git a/wizards/com/sun/star/wizards/README b/wizards/com/sun/star/wizards/README
index c0351e9..a3877a3 100644
--- a/wizards/com/sun/star/wizards/README
+++ b/wizards/com/sun/star/wizards/README
@@ -13,6 +13,6 @@ To call a wizard remotely you need to:
soffice --"accept=socket,host=localhost,port=2002;urp;"
-> Launch the wizard from wizards parent folder:
- python
- from wizards.[Wizard's folder].CallWizard import CallWizard
+ python3.3
+ from wizards.[Wizard's folder].CallWizard import CallWizard
CallWizard.callRemote()
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
index 014159e..d0fd320 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
@@ -41,11 +41,10 @@ from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
class AgendaWizardDialogImpl(AgendaWizardDialog):
- pageDesign = None
-
def __init__(self, xmsf):
super(AgendaWizardDialogImpl, self).__init__(xmsf)
self.filenameChanged = False
+ self.pageDesign = -1
def enterStep(self, OldStep, NewStep):
pass
@@ -141,6 +140,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
tuple(self.agendaTemplates[0])
UnoDataAware.attachListBox(
self.agenda, "cp_AgendaType", self.listPageDesign, True).updateUI()
+ self.pageDesign = self.agenda.cp_AgendaType
UnoDataAware.attachCheckBox(
self.agenda, "cp_IncludeMinutes", self.chkMinutes, True).updateUI()
UnoDataAware.attachEditControl(
@@ -187,7 +187,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
RadioDataAware.attachRadioButtons(
self.agenda, "cp_ProceedMethod",
(self.optCreateAgenda, self.optMakeChanges), True).updateUI()
-
+
def insertRoadmap(self):
self.addRoadmap()
@@ -223,8 +223,8 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
try:
SelectedItemPos = self.listPageDesign.SelectedItemPos
#avoid to load the same item again
- if AgendaWizardDialogImpl.pageDesign is not SelectedItemPos:
- AgendaWizardDialogImpl.pageDesign = SelectedItemPos
+ if self.pageDesign is not SelectedItemPos:
+ self.pageDesign = SelectedItemPos
self.myAgendaDoc.load(
self.agendaTemplates[1][SelectedItemPos])
self.drawConstants()
diff --git a/wizards/com/sun/star/wizards/common/Desktop.py b/wizards/com/sun/star/wizards/common/Desktop.py
index 4a18ca0..94a4a11 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list