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

added "viewable" as a property. 

2006-04-23  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimpviewabledialog.c: added "viewable" as a property.
This commit is contained in:
Sven Neumann 2006-04-23 02:28:15 +00:00 committed by Sven Neumann
parent 7755ec12dd
commit 9508618a50
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-04-23 Sven Neumann <sven@gimp.org>
* app/widgets/gimpviewabledialog.c: added "viewable" as a property.
2006-04-23 Sven Neumann <sven@gimp.org> 2006-04-23 Sven Neumann <sven@gimp.org>
* app/dialogs/module-dialog.c * app/dialogs/module-dialog.c

43
app/widgets/gimpviewabledialog.c
View File

@ -39,6 +39,7 @@
enum enum
{ {
PROP_0, PROP_0,
PROP_VIEWABLE,
PROP_STOCK_ID, PROP_STOCK_ID,
PROP_DESC, PROP_DESC,
PROP_PARENT PROP_PARENT
@ -49,6 +50,10 @@ static void gimp_viewable_dialog_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gimp_viewable_dialog_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_viewable_dialog_destroy (GtkObject *object); static void gimp_viewable_dialog_destroy (GtkObject *object);
@ -70,8 +75,13 @@ gimp_viewable_dialog_class_init (GimpViewableDialogClass *klass)
gtk_object_class->destroy = gimp_viewable_dialog_destroy; gtk_object_class->destroy = gimp_viewable_dialog_destroy;
object_class->get_property = gimp_viewable_dialog_get_property;
object_class->set_property = gimp_viewable_dialog_set_property; object_class->set_property = gimp_viewable_dialog_set_property;
g_object_class_install_property (object_class, PROP_VIEWABLE,
g_param_spec_object ("viewable", NULL, NULL,
GIMP_TYPE_VIEWABLE,
GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_STOCK_ID, g_object_class_install_property (object_class, PROP_STOCK_ID,
g_param_spec_string ("stock-id", NULL, NULL, g_param_spec_string ("stock-id", NULL, NULL,
NULL, NULL,
@ -147,6 +157,9 @@ gimp_viewable_dialog_set_property (GObject *object,
switch (property_id) switch (property_id)
{ {
case PROP_VIEWABLE:
gimp_viewable_dialog_set_viewable (dialog, g_value_get_object (value));
break;
case PROP_STOCK_ID: case PROP_STOCK_ID:
gtk_image_set_from_stock (GTK_IMAGE (dialog->icon), gtk_image_set_from_stock (GTK_IMAGE (dialog->icon),
g_value_get_string (value), g_value_get_string (value),
@ -177,6 +190,27 @@ gimp_viewable_dialog_set_property (GObject *object,
} }
} }
static void
gimp_viewable_dialog_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
GimpViewableDialog *dialog = GIMP_VIEWABLE_DIALOG (object);
switch (property_id)
{
case PROP_VIEWABLE:
g_value_set_object (value,
dialog->view ?
GIMP_VIEW (dialog->view)->viewable : NULL);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static void static void
gimp_viewable_dialog_destroy (GtkObject *object) gimp_viewable_dialog_destroy (GtkObject *object)
{ {
@ -207,7 +241,11 @@ gimp_viewable_dialog_new (GimpViewable *viewable,
g_return_val_if_fail (role != NULL, NULL); g_return_val_if_fail (role != NULL, NULL);
g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL); g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
if (! viewable)
g_warning ("Use of GimpViewableDialog with a NULL viewable is depecrated!");
dialog = g_object_new (GIMP_TYPE_VIEWABLE_DIALOG, dialog = g_object_new (GIMP_TYPE_VIEWABLE_DIALOG,
"viewable", viewable,
"title", title, "title", title,
"role", role, "role", role,
"help-func", help_func, "help-func", help_func,
@ -221,8 +259,6 @@ gimp_viewable_dialog_new (GimpViewable *viewable,
gimp_dialog_add_buttons_valist (GIMP_DIALOG (dialog), args); gimp_dialog_add_buttons_valist (GIMP_DIALOG (dialog), args);
va_end (args); va_end (args);
gimp_viewable_dialog_set_viewable (dialog, viewable);
return GTK_WIDGET (dialog); return GTK_WIDGET (dialog);
} }
@ -233,9 +269,6 @@ gimp_viewable_dialog_set_viewable (GimpViewableDialog *dialog,
g_return_if_fail (GIMP_IS_VIEWABLE_DIALOG (dialog)); g_return_if_fail (GIMP_IS_VIEWABLE_DIALOG (dialog));
g_return_if_fail (! viewable || GIMP_IS_VIEWABLE (viewable)); g_return_if_fail (! viewable || GIMP_IS_VIEWABLE (viewable));
if (! viewable)
g_warning ("Use of GimpViewableDialog with a NULL viewable is depecrated!");
if (dialog->view) if (dialog->view)
{ {
GimpViewable *old_viewable = GIMP_VIEW (dialog->view)->viewable; GimpViewable *old_viewable = GIMP_VIEW (dialog->view)->viewable;