gimp r26104 - in trunk: . app/widgets
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r26104 - in trunk: . app/widgets
- Date: Thu, 10 Jul 2008 10:12:34 +0000 (UTC)
Author: neo
Date: Thu Jul 10 10:12:34 2008
New Revision: 26104
URL: http://svn.gnome.org/viewvc/gimp?rev=26104&view=rev
Log:
2008-07-10 Sven Neumann <sven gimp org>
* app/widgets/gimphelp.c: some changes to the dialog that is
shown
if the help browser is missing.
Modified:
trunk/ChangeLog
trunk/app/widgets/gimphelp.c
Modified: trunk/app/widgets/gimphelp.c
==============================================================================
--- trunk/app/widgets/gimphelp.c (original)
+++ trunk/app/widgets/gimphelp.c Thu Jul 10 10:12:34 2008
@@ -71,8 +71,10 @@
static gboolean gimp_idle_help (GimpIdleHelp *idle_help);
static void gimp_idle_help_free (GimpIdleHelp *idle_help);
-static gboolean gimp_help_browser (Gimp *gimp);
+static gboolean gimp_help_browser (Gimp *gimp,
+ GimpProgress *progress);
static void gimp_help_browser_error (Gimp *gimp,
+ GimpProgress *progress,
const gchar *title,
const gchar *primary,
const gchar *text);
@@ -199,7 +201,7 @@
if (config->help_browser == GIMP_HELP_BROWSER_GIMP)
{
- if (gimp_help_browser (idle_help->gimp))
+ if (gimp_help_browser (idle_help->gimp, idle_help->progress))
procedure_name = "extension-gimp-help-browser-temp";
}
@@ -233,7 +235,8 @@
}
static gboolean
-gimp_help_browser (Gimp *gimp)
+gimp_help_browser (Gimp *gimp,
+ GimpProgress *progress)
{
static gboolean busy = FALSE;
GimpProcedure *procedure;
@@ -260,11 +263,13 @@
if (! procedure)
{
- gimp_help_browser_error (gimp,
- _("Help browser not found"),
- _("Could not find GIMP help browser."),
+ gimp_help_browser_error (gimp, progress,
+ _("Help browser is missing"),
+ _("The GIMP help browser is not available."),
_("The GIMP help browser plug-in appears "
- "to be missing from your installation."));
+ "to be missing from your installation. "
+ "You may instead use the web browser "
+ "for reading the help pages."));
busy = FALSE;
return FALSE;
@@ -289,7 +294,7 @@
if (error)
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
+ gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
"%s", error->message);
g_error_free (error);
}
@@ -301,7 +306,7 @@
if (! procedure)
{
- gimp_help_browser_error (gimp,
+ gimp_help_browser_error (gimp, progress,
_("Help browser doesn't start"),
_("Could not start the GIMP help browser "
"plug-in."),
@@ -317,28 +322,36 @@
}
static void
-gimp_help_browser_error (Gimp *gimp,
- const gchar *title,
- const gchar *primary,
- const gchar *text)
+gimp_help_browser_error (Gimp *gimp,
+ GimpProgress *progress,
+ const gchar *title,
+ const gchar *primary,
+ const gchar *text)
{
GtkWidget *dialog;
- dialog =
- gimp_message_dialog_new (title, GIMP_STOCK_WARNING,
- NULL, 0,
- NULL, NULL,
+ dialog = gimp_message_dialog_new (title, GIMP_STOCK_USER_MANUAL,
+ NULL, 0,
+ NULL, NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("Use _web browser instead"), GTK_RESPONSE_OK,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("Use _Web Browser"), GTK_RESPONSE_OK,
- NULL);
+ NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
+ if (progress)
+ {
+ guint32 window = gimp_progress_get_window (progress);
+
+ if (window)
+ gimp_window_set_transient_for (GTK_WINDOW (dialog), window);
+ }
+
gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
primary);
gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, text);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]