Changeset 263 for branches/mbutscher/work/lib/pwiki/PersonalWikiFrame.py

Timestamp:

03/20/11 13:12:05 (2 years ago)

Author:

mbutscher

Message:

branches/stable-2.1:
* Support for URL appendix "prnr" to create a relative link which is

not relocated (modified) when exported as HTML to a different
destination (backported to 2.1 to provide some backward compatibility
to old behavior)

* Bug fixed: Favorite wiki icons may open wrong wiki
* Bug fixed: Misleading error message and bad error handling for

corrupted wiki config file

* Internal: Default maximum length of compatible filename reduced from

250 to 120

branches/mbutscher/work:
* Less jumping around of selection in doc structure window when adding

text (thanks to Christian Ziemski)

* Support for spaces in bracketed URLs
* Option to control type of URL (bracketed or not) on drag&drop
* Support for URL appendix "prnr" to create a relative link which is

not relocated (modified) when exported as HTML to a different
destination

* Option to sort list in "Open Wiki Word" dialog in reverse

alphabetical order

* Shortcuts introduced to move one or more selected logical lines one

line up or down

* Bug fixed: Favorite wiki icons may open wrong wiki
* Bug fixed: Misleading error message and bad error handling for

corrupted wiki config file

* Internal: Deprecated makeRelUrlAbsolute() and makeAbsPathRelUrl() in

PersonalWikiFrame?, call functions in WikiDocument? instead

* Internal: Default maximum length of compatible filename reduced from

250 to 120

* File cleanup now in usable state (orphaned files complete, missing

files need work yet)

Files:

• branches/mbutscher/work/lib/pwiki/PersonalWikiFrame.py (modified) (14 diffs)

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

@@ -61 +61 @@
 
 from . import AdditionalDialogs
-
 
 
@@ -198 +197 @@
         self.lastCursorPositionInPage = {}
         self.wikiHistory = []
-        self.findDlg = None  # Stores find&replace dialog, if present
-        self.mainWwSearchDlg = None
-        self.wwSearchDlgs = []   # Stores wiki wide search dialogs and detached fast search frames
+        self.nonModalFindDlg = None  # Stores find&replace dialog, if present
+        self.nonModalMainWwSearchDlg = None
+        self.nonModalWwSearchDlgs = []   # Stores wiki wide search dialogs and detached fast search frames
+        self.nonModalFileCleanupDlg = None  # Stores file dialog FileCleanup.FileCleanupDialog
         self.spellChkDlg = None  # Stores spell check dialog, if present
         self.printer = None  # Stores Printer object (initialized on demand)
@@ -380 +380 @@
                     return
 
-                self.statusBar.SetStatusText(
-                        uniToGui(_(u"Last wiki doesn't exist: %s") % wikiToOpen), 0)
+#                 self.statusBar.SetStatusText(
+#                         uniToGui(_(u"Last wiki doesn't exist: %s") % wikiToOpen), 0)
+                self.displayErrorMessage(
+                        _(u"Wiki doesn't exist: %s") % wikiToOpen)
 
         cmdLineAction.actionBeforeShow(self)
@@ -1166 +1168 @@
                         self.openWiki(filePath, wikiWordsToOpen=(wikiWordToOpen,),
                                 anchorToOpen=anchorToOpen)
+                    else:
+                        self.displayErrorMessage(
+                                _(u"Wiki doesn't exist: %s") % wikiToOpen)
                 else:
                     self.openWiki(os.path.abspath(entry.value))
@@ -1237 +1242 @@
 
         self.insertAttribute("color", self.cmdIdToColorNameForAttribute[evt.GetId()])
+
+
+    def resetCommanding(self):
+        """
+        Reset the "commanding" (meaning menus, toolbar(s), shortcuts)
+        """
+        self.buildMainMenu()
+
+        # Update toolbar by recreating
+        if self.getShowToolbar():
+            with WindowUpdateLocker(self):
+                self.setShowToolbar(False)
+                self.setShowToolbar(True)
 
 
@@ -1899 +1917 @@
 #         wx.EVT_MENU(self, menuID, lambda evt: OsAbstract.startFile(self, 
 #                 os.path.join(self.wikiAppDir, u'license.txt')))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
@@ -2930 +2930 @@
                 of the corresponding wiki word to open
         """
-
         # Fix special case
         if wikiWordsToOpen == (None,):
@@ -2948 +2947 @@
 
         if cfgPath is None:
-            self.displayErrorMessage(_(u"Invalid path or missing file '%s'")
+            self.displayErrorMessage(_(u"Inaccessible or missing file: %s")
                         % wikiCombinedFilename)
 
@@ -3053 +3052 @@
             except (BadConfigurationFileException,
                     MissingConfigurationFileException), e:
-                self.displayErrorMessage(_(u"Configuration file '%s' is corrupted or "
-                        u"missing.\nYou may have to change some settings in configuration "
-                        u'page "Current Wiki" and below which were lost.') % cfgPath)
+                answer = wx.MessageBox(_(u"Configuration file '%s' is corrupted "
+                        u"or missing.\nYou may have to change some settings "
+                        u'in configuration page "Current Wiki" and below which '
+                        u"were lost.") % cfgPath, _(u'Continue?'),
+                        wx.OK | wx.CANCEL | wx.ICON_QUESTION, self)
+                if answer == wx.CANCEL:
+                    return False
+
                 wdhName = self._askForDbType()
                 if wdhName is None:
@@ -3147 +3151 @@
             with WindowUpdateLocker(self):
                 # reset the gui
-                self.buildMainMenu()
+                self.resetCommanding()
 
                 # enable the top level menus
@@ -3732 +3736 @@
 
 
-    def makeRelUrlAbsolute(self, relurl):
+    def makeRelUrlAbsolute(self, relurl, addSafe=''):
         """
         Return the absolute file: URL for a rel: URL
         TODO: Remove
         """
-        return self.getWikiDocument().makeRelUrlAbsolute(relurl)
-
-
-    def makeAbsPathRelUrl(self, absPath):
+        import warnings
+        warnings.warn("PersonalWikiFrame.makeRelUrlAbsolute() deprecated, use "
+                "WikiDocument.makeRelUrlAbsolute()", DeprecationWarning)
+
+        return self.getWikiDocument().makeRelUrlAbsolute(relurl, addSafe=addSafe)
+
+
+    def makeAbsPathRelUrl(self, absPath, addSafe=''):
         """
         Return the rel: URL for an absolute file path or None if
@@ -3746 +3754 @@
         TODO: Remove
         """
-        return self.getWikiDocument().makeAbsPathRelUrl(absPath)
+        import warnings
+        warnings.warn("PersonalWikiFrame.makeAbsPathRelUrl() deprecated, use "
+                "WikiDocument.makeAbsPathRelUrl()", DeprecationWarning)
+
+        return self.getWikiDocument().makeAbsPathRelUrl(absPath, addSafe=addSafe)
 
 
@@ -4271 +4283 @@
         from .SearchAndReplaceDialogs import SearchWikiDialog
 
-        if self.mainWwSearchDlg != None:
-            if isinstance(self.mainWwSearchDlg, SearchWikiDialog):
-                self.mainWwSearchDlg.SetFocus()
-            return
-
-        self.mainWwSearchDlg = SearchWikiDialog(self, self, -1,
+        if self.nonModalMainWwSearchDlg != None:
+            if isinstance(self.nonModalMainWwSearchDlg, SearchWikiDialog):
+                self.nonModalMainWwSearchDlg.SetFocus()
+            return
+
+        self.nonModalMainWwSearchDlg = SearchWikiDialog(self, self, -1,
                 allowOkCancel=False, allowOrdering=False)
-        self.mainWwSearchDlg.CenterOnParent(wx.BOTH)
-        self.mainWwSearchDlg.Show()
+        self.nonModalMainWwSearchDlg.CenterOnParent(wx.BOTH)
+        self.nonModalMainWwSearchDlg.Show()
 
 
@@ -4336 +4348 @@
         from .SearchAndReplaceDialogs import SearchPageDialog
 
-        if self.findDlg != None:
-            if isinstance(self.findDlg, SearchPageDialog):
-                self.findDlg.SetFocus()
-            return
-
-        self.findDlg = SearchPageDialog(self, -1)
-        self.findDlg.CenterOnParent(wx.BOTH)
-        self.findDlg.Show()
+        if self.nonModalFindDlg != None:
+            if isinstance(self.nonModalFindDlg, SearchPageDialog):
+                self.nonModalFindDlg.SetFocus()
+            return
+
+        self.nonModalFindDlg = SearchPageDialog(self, -1)
+        self.nonModalFindDlg.CenterOnParent(wx.BOTH)
+        self.nonModalFindDlg.Show()