diff options
7 files changed, 29 insertions, 59 deletions
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py index d0fd320ec37d..99aced710e71 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 a13c4c106a1b..4f2fe2b99187 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 ab62317f4a1d..810ba80324d4 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 618d0ef10aee..76866e700d47 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 b1bac2b25c70..5df050f08f5f 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 63c780d5cac0..668747801931 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 fecf93f7f7c6..3465dd69413d 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( |