diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 0105b6973..684c69713 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,8 @@ +2001-12-17 Bradford Hovinen + + * background-properties-capplet.c (create_dialog): Use + prefs_widget rather than preview placeholder widget + 2001-12-07 Bradford Hovinen * background.schema: Fix default values diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c index 38921a86a..df274eeaa 100644 --- a/capplets/background/background-properties-capplet.c +++ b/capplets/background/background-properties-capplet.c @@ -242,7 +242,7 @@ create_dialog (void) g_signal_connect_swapped (G_OBJECT (widget), "destroy", (GCallback) g_object_unref, G_OBJECT (applier)); /* Minor GUI addition */ - holder = WID ("preview_holder"); + holder = WID ("prefs_widget"); gtk_box_pack_start (GTK_BOX (holder), applier_get_preview_widget (applier), TRUE, TRUE, 0); gtk_widget_show_all (holder); diff --git a/capplets/background/background-properties.glade b/capplets/background/background-properties.glade index e516eedad..c2a2253ff 100644 --- a/capplets/background/background-properties.glade +++ b/capplets/background/background-properties.glade @@ -20,53 +20,6 @@ 0 yes - - - no - 0 - yes - - - - no - 0 - yes - - - - yes - - - - - 0 - yes - yes - - - - - 0 - no - no - - - - - - yes - Use a picture for the background - no - yes - yes - - - 0 - no - no - - - 4 @@ -344,6 +297,7 @@ 0 no no + GTK_PACK_END @@ -483,6 +437,23 @@ 0 no no + GTK_PACK_END + + + + + + yes + Use a picture for the background + no + yes + yes + + + 0 + no + no + GTK_PACK_END diff --git a/capplets/background/background-properties.glade1 b/capplets/background/background-properties.glade1 index f32d2f0b4..67245aef9 100644 --- a/capplets/background/background-properties.glade1 +++ b/capplets/background/background-properties.glade1 @@ -30,48 +30,6 @@ False 0 - - GtkHBox - hbox3 - False - 0 - - 0 - False - False - - - - GtkVBox - preview_holder - False - 0 - - 0 - True - True - - - - Placeholder - - - - - - GtkCheckButton - picture_enabled_check - True - - False - True - - 0 - False - False - - - GtkFrame picture_frame @@ -83,6 +41,7 @@ 0 False False + GTK_PACK_END @@ -321,6 +280,7 @@ Stretched 0 False False + GTK_PACK_END @@ -392,6 +352,21 @@ Vertical gradient + + + GtkCheckButton + picture_enabled_check + True + + False + True + + 0 + False + False + GTK_PACK_END + +