Tomboy branched for 2.16
Hey, I just branched Tomboy for GNOME 2.16 release. The branch is "gnome-2-16". All new development will happen on HEAD. Thanks, -Alex ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: Request for UI break for Tomboy
This probably doesn't help things any, but what the hell...
So as per Shaun's suggestion of detecting gtkspell at runtime, attached
is a patch to dynamically enable gtkspell and display the related
preference based on the availability of the library. It is more
dangerous than the previous patch, but is probably what will be
committed in the long term after the freeze.
This also makes the docs situation better as we can note that the option
won't be available until users install gtkspell.
-Alex
Vincent Untz wrote:
Le dimanche 03 septembre 2006, à 23:38, Alex Graveley a écrit :
Uhh sure thing, but this means that GNOME 2.16 will have a hard
dependency on gtkspell via Tomboy. Is this alright?
I prefer the hard dependency (even if it's wrong) than some new bug.
Just my opinion, of course :-)
Vincent
Index: ChangeLog
===
RCS file: /cvs/gnome/tomboy/ChangeLog,v
retrieving revision 1.289
diff -u -b -r1.289 ChangeLog
--- ChangeLog 3 Sep 2006 01:05:56 - 1.289
+++ ChangeLog 4 Sep 2006 07:34:14 -
@@ -1,3 +1,16 @@
+2006-09-04 Alex Graveley <[EMAIL PROTECTED]>
+
+ * configure.in: Remove hard gtkspell dependency, as it is now
+ detected at runtime.
+
+ * Tomboy/PluginManager.cs: Catch exceptions thrown during plugin
+ creation, such as the one NoteSpellChecker may throw.
+
+ * Tomboy/Preferences.cs: Show spell check option if
+ NoteSpellChecker.GtkSpellAvailable.
+
+ * Tomboy/Watchers.cs: Detect gtkspell availability at runtime.
+
2006-09-02 Brent Smith <[EMAIL PROTECTED]>
* help/C/figures/tomboy-new-note.png:
Index: configure.in
===
RCS file: /cvs/gnome/tomboy/configure.in,v
retrieving revision 1.98
diff -u -b -r1.98 configure.in
--- configure.in31 Aug 2006 17:41:54 - 1.98
+++ configure.in4 Sep 2006 07:34:14 -
@@ -81,10 +81,9 @@
AC_SUBST(PANELAPPLET_SERVER_DIR)
#
-# Check for GtkSpell here, as we call into it from C#.
+# Check for recent GtkSpell here. Prior versions require bug workarounds.
# http://gtkspell.sourceforge.net/
#
-PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0)
PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.9, FIXED_GTKSPELL="yes",
FIXED_GTKSPELL="no")
AM_CONDITIONAL(FIXED_GTKSPELL, test "$FIXED_GTKSPELL" = "yes")
Index: Tomboy/Watchers.cs
===
RCS file: /cvs/gnome/tomboy/Tomboy/Watchers.cs,v
retrieving revision 1.50
diff -u -b -r1.50 Watchers.cs
--- Tomboy/Watchers.cs 9 Aug 2006 06:17:11 - 1.50
+++ Tomboy/Watchers.cs 4 Sep 2006 07:34:14 -
@@ -190,6 +190,9 @@
{
IntPtr obj_ptr = IntPtr.Zero;
+ static bool gtkspell_available_tested;
+ static bool gtkspell_available_result;
+
[DllImport ("libgtkspell")]
static extern IntPtr gtkspell_new_attach (IntPtr text_view,
string locale,
@@ -197,6 +200,39 @@
[DllImport ("libgtkspell")]
static extern void gtkspell_detach (IntPtr obj);
+
+ static bool DetectGtkSpellAvailable()
+ {
+ try {
+ Gtk.TextView test_view = new Gtk.TextView ();
+ IntPtr test_ptr = gtkspell_new_attach
(test_view.Handle,
+ null,
+
IntPtr.Zero);
+ if (test_ptr != IntPtr.Zero)
+ gtkspell_detach (test_ptr);
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ public static bool GtkSpellAvailable
+ {
+ get {
+ if (!gtkspell_available_tested) {
+ gtkspell_available_result =
DetectGtkSpellAvailable ();
+ gtkspell_available_tested = true;
+ }
+ return gtkspell_available_result;
+ }
+ }
+
+ public NoteSpellChecker ()
+ {
+ if (!GtkSpellAvailable) {
+ throw new Exception();
+ }
+ }
protected override void Initialize ()
{
Index: Tomboy/Preferences.cs
===
RCS file: /cvs/gnome/tomboy/Tomboy/Pre
Re: Request for UI break for Tomboy
Uhh sure thing, but this means that GNOME 2.16 will have a hard dependency on gtkspell via Tomboy. Is this alright? -Alex Vincent Untz wrote: > Hi Alex, > > Le dimanche 03 septembre 2006, à 12:44, Elijah Newren a écrit : >> On 9/2/06, Alex Graveley <[EMAIL PROTECTED]> wrote: >>> Hi, >>> >>> This simple patch makes the gtkspell dependency optional, and removes >>> the enable spell-checking checkbox in the Prefrences depending on >>> gtkspell's availability. >>> >>> I could probably just commit this as it basically counts as a build fix, >>> but I thought I'd take the safe route since I'm new to all this. >>> Besides, it gives docs people a heads up. >> Yeah, sounds sane, and it does have a ui-change necessary to go with >> the build fix. So here's 1 of 2. I wonder if that should be 2 of 2, >> considering >> http://mail.gnome.org/archives/release-team/2006-August/msg00159.html, >> but it's at least 1. :-) > > Well, I believe it's better to not commit this for 2.16.0, but commit it > just after the release. It won't get enough testing for the .0 release > and I'd like to see more people testing the patch. (It's more than a > build fix to me) > > But someone else might give a second approval :-) > > Thanks for working on the patch, Alex. If you don't get a second > approval, go ahead and commit it after you release the tarball for > 2.16.0. > > Cheers, > > Vincent > ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Request for UI break for Tomboy
Hi,
This simple patch makes the gtkspell dependency optional, and removes
the enable spell-checking checkbox in the Prefrences depending on
gtkspell's availability.
I could probably just commit this as it basically counts as a build fix,
but I thought I'd take the safe route since I'm new to all this.
Besides, it gives docs people a heads up.
Speaking of this, I'm not really sure how the docs should handle it.
Most people will have distros with gtkspell and will see the checkbox,
but since it's optional, some people will not. What should the docs
reflect?
-Alex
Index: ChangeLog
===
RCS file: /cvs/gnome/tomboy/ChangeLog,v
retrieving revision 1.289
diff -u -b -r1.289 ChangeLog
--- ChangeLog 3 Sep 2006 01:05:56 - 1.289
+++ ChangeLog 3 Sep 2006 04:49:42 -
@@ -1,3 +1,16 @@
+2006-09-02 Alex Graveley <[EMAIL PROTECTED]>
+
+ * configure.in: Set $ENABLE_GTKSPELL if gtkspell-2.0 is installed.
+ This makes gtkspell optional as required for GNOME release.
+
+ * Tomboy/Makefile.am: Pass -define:ENABLE_DBUS if it's enabled.
+
+ If gtkspell isn't enabled...
+ * Tomboy/Watchers.cs: Conditionally include NoteSpellChecker.
+ * Tomboy/Preferences.cs: Don't show spell check enable checkbox,
+ and don't pack the font button to fill the extra space.
+ * Tomboy/PluginManager.cs: Don't create NoteSpellChecker objects.
+
2006-09-02 Brent Smith <[EMAIL PROTECTED]>
* help/C/figures/tomboy-new-note.png:
Index: configure.in
===
RCS file: /cvs/gnome/tomboy/configure.in,v
retrieving revision 1.98
diff -u -b -r1.98 configure.in
--- configure.in31 Aug 2006 17:41:54 - 1.98
+++ configure.in3 Sep 2006 04:49:42 -
@@ -84,7 +84,8 @@
# Check for GtkSpell here, as we call into it from C#.
# http://gtkspell.sourceforge.net/
#
-PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0)
+PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0, ENABLE_GTKSPELL="yes",
ENABLE_GTKSPELL="no")
+AM_CONDITIONAL(ENABLE_GTKSPELL, test "$ENABLE_GTKSPELL" = "yes")
PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.9, FIXED_GTKSPELL="yes",
FIXED_GTKSPELL="no")
AM_CONDITIONAL(FIXED_GTKSPELL, test "$FIXED_GTKSPELL" = "yes")
Index: Tomboy/Watchers.cs
===
RCS file: /cvs/gnome/tomboy/Tomboy/Watchers.cs,v
retrieving revision 1.50
diff -u -b -r1.50 Watchers.cs
--- Tomboy/Watchers.cs 9 Aug 2006 06:17:11 - 1.50
+++ Tomboy/Watchers.cs 3 Sep 2006 04:49:42 -
@@ -186,6 +186,7 @@
}
}
+#if ENABLE_GTKSPELL
public class NoteSpellChecker : NotePlugin
{
IntPtr obj_ptr = IntPtr.Zero;
@@ -281,6 +282,7 @@
}
}
}
+#endif // ENABLE_GTKSPELL
public class NoteUrlWatcher : NotePlugin
{
Index: Tomboy/Preferences.cs
===
RCS file: /cvs/gnome/tomboy/Tomboy/Preferences.cs,v
retrieving revision 1.9
diff -u -b -r1.9 Preferences.cs
--- Tomboy/Preferences.cs 28 Aug 2006 03:14:07 - 1.9
+++ Tomboy/Preferences.cs 3 Sep 2006 04:49:42 -
@@ -177,6 +177,7 @@
options_list.Show ();
+#if ENABLE_GTKSPELL
// Spell checking...
check = MakeCheckButton (Catalog.GetString ("_Spell
check while typing"));
@@ -191,6 +192,7 @@
"suggestions
shown in the right-click " +
"menu."));
options_list.PackStart (label, false, false, 0);
+#endif // ENABLE_GTKSPELL
// WikiWords...
@@ -221,7 +223,7 @@
align = new Gtk.Alignment (0.5f, 0.5f, 0.4f, 1.0f);
align.Show ();
- options_list.PackStart (align, true, true, 0);
+ options_list.PackStart (align, false, false, 0);
font_button = MakeFontButton ();
font_button.Sensitive = check.Active;
Index: Tomboy/PluginManager.cs
===
RCS file: /cvs/gnome/tomboy/Tomboy/PluginManager.cs,v
retrieving revision 1.16
diff -u -b -r1.16 PluginManager.cs
--- Tomboy/PluginManager.cs 27 Jul 2006 08:27:22 - 1.16
+++ Tomboy/PluginManager.cs 3 Sep 2006 04:49:43 -
@@ -127,7 +127,9 @@
static Type [] stock_plugins =
new Type [] {
typeof (NoteRe
Re: Documenting Tomboy
Hi Brent, Thinking about it, there aren't many pending patches that need to go in. Just one patch that breaks the code freeze to remove the gtkspell dependency. So is there any downside to not branching until after the September 4th deadline? -Alex Brent Smith wrote: > Brent Smith wrote: >> Alex Graveley wrote: >>> Hi Brent, >>> >>> Please let me know when you commit your work so I can make the >>> gnome-2-16 branch. >>> >>> -Alex >>> >>> Brent Smith wrote: >>>> Alex Graveley wrote: >>>>> Hi, >>>>> >>>>> Now that Tomboy is on the path for getting into GNOME (fingers >>>>> crossed), I just wanted to see if people are interested in helping >>>>> me to document it. I've never written user docs for a GNOME app >>>>> before, so I'm eager to learn. >>>>> >>>>> In the mean time, I'll start adding the scrollkeeper harness and >>>>> code hooks for opening the help browser. >>>>> >>>>> -Alex >>>> >>>> Alex, is tomboy branched for inclusion in GNOME? If so, which branch >>>> should I commit the documentation to? >>>> >>>> Thanks, >>>> >> >> Hi Alex, >> >>A preliminary version of the manual is committed. So you can feel >> free to branch at any point now. I will make sure to commit all >> future changes (before tarballs are due on Monday) to both branches. >> >> Thanks, >> > > Hi Alex, > >I committed the final version of the documentation to HEAD. If you > decide to branch before the release, please let the internationalization > team know which branch to translate by sending a mail to > gnome-i18n@gnome.org > ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: String change for Tomboy (patch included)
Hi,
Is it possible to get some decision on this string break? I'd really
like to get this patch in soon, if possible.
-Alex
Sanford Armstrong wrote:
> This email hasn't made it to gnome-i18n or gnome-doc-list, so I have
> subscribed to those lists to expedite things. The patch mentioned
> below is also attached to this email. Sorry for any unnecessary
> duplication.
>
> On 8/22/06, Sanford Armstrong <[EMAIL PROTECTED]> wrote:
>> As part of Tomboy being included in GNOME 2.16 [1], several users have
>> requested the ability for old Sticky Notes to be automatically
>> imported into Tomboy [2] [3]. This feature is now ready to be
>> committed.
>>
>> Attached is the patch, and it breaks the string freeze for Tomboy in
>> two ways:
>>
>> 1) A GConf key has been added to tomboy.schemas.in. Since the Sticky
>> Note import plugin is an official part of Tomboy, and the plugin uses
>> a GConf key to determine if it has ever been run before, this is a
>> necessary change.
>>
>> 2) Previously, when manually running the Sticky Note import plugin,
>> the dialog would say something like "4 of 4 Sticky Notes were
>> successfully imported". But if a user upgrades/installs Tomboy, and
>> the first time it starts is on their next log-in, that message is
>> somewhat disembodied and needs to be more explicit. Therefore it now
>> ends with "successfully imported into Tomboy". I feel that this is an
>> important change for users who are just transitioning from Sticky
>> Notes to Tomboy. If anyone has a better suggestion for the verbiage
>> in that dialog, I would be happy to hear it.
>>
>> I am new to internationalization, so if there is any additional way I
>> have broken the freeze please let me know. I would like to commit
>> this patch to CVS as soon as possible.
>>
>> Thanks,
>> Sandy Armstrong
>>
>> [1]
>> http://mail.gnome.org/archives/devel-announce-list/2006-August/msg0.html
>>
>> [2]
>> http://mail.gnome.org/archives/desktop-devel-list/2006-July/msg00642.html
>> [3]
>> http://mail.gnome.org/archives/desktop-devel-list/2006-August/msg00211.html
>>
>>
>>
>>
>
>
>
> ? INSTALL
> ? Tomboy/Plugins/.StickyNoteImport.cs.swp
> ? data/DefaultPlugins.desktop
> ? data/DefaultPlugins.desktop.in
> ? data/tomboy-plugins.pc
> ? po/stamp-it
> Index: Tomboy/NoteManager.cs
> ===
> RCS file: /cvs/gnome/tomboy/Tomboy/NoteManager.cs,v
> retrieving revision 1.30
> diff -u -p -r1.30 NoteManager.cs
> --- Tomboy/NoteManager.cs 27 Jul 2006 08:50:17 - 1.30
> +++ Tomboy/NoteManager.cs 23 Aug 2006 04:54:00 -
> @@ -143,7 +143,10 @@ namespace Tomboy
> trie_controller.Update ();
>
> // Load all the plugins for our notes.
> - foreach (Note note in notes) {
> + // Iterating through copy of notes list, because list
> may be
> + // changed when loading plugins.
> + ArrayList notesCopy = new ArrayList (notes);
> + foreach (Note note in notesCopy) {
> plugin_mgr.LoadPluginsForNote (note);
> }
> }
> Index: Tomboy/Preferences.cs
> ===
> RCS file: /cvs/gnome/tomboy/Tomboy/Preferences.cs,v
> retrieving revision 1.8
> diff -u -p -r1.8 Preferences.cs
> --- Tomboy/Preferences.cs 2 Aug 2006 07:08:24 - 1.8
> +++ Tomboy/Preferences.cs 23 Aug 2006 04:54:00 -
> @@ -23,6 +23,8 @@ namespace Tomboy
> public const string EXPORTHTML_LAST_DIRECTORY =
> "/apps/tomboy/export_html/last_directory";
> public const string EXPORTHTML_EXPORT_LINKED =
> "/apps/tomboy/export_html/export_linked";
>
> + public const string STICKYNOTEIMPORTER_FIRST_RUN =
> "/apps/tomboy/sticky_note_importer/sticky_importer_first_run";
> +
> static GConf.Client client;
> static GConf.NotifyEventHandler changed_handler;
>
> @@ -70,6 +72,9 @@ namespace Tomboy
>
> case EXPORTHTML_LAST_DIRECTORY:
> return "";
> +
> + case STICKYNOTEIMPORTER_FIRST_RUN:
> + return true;
> }
>
> return null;
> Index: Tomboy/Plugins/StickyNoteImport.cs
> ===
> RCS file: /cvs/gnome/tomboy/Tomboy/Plugins/StickyNoteImport.cs,v
> retrieving revision 1.3
> diff -u -p -r1.3 StickyNoteImport.cs
> --- Tomboy/Plugins/StickyNoteImport.cs25 Jul 2006 22:34:25 -
> 1.3
> +++ Tomboy/Plugins/StickyNoteImport.cs23 Aug 2006 04:54:00 -
> @@ -18,9 +18,15 @@ public class StickyNoteImporter : NotePl
> private const string base_duplicate_note_title = "{0} (#{1}
Re: [tomboy-list] Tomboy broke the UI and String freeze
This is my fault. I should have caught the string addition; I'm also somewhat new to this process :-) -Alex Sanford Armstrong wrote: > On 8/17/06, Danilo Šegan <[EMAIL PROTECTED]> wrote: >> Hi Wouter, >> >> Yesterday at 17:46, Wouter Bolsterlee wrote: >> >>> [1] >>> http://cvs.gnome.org/viewcvs/tomboy/Tomboy/Plugins/NoteOfTheDay.cs?r1=1.5&r2=1.6 >> Thanks for catching this. >> >> Sandy, can you please revert this change and go through the regular >> string freeze break approval procedure[1,2] (if you still want this >> string in)? > > Okay, it is reverted. Sorry for the trouble; I'm a little new to this > process. > > Thanks, > Sandy > > ___ > tomboy-list mailing list > [EMAIL PROTECTED] > http://beatniksoftware.com/mailman/listinfo/tomboy-list_beatniksoftware.com ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
