Changeset 250 for branches/mbutscher/work/lib/pwiki/AdditionalDialogs.py

Timestamp:

02/26/11 15:16:19 (2 years ago)

Author:

mbutscher

Message:

branches/stable-2.0:
2.0_1

branches/stable-2.1:
2.1rc01
* Removed annoying "blinking" on current heading in doc structure

window (thanks to Christian Ziemski)

* Internal: Bug fixed: Non-working old functions for todo handling

still present

branches/mbutscher/work:
2.2beta01
* Internal: Small reorganization (seldom used imports moved into

functions)

* Internal: Bug fixed: Non-working old functions for todo handling

still present

* Progress with file management, now dialogs available but far from

complete

Files:

• branches/mbutscher/work/lib/pwiki/AdditionalDialogs.py (modified) (8 diffs)

branches/mbutscher/work/lib/pwiki/AdditionalDialogs.py

@@ -25 +25 @@
 
 from WikiExceptions import *
-import Exporters, Importers
 import Serialization
 import SystemInfo
 
 from Consts import VERSION_STRING, DATABLOCK_STOREHINT_INTERN
-
-from SearchAndReplaceDialogs import SearchWikiDialog   # WikiPageListConstructionDialog
-from SearchAndReplace import SearchReplaceOperation, ListWikiPagesOperation
 
 
@@ -1146 +1142 @@
     def __init__(self, mainControl, ID, continuousExport=False, title=None,
                  pos=wx.DefaultPosition, size=wx.DefaultSize):
+        from . import Exporters
+        from .SearchAndReplace import SearchReplaceOperation
+
         d = wx.PreDialog()
         self.PostCreate(d)
@@ -1152 +1151 @@
         self.value = None
         
-        self.listPagesOperation = SearchReplaceOperation()  # ListWikiPagesOperation()
+        self.listPagesOperation = SearchReplaceOperation()
         self.continuousExport = continuousExport
         self.savedExports = None
@@ -1278 +1277 @@
         selset = self.ctrls.chSelectedSet.GetSelection()
         if selset == 3:  # Custom
+            from .SearchAndReplaceDialogs import SearchWikiDialog
+
             dlg = SearchWikiDialog(self, self.mainControl, -1,
                     value=self.listPagesOperation)
@@ -1586 +1587 @@
             return None
 
-#         if isinstance(lpOp, SearchReplaceOperation):
-#             pageSetXml.setAttribute(u"type", u"searchReplaceOperation")
-#         elif isinstance(lpOp, ListWikiPagesOperation):
-#             pageSetXml.setAttribute(u"type", u"listWikiPagesOperation")
-
         sarOp.serializeToXml(pageSetXml, xmlDoc)
 
@@ -1606 +1602 @@
 
     def _showExportProfile(self, xmlNode):
+        from .SearchAndReplace import SearchReplaceOperation
+
         try:
             etypeProfile = Serialization.serFromXmlUnicode(xmlNode,
@@ -1642 +1640 @@
             sarOp = SearchReplaceOperation()
     
-    #         if pageSetXml.getAttribute(u"type") == u"searchReplaceOperation":
-    #             lpOp = SearchReplaceOperation()
-    #         elif pageSetXml.getAttribute(u"type") == u"listWikiPagesOperation":
-    #             lpOp = ListWikiPagesOperation()
-    #         else:
-    #             return # TODO Error message!
-            
             sarOp.serializeFromXml(pageSetXml)
     
@@ -1678 +1669 @@
     def __init__(self, parent, ID, mainControl, title="Import",
                  pos=wx.DefaultPosition, size=wx.DefaultSize):
+        from . import Importers
+
         d = wx.PreDialog()
         self.PostCreate(d)