From cf3fb17d67eba87f618a740fcf06089b448da6fd Mon Sep 17 00:00:00 2001 From: Qball Cow Date: Mon, 11 May 2009 01:28:02 +0200 Subject: [PATCH] Change from hscale to spin-button --- src/plugin.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plugin.c b/src/plugin.c index 263ea09..0bb1574 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -153,10 +153,10 @@ void size_changed(GtkWidget *widget, GtkAllocation *alloc, gpointer user_data) } } -void album_size_changed(GtkRange *spin, gpointer user_data) +void album_size_changed(GtkSpinButton *spin, gpointer user_data) { AlbumViewPlugin *self = ALBUM_VIEW_PLUGIN(user_data); - int new_size = ((int)gtk_range_get_value(spin))*20; + int new_size = ((int)gtk_spin_button_get_value(spin))*25+50; if(new_size != self->priv->album_size) { self->priv->album_size = new_size; g_log(AV_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Set new size: %i\n", new_size); @@ -165,7 +165,7 @@ void album_size_changed(GtkRange *spin, gpointer user_data) /* Force re-display */ size_changed(self->priv->albumview_main_box, &(self->priv->albumview_main_box->allocation), self); } - cfg_set_single_value_as_int(config, "albumview", "zoom-level", (int)gtk_range_get_value(spin)); + cfg_set_single_value_as_int(config, "albumview", "zoom-level", (int)gtk_spin_button_get_value(spin)); } static gboolean albumview_scroll_event(GtkWidget *event_box, GdkEventScroll *event, gpointer data) @@ -265,9 +265,9 @@ static void albumview_init(AlbumViewPlugin *self) GtkWidget *event = gtk_scrolled_window_new(NULL, NULL); GtkWidget *hbox = NULL; int i = 0; self->priv->event_bg = gtk_event_box_new(); - self->priv->albumview_main_box = gtk_vbox_new(FALSE, 0); + self->priv->albumview_main_box = gtk_vbox_new(FALSE, 6); - self->priv->album_size = 20*cfg_get_single_value_as_int_with_default(config, "albumview", "zoom-level", 10); + self->priv->album_size = 25*cfg_get_single_value_as_int_with_default(config, "albumview", "zoom-level", 5)+50; g_signal_connect(G_OBJECT(event), "size-allocate", G_CALLBACK(size_changed), self); GtkWidget *iv = self->priv->albumview_box = gtk_vbox_new(FALSE, 6); @@ -279,26 +279,26 @@ static void albumview_init(AlbumViewPlugin *self) // gtk_box_pack_start(GTK_BOX(self->priv->albumview_main_box), self->priv->filter_entry, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(self->priv->filter_entry),"changed", G_CALLBACK(filter_list), self); - GtkWidget *spin= gtk_hscale_new_with_range(4, 15, 1); - gtk_scale_set_draw_value(GTK_SCALE(spin), FALSE); - gtk_range_set_value(GTK_RANGE(spin), self->priv->album_size); + GtkWidget *spin= gtk_spin_button_new_with_range(1, 10, 1); +// gtk_scale_set_draw_value(GTK_SCALE(spin), FALSE); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), self->priv->album_size); hbox = gtk_hbox_new(FALSE, 6); gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(("Filter")), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox),self->priv->filter_entry, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(("Zoom")), FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(("Zoom level")), FALSE, FALSE, 0); gtk_widget_set_size_request(spin, 140, -1); gtk_box_pack_start(GTK_BOX(hbox),spin, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(self->priv->albumview_main_box), hbox, FALSE, FALSE, 0); #if GTK_CHECK_VERSION(2,16,0) - for(i=4; i<15;i++){ +/* for(i=4; i<15;i++){ gtk_scale_add_mark(GTK_SCALE(spin), (gdouble)i,GTK_POS_TOP, NULL); - } + }*/ #endif - gtk_range_set_value(GTK_RANGE(spin), cfg_get_single_value_as_int_with_default(config, "albumview", "zoom-level", 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), cfg_get_single_value_as_int_with_default(config, "albumview", "zoom-level", 10)); g_signal_connect(G_OBJECT(spin), "value-changed", G_CALLBACK(album_size_changed), self); -- 2.11.4.GIT