dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

left-justify the label. 

2004-10-05  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpwidgets.c (gimp_table_attach_aligned):
	left-justify the label.

	* libgimpwidgets/gimpdialog.c: if a button with GTK_RESPONSE_HELP
	is being added, hide the automatically added help button.

	* plug-ins/script-fu/script-fu-interface.c: five buttons are too
	much for the action area. Renamed the About button to Help and
	resurrected the help button in the about dialog as a way to get to
	the actual help pages (pressing F1 will get you there as well).
This commit is contained in:
Sven Neumann 2004-10-04 22:59:13 +00:00 committed by Sven Neumann
parent 94b427de98
commit 2284ab06cc
4 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2004-10-05 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpwidgets.c (gimp_table_attach_aligned):
left-justify the label.
* libgimpwidgets/gimpdialog.c: if a button with GTK_RESPONSE_HELP
is being added, hide the automatically added help button.
* plug-ins/script-fu/script-fu-interface.c: five buttons are too
much for the action area. Renamed the About button to Help and
resurrected the help button in the about dialog as a way to get to
the actual help pages (pressing F1 will get you there as well).
2004-10-05 Sven Neumann <sven@gimp.org>
* app/widgets/gimpfiledialog.c: added a help button.

11
libgimpwidgets/gimpdialog.c
View File

@ -395,13 +395,16 @@ gimp_dialog_add_buttons_valist (GimpDialog *dialog,
{
response_id = va_arg (args, gint);
/* suppress a help button if we added one already */
if ((response_id != GTK_RESPONSE_HELP) ||
(! g_object_get_data (G_OBJECT (dialog), "gimp-dialog-help-button")))
/* hide the automatically added help button if another one is added */
if (response_id == GTK_RESPONSE_HELP)
{
gtk_dialog_add_button (GTK_DIALOG (dialog), button_text, response_id);
GtkWidget *button = g_object_get_data (G_OBJECT (dialog),
"gimp-dialog-help-button");
gtk_widget_hide (button);
}
gtk_dialog_add_button (GTK_DIALOG (dialog), button_text, response_id);
if (response_id == GTK_RESPONSE_OK)
{
gtk_dialog_set_default_response (GTK_DIALOG (dialog),

2
libgimpwidgets/gimpwidgets.c
View File

@ -1577,7 +1577,7 @@ gimp_table_attach_aligned (GtkTable *table,
{
label = gtk_label_new_with_mnemonic (label_text);
gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_table_attach (table, label,
column, column + 1,
row, row + 1,

48
plug-ins/script-fu/script-fu-interface.c
View File

@ -57,6 +57,7 @@ typedef struct
GtkWidget *about_dialog;
gchar *title;
gchar *help_id;
gchar *last_command;
gint command_count;
gint consec_command_count;
@ -161,8 +162,7 @@ script_fu_interface (SFScript *script)
GtkSizeGroup *group;
GSList *list;
gchar *title;
gchar *help_id;
gchar *buf;
gchar *tmp;
gint i;
static gboolean gtk_initted = FALSE;
@ -188,42 +188,43 @@ script_fu_interface (SFScript *script)
sf_interface->args_widgets = g_new0 (GtkWidget *, script->num_args);
/* strip the first part of the menupath if it contains _("/Script-Fu/") */
buf = strstr (gettext (script->menu_path), _("/Script-Fu/"));
if (buf)
title = g_strdup (buf + strlen (_("/Script-Fu/")));
tmp = strstr (gettext (script->menu_path), _("/Script-Fu/"));
if (tmp)
title = g_strdup (tmp + strlen (_("/Script-Fu/")));
else
title = g_strdup (gettext (script->menu_path));
/* strip mnemonics from the menupath */
sf_interface->title = gimp_strip_uline (title);
tmp = gimp_strip_uline (title);
g_free (title);
title = tmp;
tmp = strstr (title, "...");
if (tmp)
*tmp = '\0';
sf_interface->title = g_strdup_printf (_("Script-Fu: %s"), title);
g_free (title);
help_id = g_strdup (script->pdb_name);
for (buf = help_id; buf && *buf; buf++)
if (*buf == '_')
*buf = '-';
sf_interface->help_id = g_strdup (script->pdb_name);
buf = strstr (sf_interface->title, "...");
if (buf)
*buf = '\0';
buf = g_strdup_printf (_("Script-Fu: %s"), sf_interface->title);
for (tmp = sf_interface->help_id; tmp && *tmp; tmp++)
if (*tmp == '_')
*tmp = '-';
sf_interface->dialog = dlg =
gimp_dialog_new (buf, "script-fu",
gimp_dialog_new (sf_interface->title, "script-fu",
NULL, 0,
gimp_standard_help_func, help_id,
gimp_standard_help_func, sf_interface->help_id,
_("_About"), RESPONSE_ABOUT,
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
GIMP_STOCK_RESET, RESPONSE_RESET,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
g_free (buf);
g_free (help_id);
g_signal_connect (dlg, "response",
G_CALLBACK (script_fu_response),
script);
@ -560,6 +561,7 @@ script_fu_interface_quit (SFScript *script)
g_return_if_fail (sf_interface != NULL);
g_free (sf_interface->title);
g_free (sf_interface->help_id);
if (sf_interface->about_dialog)
gtk_widget_destroy (sf_interface->about_dialog);
@ -702,7 +704,7 @@ script_fu_response (GtkWidget *widget,
{
switch (response_id)
{
case RESPONSE_ABOUT:
case GTK_RESPONSE_HELP:
script_fu_about (script);
break;
@ -982,7 +984,7 @@ script_fu_about (SFScript *script)
sf_interface->about_dialog = dialog =
gimp_dialog_new (sf_interface->title, "script-fu-about",
sf_interface->dialog, 0,
gimp_standard_help_func, NULL,
gimp_standard_help_func, sf_interface->help_id,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,