[Goodies-commits] r4787 - ristretto/trunk/src
Stephan Arts
stephan at xfce.org
Mon May 12 08:57:27 CEST 2008
Author: stephan
Date: 2008-05-12 06:57:27 +0000 (Mon, 12 May 2008)
New Revision: 4787
Modified:
ristretto/trunk/src/main.c
ristretto/trunk/src/main_window.c
ristretto/trunk/src/main_window.h
Log:
Add option to auto-hide thumbnail-bar when running a slideshow.
Applied patch from Gauvain Pocentek <gauvainpocentek AT gmail DOT com>
(Fixes bug #4076)
Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c 2008-05-12 06:29:24 UTC (rev 4786)
+++ ristretto/trunk/src/main.c 2008-05-12 06:57:27 UTC (rev 4787)
@@ -253,6 +253,7 @@
gint window_width = xfce_rc_read_int_entry(xfce_rc, "LastWindowWidth", 400);
gint window_height = xfce_rc_read_int_entry(xfce_rc, "LastWindowHeight", 300);
gint slideshow_timeout = xfce_rc_read_int_entry(xfce_rc, "SlideShowTimeout", 5000);
+ gboolean slideshow_hide_thumbnail = xfce_rc_read_bool_entry(xfce_rc, "SlideShowHideThumbnail", TRUE);
gint max_cache = xfce_rc_read_int_entry(xfce_rc, "MaxImagesCacheSize", 64);
gboolean preload_during_slideshow = xfce_rc_read_bool_entry (xfce_rc, "PreloadDuringSlideShow", FALSE);
gboolean override_bg_color = xfce_rc_read_bool_entry (xfce_rc, "OverrideBgColor", FALSE);
@@ -277,6 +278,7 @@
rstto_main_window_set_max_cache_size(RSTTO_MAIN_WINDOW(window), max_cache);
rstto_main_window_set_slideshow_timeout(RSTTO_MAIN_WINDOW(window), (gdouble)slideshow_timeout);
+ rstto_main_window_set_hide_thumbnail(RSTTO_MAIN_WINDOW(window), slideshow_hide_thumbnail);
rstto_main_window_set_scale_to_100(RSTTO_MAIN_WINDOW(window), scale_to_100);
rstto_navigator_set_timeout(navigator, slideshow_timeout);
@@ -351,6 +353,7 @@
}
xfce_rc_write_int_entry(xfce_rc, "MaxImagesCacheSize", rstto_main_window_get_max_cache_size(RSTTO_MAIN_WINDOW(window)));
xfce_rc_write_int_entry(xfce_rc, "SlideShowTimeout", (gint)rstto_main_window_get_slideshow_timeout(RSTTO_MAIN_WINDOW(window)));
+ xfce_rc_write_bool_entry(xfce_rc, "SlideShowHideThumbnail", rstto_main_window_get_hide_thumbnail(RSTTO_MAIN_WINDOW(window)));
xfce_rc_flush(xfce_rc);
xfce_rc_close(xfce_rc);
gtk_widget_unref(window);
Modified: ristretto/trunk/src/main_window.c
===================================================================
--- ristretto/trunk/src/main_window.c 2008-05-12 06:29:24 UTC (rev 4786)
+++ ristretto/trunk/src/main_window.c 2008-05-12 06:57:27 UTC (rev 4787)
@@ -66,6 +66,7 @@
gboolean toolbar_visibility;
gint max_cache_size;
gdouble slideshow_timeout;
+ gboolean slideshow_hide_thumbnail;
const GdkColor *bg_color;
gboolean scale_to_100;
RsttoDesktop desktop;
@@ -1044,6 +1045,12 @@
return window->priv->settings.slideshow_timeout;
}
+gboolean
+rstto_main_window_get_hide_thumbnail (RsttoMainWindow *window)
+{
+ return window->priv->settings.slideshow_hide_thumbnail;
+}
+
gint
rstto_main_window_get_max_cache_size (RsttoMainWindow *window)
{
@@ -1058,6 +1065,12 @@
}
void
+rstto_main_window_set_hide_thumbnail (RsttoMainWindow *window, gboolean hide)
+{
+ window->priv->settings.slideshow_hide_thumbnail = hide;
+}
+
+void
rstto_main_window_set_max_cache_size (RsttoMainWindow *window, gint max_cache_size)
{
window->priv->settings.max_cache_size = max_cache_size;
@@ -1296,6 +1309,9 @@
gtk_menu_shell_insert(GTK_MENU_SHELL(window->priv->menus.go.menu), window->priv->menus.go.menu_item_pause, 5);
gtk_widget_show_all(window->priv->menus.go.menu_item_pause);
rstto_navigator_set_running(RSTTO_NAVIGATOR(window->priv->navigator), TRUE);
+ if (window->priv->settings.thumbnail_viewer_visibility &&
+ window->priv->settings.slideshow_hide_thumbnail)
+ gtk_widget_hide (window->priv->thumbnail_viewer);
}
static void
@@ -1306,6 +1322,8 @@
gtk_menu_shell_insert(GTK_MENU_SHELL(window->priv->menus.go.menu), window->priv->menus.go.menu_item_play, 5);
gtk_widget_show_all(window->priv->menus.go.menu_item_play);
rstto_navigator_set_running(RSTTO_NAVIGATOR(window->priv->navigator), FALSE);
+ if (window->priv->settings.thumbnail_viewer_visibility)
+ gtk_widget_show (window->priv->thumbnail_viewer);
}
static void
@@ -1434,6 +1452,9 @@
GtkWidget *preload_vbox = gtk_vbox_new(FALSE, 0);
GtkWidget *preload_frame = xfce_create_framebox_with_content (_("Preload"), preload_vbox);
+ GtkWidget *thumbnails_vbox = gtk_vbox_new(FALSE, 0);
+ GtkWidget *thumbnails_frame = xfce_create_framebox_with_content (_("Thumbnails"), thumbnails_vbox);
+
gtk_container_set_border_width (GTK_CONTAINER (slideshow_frame), 8);
gtk_container_set_border_width (GTK_CONTAINER (preload_frame), 8);
@@ -1444,24 +1465,35 @@
GtkWidget *preload_lbl = gtk_label_new(_("Preload images during slideshow\n(uses more memory)"));
GtkWidget *preload_check = gtk_check_button_new_with_mnemonic(_("_Preload images"));
+ GtkWidget *thumbnails_lbl = gtk_label_new(_("Hide the thumbnails bar during slideshow"));
+ GtkWidget *thumbnails_check = gtk_check_button_new_with_mnemonic(_("_Hide thumbnails"));
+
gtk_misc_set_alignment(GTK_MISC(slideshow_lbl), 0, 0.5);
gtk_misc_set_alignment(GTK_MISC(preload_lbl), 0, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(thumbnails_lbl), 0, 0.5);
gtk_misc_set_padding(GTK_MISC(slideshow_lbl), 2, 2);
gtk_misc_set_padding(GTK_MISC(preload_lbl), 2, 2);
+ gtk_misc_set_padding(GTK_MISC(thumbnails_lbl), 2, 2);
gtk_range_set_value(GTK_RANGE(slideshow_hscale), window->priv->settings.slideshow_timeout / 1000);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(preload_check), window->priv->navigator->preload);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(thumbnails_check), window->priv->settings.slideshow_hide_thumbnail);
+
gtk_box_pack_start(GTK_BOX(slideshow_vbox), slideshow_lbl, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(slideshow_vbox), slideshow_hscale, FALSE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(preload_vbox), preload_lbl, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(preload_vbox), preload_check, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(thumbnails_vbox), thumbnails_lbl, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(thumbnails_vbox), thumbnails_check, FALSE, TRUE, 0);
+
gtk_box_pack_start(GTK_BOX(slideshow_main_vbox), slideshow_frame, FALSE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(slideshow_main_vbox), preload_frame, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(slideshow_main_vbox), thumbnails_frame, FALSE, TRUE, 0);
gtk_widget_show_all(notebook);
@@ -1472,6 +1504,7 @@
case GTK_RESPONSE_OK:
rstto_main_window_set_slideshow_timeout(window, gtk_range_get_value(GTK_RANGE(slideshow_hscale)) * 1000);
window->priv->navigator->preload = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(preload_check));
+ window->priv->settings.slideshow_hide_thumbnail = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(thumbnails_check));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(bg_color_override_check)) == TRUE)
{
GdkColor *new_color = g_new0(GdkColor, 1);
Modified: ristretto/trunk/src/main_window.h
===================================================================
--- ristretto/trunk/src/main_window.h 2008-05-12 06:29:24 UTC (rev 4786)
+++ ristretto/trunk/src/main_window.h 2008-05-12 06:57:27 UTC (rev 4787)
@@ -88,11 +88,15 @@
gdouble
rstto_main_window_get_slideshow_timeout (RsttoMainWindow *window);
+gboolean
+rstto_main_window_get_hide_thumbnails (RsttoMainWindow *window);
gint
rstto_main_window_get_max_cache_size (RsttoMainWindow *window);
void
rstto_main_window_set_slideshow_timeout (RsttoMainWindow *window, gdouble timeout);
void
+rstto_main_window_set_hide_thumbnails (RsttoMainWindow *window, gboolean hide);
+void
rstto_main_window_set_max_cache_size (RsttoMainWindow *window, gint max_cache_size);
void
rstto_main_window_set_pv_bg_color (RsttoMainWindow *window, const GdkColor *color);
More information about the Goodies-commits
mailing list