Changes in / [20:30]

Location:

/branches

Files:

• greitmayr/extensions/WikiSyntax.py (modified) (1 diff)
• greitmayr/extensions/WikidPadHooks.py (modified) (1 diff)
• greitmayr/extensions/referrals.py (added)
• greitmayr/extensions/KeyBindings.py (modified) (2 diffs)
• greitmayr/lib/pwiki/WikiTxtCtrl.py (modified) (1 diff)
• greitmayr/lib/pwiki/PluginManager.py (added)
• greitmayr/lib/pwiki/WikiData.py (modified) (1 diff)
• greitmayr/lib/pwiki/PersonalWikiFrame.py (modified) (21 diffs)
• mbutscher/work/extensions/WikiSyntax.py (modified) (1 diff)
• mbutscher/work/extensions/WikidPadHooks.py (modified) (1 diff)
• mbutscher/work/extensions/referrals.py (added)
• mbutscher/work/extensions/KeyBindings.py (modified) (2 diffs)
• mbutscher/work/license.txt (modified) (1 diff)
• mbutscher/work/lib/pwiki/StringOps.py (modified) (2 diffs)
• mbutscher/work/lib/pwiki/WikiTxtCtrl.py (modified) (3 diffs)
• mbutscher/work/lib/pwiki/PluginManager.py (added)
• mbutscher/work/lib/pwiki/Exporters.py (modified) (17 diffs)
• mbutscher/work/lib/pwiki/WikiData.py (modified) (5 diffs)
• mbutscher/work/lib/pwiki/WikiFormatting.py (modified) (2 diffs)
• mbutscher/work/lib/pwiki/Configuration.py (modified) (1 diff)
• mbutscher/work/lib/pwiki/WikiTreeCtrl.py (modified) (7 diffs)
• mbutscher/work/lib/pwiki/AdditionalDialogs.py (modified) (11 diffs)
• mbutscher/work/lib/pwiki/PersonalWikiFrame.py (modified) (68 diffs)
• mbutscher/work/lib/gadfly/grammar.pyc (deleted)
• mbutscher/work/lib/gadfly/semantics.pyc (deleted)
• mbutscher/work/lib/gadfly/kjSet.pyo (deleted)
• mbutscher/work/lib/gadfly/store.pyc (deleted)
• mbutscher/work/lib/gadfly/__init__.pyc (deleted)
• mbutscher/work/lib/gadfly/sql.pyc (deleted)
• mbutscher/work/lib/gadfly/kjbuckets_select.pyo (deleted)
• mbutscher/work/lib/gadfly/introspection.pyc (deleted)
• mbutscher/work/lib/gadfly/grammar.pyo (deleted)
• mbutscher/work/lib/gadfly/semantics.pyo (deleted)
• mbutscher/work/lib/gadfly/kjbuckets0.pyc (deleted)
• mbutscher/work/lib/gadfly/store.pyo (deleted)
• mbutscher/work/lib/gadfly/sql.pyo (deleted)
• mbutscher/work/lib/gadfly/__init__.pyo (deleted)
• mbutscher/work/lib/gadfly/introspection.pyo (deleted)
• mbutscher/work/lib/gadfly/kjParser.pyc (deleted)
• mbutscher/work/lib/gadfly/kjbuckets0.pyo (deleted)
• mbutscher/work/lib/gadfly/operations.pyc (deleted)
• mbutscher/work/lib/gadfly/serialize.pyc (deleted)
• mbutscher/work/lib/gadfly/kjParser.pyo (deleted)
• mbutscher/work/lib/gadfly/bindings.pyc (deleted)
• mbutscher/work/lib/gadfly/operations.pyo (deleted)
• mbutscher/work/lib/gadfly/serialize.pyo (deleted)
• mbutscher/work/lib/gadfly/database.pyc (deleted)
• mbutscher/work/lib/gadfly/bindings.pyo (deleted)
• mbutscher/work/lib/gadfly/kjSet.pyc (deleted)
• mbutscher/work/lib/gadfly/database.pyo (deleted)
• mbutscher/work/lib/gadfly/kjbuckets_select.pyc (deleted)

/branches/greitmayr/extensions/WikiSyntax.py

@@ -14 +14 @@
 UrlRE           = re.compile("((?:wiki|file|https?|ftp|mailto)://[^\s<]*)")
 BulletRE        = re.compile("^(\s*)(\*)\s([^\\n]*)")
-NumericBulletRE = re.compile("^(\s*)(\d+)\.\s([^\\n]*)")
+NumericBulletRE = re.compile("^(\s*)((?:\d+\.)*)(\d+)\.\s([^\\n]*)")
 IndentedContentRE = re.compile("^((?:\s{4})+)()([^\\n]*)")
 

/branches/greitmayr/extensions/WikidPadHooks.py

@@ -1 +1 @@
 from os.path import join
+
+WIKIDPAD_PLUGIN = (("hooks", 1),)
 
 def startup(wikidPad):

/branches/greitmayr/extensions/KeyBindings.py

@@ -36 +36 @@
 Eval="Ctrl-E"
 InsertDate="Ctrl-Alt-D"
+MakeWikiWord="Ctrl-J"
 
 def makeBold(editor):
@@ -48 +49 @@
     editor.AddText('+')
     editor.GotoPos(pos)
+    
+def makeWikiWord(editor):
+    text = editor.GetSelectedText()
+    text = text.replace("'", "")
+    text = text[0:1].upper() + text[1:]
+    text = "[" + text + "]"
+    editor.ReplaceSelection(text)

/branches/greitmayr/lib/pwiki/WikiTxtCtrl.py

@@ -534 +534 @@
                     match = WikiFormatting.NumericBulletRE.search(previousLine)
                     if match:
-                        prevNumStr = match.group(2)
+                        prevNumStr = match.group(3)
                         prevNum = int(prevNumStr)
                         nextNum = prevNum+1
                         adjustment = len(str(nextNum)) - len(prevNumStr)
                         
-                        self.AddText("%s%d. " % (" " * (self.GetLineIndentation(currentLine-1) - adjustment), int(prevNum)+1))
+                        self.AddText("%s%s%d. " % (" " * (self.GetLineIndentation(currentLine-1) - adjustment), match.group(2), int(prevNum)+1))
                     else:
                         self.AddText(" " * self.GetLineIndentation(currentLine-1))

/branches/greitmayr/lib/pwiki/WikiData.py

@@ -379 +379 @@
             cursor.execute(sql, params)
         else:
-        cursor.execute(sql)
+            cursor.execute(sql)
         data = cursor.fetchall()
         cursor.close()

/branches/greitmayr/lib/pwiki/PersonalWikiFrame.py

@@ -14 +14 @@
 import WikiFormatting
 from Config import *
+from PluginManager import *
 
 class PersonalWikiFrame(wxFrame):
@@ -69 +70 @@
         self.wikiHistory = []
 
+        # setup plugin manager and hooks API
+        self.pluginManager = PluginManager()
+        self.hooks = self.pluginManager.registerPluginAPI(("hooks",1),
+            ["startup", "newWiki", "createdWiki", "openWiki", "openedWiki", 
+             "openWikiWord", "newWikiWord", "openedWikiWord", "savingWikiWord",
+             "savedWikiWord", "renamedWikiWord", "deletedWikiWord", "exit"] )
+        # interface for editor functions menu plugins
+        self.editorFunctions = self.pluginManager.registerPluginAPI(("EditorFunctions",1), 
+                                ["describeMenuItem", "describeToolbarItem"])
+
         # load extensions
         self.loadExtensions()
@@ -76 +87 @@
 
         # trigger hook            
-        for plugin in self.plugins:
-            plugin.startup(self)
+        self.hooks.startup(self)
  
         # if it already exists read it in
         if (exists(self.globalConfigLoc)):            
             self.globalConfig.read(self.globalConfigLoc)
-        else:
+        if not self.globalConfig.has_section("main"):
             self.createDefaultGlobalConfig()
 
@@ -181 +191 @@
         self.evalLib = self.getExtension('EvalLibrary', 'EvalLibrary.py')
         self.wikiSyntax = self.getExtension('SyntaxLibrary', 'WikiSyntax.py')
-        self.plugins = self.getPlugins() 
+        dirs = [ join(self.wikiAppDir, 'user_extensions'), join(self.wikiAppDir, 'extensions') ]
+        self.pluginManager.loadPlugins( dirs, [ 'KeyBindings.py', 'EvalLibrary.py', 'WikiSyntax.py' ] )
 
     def getExtension(self, extensionName, fileName):
@@ -189 +200 @@
         extensionFile = open(extensionFileName)
         return importCode(extensionFile, extensionName)        
-
-    def getPlugins(self):
-        import sys
-        
-        # set up some data
-        exclusions = [ 'KeyBindings.py', 'EvalLibrary.py', 'WikiSyntax.py' ]
-        result = []
-        
-        # walk the user extension path first to override any plugins in the system extension
-        userExtensionPath = join(self.wikiAppDir, 'user_extensions')
-        files = os.listdir(userExtensionPath)
-        for name in files:
-            fullname = join(userExtensionPath, name)
-            ( moduleName, ext ) = splitext(name)
-            if isfile(fullname) and ext == '.py' and name not in exclusions:
-                module = importCode(open(fullname), moduleName)
-                result.append(module)
-                exclusions.append(name)                
-        
-        # then walk the system extension with the user plugins added to the exclusions already        
-        extensionPath = join(self.wikiAppDir, 'extensions')
-        files = os.listdir(extensionPath)
-        for name in files:
-            fullname = join(extensionPath, name)
-            ( moduleName, ext ) = splitext(name)
-            if isfile(fullname) and ext == '.py' and name not in exclusions:
-                module = importCode(open(fullname), moduleName)
-                result.append(module)                
-                
-        return result   
 
     def createDefaultGlobalConfig(self):
@@ -478 +459 @@
         formattingMenu.AppendItem(menuItem)
         EVT_MENU(self, menuID, lambda evt: self.editor.AddText(self.evalLib.now()))
+
+        menuID=wxNewId()
+        menuItem = wxMenuItem(formattingMenu, menuID, 'Wikize Selected Word\t' + self.keyBindings.MakeWikiWord, 'Wikize Selected Word')
+        (id, bitmap) = self.iconLookup["pin"]
+        menuItem.SetBitmap(bitmap)
+        formattingMenu.AppendItem(menuItem)
+        EVT_MENU(self, menuID, lambda evt: self.keyBindings.makeWikiWord(self.editor))
 
         formattingMenu.AppendSeparator()
@@ -685 +673 @@
         EVT_MENU(self, menuID, lambda evt: self.showAboutDialog())
 
+        # get info for any plugin menu items and create them as necessary
+        pluginMenu = None
+        menuItems = self.editorFunctions.describeMenuItem(self)
+        if len(menuItems) > 0:
+            pluginMenu = wxMenu()
+            for function, item, tooltip in menuItems:
+                menuID = wxNewId()
+                pluginMenu.Append(menuID, item, tooltip)
+                EVT_MENU(self, menuID, lambda evt: function(self))
+                
         self.mainmenu.Append(wikiMenu, 'W&iki')
         self.mainmenu.Append(wikiWordMenu, '&Wiki Words')
         self.mainmenu.Append(historyMenu, '&History')
         self.mainmenu.Append(formattingMenu, '&Editor')
+        if pluginMenu:
+            self.mainmenu.Append(pluginMenu, "Pl&ugins")
         self.mainmenu.Append(helpMenu, 'He&lp')
 
@@ -791 +791 @@
         tb.AddSimpleTool(tbID, icon, "Zoom Out", "Zoom Out")
         EVT_TOOL(self, tbID, lambda evt: self.editor.CmdKeyExecute(wxSTC_CMD_ZOOMOUT))
+
+        (index, icon) = self.iconLookup["pin"]
+        tbID = wxNewId()
+        tb.AddSimpleTool(tbID, icon, "Wikize Selected Word", "Wikize Selected Word")
+        EVT_TOOL(self, tbID, lambda evt: self.keyBindings.makeWikiWord(self.editor))
+
+        # get info for any toolbar items and create them as necessary
+        toolbarItems = self.editorFunctions.describeToolbarItem(self)    
+        for function, label, icon, tooltip in toolbarItems:
+            tbID = wxNewId()
+            tb.AddLabelTool( tbID, label, icon, wxNullBitmap, 0, tooltip)
+            EVT_TOOL(self, tbID, lambda evt: function(self))
 
         tb.Realize()
@@ -883 +895 @@
         "creates a new wiki"
 
-        for plugin in self.plugins:
-            plugin.newWiki(self, wikiName, wikiDir)
+        self.hooks.newWiki(self, wikiName, wikiDir)
 
         wikiName = string.replace(wikiName, " ", "")
@@ -963 +974 @@
 
                 # trigger hook
-                for plugin in self.plugins:
-                    plugin.createdWiki(self, wikiName, wikiDir)
+                self.hooks.createdWiki(self, wikiName, wikiDir)
 
                 # reopen the root
@@ -973 +983 @@
         "opens up a wiki"
 
-        for plugin in self.plugins:
-            plugin.openWiki(self, wikiConfigFile)
+        # trigger hooks
+        self.hooks.openWiki(self, wikiConfigFile)
 
         # Save the state of the currently open wiki, if there was one open
@@ -1108 +1118 @@
 
         # trigger hook
-        for plugin in self.plugins:
-            plugin.openedWiki(self, self.wikiName, wikiConfigFile)
+        self.hooks.openedWiki(self, self.wikiName, wikiConfigFile)
  
         # return that the wiki was opened successfully
@@ -1141 +1150 @@
 
     def openWikiPage(self, wikiWord, addToHistory=True, forceTreeSyncFromRoot=False):
-        wikiWord = WikiFormatting.convertForWX(wikiWord)
-
         self.statusBar.SetStatusText("Opening wiki word '%s'" % wikiWord, 0)
 
@@ -1166 +1173 @@
 
         # trigger hook
-        for plugin in self.plugins:
-            plugin.openWikiWord(self, wikiWord)
+        self.hooks.openWikiWord(self, wikiWord)
 
         # check if this is an alias
@@ -1183 +1189 @@
         except WikiWordNotFoundException, e:
             self.currentWikiPage = self.wikiData.createPage(wikiWord)
-            for plugin in self.plugins:
-                plugin.newWikiWord(self, wikiWord)
+            # trigger hooks
+            self.hooks.newWikiWord(self, wikiWord)
 
         # set the editor text
@@ -1246 +1252 @@
 
         # trigger hook
-        for plugin in self.plugins:
-            plugin.openedWikiWord(self, wikiWord)
+        self.hooks.openedWikiWord(self, wikiWord)
 
 
@@ -1388 +1393 @@
     def saveCurrentWikiPage(self):
         self.statusBar.SetStatusText("Saving WikiPage", 0)
-        for plugin in self.plugins:
-            plugin.savingWikiWord(self, self.currentWikiWord)
+        # trigger hooks
+        self.hooks.savingWikiWord(self, self.currentWikiWord)
 
         error = False
@@ -1409 +1414 @@
             self.statusBar.SetStatusText("", 0)
             self.editor.SetSavePoint()
-            for plugin in self.plugins:
-                plugin.savedWikiWord(self, self.currentWikiWord)
+            # trigger hooks
+            self.hooks.savedWikiWord(self, self.currentWikiWord)
 
             # if saving the root open it in the tree
@@ -1550 +1555 @@
                     self.openWiki(renamedConfigFile)
 
-                for plugin in self.plugins:
-                    plugin.renamedWikiWord(self, wikiWord, toWikiWord)                
+                # trigger hooks
+                self.hooks.renamedWikiWord(self, wikiWord, toWikiWord)                
                 self.tree.collapse()
                 self.openWikiPage(toWikiWord, forceTreeSyncFromRoot=True)
@@ -1601 +1606 @@
             try:
                 self.wikiData.deleteWord(wikiWord)
-                for plugin in self.plugins:
-                    plugin.deletedWikiWord(self, wikiWord)
+                # trigger hooks
+                self.hooks.deletedWikiWord(self, wikiWord)
                 if wikiWord == self.currentWikiWord:
                     self.tree.collapse()
@@ -1849 +1854 @@
 
         # trigger hook
-        for plugin in self.plugins:
-            plugin.exit(self)
+        self.hooks.exit(self)
 
         wxTheClipboard.Flush()

/branches/mbutscher/work/extensions/WikiSyntax.py

@@ -25 +25 @@
 
 # The following 3 are not in WikiFormatting.FormatExpressions
-BulletRE        = re.compile(u"^(\s*)(\*)\s([^\\n]*)")
-NumericBulletRE = re.compile(u"^(\s*)(\d+)\.\s([^\\n]*)")
-IndentedContentRE = re.compile(u"^((?:\s{4})+)()([^\\n]*)")
+BulletRE        = re.compile(ur"^(\s*)(\*)\s([^\n]*)",
+        re.DOTALL | re.LOCALE | re.MULTILINE)
+NumericBulletRE = re.compile(ur"^(\s*)((?:\d+\.)*)(\d+)\.\s([^\n]*)",
+        re.DOTALL | re.LOCALE | re.MULTILINE)
+IndentedContentRE = re.compile(ur"^((?:\s{4})+)()([^\n]*)",
+        re.DOTALL | re.LOCALE | re.MULTILINE)
 
 # WikiWords

/branches/mbutscher/work/extensions/WikidPadHooks.py

@@ -1 +1 @@
 from os.path import join
+
+WIKIDPAD_PLUGIN = (("hooks", 1),)
 
 def startup(wikidPad):

/branches/mbutscher/work/extensions/KeyBindings.py

@@ -38 +38 @@
 Eval="Ctrl-E"
 InsertDate="Ctrl-Alt-D"
+MakeWikiWord="Ctrl-J"
 
 def makeBold(editor):
@@ -50 +51 @@
     editor.AddText(u'+')
     editor.GotoPos(bytePos)
+
+def makeWikiWord(editor):
+    text = editor.GetSelectedText()
+    text = text.replace(u"'", u"")
+    text = text[0:1].upper() + text[1:]
+    text = u"[" + text + u"]"
+    editor.ReplaceSelection(text)
+

/branches/mbutscher/work/license.txt

@@ -1 @@
-Copyright (c) 2005, Jason Horman
+Copyright (c) 2005, Jason Horman, Michael Butscher, Gerhard Reitmayr
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the <ORGANIZATION> nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

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

@@ -200 +200 @@
 
 def applyBinCompact(a, bops):
+    """
+    Apply binary diff operations bops to a to create b
+    """
     return applyCompact(a, binCompactToCompact(bops))
 
@@ -205 +208 @@
 def getBinCompactForDiff(a, b):
     """
-    Return the binary compact codes to change string a to b
+    Return the binary compact codes to change string a to b.
+    For strings a and b (NOT unicode) it is true that
+        applyBinCompact(a, getBinCompactForDiff(a, b)) == b
     """
 

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

@@ -330 +330 @@
         # print "buildStyling start", self.wikiWordsEnabled
         if self.wikiWordsEnabled:
-            combre = WikiFormatting.CombinedWithCamelCaseRE
+            combre = WikiFormatting.CombinedSyntaxHighlightWithCamelCaseRE
         else:
-            combre = WikiFormatting.CombinedWithoutCamelCaseRE
+            combre = WikiFormatting.CombinedSyntaxHighlightWithoutCamelCaseRE
 
         charstylepos = 0  # styling position in characters in text
@@ -605 +605 @@
 
 
-    # TODO UNICODE
-        
     def rewrapText(self):
         curPos = self.GetCurrentPos()
@@ -780 +778 @@
                     match = WikiFormatting.NumericBulletRE.search(previousLine)
                     if match:
-                        prevNumStr = match.group(2)
+                        prevNumStr = match.group(3)
                         prevNum = int(prevNumStr)
                         nextNum = prevNum+1
                         adjustment = len(str(nextNum)) - len(prevNumStr)
 
-                        self.AddText(u"%s%d. " % (u" " * (self.GetLineIndentation(currentLine-1) - adjustment), int(prevNum)+1))
+                        self.AddText(u"%s%s%d. " % (u" " * (self.GetLineIndentation(currentLine-1) - adjustment), match.group(2), int(prevNum)+1))
                     else:
                         self.AddText(u" " * self.GetLineIndentation(currentLine-1))

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

@@ +1 @@
+from Enum import Enumeration
+import WikiFormatting
 import re
 import os
 from os.path import join, exists
-import sys, traceback
+import sys
 import shutil
-# from xml.sax.saxutils import escape
+## from xml.sax.saxutils import escape
 from time import localtime
 
-from Enum import Enumeration
-from StringOps import mbcsWriter, utf8Writer, mbcsEnc, strToBool, BOM_UTF8
-import WikiFormatting
-from WikiExceptions import *
-
-
-ExportTypes = Enumeration("ExportTypes", ["WikiToSingleHtmlPage", "WikiToSetOfHtmlPages", "WikiWordToHtmlPage",
-                                          "WikiSubTreeToSingleHtmlPage", "WikiSubTreeToSetOfHtmlPages",
-                                          "WikiToXml"], 1)
+import WikiData
+import StringOps
+from StringOps import mbcsWriter, utf8Writer, utf8Enc, mbcsEnc, strToBool
+
+import wxPython.xrc as xrc
+
+from wxHelper import XrcControls
+
 
 
@@ -31 +32 @@
 
 
-class HtmlExporter:
-    def __init__(self, pWiki):
+# ExportTypes = Enumeration("ExportTypes", ["WikiToSingleHtmlPage", "WikiToSetOfHtmlPages", "WikiWordToHtmlPage",
+#                                           "WikiSubTreeToSingleHtmlPage", "WikiSubTreeToSetOfHtmlPages",
+#                                           "WikiToXml"], 1)
+
+class HtmlXmlExporter:
+    def __init__(self):
+        self.pWiki = None
+        self.wikiData = None
+        self.wordList = None
+        self.exportDest = None
+
+
+    def getExportTypes(self, guiparent):
+        """
+        Return sequence of tuples with the description of export types provided
+        by this object. A tuple has the form (<exp. type>,
+            <human readbale desctiption>, <panel for add. options or None>)
+        If panels for additional options must be created, they should use
+        guiparent as parent
+        """
+        return (
+            (u"html_single", u'Single HTML page', None),
+            (u"html_multi", u'Set of HTML pages', None),
+            (u"xml", u'XML file', None)
+            )
+
+
+    def getAddOptVersion(self):
+        """
+        Returns the version of the additional options information returned
+        by getAddOpt(). If the return value is -1, the version info can't
+        be stored between application sessions.
+        
+        Otherwise, the addopt information can be stored between sessions
+        and can later handled back to the export method of the object
+        without previously showing the export dialog.
+        """
+        return 0
+
+
+    def getAddOpt(self, addoptpanel):
+        """
+        Reads additional options from panel addoptpanel.
+        If getAddOptVersion() > -1, the return value must be a sequence
+        of simple string and/or numeric objects. Otherwise, any object
+        can be returned (normally the addoptpanel itself)
+        """
+        return ()
+
+            
+    def export(self, pWiki, wikiData, wordList, exportType, exportDest,
+            addopt):
+        """
+        Run export operation.
+        
+        pWiki -- PersonalWikiFrame object
+        wikiData -- WikiData object
+        wordList -- Sequence of wiki words to export
+        exportType -- string tag to identify how to export
+        exportDest -- Path to destination directory or file to export to
+        addopt -- additional options returned by getAddOpt()
+        """
+        
         self.pWiki = pWiki
-        self.wikiData = self.pWiki.wikiData
-
-    def export(self, type, dir):
-        if type == ExportTypes.WikiToSingleHtmlPage:
-            self.exportWikiToSingleHtmlPage(dir)
-        elif type == ExportTypes.WikiToSetOfHtmlPages:
-            self.exportWikiToSetOfHtmlPages(dir)
-        elif type == ExportTypes.WikiWordToHtmlPage:
-            self.exportWordToHtmlPage(dir)
-        elif type == ExportTypes.WikiSubTreeToSingleHtmlPage:
-            self.exportSubTreeToSingleHtmlPage(dir)
-        elif type == ExportTypes.WikiSubTreeToSetOfHtmlPages:
-            self.exportSubTreeToSetOfHtmlPages(dir)
-        elif type == ExportTypes.WikiToXml:
-            self.exportWikiToXml(dir)
-
-    def exportWikiToSingleHtmlPage(self, dir):
-        outputFile = mbcsEnc(join(dir, u"%s.html" % self.pWiki.wikiName))[0]
+        self.wikiData = wikiData # self.pWiki.wikiData
+        self.wordList = wordList
+        self.exportDest = exportDest
+        if exportType == u"html_single":
+            startfile = self.exportHtmlSingleFile()
+        elif exportType == u"html_multi":
+            startfile = self.exportHtmlMultipleFiles()
+        elif exportType == u"xml":
+            startfile = self.exportXml()
+            
+        if self.pWiki.configuration.getboolean(
+                "main", "start_browser_after_export") and startfile:
+            os.startfile(startfile)
+
+
+    def exportHtmlSingleFile(self):
+        if len(self.wordList) == 1:
+            return self.exportHtmlMultipleFiles()
+
+        outputFile = mbcsEnc(join(self.exportDest, u"%s.html" % self.pWiki.wikiName))[0]
         if exists(outputFile):
             os.unlink(outputFile)
@@ -59 +123 @@
         fp.write(self.getFileHeader(self.pWiki.wikiName))
         
-        words = self.wikiData.getAllDefinedPageNames()
-        for word in words:
+        for word in self.wordList:
             wikiPage = self.wikiData.getPage(word, toload=["parents", "children", "props"])
             if not self.shouldExport(word, wikiPage):
@@ -79 +142 @@
                     
                 formattedContent = self.formatContent(word, content, links)
-                fp.write((u'<span class="wiki-name-ref">[<a name="%s">%s</a>]'+
-                        u'</span><br><br><span class="parent-nodes">'+
-                        u'parent nodes: %s</span><br>%s%s<hr size="1"/>') %
-                        (word, word, self.getParentLinks(wikiPage, False), formattedContent, '<br />\n'*10))
+                fp.write((u'<span class="wiki-name-ref">'+
+                        u'[<a name="%s">%s</a>]</span><br><br>'+
+                        u'<span class="parent-nodes">parent nodes: %s</span>'+
+                        u'<br>%s%s<hr size="1"/>') %
+                        (word, word, self.getParentLinks(wikiPage, False),
+                        formattedContent, u'<br />\n'*10))
             except Exception, e:
-                traceback.print_exc()
                 pass
 
@@ -90 +154 @@
         fp.reset()        
         realfp.close()        
-        self.copyCssFile(dir)
-        if self.pWiki.configuration.getboolean("main", "start_browser_after_export"):
-            os.startfile(outputFile)
-
-        
-    def exportWikiToSetOfHtmlPages(self, dir):
-        words = self.wikiData.getAllDefinedPageNames()
-        for word in words:
+        self.copyCssFile(self.exportDest)
+        return outputFile
+
+
+    def exportHtmlMultipleFiles(self):
+        for word in self.wordList:
             wikiPage = self.wikiData.getPage(word, toload=["parents", "children", "props"])
             if not self.shouldExport(word, wikiPage):
@@ -113 +175 @@
                     links[relation] = u"%s.html" % relation
                                 
-            self.exportWordToHtmlPage(dir, word, links, False)
-        self.copyCssFile(dir)
-        rootFile = mbcsEnc(join(dir, u"%s.html" % self.pWiki.wikiName))[0]
-        if self.pWiki.configuration.getboolean("main", "start_browser_after_export"):
-            os.startfile(rootFile)
-
-
-    def exportWordToHtmlPage(self, dir, word=None, links=None, startFile=True, onlyInclude=None):
-        if not word:
-            word = self.pWiki.currentWikiWord
-
-        outputFile = mbcsEnc(join(dir, u"%s.html" % word))[0]
-        try:
-            wikiPage = self.wikiData.getPage(word, toload=["parents"])
-            content = wikiPage.getContent()
-            formattedContent = self.formatContent(word, content, links)
-
-            if exists(outputFile):
-                os.unlink(outputFile)
-
-            realfp = open(outputFile, "w")
-            fp = mbcsWriter(realfp, "replace")
-            fp.write(self.getFileHeader(word))
-
-            # if startFile is set then this is the only page being exported so
-            # do not include the parent header.
-            if not startFile:
-                fp.write(u'<span class="parent-nodes">parent nodes: %s</span>' %
-                        self.getParentLinks(wikiPage, True, onlyInclude))
-                
-            fp.write(formattedContent)
-            fp.write(self.getFileFooter())
-            fp.reset()        
-            realfp.close()        
-        except Exception, e:
-            traceback.print_exc()
-            pass
-        
-        self.copyCssFile(dir)
-        if startFile and self.pWiki.configuration.getboolean(
-                "main", "start_browser_after_export"):
-            os.startfile(outputFile)
-
-
-    def exportSubTreeToSingleHtmlPage(self, dir, rootWord=None):
-        if not rootWord:
-            rootWord = self.pWiki.currentWikiWord
-
-        outputFile = mbcsEnc(join(dir, u"%s.html" % rootWord))[0]
+            self.exportWordToHtmlPage(self.exportDest, word, links, False)
+        self.copyCssFile(self.exportDest)
+        rootFile = mbcsEnc(join(self.exportDest, u"%s.html" % self.wordList[0]))[0]     #self.pWiki.wikiName))[0]
+        return rootFile
+            
+            
+    def exportXml(self):
+        outputFile = mbcsEnc(join(self.exportDest, u"%s.xml" % self.pWiki.wikiName))[0]
 
         if exists(outputFile):
@@ -167 +188 @@
 
         realfp = open(outputFile, "w")
-        fp = mbcsWriter(realfp, "replace")
-        fp.write(self.getFileHeader(rootWord))
-
-        words = self.wikiData.getAllSubWords(rootWord, True)
-        for word in words:
-            wikiPage = self.wikiData.getPage(word, toload=["parents", "children", "props"])
-            if not self.shouldExport(word, wikiPage):
-                continue
-
-            try:
-                content = wikiPage.getContent()
-                links = {}
-                for relation in wikiPage.childRelations:
-                    if not self.shouldExport(relation):
-                        continue
-
-                    # get aliases too
-                    wordForAlias = self.wikiData.getAliasesWikiWord(relation)
-                    if wordForAlias:
-                        links[relation] = u"#%s" % wordForAlias
-                    else:
-                        links[relation] = u"#%s" % relation
-                    
-                formattedContent = self.formatContent(word, content, links)
-                fp.write((u'<span class="wiki-name-ref">[<a name="%s">%s</a>]'+
-                        u'</span><br><br><span class="parent-nodes">'+
-                        u'parent nodes: %s</span><br>%s%s<hr size="1"/>') %
-                        (word, word, self.getParentLinks(wikiPage, False, words),
-                        formattedContent, u'<br />\n'*10))
-            except Exception, e:
-                pass
-
-        fp.write(self.getFileFooter())
-        fp.reset()        
-        realfp.close()        
-        self.copyCssFile(dir)
-        if self.pWiki.configuration.getboolean("main", "start_browser_after_export"):
-            os.startfile(outputFile)
-
-
-    def exportSubTreeToSetOfHtmlPages(self, dir, rootWord=None):
-        if not rootWord:
-            rootWord = self.pWiki.currentWikiWord
-
-        words = self.wikiData.getAllSubWords(rootWord, True)
-        for word in words:
-            wikiPage = self.wikiData.getPage(word, toload=["parents", "children", "props"])
-            if not self.shouldExport(word, wikiPage):
-                continue
-
-            links = {}
-            for relation in wikiPage.childRelations:
-                if not self.shouldExport(relation):
-                    continue
-
-                # get aliases too
-                wordForAlias = self.wikiData.getAliasesWikiWord(relation)
-                if wordForAlias:
-                    links[relation] = u"%s.html" % wordForAlias
-                else:
-                    links[relation] = u"%s.html" % relation
-                                
-            self.exportWordToHtmlPage(dir, word, links, False, words)
-        self.copyCssFile(dir)
-        rootFile = mbcsEnc(join(dir, u"%s.html" % rootWord))[0]
-        if self.pWiki.configuration.getboolean("main", "start_browser_after_export"):
-            os.startfile(rootFile)
-
-
-    def exportWikiToXml(self, dir):
-        outputFile = mbcsEnc(join(dir, u"%s.xml" % self.pWiki.wikiName))[0]
-
-        if exists(outputFile):
-            os.unlink(outputFile)
-
-        realfp = open(outputFile, "w")
-        realfp.write(BOM_UTF8)
         fp = utf8Writer(realfp, "replace")
-        fp.write(u'<?xml version="1.0" encoding="utf-8" ?>')
-
-
+
+        fp.write(u'<?xml version="1.0" encoding="utf-8" ?>')  # TODO Encoding
         fp.write(u'<wiki name="%s">' % self.pWiki.wikiName)
         
-        words = self.wikiData.getAllDefinedPageNames()
-        for word in words:
+        for word in self.wordList:
             wikiPage = self.wikiData.getPage(word, toload=["info", "parents", "children", "props"])
             if not self.shouldExport(word, wikiPage):
                 continue
-
+                
+            # Why localtime?
             created = localtime(float(wikiPage.created))
             modified = localtime(float(wikiPage.modified))
@@ -286 +229 @@
         fp.write(u"</wiki>")
         fp.reset()        
-        realfp.close()        
-        if self.pWiki.configuration.getboolean("main", "start_browser_after_export"):
-            os.startfile(outputFile)
-
-
+        realfp.close()
+
+        return outputFile
+        
+            
+            
     def getFileHeader(self, title):
         return u"""<html>
@@ -305 +249 @@
 </html>
 """
-
-    def getParentLinks(self, wikiPage, asHref=True, wordsToInclude=None):
-        parents = u""
-        wikiPage.parentRelations.sort()
-        for relation in wikiPage.parentRelations:
-            if wordsToInclude and relation not in wordsToInclude:
-                continue
-            
-            if parents != u"":
-                parents = parents + u" | "
-
-            if asHref:
-                parents = parents + u'<span class="parent-node"><a href="%s.html">%s</a></span>' % (relation, relation)
-            else:
-                parents = parents + u'<span class="parent-node"><a href="#%s">%s</a></span>' % (relation, relation)
-
-        return parents
-    
-    
-    def formatContent(self, word, content, links=None, asXml=False):
-        # change the <<>> blocks into [[]] blocks so they aren't escaped
-        content = WikiFormatting.SuppressHighlightingRE.sub('[[\\1]]', content)
-        content = escape(content)
-        contentBeforeProcessing = content
-
-        content = WikiFormatting.ItalicRE.sub(u'<i>\\1</i>', content)
-        content = WikiFormatting.Heading3RE.sub(u'<h3>\\1</h3>', content)
-        content = WikiFormatting.Heading2RE.sub(u'<h2>\\1</h2>', content)
-        content = WikiFormatting.Heading1RE.sub(u'<h1>\\1</h1>', content)
-
-        if asXml:
-            content = WikiFormatting.ToDoREWithContent.sub(u'<todo>\\1</todo>', content)
-        else:
-            content = WikiFormatting.ToDoREWithContent.sub(
-                    u'<span class="todo">\\1</span><br />', content)
-            
-        content = WikiFormatting.ScriptRE.sub('', content)
-
-        if asXml:        
-            content = WikiFormatting.PropertyRE.sub(
-                    u'<property name="\\1" value="\\2"/>', content)
-        else:
-            content = WikiFormatting.PropertyRE.sub(
-                    u'<span class="property">[\\1: \\2]</span>', content)
-
-        if not asXml:    
-            content = WikiFormatting.HorizLineRE.sub(u'<hr size="1"/>', content)
-
-        # add the ul/ol/li tags for bullets
-        content = self.createBullets(content, asXml)
-
-        # add the blockquote tags for indents
-        content = self.createIndents(content, asXml)
-
-        # do bold last to make sure it doesn't mess with bullets
-        content = WikiFormatting.BoldRE.sub(u'<b>\\1</b>', content)
-
-        # link the wiki words
-        if links:
-            content = self.linkWikiWords(content, links, asXml)
-
-        # replace URL's last
-        if asXml:
-            content = WikiFormatting.UrlRE.sub(u'<link type="href">\\1</link>', content)
-        else:
-            def replaceLink(match):
-                lowerLink = match.group(1).lower()
-                if lowerLink.endswith(u".jpg") or lowerLink.endswith(u".gif") or\
-                        lowerLink.endswith(u".png"):
-                    return u'<img src="%s" border="0">' % match.group(1)
-                else:
-                    return u'<a href="%s">%s</a>' % (match.group(1), match.group(1))
-            content = WikiFormatting.UrlRE.sub(replaceLink, content)
-
-        # add <pre> tags for suppressed regions
-        SuppressHighlightingRE = re.compile(u"\[\[(.*?)\]\]", re.DOTALL)
-
-        # tracks which [] block we are on
-        matchIndex = MatchIndex()
-        def suppress(match):
-            # now search the pre-processed text for the same match
-            bpMatchNumber = 0
-            bpMatch = SuppressHighlightingRE.search(contentBeforeProcessing)
-            while bpMatch:
-                if bpMatchNumber == matchIndex.get():
-                    break
-                bpMatch = SuppressHighlightingRE.search(contentBeforeProcessing, bpMatch.end())
-                bpMatchNumber = bpMatchNumber + 1
-
-            if (bpMatch):
-                matchContent = bpMatch.group(1)
-                htmlRe = re.compile(u"<.+?>")
-                matchContent = htmlRe.sub('', matchContent)
-                matchIndex.increment()
-                return u'<pre>%s</pre>' % matchContent
-            else:
-                return match.group(1)
-        
-        content = SuppressHighlightingRE.sub(suppress, content)
-        
-        return content
-    
-
+            
+    # TODO Handle this correctly:
+    """
+    * Bullet
+    * Bullet
+
+    1. Number
+    2. Number
+    """
     def createBullets(self, content, asXml=False):
         lastBulletDepth = 0
@@ -420 +270 @@
                 
             if match:
-                if match.group(2) == '*':
+                if match.group(2) == u'*':
                     lastUolTag = u"ul"
                 else:
@@ -466 +316 @@
                     if len(line.strip()) == 0:
                         newContent.append(u"<p />\n")
-                    elif len(line) < 50 and line.find("<h") == -1:
+                    elif len(line) < 50 and line.find(u"<h") == -1:
                         newContent.append(u"%s<br />\n" % line)
                     else:
@@ -530 +380 @@
                     if len(line.strip()) == 0:
                         newContent.append(u"<p />\n")
-                    elif len(line) < 50 and line.find("<h") == -1:
-                        newContent.append(u"%s<br />\n" % line)
+                    ## elif len(line) < 50 and line.find("<h") == -1:   # TODO: ???
+                    ##    newContent.append("%s<br />\n" % line)
                     else:
                         newContent.append(u"%s\n" % line)
@@ -555 +405 @@
         return len(replaceRe.sub(u" ", str));
 
+    def getParentLinks(self, wikiPage, asHref=True, wordsToInclude=None):
+        parents = u""
+        wikiPage.parentRelations.sort()
+        for relation in wikiPage.parentRelations:
+            if wordsToInclude and relation not in wordsToInclude:
+                continue
+            
+            if parents != u"":
+                parents = parents + u" | "
+
+            if asHref:
+                parents = parents + u'<span class="parent-node"><a href="%s.html">%s</a></span>' % (relation, relation)
+            else:
+                parents = parents + u'<span class="parent-node"><a href="#%s">%s</a></span>' % (relation, relation)
+
+        return parents
 
     def linkWikiWords(self, content, links, asXml=False):
@@ -582 +448 @@
 
     def copyCssFile(self, dir):
-        if not exists(join(dir, 'wikistyle.css')):
-            cssFile = join(self.pWiki.wikiAppDir, 'export', 'wikistyle.css')
+        if not exists(mbcsEnc(join(dir, 'wikistyle.css'))[0]):
+            cssFile = mbcsEnc(join(self.pWiki.wikiAppDir, 'export', 'wikistyle.css'))[0]
             if exists(cssFile):
                 shutil.copy(cssFile, dir)
@@ -591 +457 @@
             try:
                 wikiPage = self.wikiData.getPage(wikiWord, toload=["props"])
-            except WikiWordNotFoundException:
+            except WikiData.WikiWordNotFoundException:
                 return False
             
@@ -598 +464 @@
             
         return strToBool(wikiPage.props.get("export", ("True",))[0])
-            
+
+    
+    def formatContent(self, word, content, links=None, asXml=False):
+        # change the <<>> blocks into [[]] blocks so they aren't escaped
+        content = WikiFormatting.SuppressHighlightingRE.sub(u'[[\\1]]', content)
+        content = escape(content)
+        contentBeforeProcessing = content
+
+        content = WikiFormatting.ItalicRE.sub(u'<i>\\1</i>', content)
+        content = WikiFormatting.Heading4RE.sub(u'<h4>\\1</h4>', content)
+        content = WikiFormatting.Heading3RE.sub(u'<h3>\\1</h3>', content)
+        content = WikiFormatting.Heading2RE.sub(u'<h2>\\1</h2>', content)
+        content = WikiFormatting.Heading1RE.sub(u'<h1>\\1</h1>', content)
+
+        if asXml:
+            content = WikiFormatting.ToDoREWithContent.sub(u'<todo>\\1</todo>', content)
+        else:
+            content = WikiFormatting.ToDoREWithContent.sub(u'<span class="todo">\\1</span><br />', content)
+            
+        content = WikiFormatting.ScriptRE.sub(u'', content)
+
+        if asXml:        
+            content = WikiFormatting.PropertyRE.sub(u'<property name="\\1" value="\\2"/>', content)
+        else:
+            content = WikiFormatting.PropertyRE.sub(u'<span class="property">[\\1: \\2]</span>', content)
+
+        if not asXml:    
+            content = WikiFormatting.HorizLineRE.sub(u'<hr size="1"/>', content)
+
+        # add the ul/ol/li tags for bullets
+        content = self.createBullets(content, asXml)
+
+        # add the blockquote tags for indents
+        content = self.createIndents(content, asXml)
+
+        # do bold last to make sure it doesn't mess with bullets
+        content = WikiFormatting.BoldRE.sub(u'<b>\\1</b>', content)
+
+        # link the wiki words
+        if links:
+            content = self.linkWikiWords(content, links, asXml)
+
+        # replace URL's last
+        if asXml:
+            content = WikiFormatting.UrlRE.sub(u'<link type="href">\\1</link>', content)
+        else:
+            def replaceLink(match):
+                lowerLink = match.group(1).lower()
+                if lowerLink.endswith(".jpg") or lowerLink.endswith(".gif") or lowerLink.endswith(".png"):
+                    return u'<img src="%s" border="0">' % match.group(1)
+                else:
+                    return u'<a href="%s">%s</a>' % (match.group(1), match.group(1))
+            content = WikiFormatting.UrlRE.sub(replaceLink, content)
+
+        # add <pre> tags for suppressed regions
+        SuppressHighlightingRE = re.compile(u"\[\[(.*?)\]\]", re.DOTALL)
+
+        # tracks which [] block we are on
+        matchIndex = MatchIndex()
+        def suppress(match):
+            # now search the pre-processed text for the same match
+            bpMatchNumber = 0
+            bpMatch = SuppressHighlightingRE.search(contentBeforeProcessing)
+            while bpMatch:
+                if bpMatchNumber == matchIndex.get():
+                    break
+                bpMatch = SuppressHighlightingRE.search(contentBeforeProcessing, bpMatch.end())
+                bpMatchNumber = bpMatchNumber + 1
+
+            if (bpMatch):
+                matchContent = bpMatch.group(1)
+                htmlRe = re.compile(u"<.+?>")
+                matchContent = htmlRe.sub('', matchContent)
+                matchIndex.increment()
+                return u'<pre>%s</pre>' % matchContent
+            else:
+                return match.group(1)
+        
+        content = SuppressHighlightingRE.sub(suppress, content)
+        
+        return content
+
+    
+    def exportWordToHtmlPage(self, dir, word, links=None, startFile=True, onlyInclude=None):
+        outputFile = mbcsEnc(join(dir, u"%s.html" % word))[0]
+        try:
+            wikiPage = self.wikiData.getPage(word, toload=["parents"])
+            content = wikiPage.getContent()
+            formattedContent = self.formatContent(word, content, links)
+
+            if exists(outputFile):
+                os.unlink(outputFile)
+
+            realfp = open(outputFile, "w")
+            fp = mbcsWriter(realfp, "replace")
+            fp.write(self.getFileHeader(word))
+
+            # if startFile is set then this is the only page being exported so
+            # do not include the parent header.
+            if not startFile:
+                fp.write(u'<span class="parent-nodes">parent nodes: %s</span>'
+                        % self.getParentLinks(wikiPage, True, onlyInclude))
+
+            fp.write(formattedContent)
+            fp.write(self.getFileFooter())
+            fp.reset()        
+            realfp.close()        
+        except Exception, e:
+            pass
+        
+        self.copyCssFile(dir)
+        return outputFile
+#         if startFile:
+#             os.startfile(outputFile)
+
+        
+        
 class MatchIndex:
     def __init__(self):
@@ -606 +588 @@
     def get(self):
         return self.matchIndex
-        
+
+
+
+class TextExporter:
+    """
+    Exports raw text
+    """
+    def __init__(self):
+        self.pWiki = None
+        self.wikiData = None
+        self.wordList = None
+        self.exportDest = None
+
+
+    def getExportTypes(self, guiparent):
+        """
+        Return sequence of tuples with the description of export types provided
+        by this object. A tuple has the form (<exp. type>,
+            <human readable desctiption>, <panel for add. options or None>)
+        If panels for additional options must be created, they should use
+        guiparent as parent
+        """
+        
+        res = xrc.wxXmlResource.Get()
+        
+#         self.additOptions = wxPanel(self)
+#         res.AttachUnknownControl("additOptions", self.additOptions, self)
+
+        textPanel = res.LoadPanel(guiparent, "ExportSubText") # .ctrls.additOptions
+        
+        return (
+            ("raw_files", 'Set of *.wiki files', textPanel),
+            )
+
+
+    def getAddOptVersion(self):
+        """
+        Returns the version of the additional options information returned
+        by getAddOpt(). If the return value is -1, the version info can't
+        be stored between application sessions.
+        
+        Otherwise, the addopt information can be stored between sessions
+        and can later handled back to the export method of the object
+        without previously showing the export dialog.
+        """
+        return 0
+
+
+    def getAddOpt(self, addoptpanel):
+        """
+        Reads additional options from panel addoptpanel.
+        If getAddOptVersion() > -1, the return value must be a sequence
+        of simple string and/or numeric objects. Otherwise, any object
+        can be returned (normally the addoptpanel itself)
+        """
+        ctrls = XrcControls(addoptpanel)
+        
+        # Which encoding:
+        # 0:System standard, 1:utf-8 with BOM, 2: utf-8 without BOM
+
+        return (ctrls.chTextEncoding.GetSelection(),)
+
+            
+
+    def export(self, pWiki, wikiData, wordList, exportType, exportDest,
+            addopt):
+        """
+        Run export operation.
+        
+        pWiki -- PersonalWikiFrame object
+        wikiData -- WikiData object
+        wordList -- Sequence of wiki words to export
+        exportType -- string tag to identify how to export
+        exportDest -- Path to destination directory or file to export to
+        addopt -- additional options returned by getAddOpt()
+        """
+        self.pWiki = pWiki
+        self.wikiData = wikiData # self.pWiki.wikiData
+        self.wordList = wordList
+        self.exportDest = exportDest
+        
+        # 0:System standard, 1:utf-8 with BOM, 2: utf-8 without BOM
+        encoding = addopt[0]
+                
+        if encoding == 0:
+            enc = mbcsEnc
+        else:
+            enc = utf8Enc
+            
+        if encoding == 1:
+            filehead = StringOps.BOM_UTF8
+        else:
+            filehead = ""
+
+        for word in self.wordList:
+            try:
+                content, modified = self.wikiData.getContentAndInfo(word)[:2]
+            except:
+                continue
+                
+            outputFile = mbcsEnc(join(self.exportDest, u"%s.wiki" % word))[0]
+            try:
+#                 if exists(outputFile):
+#                     os.unlink(outputFile)
+    
+                fp = open(outputFile, "wb")
+                fp.write(filehead)
+                fp.write(enc(content, "replace")[0])
+                fp.close()
+                
+                try:
+                    os.utime(outputFile, (long(modified), long(modified)))
+                except:
+                    pass
+            except:
+                continue
+
+
+def describeExporters():
+    return (HtmlXmlExporter(), TextExporter())
+    

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

@@ -22 +22 @@
 import gadfly
 import WikiFormatting
-from WikiExceptions import *   # TODO make normal import
+from WikiExceptions import *   # TODO make normal import?
 
 from StringOps import mbcsEnc, mbcsDec, utf8Enc, utf8Dec, BOM_UTF8, \
@@ -40 +40 @@
     else:
         return ob
-        
 
 
@@ -51 +50 @@
         self.pWiki = pWiki
         self.dataDir = dataDir
-        self.dbConn = gadfly.gadfly("wikidb", dataDir)
+        self.dbConn = None
+        self.cachedWikiWords = None
+        
+        self._reinit()
+        
+
+    def _reinit(self):
+        """
+        Actual initialization or reinitialization after rebuildWiki()
+        """
+        self.dbConn = gadfly.gadfly("wikidb", self.dataDir)
 
         # create word caches
@@ -115 +124 @@
         return fileContentToUnicode(content)
 
-        # TODO Remove method, create rebuildWiki method
+        # TODO Remove method
     def updatePageEntry(self, word, moddate = None, creadate = None):
         """
@@ -187 +196 @@
         
 
+    # ---------- Rebuilding the wiki ----------
+    def rebuildWiki(self, progresshandler):
+        """
+        progresshandler -- Object, fulfilling the GuiProgressHandler
+            protocol
+        """
+        # get all of the wikiWords
+        wikiWords = self.getAllPageNamesFromDisk()   # Replace this call
+        # get the saved searches
+        searches = self.getSavedSearches()
+
+        self.close()
+                
+        progresshandler.open(len(wikiWords) + len(searches) + 1)
+
+        try:
+            step = 1
+            # recreate the db
+            progresshandler.update(step, "Recreating database")
+            createWikiDB("", self.dataDir, True)
+            # reopen the wiki
+            self._reinit()
+            # re-save all of the pages
+            for wikiWord in wikiWords:
+                progresshandler.update(step, u"Rebuilding %s" % wikiWord)
+                wikiPage = self.createPage(wikiWord)
+                self.updatePageEntry(wikiWord)
+                wikiPage.update(wikiPage.getContent(), False)
+                step += 1
+
+            # resave searches
+            for search in searches:
+                progresshandler.update(step, u"Reading search %s" % search)
+                self.saveSearch(search)
+
+##             self.close()
+##             self._reinit()
+            
+        finally:            
+            progresshandler.close()
+    
+    
+    
     # ---------- The rest ----------
 

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

@@ -31 +31 @@
     global ToDoREWithCapturing
     global FormatExpressions
-    global CombinedWithCamelCaseRE
-    global CombinedWithoutCamelCaseRE
+    global CombinedSyntaxHighlightWithCamelCaseRE
+    global CombinedSyntaxHighlightWithoutCamelCaseRE
     
     BoldRE = wikiSyntax.BoldRE
@@ -90 +90 @@
 
 
-    CombinedWithCamelCaseRE = re.compile(u"|".join(WithCamelCase), re.DOTALL | re.LOCALE | re.MULTILINE | re.UNICODE)
-    CombinedWithoutCamelCaseRE = re.compile(u"|".join(WithoutCamelCase), re.DOTALL | re.LOCALE | re.MULTILINE | re.UNICODE)
+    CombinedSyntaxHighlightWithCamelCaseRE = \
+            re.compile(u"|".join(WithCamelCase),
+                    re.DOTALL | re.LOCALE | re.MULTILINE | re.UNICODE)
+    CombinedSyntaxHighlightWithoutCamelCaseRE = \
+            re.compile(u"|".join(WithoutCamelCase),
+                    re.DOTALL | re.LOCALE | re.MULTILINE | re.UNICODE)
     
 

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

@@ -17 +17 @@
 from StringOps import utf8Enc, utf8Dec, mbcsDec, strToBool
 
-
+Error = ConfigParser.Error
 
 def _setValue(section, option, value, config):

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

@@ -194 +194 @@
         # Refresh subtree
         
-        ## self.Freeze() # Stop visual updates
+        self.Freeze() # Stop visual updates
         if self.IsExpanded(treeNode):
             treeChildren = self.getChildTreeNodes(treeNode)
@@ -233 +233 @@
                 viewNode = self.addViewNode(treeNode, "Views", icon="orgchart")
                 
-        ## self.Thaw() # Allow visual updates again
+        self.Thaw() # Allow visual updates again
         
         return treeNode
@@ -259 +259 @@
             nodeValue = nodeText
         nodeText = getTextForNode(nodeText)
-        newNode = self.AppendItem(parentNode, mbcsEnc(nodeText, "replace")[0])
+        newNode = self.AppendItem(parentNode, uniToGui(nodeText))
         self.SetPyData(newNode, (nodeValue, viewData, searchData))
 
@@ -370 +370 @@
     def setNodeImage(self, node, image):
         try:
-            (index, icon) = self.pWiki.iconLookup[image]
+            index = self.pWiki.lookupIconIndex(image)
             ## if icon:
                 ## self.SetItemImage(node, index, wxTreeItemIcon_Selected)
@@ -448 +448 @@
         elif name == "searches":
             for search in wikiData.getSavedSearches():     # ???
-                self.addViewNode(viewNode, search, "%s~searchFor" % name, icon="lens")
+                self.addViewNode(viewNode, search, u"%s~searchFor" % name, icon="lens")
 
         elif name == "modified-within":
@@ -564 +564 @@
                     
     def OnTreeItemExpand(self, event):
-        ## print "OnTreeItemExpand start"
-        ## _prof.start()
         item = event.GetItem()
         if not self.isViewNode(item):
@@ -574 +572 @@
         else:
             self.expandView(item)
-        ## _prof.stop()
-        ## print "OnTreeItemExpand stop"
 
     def OnTreeItemCollapse(self, event):

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

@@ -10 +10 @@
 from wxHelper import *
 
-from StringOps import uniToGui, guiToUni
+from StringOps import uniToGui, guiToUni, mbcsEnc, mbcsDec
 import WikiFormatting
 import Exporters
@@ -111 +111 @@
         wikiWord = self.value
         if not WikiFormatting.isWikiWord(wikiWord):
-            wikiWord = "[%s]" % wikiWord
+            wikiWord = u"[%s]" % wikiWord
         if not WikiFormatting.isWikiWord(wikiWord):
-            self.pWiki.displayErrorMessage("'%s' is an invalid WikiWord" % wikiWord)
+            self.pWiki.displayErrorMessage(u"'%s' is an invalid WikiWord" % wikiWord)
             self.ctrls.text.SetFocus()
             return
         
         if self.pWiki.wikiData.isDefinedWikiWord(wikiWord):
-            self.pWiki.displayErrorMessage("'%s' exists already" % wikiWord)
+            self.pWiki.displayErrorMessage(u"'%s' exists already" % wikiWord)
             self.ctrls.text.SetFocus()
             return
@@ -134 +134 @@
         self.pWiki = pWiki
         self.iconImageList = self.pWiki.iconImageList
-        self.iconLookup = self.pWiki.iconLookup
+        self.lookupIconIndex = self.pWiki.lookupIconIndex
         
         self.iconNames = filter(lambda n: not n.startswith("tb_"),
-                self.pWiki.iconLookup.keys())
+                self.pWiki.iconLookupCache.keys())
         self.iconNames.sort()
         
@@ -156 +156 @@
 
         for icn in self.iconNames:
-            self.lc.InsertImageStringItem(sys.maxint, icn, self.iconLookup[icn][0])
+            self.lc.InsertImageStringItem(sys.maxint, icn,
+                    self.lookupIconIndex(icn))
         self.lc.SetColumnWidth(0, wxLIST_AUTOSIZE)
         
@@ -337 +338 @@
     def __init__(self, pWiki, ID, title="Select Date Format",
                  pos=wxDefaultPosition, size=wxDefaultSize,
-                 style=wxNO_3D, deffmt=""):
+                 style=wxNO_3D, deffmt=u""):
         """
         deffmt -- Initial value for format string
@@ -367 +368 @@
     def OnText(self, evt):
         preview = "<invalid>"
-        text = self.ctrls.fieldFormat.GetValue()
+        text = guiToUni(self.ctrls.fieldFormat.GetValue())
         try:
-            preview = strftime(text)
+            # strftime can't handle unicode correctly, so conversion is needed
+            mstr = mbcsEnc(text, "replace")[0]
+            preview = mbcsDec(strftime(mstr), "replace")[0]
             self.value = text
         except:
@@ -421 +424 @@
         # Transfer options from dialog to config file
         for o, c, t in self.OPTION_TO_CONTROL:
+            #TODO Handle unicode text controls
             self.pWiki.configuration.set("main", o, repr(self.ctrls[c].GetValue()))
             
@@ -456 +460 @@
                           # <readable description>, <additional options panel>)
         
-        for ob in Exporters.getExporterObjects():   # TODO search plugins
+        for ob in Exporters.describeExporters():   # TODO search plugins
             for tp in ob.getExportTypes(self.ctrls.additOptions):
                 panel = tp[2]
@@ -491 +495 @@
 
 
-        # ['Single HTML page', 'Set of HTML pages', 'XML file', 'Set of *.wiki files']
         for e in self.exporterList:
             e[3].Show(False)
@@ -520 +523 @@
 
     def OnOk(self, evt):
-        if not exists(self.ctrls.tfDirectory.GetValue()):
+        if not exists(guiToUni(self.ctrls.tfDirectory.GetValue())):
             self.pWiki.displayErrorMessage(u"Destination directory does not exist")
             return
@@ -541 +544 @@
         ob, t, desc, panel = \
                 self.exporterList[self.ctrls.chExportTo.GetSelection()][:4]
-                
+
         ob.export(self.pWiki, self.pWiki.wikiData, wordList, t, 
-                self.ctrls.tfDirectory.GetValue(), panel)
- 
+                guiToUni(self.ctrls.tfDirectory.GetValue()), ob.getAddOpt(panel))
+
         self.EndModal(wxID_OK)
 
         
     def OnSelectDir(self, evt):
+        # Only transfer between GUI elements, so no unicode conversion
         seldir = wxDirSelector(u"Select Export Directory",
                 self.ctrls.tfDirectory.GetValue(),

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

@@ -1 @@
-from Configuration import createConfiguration
+
 import os, gc, traceback
 from os.path import *
@@ -9 +9 @@
 from wxHelper import GUI_ID
 
+import Configuration
+from Configuration import createConfiguration
 from WikiData import *
 from WikiTxtCtrl import *
 from WikiTreeCtrl import *
 from AdditionalDialogs import *
-from Exporters import *
+import Exporters
 from StringOps import uniToGui, guiToUni, mbcsDec, mbcsEnc
 import WikiFormatting
 
-
+from PluginManager import *
 _COLORS = [
     "AQUAMARINE",
@@ -91 +93 @@
 
 
+class wxGuiProgressHandler:
+    """
+    Implementation of a GuiProgressListener to
+    show a wxProgressDialog
+    """
+    def __init__(self, title, msg, addsteps, parent, flags=wxPD_APP_MODAL):
+        self.title = title
+        self.msg = msg
+        self.addsteps = addsteps
+        self.parent = parent
+        self.flags = flags
+
+    def open(self, sum):
+        """
+        Start progress handler, set the number of steps, the operation will
+        take in sum. Will be called once before update()
+        is called several times
+        """
+        self.progDlg = wxProgressDialog(self.title, self.msg,
+                sum + self.addsteps, self.parent, self.flags)
+        
+    def update(self, step, msg):
+        """
+        Called after a step is finished to trigger update
+        of GUI.
+        step -- Number of done steps
+        msg -- Human readable descripion what is currently done
+        returns: True to continue, False to stop operation
+        """
+        self.progDlg.Update(step, uniToGui(msg))
+        return True
+
+    def close(self):
+        """
+        Called after finishing operation or after abort to 
+        do clean-up if necessary
+        """
+        self.progDlg.Destroy()
+        self.progDlg = None
+
+
 
 class PersonalWikiFrame(wxFrame):
@@ -105 +148 @@
             self.wikiAppDir = dirname(abspath(sys.argv[0]))
             if not self.wikiAppDir:
-                self.wikiAppDir = "C:\Program Files\WikidPad"
+                self.wikiAppDir = r"C:\Program Files\WikidPad"
 
             homeDir = os.environ.get("HOME")
@@ -113 +156 @@
                 user = os.environ.get("USERNAME")
                 if user:
-                    homeDir = "c:\Documents And Settings\%s" % user
+                    homeDir = r"c:\Documents And Settings\%s" % user
                     if homeDir and exists(homeDir):
                         globalConfigDir = homeDir
         except Exception, e:
-            self.displayErrorMessage("Error initializing environment", e)
+            self.displayErrorMessage(u"Error initializing environment", e)
 
         if not globalConfigDir:
@@ -126 +169 @@
 
         if not globalConfigDir or not exists(globalConfigDir):
-            self.displayErrorMessage("Error initializing environment, couldn't locate global config directory", "Shutting Down")
+            self.displayErrorMessage(
+                    u"Error initializing environment, couldn't locate "+
+                    u"global config directory", u"Shutting Down")
             self.Close()
 
@@ -132 +177 @@
         # initialize some variables
         self.globalConfigDir = globalConfigDir
-        self.globalConfigLoc = join(globalConfigDir, "WikidPad.config")
+        self.globalConfigLoc = join(globalConfigDir, u"WikidPad.config")
         self.configuration = createConfiguration()
 
-        self.wikiPadHelp = join(self.wikiAppDir, 'WikidPadHelp', 'WikidPadHelp.wiki')
+        self.wikiPadHelp = join(self.wikiAppDir, u'WikidPadHelp',
+                u'WikidPadHelp.wiki')
 
         # defaults
@@ -145 +191 @@
         self.wikiWordHistory = []
         self.lastCursorPositionInPage = {}
-        self.iconLookup = {}
+        self.iconLookupCache = {}
         self.wikiHistory = []
+
+        # setup plugin manager and hooks API
+        self.pluginManager = PluginManager()
+        self.hooks = self.pluginManager.registerPluginAPI(("hooks",1),
+            ["startup", "newWiki", "createdWiki", "openWiki", "openedWiki", 
+             "openWikiWord", "newWikiWord", "openedWikiWord", "savingWikiWord",
+             "savedWikiWord", "renamedWikiWord", "deletedWikiWord", "exit"] )
+        # interfaces for menu and toolbar plugins
+#         self.editorFunctions = self.pluginManager.registerPluginAPI(("EditorFunctions",1), 
+#                                 ["describeMenuItem", "describeToolbarItem"])
+        self.menuFunctions = self.pluginManager.registerPluginAPI(("MenuFunctions",1), 
+                                ["describeMenuItems"])
+        self.toolbarFunctions = self.pluginManager.registerPluginAPI(("ToolbarFunctions",1), 
+                                ["describeToolbarItems"])
 
         # load extensions
@@ -155 +215 @@
 
         # trigger hook
-        self.wikidPadHooks.startup(self)
+        self.hooks.startup(self)
 
         # if it already exists read it in
-        if (exists(self.globalConfigLoc)):
-            self.configuration.loadGlobalConfig(self.globalConfigLoc)
+        if exists(self.globalConfigLoc):
+            try:
+                self.configuration.loadGlobalConfig(self.globalConfigLoc)
+            except Configuration.Error:
+                self.createDefaultGlobalConfig()
         else:
             self.createDefaultGlobalConfig()
@@ -166 +229 @@
         history = self.configuration.get("main", "wiki_history")
         if history:
-            self.wikiHistory = history.split(";")
+            self.wikiHistory = history.split(u";")
 
         # resize the window to the last position/size
@@ -274 +337 @@
 
     def loadExtensions(self):
-        self.wikidPadHooks = self.getExtension('WikidPadHooks', 'WikidPadHooks.py')
-        self.keyBindings = self.getExtension('KeyBindings', 'KeyBindings.py')
-        self.evalLib = self.getExtension('EvalLibrary', 'EvalLibrary.py')
-        self.wikiSyntax = self.getExtension('SyntaxLibrary', 'WikiSyntax.py')
-        self.presentationExt = self.getExtension('Presentation', 'Presentation.py')
+        self.wikidPadHooks = self.getExtension('WikidPadHooks', u'WikidPadHooks.py')
+        self.keyBindings = self.getExtension('KeyBindings', u'KeyBindings.py')
+        self.evalLib = self.getExtension('EvalLibrary', u'EvalLibrary.py')
+        self.wikiSyntax = self.getExtension('SyntaxLibrary', u'WikiSyntax.py')
+        self.presentationExt = self.getExtension('Presentation', u'Presentation.py')
+        dirs = [ join(self.wikiAppDir, u'user_extensions'),
+                join(self.wikiAppDir, u'extensions') ]
+        self.pluginManager.loadPlugins( dirs, [ u'KeyBindings.py',
+                u'EvalLibrary.py', u'WikiSyntax.py' ] )
 
     def getExtension(self, extensionName, fileName):
@@ -302 +369 @@
 
 
-    def fillIconLookup(self, createIconImageList=False):
+    # TODO!
+    def fillIconLookupCache(self, createIconImageList=False):
         """
-        Fills or refills the self.iconLookup (if createIconImageList is
+        Fills or refills the self.iconLookupCache (if createIconImageList is
         false, it must exist already)
         If createIconImageList is true, self.iconImageList is also
@@ -313 +381 @@
             # create the image icon list
             self.iconImageList = wxImageList(16, 16)
-            self.iconLookup = {}
+            self.iconLookupCache = {}
 
         for icon in self.iconFileList:
@@ -323 +391 @@
                     id = self.iconImageList.Add(bitmap, wxNullBitmap)
 
-                if self.lowResources and not icon.startswith("tb_"):
+                if self.lowResources:   # and not icon.startswith("tb_"):
                     bitmap = None
 
                 iconname = icon.replace('.gif', '')
                 if id == -1:
-                    id = self.iconLookup[iconname][0]
-
-                self.iconLookup[iconname] = (id, bitmap)
+                    id = self.iconLookupCache[iconname][0]
+
+                self.iconLookupCache[iconname] = (id, bitmap)
             except Exception, e:
                 traceback.print_exc()
                 sys.stderr.write("couldn't load icon %s\n" % iconFile)
 
-
-    def addMenuItem(self, menu, label, text, evtfct, iconname=None, menuID=None):
+    def lookupIcon(self, iconname):
+        """
+        Returns the bitmap object for the given iconname.
+        If the bitmap wasn't cached already, it is loaded and created.
+        If icon is unknown, None is returned.
+        """
+        try:
+            bitmap = self.iconLookupCache[iconname][1]
+            if bitmap is not None:
+                return bitmap
+                
+            # Bitmap not yet available -> create it and store in the cache
+            iconFile = join(self.wikiAppDir, "icons", iconname+".gif")
+            bitmap = wxBitmap(iconFile, wxBITMAP_TYPE_GIF)
+            
+            self.iconLookupCache[iconname] = (self.iconLookupCache[iconname][0],
+                    bitmap)
+            return bitmap
+
+        except KeyError:
+            return None
+
+
+    def lookupIconIndex(self, iconname):
+        """
+        Returns the id number into self.iconImageList of the requested icon.
+        If icon is unknown, -1 is returned.
+        """
+        try:
+            return self.iconLookupCache[iconname][0]
+        except KeyError:
+            return -1
+
+
+    def resolveIconDescriptor(self, desc, default=None):
+        """
+        Used for plugins of type "MenuFunctions" or "ToolbarFunctions".
+        Tries to find and return an appropriate wxBitmap object.
+        
+        An icon descriptor can be one of the following:
+            - None
+            - a wxBitmap object
+            - the filename of a bitmap
+            - a tuple of filenames, first existing file is used
+        
+        If no bitmap can be found, default is returned instead.
+        """
+        if desc is None:
+            return default            
+        elif isinstance(desc, wxBitmap):
+            return desc
+        elif isinstance(desc, basestring):
+            result = self.lookupIcon(desc)
+            if result is not None:
+                return result
+            
+            return default
+        else:    # A sequence of possible names
+            for n in desc:
+                result = self.lookupIcon(n)
+                if result is not None:
+                    return result
+
+            return default
+
+
+    def addMenuItem(self, menu, label, text, evtfct, icondesc=None, menuID=None):
         if menuID is None:
             menuID = wxNewId()
 
         menuitem = wxMenuItem(menu, menuID, label, text)
-        if iconname:  # (not self.lowResources) and
-            (id, bitmap) = self.iconLookup[iconname]
+        # if icondesc:  # (not self.lowResources) and
+        bitmap = self.resolveIconDescriptor(icondesc)
+        if bitmap:
             menuitem.SetBitmap(bitmap)
 
@@ -401 +535 @@
         wikiMenu.AppendSeparator()
 
-#         menuID=wxNewId()
-#         wikiMenu.Append(menuID, 'Export Dialog', 'Export  Dialog')
-#         EVT_MENU(self, menuID, lambda evt: self.showExportDialog())
-
-
         exportWikisMenu = wxMenu()
         wikiMenu.AppendMenu(wxNewId(), 'Export', exportWikisMenu)
 
-        menuID=wxNewId()
-        exportWikisMenu.Append(menuID, 'Export Wiki as Single HTML Page', 'Export As Single HTML Page')
-        EVT_MENU(self, menuID, lambda evt: self.exportWiki(ExportTypes.WikiToSingleHtmlPage))
-
-        menuID=wxNewId()
-        exportWikisMenu.Append(menuID, 'Export Wiki as Set of HTML Pages', 'Export Wiki As Set of HTML Pages')
-        EVT_MENU(self, menuID, lambda evt: self.exportWiki(ExportTypes.WikiToSetOfHtmlPages))
-
-        menuID=wxNewId()
-        exportWikisMenu.Append(menuID, 'Export Current Wiki Word as HTML Page', 'Export Current Wiki Word as HTML Page')
-        EVT_MENU(self, menuID, lambda evt: self.exportWiki(ExportTypes.WikiWordToHtmlPage))
-
-        menuID=wxNewId()
-        exportWikisMenu.Append(menuID, 'Export Sub-Tree as Single HTML Page', 'Export Sub-Tree as Single HTML Page')
-        EVT_MENU(self, menuID, lambda evt: self.exportWiki(ExportTypes.WikiSubTreeToSingleHtmlPage))
-
-        menuID=wxNewId()
-        exportWikisMenu.Append(menuID, 'Export Sub-Tree as Set of HTML Pages', 'Export Sub-Tree as Set of HTML Pages')
-        EVT_MENU(self, menuID, lambda evt: self.exportWiki(ExportTypes.WikiSubTreeToSetOfHtmlPages))
-
-        menuID=wxNewId()
-        exportWikisMenu.Append(menuID, 'Export Wiki as XML', 'Export Wiki as XML')
-        EVT_MENU(self, menuID, lambda evt: self.exportWiki(ExportTypes.WikiToXml))
+        self.addMenuItem(exportWikisMenu, 'Export Wiki as Single HTML Page',
+                'Export Wiki as Single HTML Page', self.OnExportWiki,
+                menuID=GUI_ID.MENU_EXPORT_WHOLE_AS_PAGE)
+
+        self.addMenuItem(exportWikisMenu, 'Export Wiki as Set of HTML Pages',
+                'Export Wiki as Set of HTML Pages', self.OnExportWiki,
+                menuID=GUI_ID.MENU_EXPORT_WHOLE_AS_PAGES)
+
+        self.addMenuItem(exportWikisMenu, 'Export Current Wiki Word as HTML Page',
+                'Export Current Wiki Word as HTML Page', self.OnExportWiki,
+                menuID=GUI_ID.MENU_EXPORT_WORD_AS_PAGE)
+
+        self.addMenuItem(exportWikisMenu, 'Export Sub-Tree as Single HTML Page',
+                'Export Sub-Tree as Single HTML Page', self.OnExportWiki,
+                menuID=GUI_ID.MENU_EXPORT_SUB_AS_PAGE)
+
+        self.addMenuItem(exportWikisMenu, 'Export Sub-Tree as Set of HTML Pages',
+                'Export Sub-Tree as Set of HTML Pages', self.OnExportWiki,
+                menuID=GUI_ID.MENU_EXPORT_SUB_AS_PAGES)
+
+        self.addMenuItem(exportWikisMenu, 'Export Wiki as XML',
+                'Export Wiki as XML in UTF-8', self.OnExportWiki,
+                menuID=GUI_ID.MENU_EXPORT_WHOLE_AS_XML)
+
+        self.addMenuItem(exportWikisMenu, 'Export Wiki to .wiki files',
+                'Export Wiki to .wiki files in UTF-8', self.OnExportWiki,
+                menuID=GUI_ID.MENU_EXPORT_WHOLE_AS_RAW)
+
+        self.addMenuItem(exportWikisMenu, 'Other Export...',
+                'Open export dialog',
+                lambda evt: self.showExportDialog())
 
         menuID=wxNewId()
@@ -541 +678 @@
         self.addMenuItem(formattingMenu, 'Set Date Format',
                 'Set Date Format', lambda evt: self.showDateformatDialog())
+
+        self.addMenuItem(formattingMenu,
+                'Wikize Selected Word\t' + self.keyBindings.MakeWikiWord,
+                'Wikize Selected Word',
+                lambda evt: self.keyBindings.makeWikiWord(self.editor),
+                "tb_pin")
 
 
@@ -624 +767 @@
             iconsMenu.AppendMenu(wxNewId(), 'T-Z', iconsMenu6)
 
-            icons = self.iconLookup.keys();
+            icons = self.iconLookupCache.keys();  # TODO: Create function?
             icons.sort()
 
@@ -646 +789 @@
                 menuID=wxNewId()
                 menuItem = wxMenuItem(iconsSubMenu, menuID, id, id)
-                (id2, bitmap) = self.iconLookup[id]
+                bitmap = self.lookupIcon(id)
                 menuItem.SetBitmap(bitmap)
                 iconsSubMenu.AppendItem(menuItem)
@@ -782 +925 @@
         EVT_MENU(self, menuID, lambda evt: self.showAboutDialog())
 
+        # get info for any plugin menu items and create them as necessary
+        pluginMenu = None
+        menuItems = reduce(lambda a, b: a+list(b),
+                self.menuFunctions.describeMenuItems(self), [])
+        if len(menuItems) > 0:
+            pluginMenu = wxMenu()
+                
+            def addPluginMenuItem(function, label, statustext, icondesc=None,
+                    menuID=None):
+                self.addMenuItem(pluginMenu, label, statustext,
+                        lambda evt: function(self, evt), icondesc, menuID)
+            
+            for item in menuItems:
+                addPluginMenuItem(*item)
+
+
         self.mainmenu.Append(wikiMenu, 'W&iki')
         self.mainmenu.Append(wikiWordMenu, '&Wiki Words')
         self.mainmenu.Append(historyMenu, '&History')
         self.mainmenu.Append(formattingMenu, '&Editor')
+        if pluginMenu:
+            self.mainmenu.Append(pluginMenu, "Pl&ugins")
         self.mainmenu.Append(helpMenu, 'He&lp')
 
@@ -819 +980 @@
 
         tb = self.CreateToolBar(wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT | wxTB_TEXT)
-        (index, seperator) = self.iconLookup["tb_seperator"]
-
-        (index, icon) = self.iconLookup["tb_back"]
+        seperator = self.lookupIcon("tb_seperator")
+
+        icon = self.lookupIcon("tb_back")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Back (Ctrl-Alt-Back)", "Back")
         EVT_TOOL(self, tbID, lambda evt: self.goInHistory(-1))
 
-        (index, icon) = self.iconLookup["tb_forward"]
+        icon = self.lookupIcon("tb_forward")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Forward (Ctrl-Alt-Forward)", "Forward")
         EVT_TOOL(self, tbID, lambda evt: self.goInHistory(1))
 
-        (index, icon) = self.iconLookup["tb_home"]
+        icon = self.lookupIcon("tb_home")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Wiki Home", "Wiki Home")
         EVT_TOOL(self, tbID, lambda evt: self.openWikiPage(self.wikiName, forceTreeSyncFromRoot=True))
 
-        (index, icon) = self.iconLookup["tb_doc"]
+        icon = self.lookupIcon("tb_doc")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Open Wiki Word  (Ctrl-O)", "Open Wiki Word")
         EVT_TOOL(self, tbID, lambda evt: self.showWikiWordOpenDialog())
 
-        (index, icon) = self.iconLookup["tb_lens"]
+        icon = self.lookupIcon("tb_lens")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Search  (Ctrl-Alt-F)", "Search")
         EVT_TOOL(self, tbID, lambda evt: self.showSearchDialog())
 
-        (index, icon) = self.iconLookup["tb_cycle"]
+        icon = self.lookupIcon("tb_cycle")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Find current word in tree", "Find current word in tree")
@@ -853 +1014 @@
         tb.AddSimpleTool(wxNewId(), seperator, "Separator", "Separator")
 
-        (index, icon) = self.iconLookup["tb_save"]
+        icon = self.lookupIcon("tb_save")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Save Wiki Word (Ctrl-S)", "Save Wiki Word")
         EVT_TOOL(self, tbID, lambda evt: (self.saveCurrentWikiPage(), self.wikiData.commit()))
 
-        (index, icon) = self.iconLookup["tb_rename"]
+        icon = self.lookupIcon("tb_rename")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Rename Wiki Word (Ctrl-Alt-R)", "Rename Wiki Word")
         EVT_TOOL(self, tbID, lambda evt: self.showWikiWordRenameDialog())
 
-        (index, icon) = self.iconLookup["tb_delete"]
+        icon = self.lookupIcon("tb_delete")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Delete (Ctrl-D)", "Delete Wiki Word")
@@ -870 +1031 @@
         tb.AddSimpleTool(wxNewId(), seperator, "Separator", "Separator")
 
-        (index, icon) = self.iconLookup["tb_heading"]
+        icon = self.lookupIcon("tb_heading")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Heading (Ctrl-Alt-H)", "Heading")
         EVT_TOOL(self, tbID, lambda evt: self.keyBindings.addHeading(self.editor))
 
-        (index, icon) = self.iconLookup["tb_bold"]
+        icon = self.lookupIcon("tb_bold")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Bold (Ctrl-B)", "Bold")
         EVT_TOOL(self, tbID, lambda evt: self.keyBindings.makeBold(self.editor))
 
-        (index, icon) = self.iconLookup["tb_italic"]
+        icon = self.lookupIcon("tb_italic")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Italic (Ctrl-I)", "Italic")
@@ -887 +1048 @@
         tb.AddSimpleTool(wxNewId(), seperator, "Separator", "Separator")
 
-        (index, icon) = self.iconLookup["tb_zoomin"]
+        icon = self.lookupIcon("tb_zoomin")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Zoom In", "Zoom In")
         EVT_TOOL(self, tbID, lambda evt: self.editor.CmdKeyExecute(wxSTC_CMD_ZOOMIN))
 
-        (index, icon) = self.iconLookup["tb_zoomout"]
+        icon = self.lookupIcon("tb_zoomout")
         tbID = wxNewId()
         tb.AddSimpleTool(tbID, icon, "Zoom Out", "Zoom Out")
         EVT_TOOL(self, tbID, lambda evt: self.editor.CmdKeyExecute(wxSTC_CMD_ZOOMOUT))
+
+        icon = self.lookupIcon("tb_pin")
+        tbID = wxNewId()
+        tb.AddSimpleTool(tbID, icon, "Wikize Selected Word", "Wikize Selected Word")
+        EVT_TOOL(self, tbID, lambda evt: self.keyBindings.makeWikiWord(self.editor))
+
+        # get info for any plugin toolbar items and create them as necessary
+        toolbarItems = reduce(lambda a, b: a+list(b),
+                self.toolbarFunctions.describeToolbarItems(self), [])
+        
+        def addPluginTool(function, label, tooltip, icondesc, tbID=None):
+            if tbID is None:
+                tbID = wxNewId()
+                
+            icon = self.resolveIconDescriptor(icondesc, self.lookupIcon(u"tb_doc"))
+            tb.AddLabelTool(tbID, label, icon, wxNullBitmap, 0, tooltip)
+            EVT_TOOL(self, tbID, lambda evt: function(self, evt))
+            
+        for item in toolbarItems:
+            addPluginTool(*item)
+
 
         tb.Realize()
@@ -921 +1103 @@
 
         # Create iconImageList
-        self.fillIconLookup(True)
+        self.fillIconLookupCache(True)
 
         self.buildMainMenu()
@@ -951 +1133 @@
             self.tree.AssignImageList(self.iconImageList)
         except Exception, e:
-            self.displayErrorMessage('There was an error loading the icons for the tree control.', e)
+            self.displayErrorMessage('There was an error loading the icons '+
+                    'for the tree control.', e)
 
 
@@ -990 +1173 @@
 
         # turn on the tree control check box   # TODO: Doesn't work after restore from sleep mode
-        if self.vertSplitter.GetSashPosition() > 1:
+        ## if self.vertSplitter.GetSashPosition() > 1:
+        if self.lastSplitterPos > 1:
             self.showTreeCtrlMenuItem.Check(1)
         else:
@@ -1017 +1201 @@
 
 
-        for k in self.iconLookup.keys():
-            self.iconLookup[k] = (self.iconLookup[k][0], None)
+        for k in self.iconLookupCache.keys():
+            self.iconLookupCache[k] = (self.iconLookupCache[k][0], None)
 
         gc.collect()
@@ -1031 +1215 @@
         self.sleepMode = False
 
-        self.fillIconLookup(False)
         self.buildMainMenu()
         self.buildToolbar()
@@ -1102 +1285 @@
         "creates a new wiki"
 
-        self.wikidPadHooks.newWiki(self, wikiName, wikiDir)
-
-        wikiName = string.replace(wikiName, " ", "")
+        self.hooks.newWiki(self, wikiName, wikiDir)
+
+        wikiName = string.replace(wikiName, u" ", u"")
         wikiDir = join(wikiDir, wikiName)
-        configFileLoc = join(wikiDir, "%s.wiki" % wikiName)
+        configFileLoc = join(wikiDir, u"%s.wiki" % wikiName)
 
         self.statusBar.SetStatusText(uniToGui(u"Creating Wiki: %s" % wikiName), 0)
@@ -1112 +1295 @@
         createIt = True;
         if (exists(wikiDir)):
-            dlg=wxMessageDialog(self, "A wiki already exists in '%s', overwrite?" % wikiDir,
-                               'Warning', wxYES_NO)
+            dlg=wxMessageDialog(self,
+                    uniToGui(u"A wiki already exists in '%s', overwrite?" %
+                    wikiDir), u'Warning', wxYES_NO)
             result = dlg.ShowModal()
             if result == wxID_YES:
@@ -1135 +1319 @@
             except WikiDBExistsException:
                 # The DB exists, should it be overwritten
-                dlg=wxMessageDialog(self, 'A wiki database already exists in this location, overwrite?',
-                                    'Wiki DB Exists', wxYES_NO)
+                dlg=wxMessageDialog(self, u'A wiki database already exists '+
+                        u'in this location, overwrite?',
+                        u'Wiki DB Exists', wxYES_NO)
                 result = dlg.ShowModal()
                 if result == wxID_YES:
@@ -1168 +1353 @@
                 # open the new wiki
                 self.openWiki(configFileLoc)
+                p = self.wikiData.createPage(u"WikiSettings")
+                text = u"""++ Wiki Settings
+
+
+These are your default global settings.
+
+[global.importance.low.color: grey]
+[global.importance.high.bold: true]
+[global.contact.icon: contact]
+[global.todo.bold: true]
+[global.todo.icon: pin]
+[global.wrap: 70]
+
+[icon: cog]
+"""
+                p.save(text, False)
+                p.update(text, False)
+
+                p = self.wikiData.createPage(u"ScratchPad")
+                text = u"++ Scratch Pad\n\n"
+                p.save(text, False)
+                p.update(text, False)
+                
                 self.editor.GotoPos(self.editor.GetLength())
-                self.editor.AddText("\n\n\t* WikiSettings\n")
-
-                # create the WikiSettings page
-                self.openWikiPage("WikiSettings", False, False)
-                self.editor.GotoPos(self.editor.GetLength())
-                self.editor.AddText("\n\nThese are your default global settings.\n\n")
-                self.editor.AddText("[global.importance.low.color: grey]\n")
-                self.editor.AddText("[global.importance.high.bold: true]\n")
-                self.editor.AddText("[global.contact.icon: contact]\n")
-                self.editor.AddText("[global.todo.bold: true]\n")
-                self.editor.AddText("[global.todo.icon: pin]\n")
-                self.editor.AddText("[global.wrap: 70]\n")
-                self.editor.AddText("\n[icon: cog]\n")
+                self.editor.AddText(u"\n\n\t* WikiSettings\n")
+                self.saveCurrentWikiPage()
+                
+
+#                 # create the WikiSettings page
+#                 self.openWikiPage("WikiSettings", False, False)
+#                 self.editor.GotoPos(self.editor.GetLength())
+#                 self.editor.AddText(u"\n\nThese are your default global settings.\n\n")
+#                 self.editor.AddText(u"[global.importance.low.color: grey]\n")
+#                 self.editor.AddText(u"[global.importance.high.bold: true]\n")
+#                 self.editor.AddText(u"[global.contact.icon: contact]\n")
+#                 self.editor.AddText(u"[global.todo.bold: true]\n")
+#                 self.editor.AddText(u"[global.todo.icon: pin]\n")
+#                 self.editor.AddText(u"[global.wrap: 70]\n")
+#                 self.editor.AddText(u"\n[icon: cog]\n")
 
                 # trigger hook
-                self.wikidPadHooks.createdWiki(self, wikiName, wikiDir)
+                self.hooks.createdWiki(self, wikiName, wikiDir)
 
                 # reopen the root
@@ -1193 +1403 @@
         "opens up a wiki"
 
-        self.wikidPadHooks.openWiki(self, wikiConfigFilename)
+        # trigger hooks
+        self.hooks.openWiki(self, wikiConfigFilename)
 
         # Save the state of the currently open wiki, if there was one open
@@ -1208 +1419 @@
         # make sure the config exists
         if (not exists(wikiConfigFilename)):
-            self.displayErrorMessage("Wiki configuration file '%s' not found" % wikiConfigFilename)
+            self.displayErrorMessage(u"Wiki configuration file '%s' not found" %
+                    wikiConfigFilename)
             if wikiConfigFilename in self.wikiHistory:
                 self.wikiHistory.remove(wikiConfigFilename)
@@ -1225 +1437 @@
                 parentDir = dirname(dirname(wikiConfigFilename))
                 if parentDir:
-                    wikiFiles = [file for file in os.listdir(parentDir) if file.endswith(".wiki")]
+                    wikiFiles = [file for file in os.listdir(parentDir) \
+                            if file.endswith(".wiki")]
                     if len(wikiFiles) > 0:
                         wikiWord = basename(wikiConfigFilename)
@@ -1234 +1447 @@
                         if windows83Marker != -1:
                             wikiWord = wikiWord[0:windows83Marker]
-                            matchingFiles = [file for file in wikiFiles if file.lower().startswith(wikiWord)]
+                            matchingFiles = [file for file in wikiFiles \
+                                    if file.lower().startswith(wikiWord)]
                             if matchingFiles:
                                 wikiWord = matchingFiles[0]
@@ -1240 +1454 @@
                         return
             except Exception, ne:
-                self.displayErrorMessage("Error reading config file '%s'" % wikiConfigFilename, e)
+                self.displayErrorMessage(u"Error reading config file '%s'" %
+                        wikiConfigFilename, e)
                 traceback.print_exc()
                 return False
@@ -1342 +1557 @@
 
         # trigger hook
-        self.wikidPadHooks.openedWiki(self, self.wikiName, wikiConfigFilename)
+        self.hooks.openedWiki(self, self.wikiName, wikiConfigFilename)
 
         # return that the wiki was opened successfully
@@ -1386 +1601 @@
             forceTreeSyncFromRoot=False, forceReopen=False):
 
-        self.statusBar.SetStatusText(uniToGui("Opening wiki word '%s'" %
+        self.statusBar.SetStatusText(uniToGui(u"Opening wiki word '%s'" %
                 wikiWord), 0)
 
         # make sure this is a valid wiki word
         if not WikiFormatting.isWikiWord(wikiWord):
-            self.displayErrorMessage("'%s' is an invalid wiki word." % wikiWord)
+            self.displayErrorMessage(u"'%s' is an invalid wiki word." % wikiWord)
 
         # don't reopen the currently open page
         if (wikiWord == self.currentWikiWord) and not forceReopen:
             # self.tree.buildTreeForWord(self.currentWikiWord)  # TODO Needed?
-            self.statusBar.SetStatusText(uniToGui("Wiki word '%s' already open" %
+            self.statusBar.SetStatusText(uniToGui(u"Wiki word '%s' already open" %
                     wikiWord), 0)
             return
@@ -1411 +1626 @@
 
         # trigger hook
-        self.wikidPadHooks.openWikiWord(self, wikiWord)
+        self.hooks.openWikiWord(self, wikiWord)
 
         # check if this is an alias
@@ -1427 +1642 @@
         except WikiWordNotFoundException, e:
             self.currentWikiPage = self.wikiData.createPage(wikiWord)
-            self.wikidPadHooks.newWikiWord(self, wikiWord)
+            # trigger hooks
+            self.hooks.newWikiWord(self, wikiWord)
 
         # set the editor text
@@ -1434 +1650 @@
         try:
             content = self.currentWikiPage.getContent()
-            self.statusBar.SetStatusText(uniToGui("Opened wiki word '%s'" %
+            self.statusBar.SetStatusText(uniToGui(u"Opened wiki word '%s'" %
                     self.currentWikiWord), 0)
         except WikiFileNotFoundException, e:
@@ -1481 +1697 @@
 
         # set the title and add the word to the history
-        self.SetTitle(uniToGui("Wiki: %s - %s" %
+        self.SetTitle(uniToGui(u"Wiki: %s - %s" %
                 (self.wikiName,self.currentWikiWord)))
         if addToHistory: self.addToHistory(wikiWord)
@@ -1491 +1707 @@
 
         # trigger hook
-        self.wikidPadHooks.openedWikiWord(self, wikiWord)
+        self.hooks.openedWikiWord(self, wikiWord)
 
 
@@ -1505 +1721 @@
 
         dlg = wxSingleChoiceDialog(self,
-                                    "Parent nodes of '%s'" % ofWord,
-                                    "Parent nodes of '%s'" % ofWord,
+                                    uniToGui(u"Parent nodes of '%s'" % ofWord),
+                                    uniToGui(u"Parent nodes of '%s'" % ofWord),
                                     parents,
                                     wxOK|wxCANCEL)
@@ -1537 +1753 @@
         children = self.wikiData.getChildRelationships(ofWord)
         dlg = wxSingleChoiceDialog(self,
-                                   "Child nodes of '%s'" % ofWord,
-                                   "Child nodes of '%s'" % ofWord,
+                                   uniToGui(u"Child nodes of '%s'" % ofWord),
+                                   uniToGui(u"Child nodes of '%s'" % ofWord),
                                    children,
                                    wxOK|wxCANCEL)
@@ -1571 +1787 @@
 
     def goInHistory(self, posDelta=0):
-        if (posDelta < 0 and self.historyPosition > 0) or (posDelta > 0 and self.historyPosition < (len(self.wikiWordHistory)-1)):
+        if (posDelta < 0 and self.historyPosition > 0) or \
+                (posDelta > 0 and self.historyPosition < (len(self.wikiWordHistory)-1)):
             self.historyPosition = self.historyPosition + posDelta
         wikiWord = self.wikiWordHistory[self.historyPosition]
@@ -1600 +1817 @@
     def viewHistory(self, posDelta=0):
         dlg = wxSingleChoiceDialog(self,
-                                   "History",
-                                   "History",
+                                   u"History",
+                                   u"History",
                                    self.wikiWordHistory,
                                    wxOK|wxCANCEL)
@@ -1623 +1840 @@
                                    u"Bookmarks",
                                    u"Bookmarks",
-                                   self.wikiData.getWordsWithPropertyValue("bookmarked", "true"),
+                                   self.wikiData.getWordsWithPropertyValue("bookmarked", u"true"),
                                    wxOK|wxCANCEL)
 
@@ -1639 +1856 @@
 
     def saveWikiPage(self, word, page, text):
-        self.statusBar.SetStatusText("Saving WikiPage", 0)
-        self.wikidPadHooks.savingWikiWord(self, word)
+        self.statusBar.SetStatusText(u"Saving WikiPage", 0)
+        # trigger hooks
+        self.hooks.savingWikiWord(self, word)
 
         error = False
@@ -1652 +1870 @@
                 error = True
                 dlg=wxMessageDialog(self,
-                        uniToGui(u'There was an error saving the contents of wiki page "%s".\n%s\n\nWould you like to try and save this document again?' % (word, e)),
+                        uniToGui((u'There was an error saving the contents of '+
+                        u'wiki page "%s".\n%s\n\nWould you like to try and '+
+                        u'save this document again?') % (word, e)),
                                     u'Error Saving!', wxYES_NO)
                 result = dlg.ShowModal()
@@ -1661 +1881 @@
 
         if not error:
-            self.statusBar.SetStatusText("", 0)
+            self.statusBar.SetStatusText(u"", 0)
             self.editor.SetSavePoint()
-            self.wikidPadHooks.savedWikiWord(self, word)
+            # trigger hooks
+            self.hooks.savedWikiWord(self, word)
 
 
@@ -1742 +1963 @@
             tooltip = None
             if self.wikiConfigFilename:  # If a wiki is open
-                tooltip = "Wiki: %s" % self.wikiName
+                tooltip = u"Wiki: %s" % self.wikiName
             else:
-                tooltip = "Wikidpad"
+                tooltip = u"Wikidpad"
 
             self.tbIcon.SetIcon(wxIcon(os.path.join(self.wikiAppDir, 'icons', 'pwiki.ico'),
-                    wxBITMAP_TYPE_ICO), tooltip)
+                    wxBITMAP_TYPE_ICO), uniToGui(tooltip))
         else:
             if self.tbIcon is not None:
@@ -1798 +2019 @@
 
     def showWikiWordRenameDialog(self, wikiWord=None, toWikiWord=None):
-        dlg = wxTextEntryDialog (self, "Rename '%s' to:" % self.currentWikiWord,
-                                 "Rename Wiki Word", self.currentWikiWord,
-                                 wxOK | wxCANCEL)
+        dlg = wxTextEntryDialog (self, uniToGui(u"Rename '%s' to:" %
+                self.currentWikiWord), u"Rename Wiki Word", self.currentWikiWord,
+                wxOK | wxCANCEL)
 
         try:
@@ -1824 +2045 @@
 
         if wikiWord == toWikiWord:
-            self.displayErrorMessage("Can't rename wiki home")
+            self.displayErrorMessage(u"Can't rename wiki home")
             return False
 
         if wikiWord == "ScratchPad":
-            self.displayErrorMessage("The scratch pad cannot be renamed.")
+            self.displayErrorMessage(u"The scratch pad cannot be renamed.")
             return False
 
         if not WikiFormatting.isWikiWord(toWikiWord):
-            toWikiWord = "[%s]" % toWikiWord
+            toWikiWord = u"[%s]" % toWikiWord
         if not WikiFormatting.isWikiWord(toWikiWord):
-            self.displayErrorMessage("'%s' is an invalid WikiWord" % toWikiWord)
+            self.displayErrorMessage(u"'%s' is an invalid WikiWord" % toWikiWord)
             return False
 
         if self.wikiData.isDefinedWikiWord(toWikiWord):
-            self.displayErrorMessage("Cannot rename to '%s', word already exists" % toWikiWord)
+            self.displayErrorMessage(u"Cannot rename to '%s', word already exists" %
+                    toWikiWord)
             return False
 
-        dlg=wxMessageDialog(self, "Are you sure you want to rename wiki word '%s' to '%s'?" % (wikiWord, toWikiWord),
-                            'Rename Wiki Word', wxYES_NO)
+        dlg=wxMessageDialog(self, uniToGui((u"Are you sure you want to rename "+
+                u"wiki word '%s' to '%s'?") % (wikiWord, toWikiWord)),
+                u'Rename Wiki Word', wxYES_NO)
         renamed = False
         result = dlg.ShowModal()
@@ -1856 +2079 @@
                     self.saveCurrentWikiState()
                     self.wikiHistory.remove(self.wikiConfigFilename)
-                    renamedConfigFile = join(dirname(self.wikiConfigFilename), "%s.wiki" % toWikiWord)
+                    renamedConfigFile = join(dirname(self.wikiConfigFilename),
+                            u"%s.wiki" % toWikiWord)
                     os.rename(self.wikiConfigFilename, renamedConfigFile)
                     self.wikiConfigFilename = None
                     self.openWiki(renamedConfigFile)
 
-                self.wikidPadHooks.renamedWikiWord(self, wikiWord, toWikiWord)
+                # trigger hooks
+                self.hooks.renamedWikiWord(self, wikiWord, toWikiWord)                
                 self.tree.collapse()
                 self.openWikiPage(toWikiWord, forceTreeSyncFromRoot=True)
@@ -1903 +2128 @@
 
         if wikiWord == "ScratchPad":
-            self.displayErrorMessage("The scratch pad cannot be deleted")
+            self.displayErrorMessage(u"The scratch pad cannot be deleted")
             return
 
-        dlg=wxMessageDialog(self, "Are you sure you want to delete wiki word '%s'?" % wikiWord,
-                            'Delete Wiki Word', wxYES_NO)
+        dlg=wxMessageDialog(self,
+                uniToGui(u"Are you sure you want to delete wiki word '%s'?" % wikiWord),
+                'Delete Wiki Word', wxYES_NO)
         result = dlg.ShowModal()
         if result == wxID_YES:
@@ -1913 +2139 @@
             try:
                 self.wikiData.deleteWord(wikiWord)
-                self.wikidPadHooks.deletedWikiWord(self, wikiWord)
+                # trigger hooks
+                self.hooks.deletedWikiWord(self, wikiWord)
                 if wikiWord == self.currentWikiWord:
                     self.tree.collapse()
@@ -1930 +2157 @@
         self.lastFindPos = -1
         data = wxFindReplaceData()
-        dlg = wxFindReplaceDialog(self, data, "Find and Replace", wxFR_REPLACEDIALOG)
+        dlg = wxFindReplaceDialog(self, data, u"Find and Replace", wxFR_REPLACEDIALOG)
         dlg.data = data
         dlg.Show(True)
 
     def showReplaceTextByWikiwordDialog(self):
-        wikiWord = guiToUni(wxGetTextFromUser("Replace text by WikiWord:",
-                "Replace by Wiki Word", self.currentWikiWord, self))
+        wikiWord = guiToUni(wxGetTextFromUser(u"Replace text by WikiWord:",
+                u"Replace by Wiki Word", self.currentWikiWord, self))
 
         if wikiWord:
             if not WikiFormatting.isWikiWord(wikiWord):
-                wikiWord = "[%s]" % wikiWord
+                wikiWord = u"[%s]" % wikiWord
             if not WikiFormatting.isWikiWord(wikiWord):
                 self.displayErrorMessage(u"'%s' is an invalid WikiWord" % wikiWord)
@@ -2003 +2230 @@
         dlg.Destroy()
 
-        if result == wxID_OK:
-            pass
-
-
-    def exportWiki(self, type):
-        dlg = wxDirDialog(self, "Select Export Directory", self.getLastActiveDir(), style=wxDD_DEFAULT_STYLE|wxDD_NEW_DIR_BUTTON)
-        if dlg.ShowModal() == wxID_OK:
-            exporter = HtmlExporter(self)
-            dir = dlg.GetPath()
-            exporter.export(type, dir)
-            self.configuration.set("main", "last_active_dir", dir)
-
-    # TODO: Should be more general to support other databases
+#         if result == wxID_OK:
+#             pass
+
+
+    EXPORT_PARAMS = {
+            GUI_ID.MENU_EXPORT_WHOLE_AS_PAGE:
+                    (Exporters.HtmlXmlExporter, u"html_single", ()),
+            GUI_ID.MENU_EXPORT_WHOLE_AS_PAGES:
+                    (Exporters.HtmlXmlExporter, u"html_multi", ()),
+            GUI_ID.MENU_EXPORT_WORD_AS_PAGE:
+                    (Exporters.HtmlXmlExporter, u"html_single", ()),
+            GUI_ID.MENU_EXPORT_SUB_AS_PAGE:
+                    (Exporters.HtmlXmlExporter, u"html_single", ()),
+            GUI_ID.MENU_EXPORT_SUB_AS_PAGES:
+                    (Exporters.HtmlXmlExporter, u"html_multi", ()),
+            GUI_ID.MENU_EXPORT_WHOLE_AS_XML:
+                    (Exporters.HtmlXmlExporter, u"xml", ()),
+            GUI_ID.MENU_EXPORT_WHOLE_AS_RAW:
+                    (Exporters.TextExporter, u"raw_files", (1,))
+            }
+
+
+    def OnExportWiki(self, evt):
+        dest = wxDirSelector(u"Select Export Directory", self.getLastActiveDir(),
+        wxDD_DEFAULT_STYLE|wxDD_NEW_DIR_BUTTON, parent=self)
+#         dlg = wxDirDialog(self, "Select Export Directory",
+#                 self.getLastActiveDir(),
+#                 style=wxDD_DEFAULT_STYLE|wxDD_NEW_DIR_BUTTON)
+
+        if dest:
+            typ = evt.GetId()
+            
+            if typ in (GUI_ID.MENU_EXPORT_WHOLE_AS_PAGE,
+                    GUI_ID.MENU_EXPORT_WHOLE_AS_PAGES,
+                    GUI_ID.MENU_EXPORT_WHOLE_AS_XML,
+                    GUI_ID.MENU_EXPORT_WHOLE_AS_RAW):
+                wordList = self.wikiData.getAllDefinedPageNames()
+                
+            elif typ in (GUI_ID.MENU_EXPORT_SUB_AS_PAGE,
+                    GUI_ID.MENU_EXPORT_SUB_AS_PAGES):
+                wordList = self.wikiData.getAllSubWords(
+                        self.currentWikiWord, True)
+            else:
+                wordList = (self.currentWikiWord,)
+                
+            expclass, exptype, addopt = self.EXPORT_PARAMS[typ]
+            
+            expclass().export(self, self.wikiData, wordList, exptype, dest,
+                    addopt)
+
+
+            self.configuration.set("main", "last_active_dir", dest)
+
+
     def rebuildWiki(self, skipConfirm = False):
         if not skipConfirm:
-            result = wxMessageBox("Are you sure you want to rebuild this wiki? You may want to backup your data first!",
-                    'Rebuild wiki', wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION, self)
+            result = wxMessageBox(u"Are you sure you want to rebuild this wiki? "+
+                    u"You may want to backup your data first!",
+                    u'Rebuild wiki', wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION, self)
 
         if skipConfirm or result == wxYES :
-            # get all of the wikiWords
-            wikiWords = self.wikiData.getAllPageNamesFromDisk()   # Replace this call
-            # get the saved searches
-            searches = self.wikiData.getSavedSearches()
-
-            # close nulls the wikiConfigFilename var, so save it
-            wikiConfigFilename = self.wikiConfigFilename
-            # first close the existing wiki
-            self.closeWiki()
-
-            progress = wxProgressDialog("Rebuilding wiki", "Rebuilding wiki",
-                                        len(wikiWords) + len(searches) + 1, self, wxPD_APP_MODAL)
-
             try:
-                step = 1
-                # recreate the db
-                progress.Update(step, "Recreating database")
-                createWikiDB(self.wikiName, self.dataDir, True)
-                # reopen the wiki
-                wikiData = WikiData(self, self.dataDir)
-                # re-save all of the pages
-                for wikiWord in wikiWords:
-                    progress.Update(step, "Rebuilding %s" % wikiWord)
-                    wikiPage = wikiData.createPage(wikiWord)
-                    wikiData.updatePageEntry(wikiWord)
-                    wikiPage.update(wikiPage.getContent(), False)
-                    step = step + 1
-
-                # resave searches
-                for search in searches:
-                    progress.Update(step, "Reading search %s" % search)
-                    wikiData.saveSearch(search)
-
-                wikiData.close()
-                progress.Destroy()
-
+                self.wikiData.rebuildWiki(
+                        wxGuiProgressHandler(u"Rebuilding wiki", u"Rebuilding wiki",
+                        0, self))
+
+                self.tree.collapse()
+                self.openWikiPage(self.currentWikiWord, forceTreeSyncFromRoot=True)
             except Exception, e:
-                self.displayErrorMessage("Error rebuilding wiki", e)
+                self.displayErrorMessage(u"Error rebuilding wiki", e)
                 traceback.print_exc()
-            self.openWiki(wikiConfigFilename)
 
 
@@ -2081 +2320 @@
     def displayMessage(self, title, str):
         "pops up a dialog box"
-        dlg_m = wxMessageDialog(self, "%s" % str, title, wxOK)
+        dlg_m = wxMessageDialog(self, uniToGui(u"%s" % str), title, wxOK)
         dlg_m.ShowModal()
         dlg_m.Destroy()
 
 
-    def displayErrorMessage(self, errorStr, e=""):
+    def displayErrorMessage(self, errorStr, e=u""):
         "pops up a error dialog box"
-        dlg_m = wxMessageDialog(self, uniToGui("%s. %s." % (errorStr, e)), 'Error!', wxOK)
+        dlg_m = wxMessageDialog(self, uniToGui(u"%s. %s." % (errorStr, e)), 'Error!', wxOK)
         dlg_m.ShowModal()
         dlg_m.Destroy()
         try:
-            self.statusBar.SetStatusText(errorStr, 0)
+            self.statusBar.SetStatusText(uniToGui(errorStr), 0)
         except:
             pass
@@ -2104 +2343 @@
 
     def getWikiPageTitle(self, wikiWord):
-        title = re.sub(r'([A-Z\xc0-\xde]{2,})([a-z\xdf-\xff])', r'\1 \2', wikiWord)
-        title = re.sub(r'([a-z\xdf-\xff])([A-Z\xc0-\xde])', r'\1 \2', title)
+        title = re.sub(ur'([A-Z\xc0-\xde]{2,})([a-z\xdf-\xff])', r'\1 \2', wikiWord)
+        title = re.sub(ur'([a-z\xdf-\xff])([A-Z\xc0-\xde])', r'\1 \2', title)
         if title.startswith("["):
             title = title[1:len(title)-1]
@@ -2119 +2358 @@
 
     def OnWikiOpen(self, event):
-        dlg = wxFileDialog(self, "Choose a Wiki to open", self.getLastActiveDir(), "", "*.wiki", wxOPEN)
+        dlg = wxFileDialog(self, u"Choose a Wiki to open",
+                self.getLastActiveDir(), "", "*.wiki", wxOPEN)
         if dlg.ShowModal() == wxID_OK:
             self.openWiki(abspath(dlg.GetPath()))
@@ -2126 +2366 @@
 
     def OnWikiNew(self, event):
-        dlg = wxTextEntryDialog (self, "Name for new wiki (must be in the form of a WikiWord):",
-                                 "Create New Wiki", "MyWiki", wxOK | wxCANCEL)
+        dlg = wxTextEntryDialog (self,
+                u"Name for new wiki (must be in the form of a WikiWord):",
+                u"Create New Wiki", u"MyWiki", wxOK | wxCANCEL)
 
         if dlg.ShowModal() == wxID_OK:
@@ -2134 +2375 @@
             # make sure this is a valid wiki word
             if wikiName.find(u' ') == -1 and WikiFormatting.isWikiWord(wikiName):
-                dlg = wxDirDialog(self, "Directory to store new wiki", self.getLastActiveDir(), style=wxDD_DEFAULT_STYLE|wxDD_NEW_DIR_BUTTON)
+                dlg = wxDirDialog(self, u"Directory to store new wiki",
+                        self.getLastActiveDir(),
+                        style=wxDD_DEFAULT_STYLE|wxDD_NEW_DIR_BUTTON)
                 if dlg.ShowModal() == wxID_OK:
                     try:
                         self.newWiki(wikiName, dlg.GetPath())
                     except IOError, e:
-                        self.displayErrorMessage('There was an error while creating your new Wiki.', e)
+                        self.displayErrorMessage(u'There was an error while '+
+                                'creating your new Wiki.', e)
             else:
-                self.displayErrorMessage("'%s' is an invalid WikiWord. There must be no spaces and mixed caps" % wikiName)
+                self.displayErrorMessage((u"'%s' is an invalid WikiWord. "+
+                u"There must be no spaces and mixed caps") % wikiName)
 
         dlg.Destroy()
@@ -2249 +2494 @@
 
         # trigger hook
-        self.wikidPadHooks.exit(self)
+        self.hooks.exit(self)
 
         wxTheClipboard.Flush()
@@ -2341 +2586 @@
             self.EndModal(wxID_CANCEL)
         else:
-            self.pWiki.displayErrorMessage("Invalid search string, can't save as view")
+            self.pWiki.displayErrorMessage(u"Invalid search string, can't save as view")
 
     def OnListBox(self, evt):
@@ -2464 +2709 @@
             <tr><td width="30%" align="right"><font size="3"><b>Email:</b></font></td><td nowrap><font size="3">mbutscher@gmx.de</font></td></tr>
             <tr><td width="30%" align="right"><font size="3"><b>URL:</b></font></td><td nowrap><font size="3">http://www.mbutscher.nextdesigns.net/software.html</font></td></tr>
+            <tr><td width="30%" align="right">&nbsp;</td></tr>
+            <tr><td width="30%" align="right"><font size="3"><b>Author:</b></font></td><td nowrap><font size="3">Gerhard Reitmayr</font></td></tr>
+            <tr><td width="30%" align="right"><font size="3"><b>Email:</b></font></td><td nowrap><font size="3">gerhard.reitmayr@gmail.com</font></td></tr>
         </table>
     </center>