[Libreoffice-commits] .: Branch 'feature/gsoc2011_wizards' - wizards/com
Xisco Fauli
xfauli at kemper.freedesktop.org
Mon Sep 5 02:31:11 PDT 2011
wizards/com/sun/star/wizards/fax/FaxDocument.py | 5
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py | 120 ------
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py | 4
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 200 -----------
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py | 4
5 files changed, 333 deletions(-)
New commits:
commit b55c26a346494f75e8f2ac968b4d08dedd4ab323
Author: Xisco Fauli <anistenis at gmail.com>
Date: Mon Sep 5 11:30:10 2011 +0200
Fix merge conflicts
diff --git a/wizards/com/sun/star/wizards/fax/FaxDocument.py b/wizards/com/sun/star/wizards/fax/FaxDocument.py
index 3b132e4..b5fee83 100644
--- a/wizards/com/sun/star/wizards/fax/FaxDocument.py
+++ b/wizards/com/sun/star/wizards/fax/FaxDocument.py
@@ -1,10 +1,5 @@
from text.TextDocument import *
from text.TextSectionHandler import TextSectionHandler
-<<<<<<< HEAD
-=======
-from text.TextFieldHandler import TextFieldHandler
-from common.Configuration import Configuration
->>>>>>> master
from common.PropertyNames import PropertyNames
from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 8d7ea27..644f08a 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -86,11 +86,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(True, 12, LSTPRIVATESTYLE_HID, 180, 95, 1,
4, 74), self)
-<<<<<<< HEAD
self.insertLabel("lblBusinessStyle",
-=======
- self.lblBusinessStyle = self.insertLabel("lblBusinessStyle",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -101,11 +97,7 @@ class FaxWizardDialog(WizardDialog):
(8, self.resources.reslblBusinessStyle_value,
110, 42, 1, 32, 60))
-<<<<<<< HEAD
self.insertLabel("lblTitle1",
-=======
- self.lblTitle1 = self.insertLabel("lblTitle1",
->>>>>>> master
("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -116,11 +108,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle1_value,
True, 91, 8, 1, 37, 212))
-<<<<<<< HEAD
self.insertLabel("lblPrivateStyle",
-=======
- self.lblPrivateStyle = self.insertLabel("lblPrivateStyle",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -129,11 +117,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblPrivateStyle_value, 110, 95, 1, 50, 60))
-<<<<<<< HEAD
self.insertLabel("lblIntroduction",
-=======
- self.lblIntroduction = self.insertLabel("lblIntroduction",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -280,11 +264,7 @@ class FaxWizardDialog(WizardDialog):
(8, CHKUSEFOOTER_HID,
self.resources.reschkUseFooter_value, 97, 163,
0, 2, 14, 212), self)
-<<<<<<< HEAD
self.insertLabel("lblTitle3",
-=======
- self.lblTitle3 = self.insertLabel("lblTitle3",
->>>>>>> master
("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -332,12 +312,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-<<<<<<< HEAD
(12, TXTSENDERNAME_HID, 182, 67, 3, 17, 119), self)
-=======
- (12, TXTSENDERNAME_HID, 182, 67, 3,
- 17, 119), self)
->>>>>>> master
self.txtSenderStreet = self.insertTextField("txtSenderStreet",
TXTSENDERSTREET_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -347,12 +322,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-<<<<<<< HEAD
(12, TXTSENDERSTREET_HID, 182, 81, 3, 18, 119), self)
-=======
- (12, TXTSENDERSTREET_HID, 182, 81, 3,
- 18, 119), self)
->>>>>>> master
self.txtSenderPostCode = self.insertTextField("txtSenderPostCode",
TXTSENDERPOSTCODE_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -362,12 +332,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-<<<<<<< HEAD
(12, TXTSENDERPOSTCODE_HID, 182, 95, 3, 19, 25), self)
-=======
- (12, TXTSENDERPOSTCODE_HID, 182, 95, 3,
- 19, 25), self)
->>>>>>> master
self.txtSenderState = self.insertTextField("txtSenderState",
TXTSENDERSTATE_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -377,12 +342,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-<<<<<<< HEAD
(12, TXTSENDERSTATE_HID, 211, 95, 3, 20, 21), self)
-=======
- (12, TXTSENDERSTATE_HID, 211, 95, 3,
- 20, 21), self)
->>>>>>> master
self.txtSenderCity = self.insertTextField("txtSenderCity",
TXTSENDERCITY_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -392,12 +352,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-<<<<<<< HEAD
(12, TXTSENDERCITY_HID, 236, 95, 3, 21, 65), self)
-=======
- (12, TXTSENDERCITY_HID, 236, 95, 3,
- 21, 65), self)
->>>>>>> master
self.txtSenderFax = self.insertTextField("txtSenderFax",
TXTSENDERFAX_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -407,12 +362,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-<<<<<<< HEAD
(12, TXTSENDERFAX_HID, 182, 109, 3, 22, 119), self)
-=======
- (12, TXTSENDERFAX_HID, 182, 109, 3,
- 22, 119), self)
->>>>>>> master
self.optReceiverPlaceholder = self.insertRadioButton(
"optReceiverPlaceholder",
OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
@@ -441,11 +391,7 @@ class FaxWizardDialog(WizardDialog):
(8, OPTRECEIVERDATABASE_HID,
self.resources.resoptReceiverDatabase_value, 104, 160, 3,
24, 200), self)
-<<<<<<< HEAD
self.insertLabel("lblSenderAddress",
-=======
- self.lblSenderAddress = self.insertLabel("lblSenderAddress",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -454,22 +400,14 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblSenderAddress_value, 97, 28, 3, 46, 136))
-<<<<<<< HEAD
self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
-=======
- self.FixedLine2 = self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
->>>>>>> master
PropertyNames.PROPERTY_POSITION_X,
PropertyNames.PROPERTY_POSITION_Y,
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(5, 90, 126, 3, 51, 212))
-<<<<<<< HEAD
self.insertLabel("lblSenderName",
-=======
- self.lblSenderName = self.insertLabel("lblSenderName",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -477,14 +415,8 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-<<<<<<< HEAD
(8, self.resources.reslblSenderName_value, 113, 69, 3, 52, 68))
self.insertLabel("lblSenderStreet",
-=======
- (8, self.resources.reslblSenderName_value, 113, 69, 3,
- 52, 68))
- self.lblSenderStreet = self.insertLabel("lblSenderStreet",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -492,14 +424,8 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-<<<<<<< HEAD
(8, self.resources.reslblSenderStreet_value, 113, 82, 3, 53, 68))
self.insertLabel("lblPostCodeCity",
-=======
- (8, self.resources.reslblSenderStreet_value, 113, 82, 3,
- 53, 68))
- self.lblPostCodeCity = self.insertLabel("lblPostCodeCity",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -507,14 +433,8 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-<<<<<<< HEAD
(8, self.resources.reslblPostCodeCity_value, 113, 97, 3, 54, 68))
self.insertLabel("lblTitle4",
-=======
- (8, self.resources.reslblPostCodeCity_value,
- 113, 97, 3, 54, 68))
- self.lblTitle4 = self.insertLabel("lblTitle4",
->>>>>>> master
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -526,11 +446,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle4_value,
True, 91, 8, 3, 60, 212))
-<<<<<<< HEAD
self.insertLabel("lblSenderFax",
-=======
- self.Label1 = self.insertLabel("lblSenderFax",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -539,11 +455,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.resLabel1_value, 113, 111, 3, 68, 68))
-<<<<<<< HEAD
self.insertLabel("Label2",
-=======
- self.Label2 = self.insertLabel("Label2",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -593,11 +505,7 @@ class FaxWizardDialog(WizardDialog):
(8, CHKFOOTERPAGENUMBERS_HID,
self.resources.reschkFooterPageNumbers_value, 97, 106,
0, 4, 27, 201), self)
-<<<<<<< HEAD
self.insertLabel("lblFooter",
-=======
- self.lblFooter = self.insertLabel("lblFooter",
->>>>>>> master
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -608,11 +516,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor4, 8, self.resources.reslblFooter_value,
97, 28, 4, 33, 116))
-<<<<<<< HEAD
self.insertLabel("lblTitle5",
-=======
- self.lblTitle5 = self.insertLabel("lblTitle5",
->>>>>>> master
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -663,11 +567,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, OPTMAKECHANGES_HID, self.resources.resoptMakeChanges_value,
104, 123, 5, 31, 198), self)
-<<<<<<< HEAD
self.insertLabel("lblFinalExplanation1",
-=======
- self.lblFinalExplanation1 = self.insertLabel("lblFinalExplanation1",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -678,11 +578,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(28, self.resources.reslblFinalExplanation1_value,
True, 97, 28, 5, 34, 205))
-<<<<<<< HEAD
self.insertLabel("lblProceed",
-=======
- self.lblProceed = self.insertLabel("lblProceed",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -692,11 +588,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblProceed_value, 97, 100, 5,
35, 204))
-<<<<<<< HEAD
self.insertLabel("lblFinalExplanation2",
-=======
- self.lblFinalExplanation2 = self.insertLabel("lblFinalExplanation2",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_MULTILINE,
@@ -707,11 +599,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(33, self.resources.reslblFinalExplanation2_value, True, 104, 145, 5,
36, 199))
-<<<<<<< HEAD
self.insertImage("ImageControl2",
-=======
- self.ImageControl2 = self.insertImage("ImageControl2",
->>>>>>> master
("Border",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_IMAGEURL,
@@ -723,11 +611,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(0, 10, UIConsts.INFOIMAGEURL, 92, 145,
False, 5, 47, 10))
-<<<<<<< HEAD
self.insertLabel("lblTemplateName",
-=======
- self.lblTemplateName = self.insertLabel("lblTemplateName",
->>>>>>> master
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X,
@@ -738,11 +622,7 @@ class FaxWizardDialog(WizardDialog):
(8, self.resources.reslblTemplateName_value, 97, 58, 5,
57, 101))
-<<<<<<< HEAD
self.insertLabel("lblTitle6",
-=======
- self.lblTitle6 = self.insertLabel("lblTitle6",
->>>>>>> master
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
index e690248..e5a72e1 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
@@ -38,11 +38,7 @@ CHKFOOTERNEXTPAGES_ITEM_CHANGED = "chkFooterNextPagesItemChanged"
CHKFOOTERPAGENUMBERS_ITEM_CHANGED = "chkFooterPageNumbersItemChanged"
TXTTEMPLATENAME_TEXT_CHANGED = "txtTemplateNameTextChanged"
FILETEMPLATEPATH_TEXT_CHANGED = None # "fileTemplatePathTextChanged"
-<<<<<<< HEAD
OPTCREATEFAX_ITEM_CHANGED = "optCreateFromTemplateItemChanged"
-=======
-OPTCREATEFAX_ITEM_CHANGED = "optCreateFaxItemChanged"
->>>>>>> master
OPTMAKECHANGES_ITEM_CHANGED = "optMakeChangesItemChanged"
imageURLImageControl2 = None #"images/ImageControl2"
imageURLImageControl3 = None #"images/ImageControl3"
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 4da4146..92749ee 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -1,7 +1,6 @@
from FaxWizardDialog import *
from CGFaxWizard import *
from FaxDocument import *
-<<<<<<< HEAD
from ui.PathSelection import PathSelection
from common.FileAccess import FileAccess
from ui.event.UnoDataAware import UnoDataAware
@@ -13,21 +12,6 @@ from common.NoValidPathException import NoValidPathException
from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
from com.sun.star.uno import RuntimeException
from com.sun.star.util import CloseVetoException
-=======
-from ui.PathSelection import *
-from common.FileAccess import *
-from ui.event.UnoDataAware import *
-from ui.event.RadioDataAware import *
-from common.Configuration import *
-from document.OfficeDocument import OfficeDocument
-from text.TextFieldHandler import TextFieldHandler
-from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
-
-from common.NoValidPathException import *
-from com.sun.star.uno import RuntimeException
-from com.sun.star.util import CloseVetoException
-
->>>>>>> master
from com.sun.star.view.DocumentZoomType import OPTIMAL
from com.sun.star.document.UpdateDocMode import FULL_UPDATE
from com.sun.star.document.MacroExecMode import ALWAYS_EXECUTE
@@ -46,19 +30,11 @@ class FaxWizardDialogImpl(FaxWizardDialog):
RM_FOOTER = 4
RM_FINALSETTINGS = 5
-<<<<<<< HEAD
lstBusinessStylePos = None
lstPrivateStylePos = None
def __init__(self, xmsf):
super(FaxWizardDialogImpl, self).__init__(xmsf)
-=======
-
- def __init__(self, xmsf):
- super(FaxWizardDialogImpl, self).__init__(xmsf)
- self.mainDA = []
- self.faxDA = []
->>>>>>> master
self.bSaveSuccess = False
self.filenameChanged = False
self.UserTemplatePath = ""
@@ -83,11 +59,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
def startWizard(self, xMSF, CurPropertyValue):
self.running = True
try:
-<<<<<<< HEAD
#Number of steps on WizardDialog
-=======
- #Number of steps on WizardDialog:
->>>>>>> master
self.nMaxStep = 5
#instatiate The Document Frame for the Preview
@@ -110,33 +82,17 @@ class FaxWizardDialogImpl(FaxWizardDialog):
#special Control fFrameor setting the save Path:
self.insertPathSelectionControl()
-<<<<<<< HEAD
self.initializeTemplates(xMSF)
-=======
->>>>>>> master
#load the last used settings
#from the registry and apply listeners to the controls:
self.initConfiguration()
-<<<<<<< HEAD
-
if self.myPathSelection.xSaveTextBox.Text.lower() == "":
self.myPathSelection.initializePath()
xContainerWindow = self.myFaxDoc.xFrame.ContainerWindow
self.createWindowPeer(xContainerWindow)
-=======
- self.initializeTemplates(xMSF)
-
- #update the dialog UI according to the loaded Configuration
- self.__updateUI()
- if self.myPathSelection.xSaveTextBox.Text.lower() == "":
- self.myPathSelection.initializePath()
-
- self.xContainerWindow = self.myFaxDoc.xFrame.ContainerWindow
- self.createWindowPeer(self.xContainerWindow)
->>>>>>> master
#add the Roadmap to the dialog:
self.insertRoadmap()
@@ -189,12 +145,8 @@ class FaxWizardDialogImpl(FaxWizardDialog):
if fileAccess.exists(self.sPath, True):
answer = SystemDialog.showMessageBox(
self.xMSF, "MessBox", YES_NO + DEF_NO,
-<<<<<<< HEAD
self.resources.resOverwriteWarning,
self.xUnoDialog.Peer)
-=======
- self.resources.resOverwriteWarning, self.xUnoDialog.Peer)
->>>>>>> master
if answer == 3:
# user said: no, do not overwrite...
endWizard = False
@@ -261,32 +213,9 @@ class FaxWizardDialogImpl(FaxWizardDialog):
def insertRoadmap(self):
self.addRoadmap()
-<<<<<<< HEAD
self.insertRoadMapItems(
[True, True, True, False, True], self.resources.RoadmapLabels)
-=======
- i = 0
- i = self.insertRoadmapItem(
- 0, True, self.resources.RoadmapLabels[
- FaxWizardDialogImpl.RM_TYPESTYLE - 1],
- FaxWizardDialogImpl.RM_TYPESTYLE)
- i = self.insertRoadmapItem(
- i, True, self.resources.RoadmapLabels[
- FaxWizardDialogImpl.RM_ELEMENTS - 1],
- FaxWizardDialogImpl.RM_ELEMENTS)
- i = self.insertRoadmapItem(
- i, True, self.resources.RoadmapLabels[
- FaxWizardDialogImpl.RM_SENDERRECEIVER - 1],
- FaxWizardDialogImpl.RM_SENDERRECEIVER)
- i = self.insertRoadmapItem(
- i, False, self.resources.RoadmapLabels[
- FaxWizardDialogImpl.RM_FOOTER - 1], FaxWizardDialogImpl.RM_FOOTER)
- i = self.insertRoadmapItem(i, True,
- self.resources.RoadmapLabels[
- FaxWizardDialogImpl.RM_FINALSETTINGS - 1],
- FaxWizardDialogImpl.RM_FINALSETTINGS)
->>>>>>> master
self.setRoadmapInteractive(True)
self.setRoadmapComplete(True)
self.setCurrentRoadmapItemID(1)
@@ -305,13 +234,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.myPathSelection.addSelectionListener( \
self.myPathSelectionListener())
-<<<<<<< HEAD
-=======
- def __updateUI(self):
- UnoDataAware.updateUIs(self.mainDA)
- UnoDataAware.updateUIs(self.faxDA)
-
->>>>>>> master
def __initializePaths(self):
try:
self.sTemplatePath = FileAccess.getOfficePath2(self.xMSF,
@@ -385,7 +307,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
root = Configuration.getConfigurationRoot(self.xMSF,
"/org.openoffice.Office.Writer/Wizards/Fax", False)
self.myConfig.readConfiguration(root, "cp_")
-<<<<<<< HEAD
RadioDataAware.attachRadioButtons(
self.myConfig, "cp_FaxType",
(self.optBusinessFax, self.optPrivateFax), True).updateUI()
@@ -446,74 +367,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
"cp_TemplateName", self.txtTemplateName, True).updateUI()
UnoDataAware.attachEditControl(cgl, "cp_TemplatePath",
self.myPathSelection.xSaveTextBox, True).updateUI()
-=======
- self.mainDA.append(RadioDataAware.attachRadioButtons(
- self.myConfig, "cp_FaxType",
- (self.optBusinessFax, self.optPrivateFax), True))
- self.mainDA.append(UnoDataAware.attachListBox(
- self.myConfig.cp_BusinessFax, "cp_Style",
- self.lstBusinessStyle, True))
- self.mainDA.append(UnoDataAware.attachListBox(
- self.myConfig.cp_PrivateFax, "cp_Style", self.lstPrivateStyle,
- True))
- cgl = self.myConfig.cp_BusinessFax
- self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
- "cp_PrintCompanyLogo", self.chkUseLogo, True))
- self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
- "cp_PrintSubjectLine", self.chkUseSubject, True))
- self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
- "cp_PrintSalutation", self.chkUseSalutation, True))
- self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
- "cp_PrintDate", self.chkUseDate, True))
- self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
- "cp_PrintCommunicationType", self.chkUseCommunicationType,
- True))
- self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
- "cp_PrintGreeting", self.chkUseGreeting, True))
- self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
- "cp_PrintFooter", self.chkUseFooter, True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_Salutation", self.lstSalutation, True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_Greeting", self.lstGreeting, True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_CommunicationType", self.lstCommunicationType,
- True))
- self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
- "cp_SenderAddressType", (self.optSenderDefine, \
- self.optSenderPlaceholder), True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_SenderCompanyName", self.txtSenderName, True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_SenderStreet", self.txtSenderStreet, True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_SenderPostCode", self.txtSenderPostCode, True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_SenderState", self.txtSenderState, True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_SenderCity", self.txtSenderCity, True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_SenderFax", self.txtSenderFax, True))
- self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
- "cp_ReceiverAddressType", (self.optReceiverDatabase,
- self.optReceiverPlaceholder), True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_Footer", self.txtFooter, True))
- self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
- "cp_FooterOnlySecondPage", self.chkFooterNextPages,
- True))
- self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
- "cp_FooterPageNumbers", self.chkFooterPageNumbers,
- True))
- self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
- "cp_CreationType", (self.optCreateFax, self.optMakeChanges),
- True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_TemplateName", self.txtTemplateName, True))
- self.faxDA.append(UnoDataAware.attachEditControl(cgl,
- "cp_TemplatePath", self.myPathSelection.xSaveTextBox,
- True))
->>>>>>> master
except Exception, exception:
traceback.print_exc()
@@ -534,12 +387,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.optPrivateFaxItemChanged()
def optBusinessFaxItemChanged(self):
-<<<<<<< HEAD
FaxWizardDialogImpl.lstPrivateStylePos = None
-=======
- DataAware.setDataObjects(self.faxDA,
- self.myConfig.cp_BusinessFax, True)
->>>>>>> master
self.setControlProperty("lblBusinessStyle",
PropertyNames.PROPERTY_ENABLED, True)
self.setControlProperty("lstBusinessStyle",
@@ -551,7 +399,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.lstBusinessStyleItemChanged()
self.__enableSenderReceiver()
self.__setPossibleFooter(True)
-<<<<<<< HEAD
def lstBusinessStyleItemChanged(self):
selectedItemPos = self.lstBusinessStyle.SelectedItemPos
@@ -565,18 +412,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
def optPrivateFaxItemChanged(self):
FaxWizardDialogImpl.lstBusinessStylePos = None
-=======
- def lstBusinessStyleItemChanged(self):
- TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( \
- self.BusinessFiles[1][self.lstBusinessStyle.SelectedItemPos],
- False)
- self.initializeElements()
- self.setElements()
-
- def optPrivateFaxItemChanged(self):
- DataAware.setDataObjects(self.faxDA,
- self.myConfig.cp_PrivateFax, True)
->>>>>>> master
self.setControlProperty("lblBusinessStyle",
PropertyNames.PROPERTY_ENABLED, False)
self.setControlProperty("lstBusinessStyle",
@@ -590,7 +425,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.__setPossibleFooter(False)
def lstPrivateStyleItemChanged(self):
-<<<<<<< HEAD
selectedItemPos = self.lstPrivateStyle.SelectedItemPos
#avoid to load the same item again
if FaxWizardDialogImpl.lstPrivateStylePos is not selectedItemPos:
@@ -599,13 +433,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.PrivateFiles[1][selectedItemPos], False)
self.initializeElements()
self.setElements()
-=======
- TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( \
- self.PrivateFiles[1][self.lstPrivateStyle.SelectedItemPos],
- False)
- self.initializeElements()
- self.setElements()
->>>>>>> master
def txtTemplateNameTextChanged(self):
xDocProps = TextDocument.xTextDocument.DocumentProperties
@@ -665,23 +492,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.txtSenderCityTextChanged()
self.txtSenderFaxTextChanged()
-<<<<<<< HEAD
-=======
- def optReceiverPlaceholderItemChanged(self):
- OfficeDocument.attachEventCall(TextDocument.xTextDocument, "OnNew",
- "StarBasic", "macro:#/Template.Correspondence.Placeholder()")
-
- def optReceiverDatabaseItemChanged(self):
- OfficeDocument.attachEventCall(TextDocument.xTextDocument, "OnNew",
- "StarBasic", "macro:#/Template.Correspondence.Database()")
-
- def optCreateFaxItemChanged(self):
- self.bEditTemplate = False
-
- def optMakeChangesItemChanged(self):
- self.bEditTemplate = True
-
->>>>>>> master
def txtSenderNameTextChanged(self):
self.myFieldHandler.changeUserFieldContent(
"Company", self.txtSenderName.Text)
@@ -728,7 +538,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
if self.optReceiverDatabase.State:
self.optReceiverDatabaseItemChanged()
-<<<<<<< HEAD
elif self.optReceiverPlaceholder.State:
self.optReceiverPlaceholderItemChanged()
@@ -736,15 +545,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.optCreateFromTemplateItemChanged()
elif self.optMakeChanges.State:
-=======
- if self.optReceiverPlaceholder.State:
- self.optReceiverPlaceholderItemChanged()
-
- if self.optCreateFax.State:
- self.optCreateFaxItemChanged()
-
- if self.optMakeChanges.State:
->>>>>>> master
self.optMakeChangesItemChanged()
def chkUseLogoItemChanged(self):
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index 20c32c3..bbf6921 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -1,10 +1,6 @@
from common.Resource import Resource
class FaxWizardDialogResources(Resource):
-<<<<<<< HEAD
-=======
- UNIT_NAME = "dbwizres"
->>>>>>> master
MODULE_NAME = "dbw"
RID_FAXWIZARDDIALOG_START = 3200
RID_FAXWIZARDCOMMUNICATION_START = 3270
More information about the Libreoffice-commits
mailing list