glw: Make it possible to adjust screen saver per-image duration

Fixes #3080
ecv80 · Apr 13, 2016 · 04063f4 · 04063f4
1 parent 3305fc0
commit 04063f4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/glwskins/flat/screensaver.view b/glwskins/flat/screensaver.view
@@ -1,7 +1,7 @@
 widget(slideshow, {
  alpha: $ui.screenSaverAlpha;
 
- time: 15;
+ time: $core.glw.screensaver.imageDuration;
  transitionTime: 2;
 
  cloner($core.glw.screensaver.items, container_z, {
@@ -11,6 +11,10 @@ widget(slideshow, {
  source: $self.url;
  });
 
+ label({
+ caption: $core.glw.screensaver.imageDuration;
+ });
+
  underscan({
  hidden: isVoid($self.info);
  vbox({

diff --git a/src/ui/glw/glw_settings.c b/src/ui/glw/glw_settings.c
@@ -433,6 +433,19 @@ glw_settings_init(void)
  SETTING_MUTEX(&screensaver_mutex),
  NULL);
 
+ prop_t *id = prop_create_multi(prop_get_global(), "glw", "screensaver",
+ "imageDuration", NULL);
+
+ glw_settings.gs_setting_per_image_timeout =
+ setting_create(SETTING_INT, s, SETTINGS_INITIAL_UPDATE,
+ SETTING_TITLE(_p("Seconds per image")),
+ SETTING_WRITE_PROP(id),
+ SETTING_VALUE(15),
+ SETTING_RANGE(5, 60),
+ SETTING_STORE("glw", "screensaverimageduration"),
+ NULL);
+ prop_ref_dec(id);
+
  prop_t *p = prop_create(prop_get_global(), "glw");
  p = prop_create(p, "osk");
  kv_prop_bind_create(p, "showtime:glw:osk");
@@ -449,6 +462,7 @@ glw_settings_fini(void)
 {
  setting_destroy(glw_settings.gs_setting_user_images);
  setting_destroy(glw_settings.gs_setting_screensaver_timer);
+ setting_destroy(glw_settings.gs_setting_per_image_timeout);
  setting_destroy(glw_settings.gs_setting_bing_image);
  setting_destroy(glw_settings.gs_setting_underscan_v);
  setting_destroy(glw_settings.gs_setting_underscan_h);

diff --git a/src/ui/glw/glw_settings.h b/src/ui/glw/glw_settings.h
@@ -41,6 +41,7 @@ typedef struct glw_settings {
  struct setting *gs_setting_screensaver_timer;
  struct setting *gs_setting_bing_image;
  struct setting *gs_setting_user_images;
+ struct setting *gs_setting_per_image_timeout;
 
  struct prop *gs_settings;