diff --git a/ChangeLog b/ChangeLog index 99372462df..4709fb9cff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-09-28 Michael Natterer + + * app/gui/preferences-dialog.c: added a frame around the tree. + + * app/widgets/gimphistogramview.c: forgot to pass the "detail" to + g_signal_emit(). Should fix the histogram tool. Thanks to Seth for + debugging. + 2001-09-28 Wang Jian * configure.in(ALL_LINGUAS): Added zh_CN diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 52057ef7b0..08e69e5081 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -1543,21 +1543,20 @@ preferences_dialog_create (void) old_tile_cache_size = edit_tile_cache_size; /* Create the dialog */ - prefs_dlg = - gimp_dialog_new (_("Preferences"), "gimp_preferences", - prefs_help_func, - "dialogs/preferences/preferences.html", - GTK_WIN_POS_NONE, - FALSE, TRUE, FALSE, + prefs_dlg = gimp_dialog_new (_("Preferences"), "gimp_preferences", + prefs_help_func, + "dialogs/preferences/preferences.html", + GTK_WIN_POS_NONE, + FALSE, TRUE, FALSE, - GTK_STOCK_OK, prefs_ok_callback, - NULL, NULL, NULL, TRUE, FALSE, - GTK_STOCK_SAVE, prefs_save_callback, - NULL, NULL, NULL, FALSE, FALSE, - GTK_STOCK_CANCEL, prefs_cancel_callback, - NULL, NULL, NULL, FALSE, TRUE, + GTK_STOCK_OK, prefs_ok_callback, + NULL, NULL, NULL, TRUE, FALSE, + GTK_STOCK_SAVE, prefs_save_callback, + NULL, NULL, NULL, FALSE, FALSE, + GTK_STOCK_CANCEL, prefs_cancel_callback, + NULL, NULL, NULL, FALSE, TRUE, - NULL); + NULL); /* The main hbox */ hbox = gtk_hbox_new (FALSE, 6); @@ -1566,6 +1565,11 @@ preferences_dialog_create (void) gtk_widget_show (hbox); /* The categories tree */ + frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); + gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0); + gtk_widget_show (frame); + tree = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_INT); tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (tree)); g_object_unref (G_OBJECT (tree)); @@ -1575,7 +1579,7 @@ preferences_dialog_create (void) gtk_cell_renderer_text_new (), "text", 0, NULL); - gtk_box_pack_start (GTK_BOX (hbox), tv, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (frame), tv); /* The main preferences notebook */ frame = gtk_frame_new (NULL); diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index 52057ef7b0..08e69e5081 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -1543,21 +1543,20 @@ preferences_dialog_create (void) old_tile_cache_size = edit_tile_cache_size; /* Create the dialog */ - prefs_dlg = - gimp_dialog_new (_("Preferences"), "gimp_preferences", - prefs_help_func, - "dialogs/preferences/preferences.html", - GTK_WIN_POS_NONE, - FALSE, TRUE, FALSE, + prefs_dlg = gimp_dialog_new (_("Preferences"), "gimp_preferences", + prefs_help_func, + "dialogs/preferences/preferences.html", + GTK_WIN_POS_NONE, + FALSE, TRUE, FALSE, - GTK_STOCK_OK, prefs_ok_callback, - NULL, NULL, NULL, TRUE, FALSE, - GTK_STOCK_SAVE, prefs_save_callback, - NULL, NULL, NULL, FALSE, FALSE, - GTK_STOCK_CANCEL, prefs_cancel_callback, - NULL, NULL, NULL, FALSE, TRUE, + GTK_STOCK_OK, prefs_ok_callback, + NULL, NULL, NULL, TRUE, FALSE, + GTK_STOCK_SAVE, prefs_save_callback, + NULL, NULL, NULL, FALSE, FALSE, + GTK_STOCK_CANCEL, prefs_cancel_callback, + NULL, NULL, NULL, FALSE, TRUE, - NULL); + NULL); /* The main hbox */ hbox = gtk_hbox_new (FALSE, 6); @@ -1566,6 +1565,11 @@ preferences_dialog_create (void) gtk_widget_show (hbox); /* The categories tree */ + frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); + gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0); + gtk_widget_show (frame); + tree = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_INT); tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (tree)); g_object_unref (G_OBJECT (tree)); @@ -1575,7 +1579,7 @@ preferences_dialog_create (void) gtk_cell_renderer_text_new (), "text", 0, NULL); - gtk_box_pack_start (GTK_BOX (hbox), tv, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (frame), tv); /* The main preferences notebook */ frame = gtk_frame_new (NULL); diff --git a/app/widgets/gimphistogramview.c b/app/widgets/gimphistogramview.c index 28008920ba..fd8e6ede36 100644 --- a/app/widgets/gimphistogramview.c +++ b/app/widgets/gimphistogramview.c @@ -216,7 +216,7 @@ histogram_widget_events (HistogramWidget *histogram, gdk_pointer_ungrab (bevent->time); g_signal_emit (G_OBJECT(histogram), - histogram_widget_signals[RANGE_CHANGED], + histogram_widget_signals[RANGE_CHANGED], 0, MIN (histogram->start, histogram->end), MAX (histogram->start, histogram->end)); break; @@ -274,7 +274,7 @@ histogram_widget_update (HistogramWidget *histogram_widget, /* Give a range callback */ g_signal_emit (G_OBJECT (histogram_widget), - histogram_widget_signals[RANGE_CHANGED], + histogram_widget_signals[RANGE_CHANGED], 0, MIN (histogram_widget->start, histogram_widget->end), MAX (histogram_widget->start, histogram_widget->end)); } @@ -301,7 +301,7 @@ histogram_widget_channel (HistogramWidget *histogram, /* Give a range callback */ g_signal_emit (G_OBJECT (histogram), - histogram_widget_signals[RANGE_CHANGED], + histogram_widget_signals[RANGE_CHANGED], 0, MIN (histogram->start, histogram->end), MAX (histogram->start, histogram->end)); }