Merge lp:~vr123456/leo-editor/detect_urls into lp:leo-editor/old-trunk

[Viktor Ransmayr]

[Viktor Ransmayr (vr123456)]

I have made one more improvement, that I think is important.

I have introduced an explicit 'init' function, so that info
about the plugin is published, when the cmd 'print-plugins-info'
is executed.

I have used the style found in plugin 'maximizeNewWindows.py'.

Please check especially the section << version history >>
and my 'version' choice. - I do not know if there is any
established convention, that I should follow ...

=== modified file 'leo/plugins/detect_urls.py'
--- leo/plugins/detect_urls.py	2010-01-09 13:50:47 +0000
+++ leo/plugins/detect_urls.py	2010-01-10 15:58:16 +0000
@@ -3,8 +3,7 @@
 #@<< docstring >>
 #@+node:vpe.20060426084738:<< docstring >>
 """
-Colorizes URLs everywhere in node's body on node selection
-or saving.
+Colorizes URLs everywhere in node's body on node selection or saving.
 
 Double click on any URL launches it in default browser.
 
@@ -16,13 +15,45 @@
 #@nl
 #@@language python
 #@@tabwidth -4
+
+__version__ = "0.3"
+#@<< version history >>
+#@+node:RV20090910.20100110154407.7439:<< version history >>
+#@+at
+# 
+# Originally written by ???
+# 
+# 0.1 ???: Initial version.
+# 
+# 0.2 VR: Detect URLs with protocol type 'file' and detect a new URL also
+#         after a save operation.
+# 
+# 0.3 VR: Display info about this plugin, when executing cmd 
+# 'print-plugins-info'.
+#@-at
+#@-node:RV20090910.20100110154407.7439:<< version history >>
+#@nl
+#@<< imports >>
+#@+node:RV20090910.20100110154407.7437:<< imports >>
 import leo.core.leoGlobals as g
 import leo.core.leoPlugins as leoPlugins
 import re
-#VR20100108: url_regex = re.compile(r"""(http|https|ftp)://[^\s'"]+[\w=/]""")
+#@-node:RV20090910.20100110154407.7437:<< imports >>
+#@nl
+
 url_regex = re.compile(r"""(http|https|file|ftp)://[^\s'"]+[\w=/]""")
 
 #@+others
+#@+node:RV20090910.20100110154407.7438:init()
+def init():
+    ok = not g.app.unitTesting
+    if ok:
+        leoPlugins.registerHandler("bodydclick1", openURL)
+        leoPlugins.registerHandler("select2", colorizeURLs)
+        leoPlugins.registerHandler("save2", colorizeURLs)
+        g.plugin_signon(__name__)
+    return ok
+#@-node:RV20090910.20100110154407.7438:init()
 #@+node:vpe.20060305064323.5:openURL()
 def openURL(tag,keywords):
     c = keywords.get("c")
@@ -69,11 +100,5 @@
         n += len(line) + 1
 #@-node:vpe.20060426062042:colorizeURLs()
 #@-others
-
-if 1:
-    leoPlugins.registerHandler("bodydclick1", openURL)
-    leoPlugins.registerHandler("select2", colorizeURLs)
-    leoPlugins.registerHandler("save2", colorizeURLs) #VR20100108
-    g.plugin_signon(__name__)
 #@-node:ekr.20060506070443.1:@thin detect_urls.py
 #@-leo

=== modified file 'leo/plugins/leoPluginsRef.leo'
--- leo/plugins/leoPluginsRef.leo	2010-01-09 19:51:52 +0000
+++ leo/plugins/leoPluginsRef.leo	2010-01-10 15:58:16 +0000
@@ -3,7 +3,7 @@
 <leo_file>
 <leo_header file_format="2" tnodes="0" max_tnode_index="0" clone_windows="0"/>
 <globals body_outline_ratio="0.5">
-	<global_window_position top="48" left="25" height="692" width="996"/>
+	<global_window_position top="48" left="10" height="692" width="1024"/>
 	<global_log_window_position top="0" left="0" height="0" width="0"/>
 </globals>
 <preferences/>
@@ -32,9 +32,9 @@
 <v t="ekr.20090430075506.4"><vh>Notes &amp; to-do</vh>
 <v t="ekr.20090430075506.3"><vh>@thin leoPluginNotes.txt</vh></v>
 </v>
-<v t="edream.110203113231.618"><vh>Plugins</vh>
+<v t="edream.110203113231.618" a="E"><vh>Plugins</vh>
 <v t="EKR.20040517090508"><vh>  Enable plugins using @enabled-plugins nodes</vh></v>
-<v t="ekr.20050303051035"><vh> Templates: these show recommended ways of defining plugins.</vh>
+<v t="ekr.20050303051035" a="E"><vh> Templates: these show recommended ways of defining plugins.</vh>
 <v t="ekr.20041114102139"><vh>Notes</vh>
 <v t="ekr.20041114103913"><vh>About comments in the style guide</vh></v>
 <v t="ekr.20041114102139.1"><vh>About the root node</vh></v>
@@ -64,7 +64,7 @@
 <v t="ekr.20091118065749.5261"><vh>@thin ctagscompleter.py</vh></v>
 <v t="ville.20091204224145.5355"><vh>@thin codewisecompleter.py</vh></v>
 </v>
-<v t="ekr.20040722135402.1"><vh>Body pane</vh>
+<v t="ekr.20040722135402.1" a="E"><vh>Body pane</vh>
 <v t="edream.110403140857.8"><vh>@thin color_markup.py</vh></v>
 <v t="ekr.20060506070443.1"><vh>@thin detect_urls.py</vh></v>
 <v t="edream.110203113231.753"><vh>@thin image.py</vh></v>
@@ -364,7 +364,7 @@
 <v t="edream.110203113231.873"><vh>@thin at_folder.py</vh></v>
 <v t="ekr.20040915085351"><vh>@thin at_produce.py</vh></v>
 <v t="ktenney.20041211072654.1"><vh>@thin at_view.py</vh></v>
-<v t="tbrown.20091029123555.5319" descendentVnodeUnknownAttributes="7d71005803000000302e3571017d710258040000007465737471037d710458050000005f6564697471057d7106580400000074686973710758120000006f6b20686f77206120626f757420746869737108737373732e"><vh>@thin attrib_edit.py</vh></v>
+<v t="tbrown.20091029123555.5319" descendentVnodeUnknownAttributes="7d71005503302e3571017d710258040000007465737471037d710458050000005f6564697471057d7106580400000074686973710758120000006f6b20686f77206120626f757420746869737108737373732e"><vh>@thin attrib_edit.py</vh></v>
 <v t="mork.20041020082242.1"><vh>@thin base64Packager.py</vh></v>
 <v t="tbrown.20070322113635"><vh>@thin bookmarks.py</vh></v>
 <v t="ekr.20060807103814.1"><vh>@thin datenodes.py</vh></v>
@@ -801,8 +801,7 @@
 </v>
 <v t="ekr.20100103093121.5329"
 marks="vivainio2.20091008133028.5823,vivainio2.20091008140054.14555,ville.20091008210853.7616,ville.20091023181249.5264,vivainio2.20091008133028.5825,ville.20091023181249.5266,"><vh>@thin stickynotes.py</vh></v>
-<v t="ekr.20100103093121.5339"
-marks="vivainio2.20091008133028.5823,vivainio2.20091008140054.14555,ville.20091008210853.7616,ville.20091023181249.5264,vivainio2.20091008133028.5825,ville.20091023181249.5266,"><vh>@thin stickynotes_plus.py</vh></v>
+<v t="ekr.20100103093121.5339"><vh>@thin stickynotes_plus.py</vh></v>
 <v t="ekr.20070119094733.1"><vh>@thin dtest.py</vh></v>
 </v>
 <v t="ekr.20061023142737"><vh>UNL plugin</vh>
@@ -814,7 +813,7 @@
 </v>
 <v t="rogererens.20041013082304"><vh>@thin UNL.py</vh></v>
 </v>
-<v t="ekr.20040915073259"><vh>Windows</vh>
+<v t="ekr.20040915073259" a="E"><vh>Windows</vh>
 <v t="tbrown.20090322083202.1"><vh>NOTE: todo.py is qt verion of cleo.py (which is tk)</vh></v>
 <v t="tbrown.20090119215428.2"><vh>@thin todo.py</vh></v>
 <v t="ekr.20050227071948"><vh> cleo</vh>
@@ -861,7 +860,7 @@
 <v t="pap.20041020001240"><vh>@thin footprints.py</vh></v>
 </v>
 <v t="mork.20041018162155.1"><vh>@thin EditAttributes.py</vh></v>
-<v t="ekr.20040915073259.1"><vh>@thin maximizeNewWindows.py</vh></v>
+<v t="ekr.20040915073259.1" a="E"><vh>@thin maximizeNewWindows.py</vh></v>
 <v t="mork.20041022155742.1"><vh>@thin nodebar.py</vh></v>
 <v t="edream.110203113231.924"><vh>@thin redirect_to_log.py</vh></v>
 <v t="ekr.20040915075530"><vh>@thin UASearch.py</vh></v>
@@ -870,7 +869,8 @@
 <v t="ekr.20060506070443.1"></v>
 <v t="ville.20090310191936.10"><vh>@thin colorize_headlines.py</vh></v>
 <v t="ville.20090314215508.4"><vh>@thin quicksearch.py</vh></v>
-<v t="ville.20091008210853.5241"><vh>@thin stickynotes.py</vh></v>
+<v t="ville.20091008210853.5241"
+marks="vivainio2.20091008133028.5823,vivainio2.20091008140054.14555,ville.20091008210853.7616,ville.20091023181249.5264,vivainio2.20091008133028.5825,ville.20091023181249.5266,"><vh>@thin stickynotes.py</vh></v>
 </v>
 </v>
 </vnodes>
@@ -4496,7 +4496,7 @@
 <t tx="ekr.20041114103913.1">PLEASE define each function or method in a separate node! To make this work,
 just put @others in the root of your plugin as shown. Note that @others may be
 nested, as shown in class myClass.</t>
-<t tx="ekr.20041211035618" str_leo_pos="2"></t>
+<t tx="ekr.20041211035618" str_leo_pos="2,3,1"></t>
 <t tx="ekr.20041231134702"># This is called from plugins_menu plugin.
 
 # It should only be defined if the extension has been registered.