summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXisco Fauli <anistenis@gmail.com>2011-09-23 00:29:10 +0200
committerXisco Fauli <anistenis@gmail.com>2011-09-23 00:29:10 +0200
commit3eec17cb6ea20649d87f8e04dcffb4c75a75c12f (patch)
tree9b6b084d7145ced8e7bc07fae3257eea1b8b6d97
parentAdd the rest of the files to scp2 (diff)
downloadcore-feature/gsoc2011_wizards.tar.gz
core-feature/gsoc2011_wizards.zip
Set the python fax wizard as the default one feature/gsoc2011_wizards
-rw-r--r--instsetoo_native/util/makefile.mk2
-rw-r--r--scp2/source/ooo/file_ooo.scp2
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
-rwxr-xr-xwizards/com/sun/star/wizards/RemoteAgendaWizard6
-rwxr-xr-xwizards/com/sun/star/wizards/RemoteFaxWizard7
-rwxr-xr-xwizards/com/sun/star/wizards/RemoteLetterWizard7
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaTemplate.py6
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py2
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py2
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py10
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py2
-rw-r--r--wizards/com/sun/star/wizards/agenda/CGAgenda.py4
-rw-r--r--wizards/com/sun/star/wizards/agenda/CGTopic.py2
-rw-r--r--wizards/com/sun/star/wizards/agenda/TopicsControl.py6
-rw-r--r--wizards/com/sun/star/wizards/common/ConfigGroup.py4
-rw-r--r--wizards/com/sun/star/wizards/common/ConfigSet.py4
-rw-r--r--wizards/com/sun/star/wizards/common/Configuration.py7
-rw-r--r--wizards/com/sun/star/wizards/common/Desktop.py4
-rw-r--r--wizards/com/sun/star/wizards/common/FileAccess.py7
-rw-r--r--wizards/com/sun/star/wizards/common/Helper.py3
-rw-r--r--wizards/com/sun/star/wizards/common/NumberFormatter.py1
-rw-r--r--wizards/com/sun/star/wizards/common/PropertySetHelper.py2
-rw-r--r--wizards/com/sun/star/wizards/common/Resource.py7
-rw-r--r--wizards/com/sun/star/wizards/common/SystemDialog.py7
-rw-r--r--wizards/com/sun/star/wizards/common/__init__.py1
-rw-r--r--wizards/com/sun/star/wizards/document/OfficeDocument.py4
-rw-r--r--wizards/com/sun/star/wizards/fax/CGFax.py2
-rw-r--r--wizards/com/sun/star/wizards/fax/CGFaxWizard.py4
-rw-r--r--wizards/com/sun/star/wizards/fax/CallWizard.py24
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxDocument.py6
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialog.py7
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py2
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py23
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py2
-rw-r--r--wizards/com/sun/star/wizards/fax/__init__.py1
-rw-r--r--wizards/com/sun/star/wizards/letter/CGLetter.py2
-rw-r--r--wizards/com/sun/star/wizards/letter/CGLetterWizard.py2
-rw-r--r--wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py2
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterDocument.py8
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialog.py2
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py16
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py2
-rw-r--r--wizards/com/sun/star/wizards/letter/LocaleCodes.py2
-rw-r--r--wizards/com/sun/star/wizards/text/TextDocument.py13
-rw-r--r--wizards/com/sun/star/wizards/text/TextFieldHandler.py5
-rw-r--r--wizards/com/sun/star/wizards/text/TextSectionHandler.py4
-rw-r--r--wizards/com/sun/star/wizards/ui/ControlScroller.py10
-rw-r--r--wizards/com/sun/star/wizards/ui/DocumentPreview.py2
-rw-r--r--wizards/com/sun/star/wizards/ui/ImageList.py9
-rw-r--r--wizards/com/sun/star/wizards/ui/PathSelection.py6
-rw-r--r--wizards/com/sun/star/wizards/ui/PeerConfig.py2
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.py9
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog2.py6
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.py12
-rw-r--r--wizards/com/sun/star/wizards/ui/__init__.py1
-rw-r--r--wizards/com/sun/star/wizards/ui/event/DataAware.py6
-rw-r--r--wizards/com/sun/star/wizards/ui/event/ListModelBinder.py2
-rw-r--r--wizards/com/sun/star/wizards/ui/event/RadioDataAware.py4
-rw-r--r--wizards/com/sun/star/wizards/ui/event/UnoDataAware.py4
59 files changed, 141 insertions, 171 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 8568ff686a6b..8af871684608 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -83,8 +83,8 @@ LOCALPYFILES= \
$(BIN)$/CGFaxWizard.py \
$(BIN)$/FaxWizardDialogImpl.py \
$(BIN)$/FaxWizardDialog.py \
- $(BIN)$/ConfigGroup.py \
$(BIN)$/Configuration.py \
+ $(BIN)$/ConfigGroup.py \
$(BIN)$/FileAccess.py \
$(BIN)$/Properties.py \
$(BIN)$/Resource.py \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 1497b786eb46..f05fc13da6c8 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -473,10 +473,10 @@ STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
#ifndef AIX
#ifndef DISABLE_PYUNO
-STD_PY_FILE( gid_File_PyCallFaxWizard, CallWizard, gid_Dir_Program )
STD_PY_FILE( gid_File_PyInitWizards, __init__, gid_Dir_Wizards )
+STD_PY_FILE( gid_File_PyCallFaxWizard, CallWizard, gid_Dir_Program )
STD_PY_FILE( gid_File_PyInitFax, __init__, gid_Dir_Wizards_Fax )
STD_PY_FILE( gid_File_PyFaxDocument, FaxDocument, gid_Dir_Wizards_Fax )
STD_PY_FILE( gid_File_PyCGFax, CGFax, gid_Dir_Wizards_Fax )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 4996263fe9c2..3e5b9a2dd15a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -140,6 +140,7 @@ Module gid_Module_Root_Files_3
gid_File_Jar_Letter,
gid_File_Jar_Form,
gid_File_PyCallFaxWizard,
+ gid_File_PyCallFaxWizard,
gid_File_PyFaxDocument,
gid_File_PyCGFax,
gid_File_PyFaxWizardDialogConst,
diff --git a/wizards/com/sun/star/wizards/RemoteAgendaWizard b/wizards/com/sun/star/wizards/RemoteAgendaWizard
deleted file mode 100755
index 996ad35e4e76..000000000000
--- a/wizards/com/sun/star/wizards/RemoteAgendaWizard
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-from agenda.AgendaWizardDialogImpl import AgendaWizardDialogImpl
-import sys
-
-if __name__ == "__main__":
- AgendaWizardDialogImpl.main(sys.argv)
diff --git a/wizards/com/sun/star/wizards/RemoteFaxWizard b/wizards/com/sun/star/wizards/RemoteFaxWizard
deleted file mode 100755
index 76144cbfef1d..000000000000
--- a/wizards/com/sun/star/wizards/RemoteFaxWizard
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-from fax.FaxWizardDialogImpl import FaxWizardDialogImpl
-import sys
-
-if __name__ == "__main__":
-
- FaxWizardDialogImpl.main(sys.argv)
diff --git a/wizards/com/sun/star/wizards/RemoteLetterWizard b/wizards/com/sun/star/wizards/RemoteLetterWizard
deleted file mode 100755
index 9928625f6e5f..000000000000
--- a/wizards/com/sun/star/wizards/RemoteLetterWizard
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-from letter.LetterWizardDialogImpl import LetterWizardDialogImpl
-import sys
-
-if __name__ == "__main__":
-
- LetterWizardDialogImpl.main(sys.argv)
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py
index 9bae395b3880..d98536ec568c 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py
@@ -1,9 +1,9 @@
import uno
from TemplateConsts import *
from threading import RLock
-from text.TextDocument import *
-from common.FileAccess import FileAccess
-from text.TextSectionHandler import TextSectionHandler
+from wizards.text.TextDocument import *
+from wizards.common.FileAccess import FileAccess
+from wizards.text.TextSectionHandler import TextSectionHandler
from TopicsControl import TopicsControl
from datetime import date as dateTimeObject
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
index 1090717e4fc7..3555a2d6244a 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
@@ -1,4 +1,4 @@
-from ui.WizardDialog import *
+from wizards.ui.WizardDialog import *
from AgendaWizardDialogConst import *
from AgendaWizardDialogResources import AgendaWizardDialogResources
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
index 6f3fe7a25c60..2e26a350cd8b 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
@@ -1,4 +1,4 @@
-from common.HelpIds import HelpIds
+from wizards.common.HelpIds import HelpIds
TXTTITLE_TEXT_CHANGED = "txtTitleTextChanged"
TXTDATE_TEXT_CHANGED = "txtDateTextChanged"
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
index 22ed320229d4..68e39f29b72c 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
@@ -1,11 +1,11 @@
from AgendaWizardDialog import *
from AgendaTemplate import *
from CGAgenda import CGAgenda
-from ui.PathSelection import PathSelection
-from ui.event.UnoDataAware import UnoDataAware
-from ui.event.RadioDataAware import RadioDataAware
-from common.NoValidPathException import NoValidPathException
-from common.SystemDialog import SystemDialog
+from wizards.ui.PathSelection import PathSelection
+from wizards.ui.event.UnoDataAware import UnoDataAware
+from wizards.ui.event.RadioDataAware import RadioDataAware
+from wizards.common.NoValidPathException import NoValidPathException
+from wizards.common.SystemDialog import SystemDialog
from com.sun.star.view.DocumentZoomType import OPTIMAL
from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
index da84ee5b94e9..332c342d9d54 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
@@ -1,4 +1,4 @@
-from common.Resource import Resource
+from wizards.common.Resource import Resource
class AgendaWizardDialogResources(Resource):
MODULE_NAME = "dbw"
diff --git a/wizards/com/sun/star/wizards/agenda/CGAgenda.py b/wizards/com/sun/star/wizards/agenda/CGAgenda.py
index 112ef041df25..a1261de90f1a 100644
--- a/wizards/com/sun/star/wizards/agenda/CGAgenda.py
+++ b/wizards/com/sun/star/wizards/agenda/CGAgenda.py
@@ -1,5 +1,5 @@
-from common.ConfigGroup import ConfigGroup
-from common.ConfigSet import ConfigSet
+from wizards.common.ConfigGroup import ConfigGroup
+from wizards.common.ConfigSet import ConfigSet
from CGTopic import CGTopic
class CGAgenda(ConfigGroup):
diff --git a/wizards/com/sun/star/wizards/agenda/CGTopic.py b/wizards/com/sun/star/wizards/agenda/CGTopic.py
index ae6fb5125533..e9d57ec72cb4 100644
--- a/wizards/com/sun/star/wizards/agenda/CGTopic.py
+++ b/wizards/com/sun/star/wizards/agenda/CGTopic.py
@@ -1,4 +1,4 @@
-from common.ConfigGroup import *
+from wizards.common.ConfigGroup import *
'''
CGTopic means: Configuration Group Topic.
diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.py b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
index d1fe2cac9979..1ec37b293fd2 100644
--- a/wizards/com/sun/star/wizards/agenda/TopicsControl.py
+++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
@@ -1,9 +1,9 @@
from threading import RLock
from CGTopic import CGTopic
-from ui.ControlScroller import *
+from wizards.ui.ControlScroller import *
from AgendaWizardDialogConst import LAST_HID
-from common.Properties import Properties
-from ui.event.CommonListener import FocusListenerProcAdapter, KeyListenerProcAdapter
+from wizards.common.Properties import Properties
+from wizards.ui.event.CommonListener import FocusListenerProcAdapter, KeyListenerProcAdapter
from com.sun.star.awt.Key import DOWN, UP, TAB
from com.sun.star.awt.KeyModifier import SHIFT, MOD1
diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.py b/wizards/com/sun/star/wizards/common/ConfigGroup.py
index 2e0fd9434699..b9fba2b23afd 100644
--- a/wizards/com/sun/star/wizards/common/ConfigGroup.py
+++ b/wizards/com/sun/star/wizards/common/ConfigGroup.py
@@ -1,7 +1,7 @@
-from ConfigNode import *
-from Configuration import Configuration
import traceback
import inspect
+from wizards.common.ConfigNode import *
+from wizards.common.Configuration import Configuration
class ConfigGroup(ConfigNode):
diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py b/wizards/com/sun/star/wizards/common/ConfigSet.py
index 26b051adf2ef..bcdf56b8f3ab 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.py
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.py
@@ -1,6 +1,6 @@
import traceback
-from ConfigNode import *
-from Configuration import Configuration
+from wizards.common.ConfigNode import *
+from wizards.common.Configuration import Configuration
class ConfigSet(ConfigNode):
'''
diff --git a/wizards/com/sun/star/wizards/common/Configuration.py b/wizards/com/sun/star/wizards/common/Configuration.py
index 9f768e9bfb8d..665442f9cbc1 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.py
+++ b/wizards/com/sun/star/wizards/common/Configuration.py
@@ -1,7 +1,8 @@
-from PropertyNames import PropertyNames
-from Helper import *
-import traceback
import uno
+import traceback
+from wizards.common.PropertyNames import PropertyNames
+from wizards.common.Helper import *
+
'''
This class gives access to the OO configuration api.
It contains 4 get and 4 set convenience methods for getting and settings
diff --git a/wizards/com/sun/star/wizards/common/Desktop.py b/wizards/com/sun/star/wizards/common/Desktop.py
index 757767a93459..99c908986a68 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.py
+++ b/wizards/com/sun/star/wizards/common/Desktop.py
@@ -1,9 +1,11 @@
import uno
import traceback
+from wizards.common.NoValidPathException import *
+
from com.sun.star.frame.FrameSearchFlag import ALL, PARENT
from com.sun.star.util import URL
from com.sun.star.i18n.KParseTokens import ANY_LETTER_OR_NUMBER, ASC_UNDERSCORE
-from NoValidPathException import *
+
class Desktop(object):
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py
index 64c78cac93f0..e76c49a67704 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -1,9 +1,10 @@
import traceback
-from NoValidPathException import *
-from com.sun.star.ucb import CommandAbortedException
-from com.sun.star.awt.VclWindowPeerAttribute import OK, YES_NO
import types
from os import path as osPath
+from wizards.common.NoValidPathException import *
+
+from com.sun.star.ucb import CommandAbortedException
+from com.sun.star.awt.VclWindowPeerAttribute import OK, YES_NO
'''
This class delivers static convenience methods
diff --git a/wizards/com/sun/star/wizards/common/Helper.py b/wizards/com/sun/star/wizards/common/Helper.py
index a31a6376fe8d..9ec970f72e0d 100644
--- a/wizards/com/sun/star/wizards/common/Helper.py
+++ b/wizards/com/sun/star/wizards/common/Helper.py
@@ -1,8 +1,9 @@
import uno
import traceback
from datetime import date as DateTime
+from wizards.common.NumberFormatter import NumberFormatter
+
from com.sun.star.uno import RuntimeException
-from NumberFormatter import NumberFormatter
class Helper(object):
diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.py b/wizards/com/sun/star/wizards/common/NumberFormatter.py
index a3deb173022f..d2737f05c66a 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.py
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.py
@@ -1,4 +1,5 @@
import traceback
+
from com.sun.star.lang import Locale
from com.sun.star.util.NumberFormat import DATE, LOGICAL, DATETIME, TEXT, NUMBER
diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.py b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
index 2fce42abce53..fbb31d8f4ec8 100644
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.py
+++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
@@ -1,4 +1,4 @@
-from DebugHelper import *
+from wizards.common.DebugHelper import *
class PropertySetHelper(object):
diff --git a/wizards/com/sun/star/wizards/common/Resource.py b/wizards/com/sun/star/wizards/common/Resource.py
index ce2c9e1a4a3b..d7d524ff4b80 100644
--- a/wizards/com/sun/star/wizards/common/Resource.py
+++ b/wizards/com/sun/star/wizards/common/Resource.py
@@ -1,7 +1,8 @@
-from com.sun.star.awt.VclWindowPeerAttribute import OK
-from Configuration import Configuration
-from SystemDialog import SystemDialog
import traceback
+from wizards.common.Configuration import Configuration
+from wizards.common.SystemDialog import SystemDialog
+
+from com.sun.star.awt.VclWindowPeerAttribute import OK
class Resource(object):
'''
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py b/wizards/com/sun/star/wizards/common/SystemDialog.py
index a04c0272c96b..33661aa9d156 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.py
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
@@ -1,9 +1,8 @@
import uno
import traceback
-from Configuration import Configuration
-
-from Desktop import Desktop
-from Helper import Helper
+from wizards.common.Configuration import Configuration
+from wizards.common.Desktop import Desktop
+from wizards.common.Helper import Helper
from com.sun.star.ui.dialogs.TemplateDescription import FILESAVE_AUTOEXTENSION, FILEOPEN_SIMPLE
from com.sun.star.ui.dialogs.ExtendedFilePickerElementIds import CHECKBOX_AUTOEXTENSION
diff --git a/wizards/com/sun/star/wizards/common/__init__.py b/wizards/com/sun/star/wizards/common/__init__.py
index 1e42b88e42ec..e69de29bb2d1 100644
--- a/wizards/com/sun/star/wizards/common/__init__.py
+++ b/wizards/com/sun/star/wizards/common/__init__.py
@@ -1 +0,0 @@
-"""Common"""
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py
index a5eef40992dd..d44c01fbf854 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.py
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py
@@ -1,8 +1,8 @@
import uno
import traceback
import unohelper
-from ui.event.CommonListener import TerminateListenerProcAdapter
-from common.Desktop import Desktop
+from wizards.ui.event.CommonListener import TerminateListenerProcAdapter
+from wizards.common.Desktop import Desktop
from com.sun.star.awt import WindowDescriptor
from com.sun.star.awt import Rectangle
diff --git a/wizards/com/sun/star/wizards/fax/CGFax.py b/wizards/com/sun/star/wizards/fax/CGFax.py
index 24b5ae067c7d..cb0ce1716305 100644
--- a/wizards/com/sun/star/wizards/fax/CGFax.py
+++ b/wizards/com/sun/star/wizards/fax/CGFax.py
@@ -1,4 +1,4 @@
-from common.ConfigGroup import *
+from wizards.common.ConfigGroup import *
class CGFax(ConfigGroup):
diff --git a/wizards/com/sun/star/wizards/fax/CGFaxWizard.py b/wizards/com/sun/star/wizards/fax/CGFaxWizard.py
index a6729e4a5486..d1b14f06814c 100644
--- a/wizards/com/sun/star/wizards/fax/CGFaxWizard.py
+++ b/wizards/com/sun/star/wizards/fax/CGFaxWizard.py
@@ -1,5 +1,5 @@
-from common.ConfigGroup import *
-from CGFax import CGFax
+from wizards.common.ConfigGroup import *
+from wizards.fax.CGFax import CGFax
class CGFaxWizard(ConfigGroup):
diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.py b/wizards/com/sun/star/wizards/fax/CallWizard.py
index 33385a251a31..5aae1b75140f 100644
--- a/wizards/com/sun/star/wizards/fax/CallWizard.py
+++ b/wizards/com/sun/star/wizards/fax/CallWizard.py
@@ -4,38 +4,24 @@ import uno
import unohelper
from com.sun.star.task import XJobExecutor
+from wizards.fax.FaxWizardDialogImpl import FaxWizardDialogImpl
# implement a UNO component by deriving from the standard unohelper.Base class
# and from the interface(s) you want to implement.
-class HelloWorldJob(unohelper.Base, XJobExecutor):
+class CallWizard(unohelper.Base, XJobExecutor):
def __init__(self, ctx):
# store the component context for later use
self.ctx = ctx
def trigger(self, args):
- # note: args[0] == "HelloWorld", see below config settings
-
- # retrieve the desktop object
- desktop = self.ctx.ServiceManager.createInstanceWithContext(
- "com.sun.star.frame.Desktop", self.ctx)
-
- # get current document model
- model = desktop.getCurrentComponent()
-
- # access the document's text property
- text = model.Text
-
- # create a cursor
- cursor = text.createTextCursor()
-
- # insert the text into the document
- text.insertString(cursor, "Hello World", 0)
+ fw = FaxWizardDialogImpl(self.ctx.ServiceManager)
+ fx.startWizard()
# pythonloader looks for a static g_ImplementationHelper variable
g_ImplementationHelper = unohelper.ImplementationHelper()
g_ImplementationHelper.addImplementation( \
- HelloWorldJob, # UNO object class
+ CallWizard, # UNO object class
"com.sun.star.wizards.fax.CallWizard", # implemenation name
("com.sun.star.task.Job",),) # list of implemented services
# (the only service)
diff --git a/wizards/com/sun/star/wizards/fax/FaxDocument.py b/wizards/com/sun/star/wizards/fax/FaxDocument.py
index b5fee838796b..3f1575729184 100644
--- a/wizards/com/sun/star/wizards/fax/FaxDocument.py
+++ b/wizards/com/sun/star/wizards/fax/FaxDocument.py
@@ -1,6 +1,6 @@
-from text.TextDocument import *
-from text.TextSectionHandler import TextSectionHandler
-from common.PropertyNames import PropertyNames
+from wizards.text.TextDocument import *
+from wizards.text.TextSectionHandler import TextSectionHandler
+from wizards.common.PropertyNames import PropertyNames
from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
from com.sun.star.style.ParagraphAdjust import CENTER
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 644f08a228db..c465d88952e8 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -1,6 +1,7 @@
-from ui.WizardDialog import *
-from FaxWizardDialogResources import FaxWizardDialogResources
-from FaxWizardDialogConst import *
+from wizards.ui.WizardDialog import *
+from wizards.fax.FaxWizardDialogResources import FaxWizardDialogResources
+from wizards.fax.FaxWizardDialogConst import *
+
from com.sun.star.awt.FontUnderline import SINGLE
class FaxWizardDialog(WizardDialog):
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
index e5a72e195033..a8f8946fa834 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
@@ -1,4 +1,4 @@
-from common.HelpIds import HelpIds
+from wizards.common.HelpIds import HelpIds
OPTBUSINESSFAX_ITEM_CHANGED = "optBusinessFaxItemChanged"
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 92749ee15396..c6b1a089389f 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -1,13 +1,13 @@
-from FaxWizardDialog import *
-from CGFaxWizard import *
-from FaxDocument import *
-from ui.PathSelection import PathSelection
-from common.FileAccess import FileAccess
-from ui.event.UnoDataAware import UnoDataAware
-from ui.event.RadioDataAware import RadioDataAware
-from text.TextFieldHandler import TextFieldHandler
-from common.SystemDialog import SystemDialog
-from common.NoValidPathException import NoValidPathException
+from wizards.fax.FaxWizardDialog import *
+from wizards.fax.CGFaxWizard import *
+from wizards.fax.FaxDocument import *
+from wizards.ui.PathSelection import PathSelection
+from wizards.common.FileAccess import FileAccess
+from wizards.ui.event.UnoDataAware import UnoDataAware
+from wizards.ui.event.RadioDataAware import RadioDataAware
+from wizards.text.TextFieldHandler import TextFieldHandler
+from wizards.common.SystemDialog import SystemDialog
+from wizards.common.NoValidPathException import NoValidPathException
from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
from com.sun.star.uno import RuntimeException
@@ -56,9 +56,10 @@ class FaxWizardDialogImpl(FaxWizardDialog):
# TODO Auto-generated catch blocksetMaxStep
traceback.print_exc()
- def startWizard(self, xMSF, CurPropertyValue):
+ def startWizard(self, xMSF):
self.running = True
try:
+ print "entra"
#Number of steps on WizardDialog
self.nMaxStep = 5
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index bbf6921d381f..9badb1868761 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -1,4 +1,4 @@
-from common.Resource import Resource
+from wizards.common.Resource import Resource
class FaxWizardDialogResources(Resource):
MODULE_NAME = "dbw"
diff --git a/wizards/com/sun/star/wizards/fax/__init__.py b/wizards/com/sun/star/wizards/fax/__init__.py
index ff5ad269ba10..e69de29bb2d1 100644
--- a/wizards/com/sun/star/wizards/fax/__init__.py
+++ b/wizards/com/sun/star/wizards/fax/__init__.py
@@ -1 +0,0 @@
-"""fax """
diff --git a/wizards/com/sun/star/wizards/letter/CGLetter.py b/wizards/com/sun/star/wizards/letter/CGLetter.py
index b9550283711f..474861297414 100644
--- a/wizards/com/sun/star/wizards/letter/CGLetter.py
+++ b/wizards/com/sun/star/wizards/letter/CGLetter.py
@@ -1,4 +1,4 @@
-from common.ConfigGroup import *
+from wizards.common.ConfigGroup import *
from CGPaperElementLocation import CGPaperElementLocation
class CGLetter(ConfigGroup):
diff --git a/wizards/com/sun/star/wizards/letter/CGLetterWizard.py b/wizards/com/sun/star/wizards/letter/CGLetterWizard.py
index 3df1ee17b800..11505bf8ee34 100644
--- a/wizards/com/sun/star/wizards/letter/CGLetterWizard.py
+++ b/wizards/com/sun/star/wizards/letter/CGLetterWizard.py
@@ -1,4 +1,4 @@
-from common.ConfigGroup import *
+from wizards.common.ConfigGroup import *
from CGLetter import CGLetter
class CGLetterWizard (ConfigGroup):
diff --git a/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py b/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py
index 901fbae82a91..3e6cc1f393f8 100644
--- a/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py
+++ b/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py
@@ -1,4 +1,4 @@
-from common.ConfigGroup import *
+from wizards.common.ConfigGroup import *
class CGPaperElementLocation(ConfigGroup):
diff --git a/wizards/com/sun/star/wizards/letter/LetterDocument.py b/wizards/com/sun/star/wizards/letter/LetterDocument.py
index af928c8aab3f..bc8b2fef42d1 100644
--- a/wizards/com/sun/star/wizards/letter/LetterDocument.py
+++ b/wizards/com/sun/star/wizards/letter/LetterDocument.py
@@ -1,8 +1,8 @@
-from text.TextDocument import *
-from text.TextSectionHandler import TextSectionHandler
-from com.sun.star.table import BorderLine
-from common.PropertyNames import PropertyNames
+from wizards.text.TextDocument import *
+from wizards.text.TextSectionHandler import TextSectionHandler
+from wizards.common.PropertyNames import PropertyNames
+from com.sun.star.table import BorderLine
from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
from com.sun.star.style.ParagraphAdjust import CENTER
from com.sun.star.text.PageNumberType import CURRENT
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index 76d4f8e79969..f6cfb4ced636 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -1,4 +1,4 @@
-from ui.WizardDialog import *
+from wizards.ui.WizardDialog import *
from LetterWizardDialogConst import *
from LetterWizardDialogResources import LetterWizardDialogResources
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index d2ca5f7150f7..3ac564269af4 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -1,15 +1,15 @@
from LetterWizardDialog import *
from LetterDocument import *
-from common.NoValidPathException import NoValidPathException
-from common.FileAccess import FileAccess
+from wizards.common.NoValidPathException import NoValidPathException
+from wizards.common.FileAccess import FileAccess
from LocaleCodes import LocaleCodes
-from ui.PathSelection import PathSelection
-from common.Configuration import Configuration
+from wizards.ui.PathSelection import PathSelection
+from wizards.common.Configuration import Configuration
from CGLetterWizard import CGLetterWizard
-from ui.event.UnoDataAware import UnoDataAware
-from ui.event.RadioDataAware import RadioDataAware
-from text.TextFieldHandler import TextFieldHandler
-from common.SystemDialog import SystemDialog
+from wizards.ui.event.UnoDataAware import UnoDataAware
+from wizards.ui.event.RadioDataAware import RadioDataAware
+from wizards.text.TextFieldHandler import TextFieldHandler
+from wizards.common.SystemDialog import SystemDialog
from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
from com.sun.star.view.DocumentZoomType import OPTIMAL
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index 12474e34c343..f6f41603b8b7 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -1,4 +1,4 @@
-from common.Resource import Resource
+from wizards.common.Resource import Resource
class LetterWizardDialogResources(Resource):
diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.py b/wizards/com/sun/star/wizards/letter/LocaleCodes.py
index ef376c575d8f..5ca85d06559f 100644
--- a/wizards/com/sun/star/wizards/letter/LocaleCodes.py
+++ b/wizards/com/sun/star/wizards/letter/LocaleCodes.py
@@ -1,4 +1,4 @@
-from common.Resource import Resource
+from wizards.common.Resource import Resource
class LocaleCodes(Resource):
UNIT_NAME = "svtres",
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py
index df7c0e76aafa..c661d064c431 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.py
+++ b/wizards/com/sun/star/wizards/text/TextDocument.py
@@ -2,13 +2,12 @@ import uno
import traceback
import time
from datetime import date as dateTimeObject
-
-from common.Desktop import Desktop
-from common.Helper import Helper
-from document.OfficeDocument import OfficeDocument
-from text.ViewHandler import ViewHandler
-from text.TextFieldHandler import TextFieldHandler
-from common.Configuration import Configuration
+from wizards.common.Desktop import Desktop
+from wizards.common.Helper import Helper
+from wizards.document.OfficeDocument import OfficeDocument
+from wizards.text.ViewHandler import ViewHandler
+from wizards.text.TextFieldHandler import TextFieldHandler
+from wizards.common.Configuration import Configuration
from com.sun.star.container import NoSuchElementException
from com.sun.star.lang import WrappedTargetException
diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.py b/wizards/com/sun/star/wizards/text/TextFieldHandler.py
index 465a19e822d9..126f61dcefd9 100644
--- a/wizards/com/sun/star/wizards/text/TextFieldHandler.py
+++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.py
@@ -1,10 +1,9 @@
import traceback
import time
-from com.sun.star.util import DateTime
-from common.PropertyNames import PropertyNames
import unicodedata
+from wizards.common.PropertyNames import PropertyNames
-import inspect
+from com.sun.star.util import DateTime
class TextFieldHandler(object):
'''
diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.py b/wizards/com/sun/star/wizards/text/TextSectionHandler.py
index 685cd1c8aa8f..fb628e4e5e01 100644
--- a/wizards/com/sun/star/wizards/text/TextSectionHandler.py
+++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.py
@@ -1,6 +1,6 @@
-import traceback
import uno
-from common.Helper import Helper
+import traceback
+from wizards.common.Helper import Helper
class TextSectionHandler(object):
'''Creates a new instance of TextSectionHandler'''
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.py b/wizards/com/sun/star/wizards/ui/ControlScroller.py
index 9601400d3237..572ec85b87ad 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.py
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.py
@@ -1,10 +1,10 @@
import uno
import traceback
-from common.Desktop import Desktop
-from common.PropertyNames import PropertyNames
-from common.HelpIds import HelpIds
-from common.Helper import Helper
-from ui.UnoDialog import UnoDialog
+from wizards.common.Desktop import Desktop
+from wizards.common.PropertyNames import PropertyNames
+from wizards.common.HelpIds import HelpIds
+from wizards.common.Helper import Helper
+from wizards.ui.UnoDialog import UnoDialog
from com.sun.star.awt.ScrollBarOrientation import HORIZONTAL, VERTICAL
diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.py b/wizards/com/sun/star/wizards/ui/DocumentPreview.py
index b3842b85b7ae..64339bb3fde2 100644
--- a/wizards/com/sun/star/wizards/ui/DocumentPreview.py
+++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.py
@@ -1,5 +1,5 @@
import traceback
-from common.Properties import Properties
+from wizards.common.Properties import Properties
from com.sun.star.awt import WindowDescriptor
from com.sun.star.awt import Rectangle
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.py b/wizards/com/sun/star/wizards/ui/ImageList.py
index a8b40dcaf79b..565f63eead6a 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.py
+++ b/wizards/com/sun/star/wizards/ui/ImageList.py
@@ -1,9 +1,10 @@
from threading import RLock
+from wizards.ui.PeerConfig import PeerConfig
+from wizards.common.PropertyNames import *
+from wizards.common.HelpIds import HelpIds
+from wizards.common.Helper import Helper
+
from com.sun.star.awt import Size
-from common.PropertyNames import *
-from PeerConfig import PeerConfig
-from common.HelpIds import HelpIds
-from common.Helper import Helper
def synchronized(lock):
''' Synchronization decorator. '''
diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.py b/wizards/com/sun/star/wizards/ui/PathSelection.py
index 2be27ac836f9..84ba2dfa5ca1 100644
--- a/wizards/com/sun/star/wizards/ui/PathSelection.py
+++ b/wizards/com/sun/star/wizards/ui/PathSelection.py
@@ -1,7 +1,7 @@
import traceback
-from common.PropertyNames import *
-from common.FileAccess import *
-from common.SystemDialog import SystemDialog
+from wizards.common.PropertyNames import *
+from wizards.common.FileAccess import *
+from wizards.common.SystemDialog import SystemDialog
class PathSelection(object):
diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.py b/wizards/com/sun/star/wizards/ui/PeerConfig.py
index b43d8bd5cc13..ad873280e042 100644
--- a/wizards/com/sun/star/wizards/ui/PeerConfig.py
+++ b/wizards/com/sun/star/wizards/ui/PeerConfig.py
@@ -1,4 +1,4 @@
-from event.CommonListener import WindowListenerProcAdapter
+from wizards.ui.event.CommonListener import WindowListenerProcAdapter
'''
@author rpiterman
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py b/wizards/com/sun/star/wizards/ui/UnoDialog.py
index 53519ec30fec..7c0aeb89cbad 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py
@@ -1,12 +1,11 @@
import uno
import traceback
-import UIConsts
-from common.PropertyNames import PropertyNames
-from common.Helper import Helper
-from ui.PeerConfig import PeerConfig
+import wizards.ui.UIConsts
+from wizards.common.PropertyNames import PropertyNames
+from wizards.common.Helper import Helper
+from wizards.ui.PeerConfig import PeerConfig
from com.sun.star.awt import Rectangle
-from com.sun.star.awt import Rectangle
from com.sun.star.awt.PosSize import POS
class UnoDialog(object):
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.py b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
index 45b6249a942f..58b448c92afa 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
@@ -1,6 +1,6 @@
-from UnoDialog import *
-from ui.event.CommonListener import *
-from common.Desktop import Desktop
+from wizards.ui.UnoDialog import *
+from wizards.ui.event.CommonListener import *
+from wizards.common.Desktop import Desktop
'''
This class contains convenience methods for inserting components to a dialog.
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index b2a687d1de5a..d73fb4f736b6 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -1,15 +1,15 @@
-from UnoDialog2 import *
-from common.Resource import Resource
+from wizards.ui.UnoDialog2 import *
from abc import ABCMeta, abstractmethod
-from common.HelpIds import *
-from document.OfficeDocument import OfficeDocument
-from text.TextDocument import TextDocument
+from wizards.common.Resource import Resource
+from wizards.ui.XPathSelectionListener import XPathSelectionListener
+from wizards.common.HelpIds import *
+from wizards.document.OfficeDocument import OfficeDocument
+from wizards.text.TextDocument import TextDocument
from com.sun.star.lang import NoSuchMethodException
from com.sun.star.lang import IllegalArgumentException
from com.sun.star.frame import TerminationVetoException
from com.sun.star.awt.PushButtonType import HELP, STANDARD
-from ui.XPathSelectionListener import XPathSelectionListener
class WizardDialog(UnoDialog2):
diff --git a/wizards/com/sun/star/wizards/ui/__init__.py b/wizards/com/sun/star/wizards/ui/__init__.py
index 51429ce86cfb..e69de29bb2d1 100644
--- a/wizards/com/sun/star/wizards/ui/__init__.py
+++ b/wizards/com/sun/star/wizards/ui/__init__.py
@@ -1 +0,0 @@
-"""UI"""
diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.py b/wizards/com/sun/star/wizards/ui/event/DataAware.py
index 5f4df9585587..2a4f5cf6531d 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.py
@@ -1,7 +1,7 @@
-from common.PropertyNames import *
-from abc import ABCMeta, abstractmethod
import traceback
-from ui.event.CommonListener import *
+from abc import ABCMeta, abstractmethod
+from wizards.common.PropertyNames import *
+from wizards.ui.event.CommonListener import *
'''
@author rpiterman
diff --git a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py
index 183bab050139..1a8878f8b6cc 100644
--- a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py
+++ b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py
@@ -1,4 +1,4 @@
-from common.Helper import Helper
+from wizards.common.Helper import Helper
class ListModelBinder(object):
diff --git a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
index 181662b19b5f..a2ef2940c54f 100644
--- a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
@@ -1,5 +1,5 @@
-from DataAware import *
-from UnoDataAware import *
+from wizards.ui.event.DataAware import *
+from wizards.ui.event.UnoDataAware import *
import time
'''
@author rpiterman
diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
index 483a56916afc..3c7e77ff016d 100644
--- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
@@ -1,5 +1,5 @@
-from DataAware import *
-from common.Helper import *
+from wizards.ui.event.DataAware import *
+from wizards.common.Helper import *
'''
@author rpiterman