Improve ordering of date/time output on time graphs.

[andy/viking.git] / src / vikstatus.c

diff --git a/src/vikstatus.c b/src/vikstatus.c
index 2bcd38ed4decd2c7900457881558c747d44767e0..cbf1afbe8ab7449c86d8324ea97fe3cd151834cc 100644 (file)
--- a/src/vikstatus.c
+++ b/src/vikstatus.c
@@ -30,6 +30,7 @@
 #include <math.h>
 
 #include "vikstatus.h"
 #include <math.h>
 
 #include "vikstatus.h"

+#include "background.h"

 
 enum
 {
 
 enum
 {


@@ -48,14 +49,21 @@ G_DEFINE_TYPE (VikStatusbar, vik_statusbar, GTK_TYPE_HBOX)
 static guint vik_statusbar_signals[LAST_SIGNAL] = { 0 };
 
 static gint
 static guint vik_statusbar_signals[LAST_SIGNAL] = { 0 };
 
 static gint

-forward_signal (GtkObject *object, gpointer user_data)
+forward_signal (GObject *object, gpointer user_data)

 {
 {

-    gint item = GPOINTER_TO_INT (gtk_object_get_data ( object, "type" ));
+    gint item = GPOINTER_TO_INT (g_object_get_data ( object, "type" ));

     VikStatusbar *vs = VIK_STATUSBAR (user_data);
 
     VikStatusbar *vs = VIK_STATUSBAR (user_data);
 

-    g_signal_emit (G_OBJECT (vs),
-                   vik_statusbar_signals[CLICKED], 0,
-                   item);
+    // Clicking on the items field will bring up the background jobs window
+    if ( item == VIK_STATUSBAR_ITEMS )
+      a_background_show_window();
+    else if ( item == VIK_STATUSBAR_INFO )
+      // Clear current info message
+      vik_statusbar_set_message ( vs, VIK_STATUSBAR_INFO, "" );
+    else
+      g_signal_emit (G_OBJECT (vs),
+                     vik_statusbar_signals[CLICKED], 0,
+                     item);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -76,6 +84,26 @@ vik_statusbar_class_init (VikStatusbarClass *klass)
   klass->clicked = NULL;
 }
 
   klass->clicked = NULL;
 }
 

+static gboolean button_release_event (GtkWidget* widget, GdkEvent *event, gpointer *user_data)
+{
+  if ( ((GdkEventButton*)event)->button == 3 ) {
+    gint type = GPOINTER_TO_INT (g_object_get_data ( G_OBJECT(widget), "type" ));
+    VikStatusbar *vs = VIK_STATUSBAR (user_data);
+    // Right Click: so copy the text in the INFO buffer only ATM
+    if ( type == VIK_STATUSBAR_INFO ) {
+      const gchar* msg = gtk_button_get_label (GTK_BUTTON(vs->status[VIK_STATUSBAR_INFO]));
+      if ( msg ) {
+        GtkClipboard *clipboard = gtk_clipboard_get ( GDK_SELECTION_CLIPBOARD );
+        gtk_clipboard_set_text  ( clipboard, msg, -1 );
+      }
+    }
+    // We've handled the event
+    return TRUE;
+  }
+  // Otherwise carry on with other event handlers - i.e. ensure forward_signal() is called
+  return FALSE;
+}
+

 static void
 vik_statusbar_init (VikStatusbar *vs)
 {
 static void
 vik_statusbar_init (VikStatusbar *vs)
 {


@@ -84,19 +112,22 @@ vik_statusbar_init (VikStatusbar *vs)
   for ( i = 0; i < VIK_STATUSBAR_NUM_TYPES; i++ ) {
     vs->empty[i] = TRUE;
     
   for ( i = 0; i < VIK_STATUSBAR_NUM_TYPES; i++ ) {
     vs->empty[i] = TRUE;
     

-    if (i == VIK_STATUSBAR_ZOOM)
+    if (i == VIK_STATUSBAR_ITEMS || i == VIK_STATUSBAR_ZOOM || i == VIK_STATUSBAR_INFO )

       vs->status[i] = gtk_button_new();
     else
     {
       vs->status[i] = gtk_statusbar_new();
       gtk_statusbar_set_has_resize_grip ( GTK_STATUSBAR(vs->status[i]), FALSE );
     }
       vs->status[i] = gtk_button_new();
     else
     {
       vs->status[i] = gtk_statusbar_new();
       gtk_statusbar_set_has_resize_grip ( GTK_STATUSBAR(vs->status[i]), FALSE );
     }

-    gtk_object_set_data (GTK_OBJECT (vs->status[i]), "type", GINT_TO_POINTER(i));
+    g_object_set_data (G_OBJECT (vs->status[i]), "type", GINT_TO_POINTER(i));

   }
 
   gtk_box_pack_start ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_TOOL], FALSE, FALSE, 1);
   }
 
   gtk_box_pack_start ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_TOOL], FALSE, FALSE, 1);

-  gtk_widget_set_size_request ( vs->status[VIK_STATUSBAR_TOOL], 150, -1 );
+  gtk_widget_set_size_request ( vs->status[VIK_STATUSBAR_TOOL], 125, -1 );

 
 

+  g_signal_connect ( G_OBJECT(vs->status[VIK_STATUSBAR_ITEMS]), "clicked", G_CALLBACK (forward_signal), vs);
+  gtk_button_set_relief ( GTK_BUTTON(vs->status[VIK_STATUSBAR_ITEMS]), GTK_RELIEF_NONE );
+  gtk_widget_set_tooltip_text (GTK_WIDGET (vs->status[VIK_STATUSBAR_ITEMS]), _("Current number of background tasks. Click to see the background jobs."));

   gtk_box_pack_start ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_ITEMS], FALSE, FALSE, 1);
   gtk_widget_set_size_request ( vs->status[VIK_STATUSBAR_ITEMS], 100, -1 );
 
   gtk_box_pack_start ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_ITEMS], FALSE, FALSE, 1);
   gtk_widget_set_size_request ( vs->status[VIK_STATUSBAR_ITEMS], 100, -1 );
 


@@ -107,8 +138,12 @@ vik_statusbar_init (VikStatusbar *vs)
   gtk_widget_set_size_request ( vs->status[VIK_STATUSBAR_ZOOM], 100, -1 );
 
   gtk_box_pack_start ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_POSITION], FALSE, FALSE, 1);
   gtk_widget_set_size_request ( vs->status[VIK_STATUSBAR_ZOOM], 100, -1 );
 
   gtk_box_pack_start ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_POSITION], FALSE, FALSE, 1);

-  gtk_widget_set_size_request ( vs->status[VIK_STATUSBAR_POSITION], 250, -1 );
+  gtk_widget_set_size_request ( vs->status[VIK_STATUSBAR_POSITION], 275, -1 );

 
 

+  g_signal_connect ( G_OBJECT(vs->status[VIK_STATUSBAR_INFO]), "button-release-event", G_CALLBACK (button_release_event), vs);
+  g_signal_connect ( G_OBJECT(vs->status[VIK_STATUSBAR_INFO]), "clicked", G_CALLBACK (forward_signal), vs);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (vs->status[VIK_STATUSBAR_INFO]), _("Left click to clear the message. Right click to copy the message."));
+  gtk_button_set_alignment ( GTK_BUTTON(vs->status[VIK_STATUSBAR_INFO]), 0.0, 0.5 ); // Left align the text

   gtk_box_pack_end ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_INFO], TRUE, TRUE, 1);
 
   // Set minimum overall size
   gtk_box_pack_end ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_INFO], TRUE, TRUE, 1);
 
   // Set minimum overall size


@@ -145,7 +180,7 @@ vik_statusbar_set_message ( VikStatusbar *vs, vik_statusbar_type_t field, const
 {
   if ( field >= 0 && field < VIK_STATUSBAR_NUM_TYPES )
   {
 {
   if ( field >= 0 && field < VIK_STATUSBAR_NUM_TYPES )
   {

-    if ( field == VIK_STATUSBAR_ZOOM )
+    if ( field == VIK_STATUSBAR_ITEMS || field == VIK_STATUSBAR_ZOOM || field == VIK_STATUSBAR_INFO )

     {
       gtk_button_set_label ( GTK_BUTTON(vs->status[field]), message);
     }
     {
       gtk_button_set_label ( GTK_BUTTON(vs->status[field]), message);
     }