[Xfce4-commits] <ristretto:master> Show 'Loading...' in statusbar when loading image.

[Stephan Arts]

Updating branch refs/heads/master
         to 65fef0d6f18df7c41fa4a12ad68b56f54461c2b0 (commit)
       from 9f91940fb7f2b5106d605dcfa50cc429beb7a41d (commit)

commit 65fef0d6f18df7c41fa4a12ad68b56f54461c2b0
Author: Stephan Arts <stephan at xfce.org>
Date:   Wed Apr 18 22:55:29 2012 +0200

    Show 'Loading...' in statusbar when loading image.

 src/image_viewer.c |   10 ++++++++++
 src/image_viewer.h |    5 +++++
 src/main_window.c  |    9 +++++++++
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/image_viewer.c b/src/image_viewer.c
index d515e6b..fcc7a9a 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -2850,3 +2850,13 @@ rstto_image_viewer_set_show_clock (
     }
 }
 
+gboolean
+rstto_image_viewer_is_busy (
+        RsttoImageViewer *viewer )
+{
+    if (viewer->priv->transaction != NULL)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
diff --git a/src/image_viewer.h b/src/image_viewer.h
index 7b39627..fde7e05 100644
--- a/src/image_viewer.h
+++ b/src/image_viewer.h
@@ -115,6 +115,11 @@ rstto_image_viewer_set_show_clock (
         RsttoImageViewer *viewer,
         gboolean value);
 
+gboolean
+rstto_image_viewer_is_busy (
+        RsttoImageViewer *viewer );
+
+
 G_END_DECLS
 
 #endif /* __RISTRETTO_IMAGE_VIEWER_H__ */
diff --git a/src/main_window.c b/src/main_window.c
index a41412a..b66ab6c 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -1206,6 +1206,15 @@ rstto_main_window_update_statusbar (RsttoMainWindow *window)
             status = g_strdup (_("Press open to select an image"));
         }
 
+        if ( rstto_image_viewer_is_busy (viewer) )
+        {
+            if (status)
+            {
+                g_free (status);
+            }
+            status = g_strdup (_("Loading..."));
+        }
+
         gtk_statusbar_pop (GTK_STATUSBAR (window->priv->statusbar), window->priv->statusbar_context_id);
 
         if (status)