Changeset 288

Timestamp:

07/25/11 11:40:57 (2 years ago)

Author:

mbutscher

Message:

branches/mbutscher/work:
* Option to open link in new window (Ross' rep.:

517346f7e238022217c982b5c71ed92880e40249 and
7698dcedf92b4a7fedfe16cc5138c2b5ab99f437)

Location:

branches/mbutscher/work

Files:

• WikidPad.xrc (modified) (2 diffs)
• lib/pwiki/CmdLineAction.py (modified) (6 diffs)
• lib/pwiki/Configuration.py (modified) (1 diff)
• lib/pwiki/PersonalWikiFrame.py (modified) (7 diffs)
• lib/pwiki/WikiHtmlView.py (modified) (1 diff)
• lib/pwiki/WikiHtmlViewWK.py (modified) (1 diff)
• lib/pwiki/WikiTxtCtrl.py (modified) (3 diffs)

branches/mbutscher/work/WikidPad.xrc

@@ -1748 +1748 @@
                 <item>New tab in background</item>
                 <item>Same Tab</item>
+                <item>New Window</item>
               </content>
               <selection>0</selection>
@@ -1767 +1768 @@
                 <item>New tab in background</item>
                 <item>Same Tab</item>
+                <item>New Window</item>
               </content>
               <selection>1</selection>

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

@@ -42 +42 @@
         self.lastTabsSubCtrls = None  # Corresponding list of subcontrol names
                 # for each wikiword to open
+        self.wikiWordsToCreate = None  # Words to create and open
         self.noRecent = False  # Do not modify history of recently opened wikis
 
@@ -62 +63 @@
         try:
             opts, rargs = getopt.getopt(sargs, "hw:p:x",
-                    ["help", "wiki=", "page=", "exit", "export-what=",
-                    "export-type=", "export-dest=", "export-compfn",
-                    "export-saved=", "continuous-export-saved=",
-                    "anchor",
-                                        "rebuild", "no-recent", "preview", "editor"])
+                    ["help", "wiki=", "page=", "new-page=", "exit", 
+                    "export-what=", "export-type=", "export-dest=", 
+                    "export-compfn", "export-saved=", "continuous-export-saved=",
+                    "anchor", "rebuild", "no-recent", "preview", "editor"])
         except getopt.GetoptError:
             self.cmdLineError = True
@@ -72 +72 @@
 
         wikiWordsToOpen = []
+        wikiWordsToCreate = []
 
         for o, a in opts:
@@ -80 +81 @@
             elif o in ("-p", "--page"):
                 wikiWordsToOpen.append(mbcsDec(a, "replace")[0])
+            elif o in ("--new-page"):
+                wikiWordsToCreate.append(mbcsDec(a, "replace")[0])
             elif o == "--anchor":
                 self.anchorToOpen = mbcsDec(a, "replace")[0]
@@ -109 +112 @@
             self.wikiWordsToOpen = tuple(wikiWordsToOpen)
 
+        if len(wikiWordsToCreate) > 0:
+            self.wikiWordsToCreate = tuple(wikiWordsToCreate)
 
         self._fillLastTabsSubCtrls(len(wikiWordsToOpen))
@@ -129 +134 @@
 
             return
-
 
         if len(self.lastTabsSubCtrls) < wwoLen:

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

@@ -848 +848 @@
 # Maps configuration setting "mouse_middleButton_withoutCtrl" number to a 
 # tabMode number for WikiTxtCtrl._activateLink or WikiHtmlView._activateLink
-MIDDLE_MOUSE_CONFIG_TO_TABMODE = {0: 2, 1: 3, 2: 0}
+MIDDLE_MOUSE_CONFIG_TO_TABMODE = {
+                                    0: 2, # New tab in background
+                                    1: 3, # New tab in foreground
+                                    2: 0, # Same Tab
+                                    3: 6, # New Window
+                                 }
 
 

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

@@ -392 +392 @@
                         anchorToOpen=anchorToOpen,
                         lastTabsSubCtrls=cmdLineAction.lastTabsSubCtrls,
-                        activeTabNo=cmdLineAction.activeTabNo)
+                        activeTabNo=cmdLineAction.activeTabNo, 
+                        wikiWordsToCreate=cmdLineAction.wikiWordsToCreate)
 #                 wx.GetApp().pauseBackgroundThreads()
             else:
@@ -2978 +2979 @@
     def openWiki(self, wikiCombinedFilename, wikiWordsToOpen=None,
             ignoreWdhName=False, lastTabsSubCtrls=None, anchorToOpen=None,
-            activeTabNo=-1):
+            activeTabNo=-1, wikiWordsToCreate=None):
         """
         opens up a wiki
@@ -3264 +3265 @@
                     # Omitting word, so adjust activeTabNo
                     activeTabNo -= 1
+
+                if wikiWordsToCreate:
+                    for word in wikiWordsToCreate:
+                        wwo.append((word, u"textedit"))
     
                 # now try and open the last wiki page as leftmost tab
@@ -3648 +3653 @@
             charlength=-1):
         """
-        tabMode -- 0:Same tab; 2: new tab in foreground; 3: new tab in background
+        tabMode -- 0:Same tab; 2: new tab in foreground; 3: new tab in background; 6: New Window
         """
         # open the wiki page
         if tabMode & 2:
-            # New tab
-            presenter = self.createNewDocPagePresenterTab()
+            if tabMode == 6:
+                # Open tab in new window
+                if len(unifName) == 0:
+                    return
+                
+                if unifName.startswith(u"wikipage/"):
+                    unifName = unifName[9:]
+
+                self.OpenNewWikidPadInstance([unifName], [u'textedit']) 
+                return
+                
+            else:
+                # New tab
+                presenter = self.createNewDocPagePresenterTab()
         else:
             # Same tab
@@ -4956 +4973 @@
 
 
-    def OnCmdCloneWindow(self, evt):
+    def OnCmdCloneWindow(self, evt, wikiWords=None, preview=False):
+        """
+        Clones the currently open window, creating a new instance with
+        the same tabs.
+
+        """
+        wws, subCtrls, activeNo = \
+                self.getMainAreaPanel().getOpenWikiWordsSubCtrlsAndActiveNo()
+        self.OpenNewWikidPadInstance(wws, subCtrls, activeNo)
+
+    def OpenNewWikidPadInstance(self, wikiWords, subCtrls, activeNo=0):
+        """
+        Launches a new wikidpad instance
+
+        @param wikiWords: List of wikiwords to open
+        @param subCtrls: Coresponding list (to wikiWords) of modes
+            e.g. u"textedit" or u"preview"
+        @ param activeNo: Tab to give focus to.
+
+        """
         wd = self.getWikiDocument()
         if wd is None:
@@ -4966 +5002 @@
             clAction.wikiToOpen = wd.getWikiConfigPath()
             clAction.frameToOpen = 1  # Open in new frame
-            wws, subCtrls, activeNo = \
-                    self.getMainAreaPanel().getOpenWikiWordsSubCtrlsAndActiveNo()
-
-            if wws is not None:
-                clAction.wikiWordsToOpen = wws
-                clAction.lastTabsSubCtrls = subCtrls
+
+            wikiWordsToOpen = []
+            wikiWordsToCreate = []
+            lastTabsSubCtrls = []
+
+            if len(wikiWords) > 1:
+                for word, sub in wikiWords, subCtrls:
+                    if self.getWikiDocument().isDefinedWikiLink(word):
+                        wikiWordsToOpen.append(word)
+                        lastTabsSubCtrls.append(sub)
+                    else:
+                        wikiWordsToCreate.append(word)
+            else:
+                if self.getWikiDocument().isDefinedWikiLink(wikiWords[0]):
+                    wikiWordsToOpen.append(wikiWords[0])
+                    lastTabsSubCtrls.append(subCtrls[0])
+                else:
+                    wikiWordsToCreate.append(wikiWords[0])
+                    
+
+            if wikiWords is not None:
+                clAction.wikiWordsToOpen = wikiWordsToOpen
+                clAction.wikiWordsToCreate = wikiWordsToCreate
+                clAction.lastTabsSubCtrls = lastTabsSubCtrls
                 clAction.activeTabNo = activeNo
 
@@ -4980 +5034 @@
                     u'WikidPad instance'), e)
             return
-
 
     def OnImportFromPagefiles(self, evt):

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

@@ -496 +496 @@
             # open the wiki page
             if tabMode & 2:
-                # New tab
-                presenter = self.presenter.getMainControl().\
-                        createNewDocPagePresenterTab()
-                presenter.switchSubControl("preview", False)
+                if tabMode == 6:
+                    # New Window
+                    self.presenter.getMainControl(). \
+                        OpenNewWikidPadInstance([word], [u'preview']) 
+                    return True
+                else:
+                    # New tab
+                    presenter = self.presenter.getMainControl().\
+                            createNewDocPagePresenterTab()
+                    presenter.switchSubControl("preview", False)
             else:
                 # Same tab

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

@@ -1394 +1394 @@
 
             if tabMode & 2:
-                # New tab
-                presenter = self.presenter.getMainControl().\
-                        createNewDocPagePresenterTab()
-                presenter.switchSubControl("preview", False)
+                if tabMode == 6:
+                    # New Window
+                    self.presenter.getMainControl(). \
+                        OpenNewWikidPadInstance([word], [u'preview']) 
+                    return True
+                else:
+                    # New tab
+                    presenter = self.presenter.getMainControl().\
+                            createNewDocPagePresenterTab()
+                    presenter.switchSubControl("preview", False)
             else:
                 # Same tab

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

@@ -1976 +1976 @@
                 searchStr = None
 
+                newWindow = False
                 # open the wiki page
                 if tabMode & 2:
-                    # New tab
-                    presenter = self.presenter.getMainControl().\
-                            createNewDocPagePresenterTab()
+                    if tabMode == 6:
+                        # New Window
+                        newWindow = True
+                    else:
+                        # New tab
+                        presenter = self.presenter.getMainControl().\
+                                createNewDocPagePresenterTab()
                 else:
                     # Same tab
@@ -2010 +2015 @@
                             forbiddenSearchfragHit = (node.pos, node.pos + node.strLength)
 
+                if newWindow:
+                    # NOTE: what about suggNewPageTitle?
+                    self.presenter.getMainControl().OpenNewWikidPadInstance(
+                            [unaliasedTarget], [u"textedit"])
+                    return True
+
                 presenter.openWikiPage(unaliasedTarget,
                         motionType="child", anchor=node.anchorLink,
@@ -2045 +2056 @@
                     # open the wiki page
                     if tabMode & 2:
-                        # New tab
-                        presenter = self.presenter.getMainControl().\
-                                createNewDocPagePresenterTab()
+                        if tabMode == 6:
+                            # New Window
+                            self.presenter.getMainControl(). \
+                                OpenNewWikidPadInstance(
+                                    [node.value], [u"textedit"])
+                            return True
+                        else:
+                            # New tab
+                            presenter = self.presenter.getMainControl().\
+                                    createNewDocPagePresenterTab()
                     else:
                         # Same tab