Enumerate use of and simplify the internals of the statusbar.

This enables control of the size of the first element of the statusbar.

diff --git a/src/background.c b/src/background.c
index 2cc3a178531b0c4aab75a02e07cf9b788a2ea3ff..de6d1a2f5c883a6ec489f005a1a2428018c56a86 100644 (file)
--- a/src/background.c
+++ b/src/background.c
@@ -47,7 +47,7 @@ enum
 void a_background_update_status ( VikStatusbar *vs, gchar *str )
 {
   gdk_threads_enter ();
-  vik_statusbar_set_message ( vs, 1, str );
+  vik_statusbar_set_message ( vs, VIK_STATUSBAR_ITEMS, str );
   gdk_threads_leave ();
 }
 

diff --git a/src/vikstatus.c b/src/vikstatus.c
index 3ea892672fe33f22d3c0dd1a8f921803ca412941..e5f27a01c13cadd69a661bda4fd71b41711e661a 100644 (file)
--- a/src/vikstatus.c
+++ b/src/vikstatus.c
@@ -2,6 +2,7 @@
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
+ * Copyright (C) 2011, Rob Norris <rw_norris@hotmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,19 +20,16 @@
  *
  */
 
-/* gtk status bars: just plain dumb. this file 
-shouldn't have to exist. */
+/* gtk status bars: just plain dumb. this file shouldn't have to exist.
+   NB as of gtk 2.18 there are 'info bars' that could be useful... */
 #include <gtk/gtk.h>
 
 #include "vikstatus.h"
 
-#define STATUS_COUNT 5
-
 struct _VikStatusbar {
-  GtkStatusbar parent;
-  gint num_extra_bars;
-  GtkWidget *status[STATUS_COUNT-1];
-  gboolean empty[STATUS_COUNT];
+  GtkHBox hbox;
+  GtkWidget *status[VIK_STATUSBAR_NUM_TYPES];
+  gboolean empty[VIK_STATUSBAR_NUM_TYPES];
 };
 
 GType vik_statusbar_get_type (void)
@@ -52,7 +50,7 @@ GType vik_statusbar_get_type (void)
       0,
       NULL /* instance init */
     };
-    vs_type = g_type_register_static ( GTK_TYPE_STATUSBAR, "VikStatusbar", &vs_info, 0 );
+    vs_type = g_type_register_static ( GTK_TYPE_HBOX, "VikStatusbar", &vs_info, 0 );
   }
 
   return vs_type;
@@ -63,41 +61,39 @@ VikStatusbar *vik_statusbar_new ()
   VikStatusbar *vs = VIK_STATUSBAR ( g_object_new ( VIK_STATUSBAR_TYPE, NULL ) );
   gint i;
 
-  gtk_statusbar_set_has_resize_grip ( GTK_STATUSBAR(vs), FALSE );
+  for ( i = 0; i < VIK_STATUSBAR_NUM_TYPES; i++ ) {
+    vs->empty[i] = TRUE;
+    vs->status[i] = gtk_statusbar_new();
+    gtk_statusbar_set_has_resize_grip ( GTK_STATUSBAR(vs->status[i]), FALSE );
+  }
+
+  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 );
 
-  vs->status[0] = gtk_statusbar_new();
-  gtk_statusbar_set_has_resize_grip ( GTK_STATUSBAR(vs->status[0]), FALSE );
-  gtk_box_pack_start ( GTK_BOX(vs), vs->status[0], FALSE, FALSE, 1);
-  gtk_widget_set_size_request ( vs->status[0], 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 );
 
-  vs->status[1] = gtk_statusbar_new();
-  gtk_statusbar_set_has_resize_grip ( GTK_STATUSBAR(vs->status[1]), FALSE );
-  gtk_box_pack_start ( GTK_BOX(vs), vs->status[1], FALSE, FALSE, 1);
-  gtk_widget_set_size_request ( vs->status[1], 100, -1 );
+  gtk_box_pack_start ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_ZOOM], FALSE, FALSE, 1);
+  gtk_widget_set_size_request ( vs->status[VIK_STATUSBAR_ZOOM], 100, -1 );
 
-  vs->status[2] = gtk_statusbar_new();
-  gtk_statusbar_set_has_resize_grip ( GTK_STATUSBAR(vs->status[2]), FALSE );
-  gtk_box_pack_end ( GTK_BOX(vs), vs->status[2], TRUE, TRUE, 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 );
 
-  vs->status[3] = gtk_statusbar_new();
-  gtk_statusbar_set_has_resize_grip ( GTK_STATUSBAR(vs->status[3]), FALSE );
-  gtk_box_pack_end ( GTK_BOX(vs), vs->status[3], TRUE, TRUE, 1);
+  gtk_box_pack_end ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_INFO], TRUE, TRUE, 1);
 
-  for ( i = 0; i < STATUS_COUNT; i++ )
-    vs->empty[i] = TRUE;
+  // Set minimum overall size
+  //  otherwise the individual size_requests above create an implicit overall size,
+  //  and so one can't downsize horizontally as much as may be desired when the statusbar is on
+  gtk_widget_set_size_request ( GTK_WIDGET(vs), 50, -1 );
 
   return vs;
 }
 
-void vik_statusbar_set_message ( VikStatusbar *vs, gint field, const gchar *message )
+void vik_statusbar_set_message ( VikStatusbar *vs, vik_statusbar_type_t field, const gchar *message )
 {
-  if ( field >= 0 && field < STATUS_COUNT )
+  if ( field >= 0 && field < VIK_STATUSBAR_NUM_TYPES )
   {
-    GtkStatusbar *gsb;
-    if ( field == 0 )
-      gsb = GTK_STATUSBAR(vs);
-    else
-      gsb = GTK_STATUSBAR(vs->status[field-1]);
+    GtkStatusbar *gsb = GTK_STATUSBAR(vs->status[field]);
 
     if ( !vs->empty[field] )
       gtk_statusbar_pop ( gsb, 0 );

diff --git a/src/vikstatus.h b/src/vikstatus.h
index f4aaa5f3e13b81d05d12222959c1f4319aa0f771..3f158d54e6f97d46cca061a377f1e13056964c1a 100644 (file)
--- a/src/vikstatus.h
+++ b/src/vikstatus.h
@@ -44,8 +44,18 @@ struct _VikStatusbarClass
 
 GType vik_statusbar_get_type ();
 
+
+typedef enum {
+  VIK_STATUSBAR_TOOL,
+  VIK_STATUSBAR_ITEMS,
+  VIK_STATUSBAR_ZOOM,
+  VIK_STATUSBAR_INFO,
+  VIK_STATUSBAR_POSITION,
+  VIK_STATUSBAR_NUM_TYPES
+} vik_statusbar_type_t;
+
 VikStatusbar *vik_statusbar_new ();
-void vik_statusbar_set_message ( VikStatusbar *vs, gint field, const gchar *message );
+void vik_statusbar_set_message ( VikStatusbar *vs, vik_statusbar_type_t field, const gchar *message );
 
 
 #endif

diff --git a/src/vikwindow.c b/src/vikwindow.c
index 8e8fa89d88c9d1803943f6281fb3ded82594d0bf..be00516b0bc90baade6f52a4a6362ba1f05ec67d 100644 (file)
--- a/src/vikwindow.c
+++ b/src/vikwindow.c
@@ -454,11 +454,11 @@ static void draw_status ( VikWindow *vw )
       /* xmpp should be a whole number so don't show useless .000 bit */
       g_snprintf ( zoom_level, 22, "%d %s", (int)xmpp, unit );
   if ( vw->current_tool == TOOL_LAYER )
-    vik_statusbar_set_message ( vw->viking_vs, 0, vik_layer_get_interface(vw->tool_layer_id)->tools[vw->tool_tool_id].name );
+    vik_statusbar_set_message ( vw->viking_vs, VIK_STATUSBAR_TOOL, vik_layer_get_interface(vw->tool_layer_id)->tools[vw->tool_tool_id].name );
   else
-    vik_statusbar_set_message ( vw->viking_vs, 0, _(tool_names[vw->current_tool]) );
+    vik_statusbar_set_message ( vw->viking_vs, VIK_STATUSBAR_TOOL, _(tool_names[vw->current_tool]) );
 
-  vik_statusbar_set_message ( vw->viking_vs, 2, zoom_level );
+  vik_statusbar_set_message ( vw->viking_vs, VIK_STATUSBAR_ZOOM, zoom_level );
 }
 
 void vik_window_set_redraw_trigger(VikLayer *vl)
@@ -605,7 +605,7 @@ static void draw_mouse_motion (VikWindow *vw, GdkEventMotion *event)
   lat = NULL;
   g_free (lon);
   lon = NULL;
-  vik_statusbar_set_message ( vw->viking_vs, 4, pointer_buf );
+  vik_statusbar_set_message ( vw->viking_vs, VIK_STATUSBAR_POSITION, pointer_buf );
 
   vik_window_pan_move ( vw, event );
 
@@ -917,7 +917,7 @@ static VikLayerToolFuncStatus ruler_click (VikLayer *vl, GdkEventButton *event,
       s->has_oldcoord = TRUE;
     }
 
-    vik_statusbar_set_message ( s->vw->viking_vs, 3, temp );
+    vik_statusbar_set_message ( s->vw->viking_vs, VIK_STATUSBAR_INFO, temp );
     g_free ( temp );
 
     s->oldcoord = coord;
@@ -981,7 +981,7 @@ static VikLayerToolFuncStatus ruler_move (VikLayer *vl, GdkEventMotion *event, r
       temp = g_strdup_printf ("Just to keep the compiler happy");
       g_critical("Houston, we've had a problem. distance=%d", dist_units);
     }
-    vik_statusbar_set_message ( vw->viking_vs, 3, temp );
+    vik_statusbar_set_message ( vw->viking_vs, VIK_STATUSBAR_INFO, temp );
     g_free ( temp );
   }
   return VIK_LAYER_TOOL_ACK;