[Xfce4-commits] <ristretto:master> Add property to enable/disable the clock

[Stephan Arts]

Updating branch refs/heads/master
         to 876972b93832b91fc797179053b7dc8b56e676e0 (commit)
       from 029c04adfbb26e3326afcfa38e578ffba1df0ed3 (commit)

commit 876972b93832b91fc797179053b7dc8b56e676e0
Author: Stephan Arts <stephan at xfce.org>
Date:   Mon Apr 16 18:10:30 2012 +0200

    Add property to enable/disable the clock

 src/main_window.c |   11 +++++++++++
 src/settings.c    |   27 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/src/main_window.c b/src/main_window.c
index 028677e..a41412a 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -1946,6 +1946,14 @@ cb_rstto_main_window_state_event(GtkWidget *widget, GdkEventWindowState *event,
     {
         if(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
         {
+            if (rstto_settings_get_boolean_property (
+                window->priv->settings_manager,
+                "show-clock"))
+            {
+                rstto_image_viewer_set_show_clock (
+                        RSTTO_IMAGE_VIEWER (window->priv->image_viewer),
+                        TRUE);
+            }
             gtk_widget_hide (window->priv->menubar);
             if (rstto_image_list_get_n_images (window->priv->image_list) != 0)
             {
@@ -2006,6 +2014,9 @@ cb_rstto_main_window_state_event(GtkWidget *widget, GdkEventWindowState *event,
         }
         else
         {
+            rstto_image_viewer_set_show_clock (
+                    RSTTO_IMAGE_VIEWER (window->priv->image_viewer),
+                    FALSE);
             gtk_ui_manager_add_ui (
                     window->priv->ui_manager,
                     window->priv->toolbar_fullscreen_merge_id,
diff --git a/src/settings.c b/src/settings.c
index 32cd274..51fca12 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -59,6 +59,7 @@ enum
     PROP_NAVBAR_POSITION,
     PROP_SHOW_THUMBNAILBAR,
     PROP_SHOW_STATUSBAR,
+    PROP_SHOW_CLOCK,
     PROP_HIDE_THUMBNAILBAR_FULLSCREEN,
     PROP_WINDOW_WIDTH,
     PROP_WINDOW_HEIGHT,
@@ -110,6 +111,7 @@ struct _RsttoSettingsPriv
     gboolean  show_toolbar;
     gboolean  show_thumbnailbar;
     gboolean  show_statusbar;
+    gboolean  show_clock;
     gboolean  hide_thumbnailbar_fullscreen;
     gchar    *navigationbar_position;
     gboolean  revert_zoom_direction;
@@ -177,6 +179,7 @@ rstto_settings_init (GObject *object)
     settings->priv->wrap_images = TRUE;
     settings->priv->show_thumbnailbar = TRUE;
     settings->priv->show_statusbar = TRUE;
+    settings->priv->show_clock = TRUE;
     settings->priv->use_thunar_properties = TRUE;
     settings->priv->maximize_on_startup = TRUE;
     settings->priv->hide_thumbnailbar_fullscreen = TRUE;
@@ -286,6 +289,13 @@ rstto_settings_init (GObject *object)
 
     xfconf_g_property_bind (
             settings->priv->channel,
+            "/window/show-clock",
+            G_TYPE_BOOLEAN,
+            settings,
+            "show-clock");
+
+    xfconf_g_property_bind (
+            settings->priv->channel,
             "/image/wrap",
             G_TYPE_BOOLEAN,
             settings,
@@ -397,6 +407,17 @@ rstto_settings_class_init (GObjectClass *object_class)
             pspec);
 
     pspec = g_param_spec_boolean (
+            "show-clock",
+            "",
+            "",
+            TRUE,
+            G_PARAM_READWRITE);
+    g_object_class_install_property (
+            object_class,
+            PROP_SHOW_CLOCK,
+            pspec);
+
+    pspec = g_param_spec_boolean (
             "hide-thumbnailbar-fullscreen",
             "",
             "",
@@ -657,6 +678,9 @@ rstto_settings_set_property    (GObject      *object,
         case PROP_SHOW_STATUSBAR:
             settings->priv->show_statusbar = g_value_get_boolean (value);
             break;
+        case PROP_SHOW_CLOCK:
+            settings->priv->show_clock = g_value_get_boolean (value);
+            break;
         case PROP_HIDE_THUMBNAILBAR_FULLSCREEN:
             settings->priv->hide_thumbnailbar_fullscreen = g_value_get_boolean (value);
             break;
@@ -753,6 +777,9 @@ rstto_settings_get_property    (GObject    *object,
         case PROP_SHOW_STATUSBAR:
             g_value_set_boolean (value, settings->priv->show_statusbar);
             break;
+        case PROP_SHOW_CLOCK:
+            g_value_set_boolean (value, settings->priv->show_clock);
+            break;
         case PROP_HIDE_THUMBNAILBAR_FULLSCREEN:
             g_value_set_boolean (value, settings->priv->hide_thumbnailbar_fullscreen);
             break;