Merge lp:~joehillen/do-plugins/Help into lp:do-plugins

[JoE]

[JoE (joehillen)]

Added my plugin to search Gnome's Help and integrated ManLookUp into it.

Unmerged revisions

675. By JoE on 2009-11-30

Added Help plugin, removed ManLookUp

=== added directory 'Help'
=== added file 'Help/Help.mdp'
--- Help/Help.mdp	1970-01-01 00:00:00 +0000
+++ Help/Help.mdp	2009-11-30 02:30:24 +0000
@@ -0,0 +1,28 @@
+<Project name="Help" fileversion="2.0" language="C#" targetFramework="3.5" ctype="DotNetProject">
+  <Configurations active="Debug">
+    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+      <Output directory="bin/Debug" assembly="Help" />
+      <Build debugmode="True" target="Library" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+    <Configuration name="Release" ctype="DotNetProjectConfiguration">
+      <Output directory="." assembly="Help" />
+      <Build debugmode="False" target="Library" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
+      <EnvironmentVariables />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+  </Configurations>
+  <Contents>
+    <File name="src/Help.cs" subtype="Code" buildaction="Compile" />
+    <File name="Resources/Help.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="Resources/icons/search-help.png" subtype="Code" buildaction="EmbedAsResource" />
+  </Contents>
+  <References>
+    <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  </References>
+</Project>
\ No newline at end of file

=== added file 'Help/Makefile.am'
--- Help/Makefile.am	1970-01-01 00:00:00 +0000
+++ Help/Makefile.am	2009-11-30 02:30:24 +0000
@@ -0,0 +1,17 @@
+include $(top_srcdir)/build.rules.mk
+
+ASSEMBLY=Help
+
+FILES = \
+	src/Help.cs \
+	src/ManPages.cs
+
+RESOURCES = \
+	Resources/Help.addin.xml \
+	Resources/icons/search-help.png \
+	Resources/icons/search-man.png
+
+REFERENCES = \
+	System \
+	$(DO_PLATFORM_LIBS) \
+	$(DO_UNIVERSE_LIBS)

=== added directory 'Help/Resources'
=== added file 'Help/Resources/Help.addin.xml.in'
--- Help/Resources/Help.addin.xml.in	1970-01-01 00:00:00 +0000
+++ Help/Resources/Help.addin.xml.in	2009-11-30 02:30:24 +0000
@@ -0,0 +1,27 @@
+<Addin
+	id="Help"
+	namespace="Do"
+	version="1.2"
+	name="Help"
+	description="Use Gnome Do to find Help."
+	author="Joe Hillenbrand and J. Carlos Navea"
+	category="Community"
+	defaultEnabled="false"
+>
+ 
+	<Runtime>
+		<Import assembly="Help.dll"/>
+	</Runtime>
+	
+	<Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
+	
+	<Dependencies>
+		<Addin id="Universe" version="1.0" />
+	</Dependencies>
+	
+	<Extension path = "/Do/Action">
+		<Action type="Help.HelpAction" />
+		<Action type="Help.ManPagesAction" />
+	</Extension>
+	
+</Addin>

=== added directory 'Help/Resources/icons'
=== added file 'Help/Resources/icons/search-help.png'
Binary files Help/Resources/icons/search-help.png	1970-01-01 00:00:00 +0000 and Help/Resources/icons/search-help.png	2009-11-30 02:30:24 +0000 differ
=== added file 'Help/Resources/icons/search-man.png'
Binary files Help/Resources/icons/search-man.png	1970-01-01 00:00:00 +0000 and Help/Resources/icons/search-man.png	2009-11-30 02:30:24 +0000 differ
=== added directory 'Help/src'
=== added file 'Help/src/Help.cs'
--- Help/src/Help.cs	1970-01-01 00:00:00 +0000
+++ Help/src/Help.cs	2009-11-30 02:30:24 +0000
@@ -0,0 +1,76 @@
+// Help.cs
+// by Joe Hillenbrand <[e-mail]>
+//
+// based on ManLookUp
+// by J. Carlos Navea <[e-mail]>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Linq;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+using Mono.Addins;
+
+using Do.Universe;
+
+namespace Help {
+
+	/// <summary>
+	/// 	HelpAction - use yelp to search for help
+	/// </summary> 
+	public class HelpAction : Act {
+
+		public override string Name {
+			get { return AddinManager.CurrentLocalizer.GetString ("Get Help"); }
+		}
+
+		public override string Description {
+			get { return AddinManager.CurrentLocalizer.GetString ("Search Gnome's Help for an Aplication or Text"); }
+		}
+
+		public override string Icon { 
+			get { return "search-help.png@" + GetType ().Assembly.FullName; }
+		}
+
+		public override IEnumerable<Type> SupportedItemTypes {
+			get {
+				yield return typeof (ITextItem);
+				yield return typeof (IRunnableItem);
+			}
+		}
+		
+		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems) 
+		{
+			string keyword = "";
+			foreach (Item i in items) {
+				if (i is ITextItem){
+					keyword = (i as ITextItem).Text;
+				} else if (i is IRunnableItem) {
+					keyword = (i as IRunnableItem).Name;
+				}
+				if (!string.IsNullOrEmpty (keyword)) {
+					Process term = new Process ();
+					term.StartInfo.FileName = "yelp";
+					term.StartInfo.Arguments = " 'x-yelp-search:"+keyword+"' ";				
+					term.Start ();
+				}					
+			}
+			yield break;
+		}
+	}
+}

=== added file 'Help/src/ManPages.cs'
--- Help/src/ManPages.cs	1970-01-01 00:00:00 +0000
+++ Help/src/ManPages.cs	2009-11-30 02:30:24 +0000
@@ -0,0 +1,74 @@
+// ManPageAction.cs
+// by J. Carlos Navea <[e-mail]>
+//
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+
+using System;
+using System.Linq;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+using Mono.Addins;
+
+using Do.Universe;
+
+namespace Help {
+
+	/// <summary>
+	/// 	ManPagesAction - find a man page using yelp
+	/// </summary>
+	public class ManPagesAction : Act {
+
+		public override string Name {
+			get { return AddinManager.CurrentLocalizer.GetString ("Look up man page"); }
+		}
+
+		public override string Description {
+			get { return AddinManager.CurrentLocalizer.GetString ("Find a manual for this..."); }
+		}
+
+		public override string Icon { 
+			get { return "search-man.png@" + GetType ().Assembly.FullName; }
+		}
+
+		/// <value>
+		/// 	Supported items: ITextItem and IRunnableItem
+		/// </value>
+		public override IEnumerable<Type> SupportedItemTypes {
+			get {
+				yield return typeof (ITextItem);
+			}
+		}
+		
+		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems) 
+		{
+			string keyword = "";
+			foreach (Item i in items) {
+				if (i is ITextItem) {
+					keyword = (i as ITextItem).Text;
+				} 
+				if (!string.IsNullOrEmpty (keyword)) {
+					Process term = new Process ();
+					term.StartInfo.FileName = "yelp";
+					term.StartInfo.Arguments = " 'man:"+keyword+"' ";				
+					term.Start ();
+				}					
+			}
+			yield break;
+		}
+	}
+}

=== modified file 'Makefile.am'
--- Makefile.am	2009-11-08 23:58:01 +0000
+++ Makefile.am	2009-11-30 02:30:24 +0000
@@ -36,11 +36,11 @@
 	GoogleDocs \
 	GoogleMaps \
 	GoogleSearch \
+	Help \
 	ImageShack \
 	JIRA \
 	Launchpad \
 	LocateFiles \
-	ManLookUp \
 	Microblogging \
 	MPD \
 	NX \

=== removed directory 'ManLookUp'
=== removed file 'ManLookUp/Makefile.am'
--- ManLookUp/Makefile.am	2009-06-22 04:05:16 +0000
+++ ManLookUp/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-include $(top_srcdir)/build.rules.mk
-
-ASSEMBLY=ManLookUp
-
-FILES = \
-	src/ReadManualPageAction.cs
-
-RESOURCES = \
-	Resources/ManLookUp.addin.xml
-
-REFERENCES = \
-	System \
-	System.Core \
-	$(DO_PLATFORM_LIBS) \
-	$(DO_UNIVERSE_LIBS)

=== removed file 'ManLookUp/ManLookUp.mdp'
--- ManLookUp/ManLookUp.mdp	2009-06-29 08:47:41 +0000
+++ ManLookUp/ManLookUp.mdp	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<Project name="ManLookUp" fileversion="2.0" language="C#" Description="Gnome-do plugin" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
-  <Configurations active="Debug">
-    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Debug" assemblyKeyFile="." assembly="ManLookUp" />
-      <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
-      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-    <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="ManLookUp" />
-      <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
-      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-  </Configurations>
-  <Contents>
-    <File name="src" subtype="Directory" buildaction="Compile" />
-    <File name="src/ReadManualPageAction.cs" subtype="Code" buildaction="Compile" />
-    <File name="Resources/ManLookUp.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
-  </Contents>
-  <References>
-    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
-    <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
-  </References>
-</Project>
\ No newline at end of file

=== removed directory 'ManLookUp/Resources'
=== removed file 'ManLookUp/Resources/ManLookUp.addin.xml.in'
--- ManLookUp/Resources/ManLookUp.addin.xml.in	2009-06-22 21:50:13 +0000
+++ ManLookUp/Resources/ManLookUp.addin.xml.in	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<Addin
-	id="ManPages"
-	namespace="Do"
-	version="1.2"
-	name="Read Manual Pages (man)"
-	description="Search and view manual pages."
-	author="J. Carlos Navea"
-	category="Community"
-	defaultEnabled="false"
->
- 
-	<Runtime>
-		<Import assembly="ManLookUp.dll"/>
-	</Runtime>
-
-	<Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
-	
-	<Dependencies>
-		<Addin id="Universe" version="1.0" />
-	</Dependencies>
-	
-	<Extension path = "/Do/Action">
-		<Action type="ManPages.ReadManualPageAction" />
-	</Extension>
-
-</Addin>

=== removed directory 'ManLookUp/src'
=== removed file 'ManLookUp/src/ReadManualPageAction.cs'
--- ManLookUp/src/ReadManualPageAction.cs	2009-06-22 04:05:16 +0000
+++ ManLookUp/src/ReadManualPageAction.cs	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-// ReadManualPageAction.cs
-//
-// J. Carlos Navea <[e-mail]>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-
-using System;
-using System.Linq;
-using System.Diagnostics;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-using Mono.Addins;
-
-using Do.Universe;
-
-namespace ManPages {
-
-	/// <summary>
-	/// 	ReadManualPageAction - the main action for our plugin. 
-	///		Allows us to hook up to Gnome-Do as a command
-	///		that can be applied to raw text or our own man page items. 
-	/// </summary>
-	public class ReadManualPageAction : Act {
-
-		/// <value>
-		/// 	The name of the action
-		/// </value>
-		public override string Name {
-			get { return AddinManager.CurrentLocalizer.GetString ("Read manual page (man)"); }
-		}
-
-		/// <value>
-		/// 	Action's description
-		/// </value>
-		public override string Description {
-			get { return AddinManager.CurrentLocalizer.GetString ("Look up and read a manual page."); }
-		}
-
-		/// <value>
-		/// 	The pretty icon
-		/// </value>	
-		public override string Icon { 
-			get { return "applications-office"; }
-		}
-
-		/// <value>
-		/// 	List of supported items (ITextItem)
-		/// </value>
-		public override IEnumerable<Type> SupportedItemTypes {
-			get {
-				yield return typeof (ITextItem);
-			}
-		}
-
-		/// <summary>
-		/// 	Called by Gnome-Do in order to perform our action.
-		/// </summary>
-		/// <param name="items">
-		/// List of <see cref="Item"/> objects, either raw text or custom look up items
-		/// </param>
-		/// <param name="modItems">
-		/// List of <see cref="Item"/> objects, action modifiers
-		/// </param>
-		/// <returns>
-		/// List of <see cref="Item"/>
-		/// </returns>
-		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems) 
-		{
-			string keyword;
-			foreach (Item i in items)
-			{
-				keyword = (i as ITextItem).Text;
-				if (!string.IsNullOrEmpty (keyword)) {
-					Process term = new Process ();
-					term.StartInfo.FileName = "yelp";
-					term.StartInfo.Arguments = " 'man:"+keyword+"' ";				
-					term.Start ();
-				}
-			}
-			yield break;
-		}
-	}
-}

=== modified file 'configure.ac'
--- configure.ac	2009-11-08 23:58:01 +0000
+++ configure.ac	2009-11-30 02:30:24 +0000
@@ -304,6 +304,8 @@
 GoogleMaps/Resources/GoogleMaps.addin.xml
 GoogleSearch/Makefile
 GoogleSearch/Resources/GoogleSearch.addin.xml
+Help/Makefile
+Help/Resources/Help.addin.xml
 ImageShack/Makefile
 ImageShack/Resources/ImageShack.addin.xml
 JIRA/Makefile
@@ -312,8 +314,6 @@
 Launchpad/Resources/Launchpad.addin.xml
 LocateFiles/Makefile
 LocateFiles/Resources/LocateFiles.addin.xml
-ManLookUp/Makefile
-ManLookUp/Resources/ManLookUp.addin.xml
 Microblogging/Makefile
 Microblogging/Resources/Microblogging.addin.xml
 MPD/Makefile