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

app/gui/splash.c reverted stuff someone accidentially checked in... 

2002-05-15  Michael Natterer  <mitch@gimp.org>

	* app/gui/splash.c
	* libgimpproxy/gimpobject.h: reverted stuff someone
	accidentially checked in...
This commit is contained in:
Michael Natterer 2002-05-15 15:55:10 +00:00 committed by Michael Natterer
parent 08ce93e959
commit 821961b8f9
3 changed files with 16 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-05-15 Michael Natterer <mitch@gimp.org>
* app/gui/splash.c
* libgimpproxy/gimpobject.h: reverted stuff someone
accidentially checked in...
2002-05-15 Jakub Steiner <jimmac@ximian.com>
* themes/Default/images/preferences/tool-options.png:

21
app/gui/splash.c
View File

@ -45,7 +45,7 @@ void
splash_create (gboolean show_image)
{
GtkWidget *vbox;
GdkPixbufAnimation *animation = NULL;
GdkPixbuf *pixbuf = NULL;
win_initstatus = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_type_hint (GTK_WINDOW (win_initstatus),
@ -54,7 +54,7 @@ splash_create (gboolean show_image)
gtk_window_set_title (GTK_WINDOW (win_initstatus), _("GIMP Startup"));
gtk_window_set_wmclass (GTK_WINDOW (win_initstatus), "gimp_startup", "Gimp");
gtk_window_set_position (GTK_WINDOW (win_initstatus), GTK_WIN_POS_CENTER);
gtk_window_set_policy (GTK_WINDOW (win_initstatus), FALSE, FALSE, FALSE);
gtk_window_set_resizable (GTK_WINDOW (win_initstatus), FALSE);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_add (GTK_CONTAINER (win_initstatus), vbox);
@ -65,17 +65,17 @@ splash_create (gboolean show_image)
gchar *filename;
filename = g_build_filename (gimp_data_directory (),
"images", "gimp_splash.gif", NULL);
animation = gdk_pixbuf_animation_new_from_file (filename, NULL);
"images", "gimp_splash.png", NULL);
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
if (animation)
if (pixbuf)
{
GtkWidget *align;
GtkWidget *image;
image = gtk_image_new_from_animation (animation);
g_object_unref (animation);
image = gtk_image_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, TRUE, 0);
@ -86,7 +86,7 @@ splash_create (gboolean show_image)
}
}
if (!animation)
if (!pixbuf)
{
GtkWidget *line;
@ -101,6 +101,8 @@ splash_create (gboolean show_image)
line = gtk_hseparator_new ();
gtk_box_pack_start_defaults (GTK_BOX (vbox), line);
gtk_widget_show (line);
gtk_widget_set_size_request (win_initstatus, DEFAULT_WIDTH, -1);
}
label1 = gtk_label_new ("");
@ -115,9 +117,6 @@ splash_create (gboolean show_image)
gtk_box_pack_start_defaults (GTK_BOX (vbox), progress);
gtk_widget_show (progress);
if (!animation)
gtk_widget_set_size_request (win_initstatus, DEFAULT_WIDTH, -1);
gtk_widget_show (win_initstatus);
}

256
libgimpproxy/gimpobject.h
View File

@ -69,259 +69,3 @@ gsize gimp_object_get_memsize (GimpObject *object);
/* Generated data ends here */
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_object_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpObject),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_object_init,
};
object_type = g_type_register_static (G_TYPE_OBJECT,
"GimpObject",
&object_info, 0);
}
return object_type;
}
static void
gimp_object_class_init (GimpObjectClass *klass)
{
GObjectClass *object_class;
object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
/* we use the gobject marshaller names directly so libgimpproxy doesn't need
* gimpmarshal.* around. -Yosh
*/
object_signals[DISCONNECT] =
g_signal_new ("disconnect",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpObjectClass, disconnect),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_signals[NAME_CHANGED] =
g_signal_new ("name_changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpObjectClass, name_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_class->dispose = gimp_object_dispose;
object_class->finalize = gimp_object_finalize;
object_class->set_property = gimp_object_set_property;
object_class->get_property = gimp_object_get_property;
klass->disconnect = NULL;
klass->name_changed = NULL;
klass->get_memsize = gimp_object_real_get_memsize;
g_object_class_install_property (object_class,
PROP_NAME,
g_param_spec_string ("name",
NULL, NULL,
NULL,
G_PARAM_READWRITE));
}
static void
gimp_object_init (GimpObject *object)
{
object->name = NULL;
}
static void
gimp_object_dispose (GObject *object)
{
gboolean disconnected;
disconnected = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (object),
"disconnected"));
if (! disconnected)
{
g_signal_emit (G_OBJECT (object), object_signals[DISCONNECT], 0);
g_object_set_data (G_OBJECT (object), "disconnected",
GINT_TO_POINTER (TRUE));
}
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_object_finalize (GObject *object)
{
GimpObject *gimp_object;
gimp_object = GIMP_OBJECT (object);
if (gimp_object->name)
{
g_free (gimp_object->name);
gimp_object->name = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
gimp_object_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
GimpObject *gimp_object;
gimp_object = GIMP_OBJECT (object);
switch (property_id)
{
case PROP_NAME:
gimp_object_set_name (gimp_object, g_value_get_string (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static void
gimp_object_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
GimpObject *gimp_object;
gimp_object = GIMP_OBJECT (object);
switch (property_id)
{
case PROP_NAME:
g_value_set_string (value, gimp_object->name);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
void
gimp_object_set_name (GimpObject *object,
const gchar *name)
{
g_return_if_fail (GIMP_IS_OBJECT (object));
if ((!object->name && !name) ||
(object->name && name && !strcmp (object->name, name)))
return;
g_free (object->name);
object->name = g_strdup (name);
gimp_object_name_changed (object);
}
const gchar *
gimp_object_get_name (const GimpObject *object)
{
g_return_val_if_fail (GIMP_IS_OBJECT (object), NULL);
return object->name;
}
void
gimp_object_name_changed (GimpObject *object)
{
g_return_if_fail (GIMP_IS_OBJECT (object));
g_signal_emit (G_OBJECT (object), object_signals[NAME_CHANGED], 0);
}
#define DEBUG_MEMSIZE 1
#ifdef DEBUG_MEMSIZE
gboolean gimp_debug_memsize = FALSE;
#endif
gsize
gimp_object_get_memsize (GimpObject *object)
{
g_return_val_if_fail (GIMP_IS_OBJECT (object), 0);
#ifdef DEBUG_MEMSIZE
if (gimp_debug_memsize)
{
static gint indent_level = 0;
static GList *aggregation_tree = NULL;
static gchar indent_buf[256];
gsize memsize;
gint i;
gint my_indent_level;
gchar *object_size;
indent_level++;
my_indent_level = indent_level;
memsize = GIMP_OBJECT_GET_CLASS (object)->get_memsize (object);
indent_level--;
for (i = 0; i < MIN (my_indent_level * 2, sizeof (indent_buf) - 1); i++)
indent_buf[i] = ' ';
indent_buf[i] = '\0';
object_size = g_strdup_printf ("%s%s \"%s\": %d\n",
indent_buf,
g_type_name (G_TYPE_FROM_INSTANCE (object)),
object->name,
memsize);
aggregation_tree = g_list_prepend (aggregation_tree, object_size);
if (indent_level == 0)
{
g_list_foreach (aggregation_tree, (GFunc) g_print, NULL);
g_list_foreach (aggregation_tree, (GFunc) g_free, NULL);
g_list_free (aggregation_tree);
aggregation_tree = NULL;
}
return memsize;
}
#endif /* DEBUG_MEMSIZE */
return GIMP_OBJECT_GET_CLASS (object)->get_memsize (object);
}
static gsize
gimp_object_real_get_memsize (GimpObject *object)
{
GTypeQuery type_query;
gsize memsize = 0;
g_type_query (G_TYPE_FROM_INSTANCE (object), &type_query);
memsize += type_query.instance_size;
if (object->name)
memsize += strlen (object->name) + 1;
return