diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/test-nautilus-clickable-image.c | 16 | ||||
| -rw-r--r-- | test/test-nautilus-labeled-image.c | 18 | ||||
| -rw-r--r-- | test/test.c | 6 |
4 files changed, 38 insertions, 9 deletions
@@ -1,5 +1,12 @@ 2001-02-11 Ramiro Estrugo <ramiro@eazel.com> + * test/test-nautilus-clickable-image.c: (main): + * test/test-nautilus-labeled-image.c: (button_callback), + (labeled_image_button_window_new): + A tiny bit more debug code. + +2001-02-11 Ramiro Estrugo <ramiro@eazel.com> + * applets/preferences-applet/nautilus-preferences-applet.c: (user_level_changed_callback), (main): Make toggle buttons insensitive on novice user level. diff --git a/test/test-nautilus-clickable-image.c b/test/test-nautilus-clickable-image.c index 742f30858..d87acb977 100644 --- a/test/test-nautilus-clickable-image.c +++ b/test/test-nautilus-clickable-image.c @@ -58,15 +58,19 @@ main (int argc, char* argv[]) vbox = gtk_vbox_new (TRUE, 10); gtk_container_add (GTK_CONTAINER (window), vbox); + clickable_images[0] = NULL; + clickable_images[1] = NULL; + clickable_images[2] = NULL; + pixbuf = test_pixbuf_new_named ("/usr/share/pixmaps/gnome-globe.png", 1.0); - clickable_images[0] = clickable_image_new ("Clickable Image", pixbuf); - clickable_images[1] = clickable_image_new ("Clickable Image No pixbuf", NULL); - clickable_images[2] = clickable_image_new (NULL, pixbuf); + if (1) clickable_images[0] = clickable_image_new ("Clickable Image", pixbuf); + if (0) clickable_images[1] = clickable_image_new ("Clickable Image No pixbuf", NULL); + if (0) clickable_images[2] = clickable_image_new (NULL, pixbuf); gdk_pixbuf_unref (pixbuf); - gtk_box_pack_start (GTK_BOX (vbox), clickable_images[0], FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), clickable_images[1], FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), clickable_images[2], FALSE, FALSE, 0); + if (clickable_images[0]) gtk_box_pack_start (GTK_BOX (vbox), clickable_images[0], FALSE, FALSE, 0); + if (clickable_images[1]) gtk_box_pack_start (GTK_BOX (vbox), clickable_images[1], FALSE, FALSE, 0); + if (clickable_images[2]) gtk_box_pack_start (GTK_BOX (vbox), clickable_images[2], FALSE, FALSE, 0); gtk_widget_show_all (window); diff --git a/test/test-nautilus-labeled-image.c b/test/test-nautilus-labeled-image.c index 3eb2420bd..208f9fdb7 100644 --- a/test/test-nautilus-labeled-image.c +++ b/test/test-nautilus-labeled-image.c @@ -50,6 +50,16 @@ labeled_image_window_new (const char *title, return window; } +static void +button_callback (GtkWidget *button, + gpointer callback_data) +{ + const char *info = callback_data; + g_return_if_fail (GTK_IS_BUTTON (button)); + + g_print ("%s(%p)\n", info, button); +} + static GtkWidget * labeled_image_button_window_new (const char *title, GdkPixbuf *pixbuf) @@ -72,6 +82,14 @@ labeled_image_button_window_new (const char *title, if (toggle_button) gtk_box_pack_start (GTK_BOX (vbox), toggle_button, TRUE, TRUE, 0); if (check_button) gtk_box_pack_start (GTK_BOX (vbox), check_button, TRUE, TRUE, 0); + if (button) { + gtk_signal_connect (GTK_OBJECT (button), "enter", GTK_SIGNAL_FUNC (button_callback), "enter"); + gtk_signal_connect (GTK_OBJECT (button), "leave", GTK_SIGNAL_FUNC (button_callback), "leave"); + gtk_signal_connect (GTK_OBJECT (button), "pressed", GTK_SIGNAL_FUNC (button_callback), "pressed"); + gtk_signal_connect (GTK_OBJECT (button), "released", GTK_SIGNAL_FUNC (button_callback), "released"); + gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (button_callback), "clicked"); + } + gtk_widget_show_all (vbox); return window; diff --git a/test/test.c b/test/test.c index cc24a3ea4..ad1ba0be8 100644 --- a/test/test.c +++ b/test/test.c @@ -461,7 +461,7 @@ test_text_caption_set_text_for_string_preferences (NautilusTextCaption *text_cap void test_text_caption_set_text_for_default_int_preferences (NautilusTextCaption *text_caption, - const char *name) + const char *name) { int int_value; char *text; @@ -469,7 +469,7 @@ test_text_caption_set_text_for_default_int_preferences (NautilusTextCaption *tex g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption)); g_return_if_fail (name != NULL); - int_value = nautilus_preferences_default_get_integer (name, nautilus_preferences_get_user_level ()); + int_value = 0; text = g_strdup_printf ("%d", int_value); @@ -487,7 +487,7 @@ test_text_caption_set_text_for_default_string_preferences (NautilusTextCaption * g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption)); g_return_if_fail (name != NULL); - text = nautilus_preferences_default_get_string (name, nautilus_preferences_get_user_level ()); + text = g_strdup (""); nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (text_caption), text); |