gimp r25908 - in trunk: . app/actions app/core app/gui app/pdb app/widgets tools/pdbgen/pdb

[neo svn gnome org]

Author: neo
Date: Tue Jun 10 09:54:54 2008
New Revision: 25908
URL: http://svn.gnome.org/viewvc/gimp?rev=25908&view=rev

Log:
2008-06-10  Sven Neumann  <sven gimp org>

	* app/core/gimp-gui.[ch]
	* app/widgets/gimphelp.[ch]
	* app/gui/gui-vtable.c
	* app/gui/gui.c: added a GimpProgress parameter to gimp_help().

	* app/actions/help-commands.c
	* app/widgets/gimpuimanager.c
	* tools/pdbgen/pdb/help.pdb: changed accordingly.

	* app/pdb/help-cmds.c: regenerated.


Modified:
   trunk/ChangeLog
   trunk/app/actions/help-commands.c
   trunk/app/core/gimp-gui.c
   trunk/app/core/gimp-gui.h
   trunk/app/gui/gui-vtable.c
   trunk/app/gui/gui.c
   trunk/app/pdb/help-cmds.c
   trunk/app/widgets/gimphelp.c
   trunk/app/widgets/gimphelp.h
   trunk/app/widgets/gimpuimanager.c
   trunk/tools/pdbgen/pdb/help.pdb

Modified: trunk/app/actions/help-commands.c
==============================================================================
--- trunk/app/actions/help-commands.c	(original)
+++ trunk/app/actions/help-commands.c	Tue Jun 10 09:54:54 2008
@@ -24,6 +24,10 @@
 
 #include "actions-types.h"
 
+#include "core/gimpprogress.h"
+
+#include "widgets/gimphelp.h"
+
 #include "actions.h"
 #include "help-commands.h"
 
@@ -32,7 +36,12 @@
 help_help_cmd_callback (GtkAction *action,
                         gpointer   data)
 {
-  gimp_standard_help_func (NULL, NULL);
+  Gimp        *gimp;
+  GimpDisplay *display;
+  return_if_no_gimp (gimp, data);
+  return_if_no_display (display, data);
+
+  gimp_help_show (gimp, GIMP_PROGRESS (display), NULL, NULL);
 }
 
 void

Modified: trunk/app/core/gimp-gui.c
==============================================================================
--- trunk/app/core/gimp-gui.c	(original)
+++ trunk/app/core/gimp-gui.c	Tue Jun 10 09:54:54 2008
@@ -190,14 +190,16 @@
 }
 
 void
-gimp_help (Gimp        *gimp,
-           const gchar *help_domain,
-           const gchar *help_id)
+gimp_help (Gimp         *gimp,
+           GimpProgress *progress,
+           const gchar  *help_domain,
+           const gchar  *help_id)
 {
   g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
 
   if (gimp->gui.help)
-    gimp->gui.help (gimp, help_domain, help_id);
+    gimp->gui.help (gimp, progress, help_domain, help_id);
 }
 
 const gchar *

Modified: trunk/app/core/gimp-gui.h
==============================================================================
--- trunk/app/core/gimp-gui.h	(original)
+++ trunk/app/core/gimp-gui.h	Tue Jun 10 09:54:54 2008
@@ -38,6 +38,7 @@
                                           const gchar         *domain,
                                           const gchar         *message);
   void           (* help)                (Gimp                *gimp,
+                                          GimpProgress        *progress,
                                           const gchar         *help_domain,
                                           const gchar         *help_id);
 
@@ -126,6 +127,7 @@
                                           const gchar         *domain,
                                           const gchar         *message);
 void           gimp_help                 (Gimp                *gimp,
+                                          GimpProgress        *progress,
                                           const gchar         *help_domain,
                                           const gchar         *help_id);
 

Modified: trunk/app/gui/gui-vtable.c
==============================================================================
--- trunk/app/gui/gui-vtable.c	(original)
+++ trunk/app/gui/gui-vtable.c	Tue Jun 10 09:54:54 2008
@@ -86,6 +86,7 @@
 static void           gui_set_busy             (Gimp                *gimp);
 static void           gui_unset_busy           (Gimp                *gimp);
 static void           gui_help                 (Gimp                *gimp,
+                                                GimpProgress        *progress,
                                                 const gchar         *help_domain,
                                                 const gchar         *help_id);
 static const gchar  * gui_get_program_class    (Gimp                *gimp);
@@ -213,11 +214,12 @@
 }
 
 static void
-gui_help (Gimp        *gimp,
-          const gchar *help_domain,
-          const gchar *help_id)
+gui_help (Gimp         *gimp,
+          GimpProgress *progress,
+          const gchar  *help_domain,
+          const gchar  *help_id)
 {
-  gimp_help_show (gimp, help_domain, help_id);
+  gimp_help_show (gimp, progress, help_domain, help_id);
 }
 
 static const gchar *

Modified: trunk/app/gui/gui.c
==============================================================================
--- trunk/app/gui/gui.c	(original)
+++ trunk/app/gui/gui.c	Tue Jun 10 09:54:54 2008
@@ -296,7 +296,7 @@
 {
   g_return_if_fail (GIMP_IS_GIMP (the_gui_gimp));
 
-  gimp_help (the_gui_gimp, NULL, help_id);
+  gimp_help (the_gui_gimp, NULL, NULL, help_id);
 }
 
 static gboolean

Modified: trunk/app/pdb/help-cmds.c
==============================================================================
--- trunk/app/pdb/help-cmds.c	(original)
+++ trunk/app/pdb/help-cmds.c	Tue Jun 10 09:54:54 2008
@@ -60,7 +60,7 @@
                                                 manager->current_plug_in->prog,
                                                 NULL);
 
-      gimp_help (gimp, help_domain, help_id);
+      gimp_help (gimp, progress, help_domain, help_id);
     }
 
   return gimp_procedure_get_return_values (procedure, success);

Modified: trunk/app/widgets/gimphelp.c
==============================================================================
--- trunk/app/widgets/gimphelp.c	(original)
+++ trunk/app/widgets/gimphelp.c	Tue Jun 10 09:54:54 2008
@@ -34,8 +34,9 @@
 #include "config/gimpguiconfig.h"
 
 #include "core/gimp.h"
-#include "core/gimp-utils.h"
 #include "core/gimpparamspecs.h"
+#include "core/gimpprogress.h"
+#include "core/gimp-utils.h"
 
 #include "pdb/gimppdb.h"
 #include "pdb/gimpprocedure.h"
@@ -55,10 +56,11 @@
 
 struct _GimpIdleHelp
 {
-  Gimp  *gimp;
-  gchar *help_domain;
-  gchar *help_locales;
-  gchar *help_id;
+  Gimp         *gimp;
+  GimpProgress *progress;
+  gchar        *help_domain;
+  gchar        *help_locales;
+  gchar        *help_id;
 };
 
 
@@ -73,6 +75,7 @@
                                            const gchar   *text);
 
 static void       gimp_help_call          (Gimp          *gimp,
+                                           GimpProgress  *progress,
                                            const gchar   *procedure_name,
                                            const gchar   *help_domain,
                                            const gchar   *help_locales,
@@ -83,13 +86,15 @@
 /*  public functions  */
 
 void
-gimp_help_show (Gimp        *gimp,
-                const gchar *help_domain,
-                const gchar *help_id)
+gimp_help_show (Gimp         *gimp,
+                GimpProgress *progress,
+                const gchar  *help_domain,
+                const gchar  *help_id)
 {
   GimpGuiConfig *config;
 
   g_return_if_fail (GIMP_IS_GIMP (gimp));
+  g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
 
   config = GIMP_GUI_CONFIG (gimp->config);
 
@@ -97,7 +102,8 @@
     {
       GimpIdleHelp *idle_help = g_slice_new0 (GimpIdleHelp);
 
-      idle_help->gimp = gimp;
+      idle_help->gimp     = gimp;
+      idle_help->progress = progress;
 
       if (help_domain && strlen (help_domain))
         idle_help->help_domain = g_strdup (help_domain);
@@ -143,6 +149,7 @@
 
   if (procedure_name)
     gimp_help_call (idle_help->gimp,
+                    idle_help->progress,
                     procedure_name,
                     idle_help->help_domain,
                     idle_help->help_locales,
@@ -280,11 +287,12 @@
 }
 
 static void
-gimp_help_call (Gimp        *gimp,
-                const gchar *procedure_name,
-                const gchar *help_domain,
-                const gchar *help_locales,
-                const gchar *help_id)
+gimp_help_call (Gimp         *gimp,
+                GimpProgress *progress,
+                const gchar  *procedure_name,
+                const gchar  *help_domain,
+                const gchar  *help_locales,
+                const gchar  *help_id)
 {
   GimpProcedure *procedure;
 
@@ -303,7 +311,7 @@
       return_vals =
         gimp_pdb_execute_procedure_by_name (gimp->pdb,
                                             gimp_get_user_context (gimp),
-                                            NULL, &error,
+                                            progress, &error,
                                             procedure_name,
                                             G_TYPE_STRING, help_domain,
                                             G_TYPE_STRING, help_locales,
@@ -352,8 +360,8 @@
       gimp_value_take_stringarray (&args->values[3], help_uris, n_domains);
 
       gimp_procedure_execute_async (procedure, gimp,
-                                    gimp_get_user_context (gimp),
-                                    NULL, args, NULL, &error);
+                                    gimp_get_user_context (gimp), progress,
+                                    args, NULL, &error);
 
       g_value_array_free (args);
 
@@ -382,7 +390,7 @@
       return_vals =
         gimp_pdb_execute_procedure_by_name (gimp->pdb,
                                             gimp_get_user_context (gimp),
-                                            NULL, &error,
+                                            progress, &error,
                                             "extension-gimp-help-temp",
                                             G_TYPE_STRING, procedure_name,
                                             G_TYPE_STRING, help_domain,

Modified: trunk/app/widgets/gimphelp.h
==============================================================================
--- trunk/app/widgets/gimphelp.h	(original)
+++ trunk/app/widgets/gimphelp.h	Tue Jun 10 09:54:54 2008
@@ -25,11 +25,12 @@
 
 /*  the main help function
  *
- *  there should be no need to use it in the common case
+ *  there should be no need to use it directly
  */
-void   gimp_help_show (Gimp        *gimp,
-                       const gchar *help_domain,
-                       const gchar *help_id);
+void   gimp_help_show (Gimp         *gimp,
+                       GimpProgress *progress,
+                       const gchar  *help_domain,
+                       const gchar  *help_id);
 
 
 #endif /* __GIMP_HELP_H__ */

Modified: trunk/app/widgets/gimpuimanager.c
==============================================================================
--- trunk/app/widgets/gimpuimanager.c	(original)
+++ trunk/app/widgets/gimpuimanager.c	Tue Jun 10 09:54:54 2008
@@ -937,9 +937,7 @@
 
   while (! help_id)
     {
-      GtkWidget *menu_item;
-
-      menu_item = GTK_MENU_SHELL (widget)->active_menu_item;
+      GtkWidget *menu_item = GTK_MENU_SHELL (widget)->active_menu_item;
 
       /*  first, get the help page from the item...
        */
@@ -1021,7 +1019,7 @@
           help_string = g_strdup (help_id);
         }
 
-      gimp_help (manager->gimp, help_domain, help_string);
+      gimp_help (manager->gimp, NULL, help_domain, help_string);
 
       g_free (help_domain);
       g_free (help_string);

Modified: trunk/tools/pdbgen/pdb/help.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/help.pdb	(original)
+++ trunk/tools/pdbgen/pdb/help.pdb	Tue Jun 10 09:54:54 2008
@@ -49,7 +49,7 @@
                                             manager->current_plug_in->prog,
                                             NULL);
 
-  gimp_help (gimp, help_domain, help_id);
+  gimp_help (gimp, progress, help_domain, help_id);
 }
 CODE
     );