Commit 17d8ca50 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

plug-ins/common/convmatrix.c plug-ins/common/iwarp.c

2002-09-17  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/convmatrix.c
	* plug-ins/common/iwarp.c
	* plug-ins/common/sample_colorize.c
	* plug-ins/common/spheredesigner.c
	* plug-ins/ifscompose/ifscompose.c
	* plug-ins/print/gimp_main_window.c
	* plug-ins/script-fu/script-fu-scripts.c
	* plug-ins/sel2path/sel2path.c: reordered action buttons.
parent 8777d5b8
2002-09-17 Sven Neumann <sven@gimp.org>
* plug-ins/common/convmatrix.c
* plug-ins/common/iwarp.c
* plug-ins/common/sample_colorize.c
* plug-ins/common/spheredesigner.c
* plug-ins/ifscompose/ifscompose.c
* plug-ins/print/gimp_main_window.c
* plug-ins/script-fu/script-fu-scripts.c
* plug-ins/sel2path/sel2path.c: reordered action buttons.
2002-09-17 Sven Neumann <sven@gimp.org>
 
* app/widgets/gimpviewabledialog.c: use PangoAttributes instead of
......
......@@ -858,12 +858,12 @@ dialog (void)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, defaults_callback,
NULL, 1, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, ok_callback,
NULL, NULL, &my_widgets.ok, TRUE, FALSE,
......
......@@ -1163,12 +1163,12 @@ iwarp_dialog (void)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, iwarp_reset_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, iwarp_ok_callback,
NULL, NULL, NULL, TRUE, FALSE,
......
......@@ -1365,15 +1365,15 @@ p_smp_dialog (void)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_CLOSE, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, p_smp_reset_callback,
NULL, NULL, NULL, FALSE, FALSE,
_("Get Sample Colors"), p_smp_get_colors_callback,
NULL, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CLOSE, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
_("Apply"), p_smp_apply_callback,
NULL, NULL, NULL, FALSE, FALSE,
......
......@@ -2208,12 +2208,12 @@ GtkWidget* makewindow (void)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_CANCEL, sphere_cancel,
NULL, NULL, &cancelbutton, FALSE, TRUE,
GIMP_STOCK_RESET, sphere_reset,
NULL, NULL, &resetbutton, FALSE, FALSE,
GTK_STOCK_CANCEL, sphere_cancel,
NULL, NULL, &cancelbutton, FALSE, TRUE,
GTK_STOCK_OK, sphere_ok,
NULL, NULL, &okbutton, TRUE, FALSE,
......
......@@ -790,18 +790,18 @@ ifs_compose_dialog (GimpDrawable *drawable)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_DELETE, ifs_compose_delete_callback,
GIMP_STOCK_RESET, ifs_compose_defaults_callback,
NULL, NULL, NULL, FALSE, FALSE,
GIMP_STOCK_RESET, ifs_compose_defaults_callback,
GTK_STOCK_DELETE, ifs_compose_delete_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_NEW, ifs_compose_new_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, ifs_compose_ok_callback,
NULL, NULL, NULL, TRUE, FALSE,
......
......@@ -355,9 +355,6 @@ create_top_level_structure(void)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
_("About"), gimp_about_callback,
NULL, NULL, NULL, FALSE, FALSE,
......@@ -367,6 +364,9 @@ create_top_level_structure(void)
_("Print and\nSave Settings"), gimp_printandsave_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_PRINT, gimp_print_callback,
NULL, NULL, NULL, FALSE, FALSE,
......
......@@ -134,7 +134,7 @@ typedef struct
GtkWidget **args_widgets;
GtkWidget *status;
GtkWidget *about_dialog;
gchar *window_title;
gchar *title;
gchar *last_command;
gint command_count;
gint consec_command_count;
......@@ -1189,17 +1189,17 @@ script_fu_interface (SFScript *script)
/* strip the first part of the menupath if it contains _("/Script-Fu/") */
buf = strstr (gettext (script->description), _("/Script-Fu/"));
if (buf)
sf_interface->window_title = g_strdup_printf (_("Script-Fu: %s"),
(buf + strlen (_("/Script-Fu/"))));
sf_interface->title = g_strdup (buf + strlen (_("/Script-Fu/")));
else
sf_interface->window_title = g_strdup_printf (_("Script-Fu: %s"),
gettext (script->description));
sf_interface->title = g_strdup (gettext (script->description));
buf = strstr (sf_interface->window_title, "...");
buf = strstr (sf_interface->title, "...");
if (buf)
*buf = '\0';
dlg = gimp_dialog_new (sf_interface->window_title, "script-fu",
buf = g_strdup_printf (_("Script-Fu: %s"), sf_interface->title);
dlg = gimp_dialog_new (buf, "script-fu",
gimp_standard_help_func, "filters/script-fu.html",
GTK_WIN_POS_MOUSE,
TRUE, FALSE, TRUE,
......@@ -1210,8 +1210,9 @@ script_fu_interface (SFScript *script)
GTK_STOCK_OK, script_fu_ok_callback,
script, NULL, NULL, TRUE, FALSE,
NULL);
NULL);
g_free (buf);
sf_interface->dialog = dlg;
g_signal_connect_swapped (G_OBJECT (dlg), "destroy",
......@@ -1225,8 +1226,12 @@ script_fu_interface (SFScript *script)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
sf_interface->status = gtk_label_new (sf_interface->window_title);
gtk_label_set_justify (GTK_LABEL (sf_interface->status), GTK_JUSTIFY_LEFT);
sf_interface->status = gtk_label_new (NULL);
buf = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>",
sf_interface->title);
gtk_label_set_markup (GTK_LABEL (sf_interface->status), buf);
g_free (buf);
gtk_misc_set_alignment (GTK_MISC (sf_interface->status), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), sf_interface->status, TRUE, TRUE, 0);
gtk_widget_show (sf_interface->status);
......@@ -1518,7 +1523,7 @@ script_fu_interface_quit (SFScript *script)
g_return_if_fail (script != NULL);
g_return_if_fail (sf_interface != NULL);
g_free (sf_interface->window_title);
g_free (sf_interface->title);
if (sf_interface->about_dialog)
gtk_widget_destroy (sf_interface->about_dialog);
......@@ -1884,7 +1889,7 @@ script_fu_about_callback (GtkWidget *widget,
if (sf_interface->about_dialog == NULL)
{
dialog = gimp_dialog_new (sf_interface->window_title, "script-fu-about",
dialog = gimp_dialog_new (sf_interface->title, "script-fu-about",
gimp_standard_help_func,
"filters/script-fu.html",
GTK_WIN_POS_MOUSE,
......
......@@ -134,7 +134,7 @@ typedef struct
GtkWidget **args_widgets;
GtkWidget *status;
GtkWidget *about_dialog;
gchar *window_title;
gchar *title;
gchar *last_command;
gint command_count;
gint consec_command_count;
......@@ -1189,17 +1189,17 @@ script_fu_interface (SFScript *script)
/* strip the first part of the menupath if it contains _("/Script-Fu/") */
buf = strstr (gettext (script->description), _("/Script-Fu/"));
if (buf)
sf_interface->window_title = g_strdup_printf (_("Script-Fu: %s"),
(buf + strlen (_("/Script-Fu/"))));
sf_interface->title = g_strdup (buf + strlen (_("/Script-Fu/")));
else
sf_interface->window_title = g_strdup_printf (_("Script-Fu: %s"),
gettext (script->description));
sf_interface->title = g_strdup (gettext (script->description));
buf = strstr (sf_interface->window_title, "...");
buf = strstr (sf_interface->title, "...");
if (buf)
*buf = '\0';
dlg = gimp_dialog_new (sf_interface->window_title, "script-fu",
buf = g_strdup_printf (_("Script-Fu: %s"), sf_interface->title);
dlg = gimp_dialog_new (buf, "script-fu",
gimp_standard_help_func, "filters/script-fu.html",
GTK_WIN_POS_MOUSE,
TRUE, FALSE, TRUE,
......@@ -1210,8 +1210,9 @@ script_fu_interface (SFScript *script)
GTK_STOCK_OK, script_fu_ok_callback,
script, NULL, NULL, TRUE, FALSE,
NULL);
NULL);
g_free (buf);
sf_interface->dialog = dlg;
g_signal_connect_swapped (G_OBJECT (dlg), "destroy",
......@@ -1225,8 +1226,12 @@ script_fu_interface (SFScript *script)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
sf_interface->status = gtk_label_new (sf_interface->window_title);
gtk_label_set_justify (GTK_LABEL (sf_interface->status), GTK_JUSTIFY_LEFT);
sf_interface->status = gtk_label_new (NULL);
buf = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>",
sf_interface->title);
gtk_label_set_markup (GTK_LABEL (sf_interface->status), buf);
g_free (buf);
gtk_misc_set_alignment (GTK_MISC (sf_interface->status), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), sf_interface->status, TRUE, TRUE, 0);
gtk_widget_show (sf_interface->status);
......@@ -1518,7 +1523,7 @@ script_fu_interface_quit (SFScript *script)
g_return_if_fail (script != NULL);
g_return_if_fail (sf_interface != NULL);
g_free (sf_interface->window_title);
g_free (sf_interface->title);
if (sf_interface->about_dialog)
gtk_widget_destroy (sf_interface->about_dialog);
......@@ -1884,7 +1889,7 @@ script_fu_about_callback (GtkWidget *widget,
if (sf_interface->about_dialog == NULL)
{
dialog = gimp_dialog_new (sf_interface->window_title, "script-fu-about",
dialog = gimp_dialog_new (sf_interface->title, "script-fu-about",
gimp_standard_help_func,
"filters/script-fu.html",
GTK_WIN_POS_MOUSE,
......
......@@ -329,12 +329,12 @@ sel2path_dialog (SELVALS *sels)
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, sel2path_reset_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, gtk_widget_destroy,
NULL, 1, NULL, FALSE, TRUE,
GTK_STOCK_OK, sel2path_ok_callback,
NULL, NULL, NULL, TRUE, FALSE,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment