Hello community,
here is the log from the commit of package tomboy
checked in at Wed Aug 16 01:44:52 CEST 2006.
--------
--- GNOME/tomboy/tomboy.changes 2006-08-12 00:15:56.000000000 +0200
+++ tomboy/tomboy.changes 2006-08-16 00:31:20.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Aug 15 20:40:55 CEST 2006 - btimothy@suse.de
+
+- Fix for BNC #177868. Fixes problem of "Export Linked Notes"
+ option from only exporting one level deep. Two new radio buttons
+ are now used underneath the checkbox that allow the user to
+ include notes directly linked in the top-level note, or all notes
+ recursively linked.
+
+-------------------------------------------------------------------
Old:
----
tomboy-html-export-xsl-177290.patch
New:
----
tomboy-html-export-deep.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tomboy.spec ++++++
--- /var/tmp/diff_new_pack.t4VoED/_old 2006-08-16 01:44:43.000000000 +0200
+++ /var/tmp/diff_new_pack.t4VoED/_new 2006-08-16 01:44:43.000000000 +0200
@@ -19,7 +19,7 @@
Autoreqprov: on
Requires: mono
Version: 0.3.3
-Release: 56
+Release: 57
Summary: GNOME Note Taking Application
URL: http://www.beatniksoftware.com/tomboy/
Source: %{name}-%{version}.tar.bz2
@@ -44,7 +44,7 @@
Patch11: tomboy-dnd-crash-176704.patch
Patch12: tomboy-always-handle-args-177298.patch
Patch13: tomboy-i18n.patch
-Patch14: tomboy-html-export-xsl-177290.patch
+Patch14: tomboy-html-export-deep.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mono-core
Requires: dbus-1 dbus-1-x11
@@ -148,6 +148,12 @@
%{prefix}/%_lib/dbus-1.0/services/com.beatniksoftware.Tomboy.service
%changelog -n tomboy
+* Tue Aug 15 2006 - btimothy@suse.de
+- Fix for BNC #177868. Fixes problem of "Export Linked Notes"
+ option from only exporting one level deep. Two new radio buttons
+ are now used underneath the checkbox that allow the user to
+ include notes directly linked in the top-level note, or all notes
+ recursively linked.
* Sat Aug 12 2006 - btimothy@suse.de
- Fix for BNC #177290. Prevents infinite recursion (segfault) when
exporting a note to HTML that contains a link to itself.
++++++ tomboy-html-export-deep.patch ++++++
From: btimothy@suse.de
Fixes two (2) BNC bugs.
Fix for BNC #177290. Prevents infinite recursion when exporting a note
that contains a link to itself.
Fix for BNC #177868. Allows a deep export by following all the links found in
the note "chain/hierarchy." Added a couple radio buttons underneath the
"Include linked notes" checkbox that allows the user to include notes linked
in the top-level note only or all notes recursively.
================================================================================
--- Tomboy/Plugins/ExportToHTML.cs
+++ Tomboy/Plugins/ExportToHTML.cs
@@ -82,7 +82,7 @@
}
writer = new StreamWriter (output_path);
- WriteHTMLForNote (writer, Note, dialog.ExportLinked);
+ WriteHTMLForNote (writer, Note, dialog.ExportLinked, dialog.ExportLinkedDepth);
Uri output_uri = new Uri (output_path);
Gnome.Url.Show (output_uri.AbsoluteUri);
@@ -96,7 +96,8 @@
void WriteHTMLForNote (TextWriter writer,
Note note,
- bool export_linked)
+ bool export_linked,
+ string export_linked_depth)
{
// NOTE: Don't use the XmlDocument version, which strips
// whitespace between elements for some reason. Also,
@@ -105,6 +106,7 @@
XsltArgumentList args = new XsltArgumentList ();
args.AddParam ("export-linked", "", export_linked);
+ args.AddParam ("export-linked-depth", "", export_linked_depth);
args.AddParam ("root-note", "", note.Title);
if ((bool) Preferences.Get (Preferences.ENABLE_CUSTOM_FONT)) {
@@ -160,6 +162,8 @@
class ExportToHTMLDialog : Gtk.Dialog
{
Gtk.CheckButton export_linked;
+ Gtk.RadioButton export_one_level;
+ Gtk.RadioButton export_all_levels;
public ExportToHTMLDialog (string default_file) :
base (gtk_file_chooser_dialog_new (Catalog.GetString ("Destination for HTML Export"),
@@ -174,8 +178,19 @@
Response += OnResponseCb;
- export_linked = new Gtk.CheckButton (Catalog.GetString ("Export linked notes"));
- gtk_file_chooser_set_extra_widget (this.Handle, export_linked.Handle);
+ Gtk.Table table = new Gtk.Table (3, 2, false);
+
+ export_linked = new Gtk.CheckButton (Catalog.GetString ("Include linked notes"));
+ export_linked.Toggled += OnExportLinkedToggled;
+ table.Attach (export_linked, 0, 2, 0, 1, Gtk.AttachOptions.Fill, 0, 0, 0);
+
+ export_one_level = new Gtk.RadioButton (Catalog.GetString ("mentioned in this note"));
+ table.Attach (export_one_level, 1, 2, 1, 2, Gtk.AttachOptions.Expand | Gtk.AttachOptions.Fill, 0, 20, 0);
+
+ export_all_levels = new Gtk.RadioButton (export_one_level, Catalog.GetString ("mentioned in this and all linked notes"));
+ table.Attach (export_all_levels, 1, 2, 2, 3, Gtk.AttachOptions.Expand | Gtk.AttachOptions.Fill, 0, 20, 0);
+
+ gtk_file_chooser_set_extra_widget (this.Handle, table.Handle);
gtk_file_chooser_set_do_overwrite_confirmation (this.Handle, true);
gtk_file_chooser_set_local_only (this.Handle, true);
@@ -190,6 +205,25 @@
set { export_linked.Active = value; }
}
+ // Returns "one", or "all"
+ public string ExportLinkedDepth
+ {
+ get
+ {
+ if (export_one_level.Active)
+ return "one";
+ else
+ return "all";
+ }
+ set
+ {
+ if (value != null && value.Equals ("all"))
+ export_all_levels.Active = true;
+ else
+ export_one_level.Active = true;
+ }
+ }
+
public string Filename {
get { return gtk_file_chooser_get_filename (this.Handle); }
}
@@ -210,6 +244,17 @@
gtk_file_chooser_set_current_name (this.Handle, default_file);
ExportLinked = (bool) Preferences.Get (Preferences.EXPORTHTML_EXPORT_LINKED);
+ if (!ExportLinked)
+ {
+ export_one_level.Sensitive = false;
+ export_all_levels.Sensitive = false;
+ }
+
+ string export_linked_depth = (string) Preferences.Get (Preferences.EXPORTHTML_EXPORT_LINKED_DEPTH);
+ if (export_linked_depth.Equals ("all"))
+ export_all_levels.Active = true;
+ else
+ export_one_level.Active = true;
}
protected void SavePreferences ()
@@ -218,6 +263,24 @@
Preferences.Set (Preferences.EXPORTHTML_LAST_DIRECTORY, dir);
Preferences.Set (Preferences.EXPORTHTML_EXPORT_LINKED, ExportLinked);
+ if (export_all_levels.Active)
+ Preferences.Set (Preferences.EXPORTHTML_EXPORT_LINKED_DEPTH, "all");
+ else
+ Preferences.Set (Preferences.EXPORTHTML_EXPORT_LINKED_DEPTH, "one");
+ }
+
+ protected void OnExportLinkedToggled (object sender, EventArgs args)
+ {
+ if (export_linked.Active)
+ {
+ export_one_level.Sensitive = true;
+ export_all_levels.Sensitive = true;
+ }
+ else
+ {
+ export_one_level.Sensitive = false;
+ export_all_levels.Sensitive = false;
+ }
}
--- Tomboy/Plugins/ExportToHTML.xsl
+++ Tomboy/Plugins/ExportToHTML.xsl
@@ -10,6 +10,7 @@