Re: [Gimp-developer] [PATCH] About dialog shows unstable status
Hi, On Wed, 2006-07-19 at 10:37 +0100, Mukund wrote: > IMHO, I prefer Alan Horkan's comment about the descriptive text. I think > this is what the field is for too, to describe what the application does > tersely. But if you think it's unnecessary, I'll remove it out. I think that the long description overloads the dialog and I would really like to see "GNU Image Manipulation Program" right below the abbreviation "GIMP". The descriptive text is already in the gimp.desktop file and from there it is a lot more visible to the user. Perhaps we should review the description there and use the wording that you and Alan suggested. Sven ___ Gimp-developer mailing list Gimp-developer@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer
Re: [Gimp-developer] [PATCH] About dialog shows unstable status
On Thu, 2006-07-20 at 13:23 +0100, Mukund wrote: > I have made the required changes (removed newlines; moved message into a > label) except I kept the descriptive text. If you think it's a bad idea > still, I'll remove it. Otherwise, if you are okay with the patch > (attached), I'll commit it. > > http://www.mukund.org/temp/about-4.png Is this patch fine? Mukund signature.asc Description: This is a digitally signed message part ___ Gimp-developer mailing list Gimp-developer@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer
Re: [Gimp-developer] [PATCH] About dialog shows unstable status
Hi Sven I have made the required changes (removed newlines; moved message into a label) except I kept the descriptive text. If you think it's a bad idea still, I'll remove it. Otherwise, if you are okay with the patch (attached), I'll commit it. http://www.mukund.org/temp/about-4.png Mukund Index: about.h === RCS file: /cvs/gnome/gimp/app/about.h,v retrieving revision 1.4 diff -u -p -r1.4 about.h --- about.h 1 Mar 2006 08:06:08 - 1.4 +++ about.h 20 Jul 2006 12:21:55 - @@ -26,6 +26,10 @@ #define GIMP_NAME \ _("GNU Image Manipulation Program") +#define GIMP_DESCRIPTION \ + _("GNU Image Manipulation Program can be used to create new graphics " \ +"or edit existing ones like photographs.") + #define GIMP_COPYRIGHT \ _("Copyright © 1995-2006\n" \ "Spencer Kimball, Peter Mattis and the GIMP Development Team") Index: dialogs/about-dialog.c === RCS file: /cvs/gnome/gimp/app/dialogs/about-dialog.c,v retrieving revision 1.139 diff -u -p -r1.139 about-dialog.c --- dialogs/about-dialog.c 20 Jun 2006 09:14:26 - 1.139 +++ dialogs/about-dialog.c 20 Jul 2006 12:21:56 - @@ -78,6 +78,11 @@ static gbooleanabout_dialog_anim_exp static voidabout_dialog_reshuffle (GimpAboutDialog *dialog); static gbooleanabout_dialog_timer (gpointer data); +#ifdef GIMP_UNSTABLE +static voidabout_dialog_add_unstable_message (GtkWidget *vbox, + GimpAboutDialog *dialog); +#endif + GtkWidget * about_dialog_create (GimpContext *context) @@ -110,7 +115,7 @@ about_dialog_create (GimpContext *contex "name", GIMP_ACRONYM, "version",GIMP_VERSION, "copyright", GIMP_COPYRIGHT, - "comments", GIMP_NAME, + "comments", GIMP_DESCRIPTION, "license",GIMP_LICENSE, "wrap-license", TRUE, "logo", pixbuf, @@ -148,7 +153,12 @@ about_dialog_create (GimpContext *contex children = gtk_container_get_children (GTK_CONTAINER (container)); if (GTK_IS_VBOX (children->data)) -about_dialog_add_animation (children->data, dialog); +{ + about_dialog_add_animation (children->data, dialog); +#ifdef GIMP_UNSTABLE + about_dialog_add_unstable_message (children->data, dialog); +#endif +} else g_warning ("%s: ooops, no vbox in this container?", G_STRLOC); @@ -585,3 +595,25 @@ about_dialog_timer (gpointer data) /* else keep the current timeout */ return TRUE; } + +#ifdef GIMP_UNSTABLE + +static void +about_dialog_add_unstable_message (GtkWidget *vbox, + GimpAboutDialog *dialog) +{ +gchar *text; +GtkWidget *label; + +text = g_strdup_printf ("%s", +_("This is an unstable development release.")); +label = gtk_label_new (NULL); +gtk_label_set_markup (GTK_LABEL (label), text); +gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); +gtk_box_reorder_child (GTK_BOX (vbox), label, 2); +gtk_widget_show (label); +g_free (text); +} + +#endif + signature.asc Description: This is a digitally signed message part ___ Gimp-developer mailing list Gimp-developer@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer
Re: [Gimp-developer] [PATCH] About dialog shows unstable status
Hi Sven On Wed, 2006-07-19 at 08:50 +0200, Sven Neumann wrote: > > With further input from Alan Horkan (idea to add descriptive comment) > > I think that the description should stay "GNU Image Manipulation > Program" as it is now. The new text is IMO too long and I really like > the fact that the current About dialog prominently expands the GIMP > acronym. This doesn't really work any longer with the proposed changes. > IMHO, I prefer Alan Horkan's comment about the descriptive text. I think this is what the field is for too, to describe what the application does tersely. But if you think it's unnecessary, I'll remove it out. > I suggest that we keep the dialog as is for stable releases. For > unstable releases, it would be nice to have a small disclaimer like you > proposed. Please implement this by adding another label to the vbox. > Yes it was too stupid of me to append the text to the comment field as it killed the semantic meaning of the field. I'll add another label to the dialog. Mukund signature.asc Description: This is a digitally signed message part ___ Gimp-developer mailing list Gimp-developer@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer
Re: [Gimp-developer] [PATCH] About dialog shows unstable status
Hi Sven On Wed, 2006-07-19 at 08:41 +0200, Sven Neumann wrote: > Please do not use newlines do adjust spacing. Especially not in > translatable strings. The spacing in the about dialog is set to what the > HIG suggests and should be fine without such hacks. If you really think > it needs to be changed, please file a bug-report against GTK+. > In hindsight, I agree and I will remove the newlines. Mukund signature.asc Description: This is a digitally signed message part ___ Gimp-developer mailing list Gimp-developer@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer
Re: [Gimp-developer] [PATCH] About dialog shows unstable status
Hi, On Wed, 2006-07-19 at 00:27 +0100, Mukund wrote: > With further input from Alan Horkan (idea to add descriptive comment) I think that the description should stay "GNU Image Manipulation Program" as it is now. The new text is IMO too long and I really like the fact that the current About dialog prominently expands the GIMP acronym. This doesn't really work any longer with the proposed changes. I suggest that we keep the dialog as is for stable releases. For unstable releases, it would be nice to have a small disclaimer like you proposed. Please implement this by adding another label to the vbox. Sven ___ Gimp-developer mailing list Gimp-developer@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer
Re: [Gimp-developer] [PATCH] About dialog shows unstable status
Hi, On Wed, 2006-07-19 at 00:27 +0100, Mukund wrote: #define GIMP_COPYRIGHT \ - _("Copyright © 1995-2006\n" \ -"Spencer Kimball, Peter Mattis and the GIMP Development Team") + _("Copyright © 1995-2006\n" \ +"Spencer Kimball, Peter Mattis\n" \ +"and the GIMP Development Team") Why is there a newline inserted here? I think it looked a lot better without it and there's no semantic reason why there should be a newline at this place. #define GIMP_LICENSE \ - _("GIMP is free software; you can redistribute it and/or modify it " \ + _("\n" \ +"GIMP is free software; you can redistribute it and/or modify it " \ "under the terms of the GNU General Public License as published by Please do not use newlines do adjust spacing. Especially not in translatable strings. The spacing in the about dialog is set to what the HIG suggests and should be fine without such hacks. If you really think it needs to be changed, please file a bug-report against GTK+. +#ifdef GIMP_UNSTABLE + gchar *comment = g_strconcat (GIMP_DESCRIPTION, "\n\n", +_("This is an unstable development release."), +"\n", NULL); +#endif Same comment applies here. Sven ___ Gimp-developer mailing list Gimp-developer@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer
Re: [Gimp-developer] [PATCH] About dialog shows unstable status
Mukund wrote: > On Tue, 2006-07-18 at 19:58 +0100, Mukund wrote: >> Patch is attached for a simple thing. Also adds some spacing to make the >> text appear nicer. If you approve, I'll commit it. > > Ugh.. that's GIMP_UNSTABLE.. not GUM_UNSTABLE in the patch. > > Corrected patch is attached. > With further input from Alan Horkan (idea to add descriptive comment) and UnNamed (the actual text of comment), we have a new patch (attached). This is how the about dialog looks like now: http://www.mukund.org/temp/about-3.png Index: app/about.h === RCS file: /cvs/gnome/gimp/app/about.h,v retrieving revision 1.4 diff -u -p -r1.4 about.h --- app/about.h 1 Mar 2006 08:06:08 - 1.4 +++ app/about.h 18 Jul 2006 23:20:49 - @@ -26,12 +26,19 @@ #define GIMP_NAME \ _("GNU Image Manipulation Program") +#define GIMP_DESCRIPTION \ + _("GNU Image Manipulation Program can be used\n" \ +"to create new graphics or edit existing ones\n" \ +"like photographs." ) + #define GIMP_COPYRIGHT \ - _("Copyright © 1995-2006\n" \ -"Spencer Kimball, Peter Mattis and the GIMP Development Team") + _("Copyright © 1995-2006\n" \ +"Spencer Kimball, Peter Mattis\n" \ +"and the GIMP Development Team") #define GIMP_LICENSE \ - _("GIMP is free software; you can redistribute it and/or modify it " \ + _("\n" \ +"GIMP 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 2 of the License, or " \ "(at your option) any later version."\ @@ -43,7 +50,8 @@ "\n\n" \ "You should have received a copy of the GNU General Public License " \ "along with GIMP; if not, write to the Free Software Foundation, " \ -"Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.") +"Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." \ +"\n\n" ) #endif /* __ABOUT_H__ */ Index: app/dialogs/about-dialog.c === RCS file: /cvs/gnome/gimp/app/dialogs/about-dialog.c,v retrieving revision 1.139 diff -u -p -r1.139 about-dialog.c --- app/dialogs/about-dialog.c 20 Jun 2006 09:14:26 - 1.139 +++ app/dialogs/about-dialog.c 18 Jul 2006 23:20:50 - @@ -93,6 +93,12 @@ about_dialog_create (GimpContext *contex GdkPixbuf *pixbuf; GList *children; +#ifdef GIMP_UNSTABLE + gchar *comment = g_strconcat (GIMP_DESCRIPTION, "\n\n", +_("This is an unstable development release."), +"\n", NULL); +#endif + if (gimp_pdb_lookup_procedure (context->gimp->pdb, PDB_URL_LOAD)) gtk_about_dialog_set_url_hook (about_dialog_load_url, g_object_ref (context), @@ -110,7 +116,11 @@ about_dialog_create (GimpContext *contex "name", GIMP_ACRONYM, "version",GIMP_VERSION, "copyright", GIMP_COPYRIGHT, - "comments", GIMP_NAME, +#ifdef GIMP_UNSTABLE + "comments", comment, +#else + "comments", GIMP_DESCRIPTION, +#endif "license",GIMP_LICENSE, "wrap-license", TRUE, "logo", pixbuf, @@ -124,6 +134,10 @@ about_dialog_create (GimpContext *contex */ "translator-credits", _("translator-credits"), NULL); + +#ifdef GIMP_UNSTABLE + g_free (comment); +#endif if (pixbuf) g_object_unref (pixbuf); signature.asc Description: OpenPGP digital signature ___ Gimp-developer mailing list Gimp-developer@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer
Re: [Gimp-developer] [PATCH] About dialog shows unstable status
On Tue, 2006-07-18 at 19:58 +0100, Mukund wrote: > Patch is attached for a simple thing. Also adds some spacing to make the > text appear nicer. If you approve, I'll commit it. Ugh.. that's GIMP_UNSTABLE.. not GUM_UNSTABLE in the patch. Corrected patch is attached. Mukund Index: app/about.h === RCS file: /cvs/gnome/gimp/app/about.h,v retrieving revision 1.4 diff -u -p -r1.4 about.h --- app/about.h 1 Mar 2006 08:06:08 - 1.4 +++ app/about.h 18 Jul 2006 18:57:07 - @@ -27,11 +27,13 @@ _("GNU Image Manipulation Program") #define GIMP_COPYRIGHT \ - _("Copyright © 1995-2006\n" \ -"Spencer Kimball, Peter Mattis and the GIMP Development Team") + _("Copyright © 1995-2006\n" \ +"Spencer Kimball, Peter Mattis\n" \ +"and the GIMP Development Team") #define GIMP_LICENSE \ - _("GIMP is free software; you can redistribute it and/or modify it " \ + _("\n" \ +"GIMP 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 2 of the License, or " \ "(at your option) any later version."\ @@ -43,7 +45,8 @@ "\n\n" \ "You should have received a copy of the GNU General Public License " \ "along with GIMP; if not, write to the Free Software Foundation, " \ -"Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.") +"Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." \ +"\n\n" ) #endif /* __ABOUT_H__ */ Index: app/dialogs/about-dialog.c === RCS file: /cvs/gnome/gimp/app/dialogs/about-dialog.c,v retrieving revision 1.139 diff -u -p -r1.139 about-dialog.c --- app/dialogs/about-dialog.c 20 Jun 2006 09:14:26 - 1.139 +++ app/dialogs/about-dialog.c 18 Jul 2006 18:57:07 - @@ -93,6 +93,12 @@ about_dialog_create (GimpContext *contex GdkPixbuf *pixbuf; GList *children; +#ifdef GIMP_UNSTABLE + gchar *comment = g_strconcat (GIMP_NAME, "\n\n", +_("This is an unstable development release."), +"\n", NULL); +#endif + if (gimp_pdb_lookup_procedure (context->gimp->pdb, PDB_URL_LOAD)) gtk_about_dialog_set_url_hook (about_dialog_load_url, g_object_ref (context), @@ -110,7 +116,11 @@ about_dialog_create (GimpContext *contex "name", GIMP_ACRONYM, "version",GIMP_VERSION, "copyright", GIMP_COPYRIGHT, +#ifdef GIMP_UNSTABLE + "comments", comment, +#else "comments", GIMP_NAME, +#endif "license",GIMP_LICENSE, "wrap-license", TRUE, "logo", pixbuf, @@ -124,6 +134,10 @@ about_dialog_create (GimpContext *contex */ "translator-credits", _("translator-credits"), NULL); + +#ifdef GIMP_UNSTABLE + g_free (comment); +#endif if (pixbuf) g_object_unref (pixbuf); signature.asc Description: This is a digitally signed message part ___ Gimp-developer mailing list Gimp-developer@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer