removed our own action_area API and use GtkDialog's one. Create all
2003-11-06 Michael Natterer <mitch@gimp.org> * libgimpwidgets/gimpdialog.[ch]: removed our own action_area API and use GtkDialog's one. Create all dialogs without separator. Changed almost everything else too. Fixes bug #125143. * libgimpwidgets/gimpquerybox.c * libgimpwidgets/gimpunitmenu.c: changed accordingly. * libgimp/gimpexport.[ch]: ditto. Renamed enum GimpExportReturnType to GimpExportReturn. * libgimp/gimpcompat.h: added a #define for the old name. * themes/Default/gtkrc: increased action_area border to 6 pixels. * app/display/gimpdisplayshell-filter-dialog.c * app/display/gimpdisplayshell-scale.c * app/display/gimpprogress.c * app/gui/brush-select.c * app/gui/channels-commands.c * app/gui/color-notebook.c * app/gui/convert-dialog.c * app/gui/file-new-dialog.c * app/gui/font-select.c * app/gui/gradient-editor-commands.c * app/gui/gradient-select.c * app/gui/grid-dialog.c * app/gui/image-commands.c * app/gui/info-window.c * app/gui/layers-commands.c * app/gui/module-browser.c * app/gui/offset-dialog.c * app/gui/palette-import-dialog.c * app/gui/palette-select.c * app/gui/pattern-select.c * app/gui/preferences-dialog.c * app/gui/qmask-commands.c * app/gui/resize-dialog.c * app/gui/resolution-calibrate-dialog.c * app/gui/stroke-dialog.c * app/gui/templates-commands.c * app/gui/user-install-dialog.c * app/gui/vectors-commands.c * app/tools/gimpcolorpickertool.c * app/tools/gimpcroptool.c * app/tools/gimpimagemaptool.c * app/tools/gimpmeasuretool.c * app/tools/gimptransformtool.c * app/widgets/gimptexteditor.c * app/widgets/gimptooldialog.[ch] * app/widgets/gimpviewabledialog.[ch] * app/widgets/gimpwidgets-utils.c: changed accordingly and increased the dialogs' outer borders to 6 pixels all over the place. * plug-ins/*/*.c: changed accordingly. The plug-ins may be arbitrarily broken, I tested none of them.
This commit is contained in:
committed by
Michael Natterer
parent
5648130ad3
commit
66c5dd8772
@ -130,7 +130,8 @@ static void server_log (gchar *format,
|
||||
static void server_quit (void);
|
||||
|
||||
static gboolean server_interface (void);
|
||||
static void ok_callback (GtkWidget *widget,
|
||||
static void response_callback (GtkWidget *widget,
|
||||
gint response_id,
|
||||
gpointer data);
|
||||
|
||||
|
||||
@ -163,13 +164,13 @@ static ServerInterface sint =
|
||||
* Server interface functions
|
||||
*/
|
||||
|
||||
void
|
||||
void
|
||||
script_fu_server_quit (void)
|
||||
{
|
||||
script_fu_done = TRUE;
|
||||
}
|
||||
|
||||
gint
|
||||
gint
|
||||
script_fu_server_get_mode (void)
|
||||
{
|
||||
return server_mode;
|
||||
@ -456,7 +457,7 @@ read_from_client (gint filedes)
|
||||
|
||||
if (nbytes == 0)
|
||||
return -1; /* EOF */
|
||||
|
||||
|
||||
i += nbytes;
|
||||
}
|
||||
|
||||
@ -483,9 +484,9 @@ read_from_client (gint filedes)
|
||||
g_free (command);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
i += nbytes;
|
||||
}
|
||||
}
|
||||
|
||||
command[command_len] = '\0';
|
||||
cmd = g_new (SFCommand, 1);
|
||||
@ -599,18 +600,17 @@ server_interface (void)
|
||||
gimp_ui_init ("script-fu", FALSE);
|
||||
|
||||
dlg = gimp_dialog_new (_("Script-Fu Server Options"), "script-fu",
|
||||
gimp_standard_help_func, "filters/script-fu.html",
|
||||
GTK_WIN_POS_MOUSE,
|
||||
FALSE, TRUE, FALSE,
|
||||
NULL, 0,
|
||||
gimp_standard_help_func, "filters/script-fu.html",
|
||||
|
||||
GTK_STOCK_CANCEL, gtk_widget_destroy,
|
||||
NULL, 1, NULL, FALSE, TRUE,
|
||||
|
||||
GTK_STOCK_OK, ok_callback,
|
||||
NULL, NULL, NULL, TRUE, FALSE,
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
||||
|
||||
NULL);
|
||||
|
||||
g_signal_connect (dlg, "response",
|
||||
G_CALLBACK (response_callback),
|
||||
NULL);
|
||||
g_signal_connect (dlg, "destroy",
|
||||
G_CALLBACK (gtk_main_quit),
|
||||
NULL);
|
||||
@ -625,13 +625,13 @@ server_interface (void)
|
||||
/* The server port */
|
||||
sint.port_entry = gtk_entry_new ();
|
||||
gtk_entry_set_text (GTK_ENTRY (sint.port_entry), "10008");
|
||||
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
|
||||
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
|
||||
_("Server Port:"), 1.0, 0.5,
|
||||
sint.port_entry, 1, TRUE);
|
||||
|
||||
/* The server logfile */
|
||||
sint.log_entry = gtk_entry_new ();
|
||||
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
|
||||
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
|
||||
_("Server Logfile:"), 1.0, 0.5,
|
||||
sint.log_entry, 1, TRUE);
|
||||
|
||||
@ -644,14 +644,18 @@ server_interface (void)
|
||||
}
|
||||
|
||||
static void
|
||||
ok_callback (GtkWidget *widget,
|
||||
gpointer data)
|
||||
response_callback (GtkWidget *widget,
|
||||
gint response_id,
|
||||
gpointer data)
|
||||
{
|
||||
g_free (sint.logfile);
|
||||
if (response_id == GTK_RESPONSE_OK)
|
||||
{
|
||||
g_free (sint.logfile);
|
||||
|
||||
sint.port = atoi (gtk_entry_get_text (GTK_ENTRY (sint.port_entry)));
|
||||
sint.logfile = g_strdup (gtk_entry_get_text (GTK_ENTRY (sint.log_entry)));
|
||||
sint.run = TRUE;
|
||||
sint.port = atoi (gtk_entry_get_text (GTK_ENTRY (sint.port_entry)));
|
||||
sint.logfile = g_strdup (gtk_entry_get_text (GTK_ENTRY (sint.log_entry)));
|
||||
sint.run = TRUE;
|
||||
}
|
||||
|
||||
gtk_widget_destroy (GTK_WIDGET (data));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user