Merge lp:~psgenfan/do-plugins/TomboyInsertText into lp:do-plugins

[Marcus]

I have yet to trace a crash to the changes made. I feel the date settings should be changed, possibly to just a text box, and a link which documents the formatting.

Unmerged revisions

681. By Marcus <marcus@marcus-desktop> on 2010-03-27

first

=== modified file 'AptURL/AptURL.mdp'
--- AptURL/AptURL.mdp	2009-06-23 00:52:54 +0000
+++ AptURL/AptURL.mdp	2010-04-04 13:44:19 +0000
@@ -1,23 +1,23 @@
-<Project name="AptURL" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
+<Project name="AptURL" fileversion="2.0" DefaultNamespace="AptURL" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="AptURL" />
       <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution consolepause="False" runwithwarnings="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="AptURL" />
       <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution consolepause="False" runwithwarnings="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="." subtype="Directory" buildaction="Compile" />
-    <File name="src" subtype="Directory" buildaction="Compile" />
-    <File name="src/AptUrl.cs" subtype="Code" buildaction="Compile" />
-    <File name="Resources/AptURL.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
+    <File subtype="Directory" buildaction="Compile" name="." />
+    <File subtype="Directory" buildaction="Compile" name="src" />
+    <File subtype="Code" buildaction="Compile" name="src/AptUrl.cs" />
+    <File subtype="Code" buildaction="EmbedAsResource" name="Resources/AptURL.addin.xml.in" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 
=== modified file 'DiskMounter/DiskMounter.mdp'
--- DiskMounter/DiskMounter.mdp	2009-06-29 08:47:41 +0000
+++ DiskMounter/DiskMounter.mdp	2010-04-04 13:44:19 +0000
@@ -1,30 +1,31 @@
-<Project name="DiskMounter" fileversion="2.0" language="C#" DefaultNamespace="DiskMounter" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
+<Project name="DiskMounter" fileversion="2.0" DefaultNamespace="DiskMounter" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="DiskMounter" />
       <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution consolepause="False" runwithwarnings="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="DiskMounter" />
       <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution consolepause="False" runwithwarnings="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/DriveItem.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/DriveItemSource.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/MountAction.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/OpenVolumeAction.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/UnmountAction.cs" subtype="Code" buildaction="Compile" />
-    <File name="Resources/DiskMounter.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
+    <File subtype="Directory" buildaction="Compile" name="src" />
+    <File subtype="Code" buildaction="Compile" name="src/DriveItem.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/DriveItemSource.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/MountAction.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/OpenVolumeAction.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/UnmountAction.cs" />
+    <File subtype="Directory" buildaction="Compile" name="Resources" />
+    <File subtype="Code" buildaction="EmbedAsResource" name="Resources/DiskMounter.addin.xml.in" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" specificVersion="False" refto="gnome-vfs-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <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" />
 
=== modified file 'Flickr/gtk-gui/gui.stetic'
--- Flickr/gtk-gui/gui.stetic	2009-06-23 00:52:54 +0000
+++ Flickr/gtk-gui/gui.stetic	2010-04-04 13:44:19 +0000
@@ -2,9 +2,10 @@
 <stetic-interface>
   <configuration>
     <images-root-path>..</images-root-path>
-    <target-gtk-version>2.12.8</target-gtk-version>
+    <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
+    <widget-library name="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
     <widget-library name="../bin/Debug/Flickr.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="Flickr.AccountConfig" design-size="401 347">
@@ -127,7 +128,7 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="Flickr.UploadConfig" design-size="346 354">
+  <widget class="Gtk.Bin" id="Flickr.UploadConfig" design-size="351 354">
     <property name="MemberName" />
     <child>
       <widget class="Gtk.VBox" id="vbox3">
@@ -157,7 +158,6 @@
                             <property name="MemberName" />
                             <property name="CanFocus">True</property>
                             <property name="Label" translatable="yes">Private</property>
-                            <property name="Active">True</property>
                             <property name="DrawIndicator">True</property>
                             <property name="HasLabel">True</property>
                             <property name="UseUnderline">True</property>
 
=== added file 'Tomboy/Resources/Tomboy.addin.xml'
--- Tomboy/Resources/Tomboy.addin.xml	1970-01-01 00:00:00 +0000
+++ Tomboy/Resources/Tomboy.addin.xml	2010-04-04 13:44:19 +0000
@@ -0,0 +1,32 @@
+<Addin
+	id="Tomboy"
+	namespace="Do"
+	version="1.4"
+	name="Tomboy"
+	description="Search and create new Tomboy notes."
+	author="Rick Harding, Chris Szikszoy"
+	category="Official"
+	defaultEnabled="false"
+    url="http://do.davebsd.com/wiki/Tomboy_Plugin"
+	>
+
+	<Runtime>
+		<Import assembly="Tomboy.dll"/>
+	</Runtime>
+
+	<Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
+
+	<Dependencies>
+		<Addin id="Universe" version="1.0" />
+	</Dependencies>
+
+	<Extension path="/Do/ItemSource">
+		<ItemSource type="Tomboy.NotesItemSource" />
+	</Extension>
+	<Extension path="/Do/Action">
+		<Action type="Tomboy.NewNoteAction" />
+		<Action type="Tomboy.SearchNotesAction" />
+		<Action type="Tomboy.AppendNoteAction" />
+		<Action type="Tomboy.GetNoteTextAction" />
+	</Extension>
+</Addin>
 
=== removed file 'Tomboy/Resources/Tomboy.addin.xml.in'
--- Tomboy/Resources/Tomboy.addin.xml.in	2009-06-26 15:25:17 +0000
+++ Tomboy/Resources/Tomboy.addin.xml.in	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-<Addin
-	id="Tomboy"
-	namespace="Do"
-	version="1.4"
-	name="Tomboy"
-	description="Search and create new Tomboy notes."
-	author="Rick Harding, Chris Szikszoy"
-	category="Official"
-	defaultEnabled="false"
-    url="http://do.davebsd.com/wiki/Tomboy_Plugin"
-	>
-
-	<Runtime>
-		<Import assembly="Tomboy.dll"/>
-	</Runtime>
-
-	<Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
-
-	<Dependencies>
-		<Addin id="Universe" version="1.0" />
-	</Dependencies>
-
-	<Extension path="/Do/ItemSource">
-		<ItemSource type="Tomboy.NotesItemSource" />
-	</Extension>
-	<Extension path="/Do/Action">
-		<Action type="Tomboy.NewNoteAction" />
-		<Action type="Tomboy.SearchNotesAction" />
-	</Extension>
-</Addin>
 
=== modified file 'Tomboy/Tomboy.mdp'
--- Tomboy/Tomboy.mdp	2009-06-23 00:52:54 +0000
+++ Tomboy/Tomboy.mdp	2010-04-04 13:44:19 +0000
@@ -1,32 +1,34 @@
-<Project name="Tomboy" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
+<Project name="Tomboy" fileversion="2.0" DefaultNamespace="Tomboy" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="Tomboy" />
       <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" />
+      <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Release" assembly="Tomboy" />
       <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" />
+      <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
   <Contents>
-    <File name="src" subtype="Directory" buildaction="Compile" />
-    <File name="src/TomboyDBus.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/TomboyItem.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/NewNoteAction.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/NotesItemSource.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/SearchNotesAction.cs" subtype="Code" buildaction="Compile" />
-    <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/TomboyConfiguration.cs" subtype="Code" buildaction="Compile" />
-    <File name="gtk-gui/Tomboy.TomboyConfiguration.cs" subtype="Code" buildaction="Compile" />
-    <File name="gtk-gui/objects.xml" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="Resources/Tomboy.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="src/TomboyBrowseNotesItem.cs" subtype="Code" buildaction="Compile" />
+    <File subtype="Directory" buildaction="Compile" name="src" />
+    <File subtype="Code" buildaction="Compile" name="src/TomboyDBus.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/TomboyItem.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/NewNoteAction.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/NotesItemSource.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/SearchNotesAction.cs" />
+    <File subtype="Code" buildaction="EmbedAsResource" name="gtk-gui/gui.stetic" />
+    <File subtype="Code" buildaction="Compile" name="gtk-gui/generated.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/TomboyConfiguration.cs" />
+    <File subtype="Code" buildaction="Compile" name="gtk-gui/Tomboy.TomboyConfiguration.cs" />
+    <File subtype="Code" buildaction="EmbedAsResource" name="gtk-gui/objects.xml" />
+    <File subtype="Code" buildaction="Compile" name="src/TomboyBrowseNotesItem.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/AppendNoteAction.cs" />
+    <File subtype="Code" buildaction="EmbedAsResource" name="Resources/Tomboy.addin.xml" />
+    <File subtype="Code" buildaction="Compile" name="src/GetContentsAction.cs" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
 
=== modified file 'Tomboy/gtk-gui/Tomboy.TomboyConfiguration.cs'
--- Tomboy/gtk-gui/Tomboy.TomboyConfiguration.cs	2009-06-23 00:52:54 +0000
+++ Tomboy/gtk-gui/Tomboy.TomboyConfiguration.cs	2010-04-04 13:44:19 +0000
@@ -35,7 +35,23 @@
         
         private Gtk.RadioButton titleFirstRadioButton;
         
-        private Gtk.Label GtkLabel2;
+        private Gtk.Label GtkLabel4;
+        
+        private Gtk.Frame frame3;
+        
+        private Gtk.Alignment GtkAlignment2;
+        
+        private Gtk.VBox vbox4;
+        
+        private Gtk.CheckButton insertionIncludeTime;
+        
+        private Gtk.ComboBox InsertionDateFormat;
+        
+        private Gtk.RadioButton insertionPrepend;
+        
+        private Gtk.RadioButton insertionAppend;
+        
+        private Gtk.Label GtkLabel9;
         
         protected virtual void Build() {
             Stetic.Gui.Initialize(this);
@@ -44,7 +60,6 @@
             this.Name = "Tomboy.TomboyConfiguration";
             // Container child Tomboy.TomboyConfiguration.Gtk.Container+ContainerChild
             this.vbox1 = new Gtk.VBox();
-            this.vbox1.Name = "vbox1";
             this.vbox1.Spacing = 6;
             // Container child vbox1.Gtk.Box+BoxChild
             this.frame1 = new Gtk.Frame();
@@ -101,7 +116,6 @@
             this.contentFirstRadioButton = new Gtk.RadioButton(Mono.Addins.AddinManager.CurrentLocalizer.GetString("First pane is content, second pane is title."));
             this.contentFirstRadioButton.CanFocus = true;
             this.contentFirstRadioButton.Name = "contentFirstRadioButton";
-            this.contentFirstRadioButton.Active = true;
             this.contentFirstRadioButton.DrawIndicator = true;
             this.contentFirstRadioButton.UseUnderline = true;
             this.contentFirstRadioButton.Group = new GLib.SList(System.IntPtr.Zero);
@@ -124,16 +138,97 @@
             w6.Fill = false;
             this.GtkAlignment1.Add(this.vbox3);
             this.frame2.Add(this.GtkAlignment1);
-            this.GtkLabel2 = new Gtk.Label();
-            this.GtkLabel2.Name = "GtkLabel2";
-            this.GtkLabel2.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("<b>New Note Title and Content Entry</b>");
-            this.GtkLabel2.UseMarkup = true;
-            this.frame2.LabelWidget = this.GtkLabel2;
+            this.GtkLabel4 = new Gtk.Label();
+            this.GtkLabel4.Name = "GtkLabel4";
+            this.GtkLabel4.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("<b>New Note Title and Content Entry</b>");
+            this.GtkLabel4.UseMarkup = true;
+            this.frame2.LabelWidget = this.GtkLabel4;
             this.vbox1.Add(this.frame2);
             Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.frame2]));
             w9.Position = 1;
             w9.Expand = false;
             w9.Fill = false;
+            // Container child vbox1.Gtk.Box+BoxChild
+            this.frame3 = new Gtk.Frame();
+            this.frame3.Name = "frame3";
+            this.frame3.ShadowType = ((Gtk.ShadowType)(0));
+            this.frame3.BorderWidth = ((uint)(1));
+            // Container child frame3.Gtk.Container+ContainerChild
+            this.GtkAlignment2 = new Gtk.Alignment(0F, 0F, 1F, 1F);
+            this.GtkAlignment2.Name = "GtkAlignment2";
+            this.GtkAlignment2.LeftPadding = ((uint)(12));
+            // Container child GtkAlignment2.Gtk.Container+ContainerChild
+            this.vbox4 = new Gtk.VBox();
+            this.vbox4.Name = "vbox4";
+            this.vbox4.Spacing = 6;
+            // Container child vbox4.Gtk.Box+BoxChild
+            this.insertionIncludeTime = new Gtk.CheckButton();
+            this.insertionIncludeTime.CanFocus = true;
+            this.insertionIncludeTime.Name = "insertionIncludeTime";
+            this.insertionIncludeTime.Label = Mono.Addins.AddinManager.CurrentLocalizer.GetString("Include Date and Time");
+            this.insertionIncludeTime.DrawIndicator = true;
+            this.insertionIncludeTime.UseUnderline = true;
+            this.vbox4.Add(this.insertionIncludeTime);
+            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox4[this.insertionIncludeTime]));
+            w10.Position = 0;
+            w10.Expand = false;
+            w10.Fill = false;
+            // Container child vbox4.Gtk.Box+BoxChild
+            this.InsertionDateFormat = Gtk.ComboBox.NewText();
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Year/Month/Day 24Hours:Minutes"));
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Year/Month/Day Hours:Minutes am/pm"));
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Year/Month/Day"));
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Month/Day/Year 24Hours:Minutes"));
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Month/Day/Year Hours:Minutes am/pm"));
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Month/Day/Year"));
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Month/Day 24Hours:Minutes"));
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Month/Day  Hours:Minutes am/pm\""));
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Month/Day"));
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("24Hours:Minutes"));
+            this.InsertionDateFormat.AppendText(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Hours:Minutes am/pm"));
+            this.InsertionDateFormat.Name = "InsertionDateFormat";
+            this.InsertionDateFormat.Active = 0;
+            this.vbox4.Add(this.InsertionDateFormat);
+            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox4[this.InsertionDateFormat]));
+            w11.Position = 1;
+            w11.Expand = false;
+            w11.Fill = false;
+            // Container child vbox4.Gtk.Box+BoxChild
+            this.insertionPrepend = new Gtk.RadioButton(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Prepend to Top of Note"));
+            this.insertionPrepend.CanFocus = true;
+            this.insertionPrepend.Name = "insertionPrepend";
+            this.insertionPrepend.DrawIndicator = true;
+            this.insertionPrepend.UseUnderline = true;
+            this.insertionPrepend.Group = new GLib.SList(System.IntPtr.Zero);
+            this.vbox4.Add(this.insertionPrepend);
+            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox4[this.insertionPrepend]));
+            w12.Position = 2;
+            w12.Expand = false;
+            w12.Fill = false;
+            // Container child vbox4.Gtk.Box+BoxChild
+            this.insertionAppend = new Gtk.RadioButton(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Append to Bottom of Note"));
+            this.insertionAppend.CanFocus = true;
+            this.insertionAppend.Name = "insertionAppend";
+            this.insertionAppend.DrawIndicator = true;
+            this.insertionAppend.UseUnderline = true;
+            this.insertionAppend.Group = this.insertionPrepend.Group;
+            this.vbox4.Add(this.insertionAppend);
+            Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.vbox4[this.insertionAppend]));
+            w13.Position = 3;
+            w13.Expand = false;
+            w13.Fill = false;
+            this.GtkAlignment2.Add(this.vbox4);
+            this.frame3.Add(this.GtkAlignment2);
+            this.GtkLabel9 = new Gtk.Label();
+            this.GtkLabel9.Name = "GtkLabel9";
+            this.GtkLabel9.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("<b>Note Insertion</b>");
+            this.GtkLabel9.UseMarkup = true;
+            this.frame3.LabelWidget = this.GtkLabel9;
+            this.vbox1.Add(this.frame3);
+            Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox1[this.frame3]));
+            w16.Position = 2;
+            w16.Expand = false;
+            w16.Fill = false;
             this.Add(this.vbox1);
             if ((this.Child != null)) {
                 this.Child.ShowAll();
 
=== modified file 'Tomboy/gtk-gui/gui.stetic'
--- Tomboy/gtk-gui/gui.stetic	2009-06-23 00:52:54 +0000
+++ Tomboy/gtk-gui/gui.stetic	2010-04-04 13:44:19 +0000
@@ -2,12 +2,13 @@
 <stetic-interface>
   <configuration>
     <images-root-path>..</images-root-path>
-    <target-gtk-version>2.12.8</target-gtk-version>
+    <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
+    <widget-library name="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
     <widget-library name="../bin/Debug/Tomboy.dll" internal="true" />
   </import>
-  <widget class="Gtk.Bin" id="Tomboy.TomboyConfiguration" design-size="413 300">
+  <widget class="Gtk.Bin" id="Tomboy.TomboyConfiguration" design-size="413 304">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>
@@ -88,6 +89,7 @@
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
                         <property name="Label" translatable="yes">First pane is content, second pane is title.</property>
+                        <property name="Active">True</property>
                         <property name="DrawIndicator">True</property>
                         <property name="HasLabel">True</property>
                         <property name="UseUnderline">True</property>
@@ -122,7 +124,7 @@
               </widget>
             </child>
             <child>
-              <widget class="Gtk.Label" id="GtkLabel2">
+              <widget class="Gtk.Label" id="GtkLabel4">
                 <property name="MemberName" />
                 <property name="LabelProp" translatable="yes">&lt;b&gt;New Note Title and Content Entry&lt;/b&gt;</property>
                 <property name="UseMarkup">True</property>
@@ -139,6 +141,118 @@
             <property name="Fill">False</property>
           </packing>
         </child>
+        <child>
+          <widget class="Gtk.Frame" id="frame3">
+            <property name="MemberName" />
+            <property name="ShadowType">None</property>
+            <property name="BorderWidth">1</property>
+            <child>
+              <widget class="Gtk.Alignment" id="GtkAlignment2">
+                <property name="MemberName" />
+                <property name="Xalign">0</property>
+                <property name="Yalign">0</property>
+                <property name="LeftPadding">12</property>
+                <child>
+                  <widget class="Gtk.VBox" id="vbox4">
+                    <property name="MemberName">append</property>
+                    <property name="Spacing">6</property>
+                    <child>
+                      <widget class="Gtk.CheckButton" id="insertionIncludeTime">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="Label" translatable="yes">Include Date and Time</property>
+                        <property name="DrawIndicator">True</property>
+                        <property name="HasLabel">True</property>
+                        <property name="UseUnderline">True</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.ComboBox" id="InsertionDateFormat">
+                        <property name="MemberName" />
+                        <property name="IsTextCombo">True</property>
+                        <property name="Items" translatable="yes">Year/Month/Day 24Hours:Minutes
+Year/Month/Day Hours:Minutes am/pm
+Year/Month/Day
+Month/Day/Year 24Hours:Minutes
+Month/Day/Year Hours:Minutes am/pm
+Month/Day/Year
+Month/Day 24Hours:Minutes
+Month/Day  Hours:Minutes am/pm"
+Month/Day
+24Hours:Minutes
+Hours:Minutes am/pm</property>
+                        <property name="Active">0</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.RadioButton" id="insertionPrepend">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="Label" translatable="yes">Prepend to Top of Note</property>
+                        <property name="Active">True</property>
+                        <property name="DrawIndicator">True</property>
+                        <property name="HasLabel">True</property>
+                        <property name="UseUnderline">True</property>
+                        <property name="Group">append</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">2</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.RadioButton" id="insertionAppend">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="Label" translatable="yes">Append to Bottom of Note</property>
+                        <property name="DrawIndicator">True</property>
+                        <property name="HasLabel">True</property>
+                        <property name="UseUnderline">True</property>
+                        <property name="Group">append</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">3</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="Gtk.Label" id="GtkLabel9">
+                <property name="MemberName" />
+                <property name="LabelProp" translatable="yes">&lt;b&gt;Note Insertion&lt;/b&gt;</property>
+                <property name="UseMarkup">True</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">2</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
       </widget>
     </child>
   </widget>
 
=== added file 'Tomboy/src/AppendNoteAction.cs'
--- Tomboy/src/AppendNoteAction.cs	1970-01-01 00:00:00 +0000
+++ Tomboy/src/AppendNoteAction.cs	2010-04-04 13:44:19 +0000
@@ -0,0 +1,86 @@
+//  AppendNoteAction.cs
+//
+//  GNOME Do is the legal property of its developers, whose names are too
+//  numerous to list here.  Please refer to the COPYRIGHT file distributed with
+//  this source distribution.
+//
+//  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/>.
+//  Authors 
+//		Marcus Walz [e-mail]
+//
+
+using System;
+using System.Linq;
+using System.Diagnostics;
+using System.Collections.Generic;
+
+using Mono.Addins;
+
+using Do.Universe;
+using Do.Platform.Linux;
+
+namespace Tomboy
+{	
+
+	public class AppendNoteAction : Act
+	{
+		public override string Name {
+			get { return AddinManager.CurrentLocalizer.GetString ("Add to Note"); }
+		}
+
+		public override string Description {
+			get { return AddinManager.CurrentLocalizer.GetString ("Insert text to the beginning or end of a tomboy note."); }
+		}
+		
+		public override string Icon {
+			get { return "list-add"; }
+		}
+		
+		public override IEnumerable<Type> SupportedItemTypes {
+			get { yield return typeof (NoteItem); }
+		}
+	
+		public override IEnumerable<Type> SupportedModifierItemTypes {
+			get { yield return typeof (ITextItem); }
+		}
+		
+		public override bool ModifierItemsOptional {
+			get { return false; }
+		}
+		
+		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
+		{
+			//ITextItem mainItem = items.First () as ITextItem;
+			foreach (NoteItem note in items)
+			{
+				//NoteItem note = items.First() as NoteItem;
+				ITextItem modItem = null;
+				if (modItems.Any ()) {
+					modItem = modItems.First () as ITextItem;
+					if(!string.IsNullOrEmpty(modItem.Text))
+					{
+						TomboyDBus tb = new TomboyDBus ();
+						tb.AppendNote(note.Name, modItem.Text);
+					}
+				}
+			}
+			yield break;
+		}
+		
+//		public Gtk.Bin GetConfiguration ()
+//		{
+//			return new TomboyConfiguration ();
+//		}
+	}
+}
 \ No newline at end of file
 
=== added file 'Tomboy/src/GetContentsAction.cs'
--- Tomboy/src/GetContentsAction.cs	1970-01-01 00:00:00 +0000
+++ Tomboy/src/GetContentsAction.cs	2010-04-04 13:44:19 +0000
@@ -0,0 +1,65 @@
+
+//  AppendNoteAction.cs
+//
+//  GNOME Do is the legal property of its developers, whose names are too
+//  numerous to list here.  Please refer to the COPYRIGHT file distributed with
+//  this source distribution.
+//
+//  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/>.
+//  Authors 
+//		Marcus Walz [e-mail]
+//
+
+using System;
+using System.Linq;
+using System.Diagnostics;
+using System.Collections.Generic;
+
+using Mono.Addins;
+
+using Do.Universe;
+using Do.Platform.Linux;
+using Do.Universe.Common;
+
+namespace Tomboy
+{	
+
+	public class GetNoteTextAction : Act
+	{
+		public override string Name {
+			get { return AddinManager.CurrentLocalizer.GetString ("Get Note's Text"); }
+		}
+
+		public override string Description {
+			get { return AddinManager.CurrentLocalizer.GetString ("Returns the selected Tomboy Note's Text."); }
+		}
+		
+		public override string Icon {
+			get { return "text-editor"; }
+		}
+		
+		public override IEnumerable<Type> SupportedItemTypes {
+			get { yield return typeof (NoteItem); }
+		}
+	
+		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
+		{
+			//ITextItem mainItem = items.First () as ITextItem;
+			NoteItem note = items.First() as NoteItem;
+			TomboyDBus tb = new TomboyDBus ();
+			yield return new TextItem(tb.GetNoteText(note.Name));
+		}
+	
+	}
+}
 
=== modified file 'Tomboy/src/TomboyConfiguration.cs'
--- Tomboy/src/TomboyConfiguration.cs	2009-01-21 19:21:55 +0000
+++ Tomboy/src/TomboyConfiguration.cs	2010-04-04 13:44:19 +0000
@@ -38,7 +38,9 @@
 	{
 		private const string DeriveTitlePrefKey = "deriveTitle";
 		private const string TitleFirstPrefKey = "titleFirst";
-		
+		private const string InsertionDatePrefKey = "includeDate";
+		private const string PrependPrefKey = "insertPrepand";
+		private const string DateFormatKey = "dateFormat";
 		private static IPreferences prefs;
 		
 		static TomboyConfiguration ()
@@ -56,6 +58,18 @@
 			get { return prefs.Get (TitleFirstPrefKey, false); }
 		}
 		
+		public static bool DateInsertion
+		{
+			get { return prefs.Get (InsertionDatePrefKey, false); }
+		}
+		public static bool PrependInsertion
+		{
+			get {return prefs.Get (PrependPrefKey, false); }	
+		}
+		public static int DateFormat
+		{
+			get {return prefs.Get (DateFormatKey, 0);}
+		}	
 		public TomboyConfiguration()
 		{
 			this.Build();
@@ -64,13 +78,28 @@
 			deriveTitleCheckButton.Active = DeriveTitle;
 			contentFirstRadioButton.Active = !TitleFirst;
 			titleFirstRadioButton.Active = TitleFirst;
-			
+			insertionIncludeTime.Active = DateInsertion;
+			insertionPrepend.Active = PrependInsertion;
+			insertionAppend.Active = !PrependInsertion;
+			InsertionDateFormat.Active = DateFormat;
 			// Set up events.  I had trouble doing this from stetic.
 			deriveTitleCheckButton.Toggled += OnDeriveTitleCheckButtonToggled;
 			contentFirstRadioButton.Toggled += OnContentFirstRadioButtonToggled;
 			titleFirstRadioButton.Toggled += OnContentFirstRadioButtonToggled;
+			insertionIncludeTime.Toggled += OnInsertionIncludeTimeToggled;
+			insertionPrepend.Toggled += OnInsertionPrependToggled;
+			insertionAppend.Toggled += OnInsertionPrependToggled;
+			InsertionDateFormat.Changed += OnDateFormatSelection;
 		}
 
+		protected virtual void OnInsertionIncludeTimeToggled (object Sender, System.EventArgs e)
+		{
+			prefs.Set(InsertionDatePrefKey, insertionIncludeTime.Active);	
+		}
+		protected virtual void OnInsertionPrependToggled (object Sender, System.EventArgs e)
+		{
+			prefs.Set(PrependPrefKey, insertionPrepend.Active);
+		}
 		protected virtual void OnDeriveTitleCheckButtonToggled (object sender, System.EventArgs e)
 		{
 			prefs.Set (DeriveTitlePrefKey, deriveTitleCheckButton.Active);
@@ -80,5 +109,9 @@
 		{
 			prefs.Set (TitleFirstPrefKey, titleFirstRadioButton.Active);
 		}
+		protected virtual void OnDateFormatSelection(object sender, System.EventArgs e)
+		{
+			prefs.Set (DateFormatKey, InsertionDateFormat.Active);	
+		}
 	}
 }
 
=== modified file 'Tomboy/src/TomboyDBus.cs'
--- Tomboy/src/TomboyDBus.cs	2009-01-21 19:21:55 +0000
+++ Tomboy/src/TomboyDBus.cs	2010-04-04 13:44:19 +0000
@@ -42,6 +42,9 @@
 			string[] ListAllNotes ();
 			void DisplaySearchWithText (string search_text);
 			string Version ();
+			string GetNoteContents (string uri);
+			string GetNoteContentsXml (string uri);
+			bool SetNoteContentsXml (string uri, string xml);
 			bool SetNoteContents (string uri, string text_contents);
 			event DBusNoteAddedHandler NoteAdded;
 			event DBusNoteRemovedHandler NoteRemoved;
@@ -52,6 +55,19 @@
 
 	class TomboyDBus	
 	{
+		string[] dateformats = {
+			"yyyy/MM/dd HH:mm",
+			"yyyy/MM/dd hh:mm tt",
+			"yyyy/MM/dd",
+			"MM/dd/yyyy HH:mm",
+			"MM/dd/yyyy hh:mm tt",
+			"MM/dd/yyyy",
+			"MM/dd HH:mm",
+			"MM/dd hh:mm tt",
+			"MM/dd",
+			"HH:mm",
+			"hh:mm tt"};
+		
 #region Constants
 
 		private const string OBJECT_PATH = "/org/gnome/Tomboy/RemoteControl";
@@ -203,6 +219,7 @@
 					i++;
 				}
 			}
+			
 
 			note_title = TomboyInstance.GetNoteTitle (uri);
 			TomboyInstance.DisplayNote (uri);
@@ -211,7 +228,48 @@
 				TomboyInstance.SetNoteContents (uri, note_title + "\n\n" + note_content);
 			return uri;
 		}
-
+		
+		public string GetNoteText(string note_title){
+			EnsureTomboyInstance();
+			string uri = TomboyInstance.FindNote(note_title);
+			try{
+				return TomboyInstance.GetNoteContents(uri);
+			} catch (Exception) {
+				Console.Error.WriteLine ("Could not open the note: {0}", note_title);
+				return "";
+			}
+		}
+		public void AppendNote(string note_title, string text){
+			EnsureTomboyInstance();
+			string uri = TomboyInstance.FindNote(note_title);
+			string note;
+			try{
+				note = TomboyInstance.GetNoteContentsXml(uri);
+			} catch (Exception) {
+				Console.Error.WriteLine ("Could not open the note: {0}", note_title);
+				return;
+			}
+			if(TomboyConfiguration.DateInsertion)
+			{
+				text = "<bold>"+System.DateTime.Now.ToString(dateformats[TomboyConfiguration.DateFormat])+"</bold> " + text;
+			}
+			if(TomboyConfiguration.PrependInsertion)
+			{
+				while(note.Substring(note.IndexOfAny("\n".ToCharArray())+2).StartsWith("\n")) //This Works Somehow
+					note = note.Remove(note.IndexOfAny("\n".ToCharArray())+2, 2); //Removies Trailing Line Breaks
+				note = note.Insert(note.IndexOfAny("\n".ToCharArray())+2, text+"\n\n"); //First Line is note's title so after first break
+			}	
+			else
+			{
+				while(note.Substring(note.LastIndexOf("<")-2).StartsWith("\n")) 
+					note = note.Remove(note.LastIndexOf("<")-2, 2); //This is Magic, Make it Better
+				note = note.Insert(note.LastIndexOf("<"), "\n\n"+text); //insert before last end tag 
+			}
+			Console.Error.WriteLine ("Sending Note: {0}", note);
+			if(!TomboyInstance.SetNoteContentsXml(uri,note))
+				Console.Error.WriteLine("Could not append note: {0}", note_title);
+			
+		}
 		/// <summary>
 		/// Open the Tomboy search window with the search string entered
 		/// </summary>