#include <math.h>
#include "vikstatus.h"
+#include "background.h"
enum
{
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);
- 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
+ g_signal_emit (G_OBJECT (vs),
+ vik_statusbar_signals[CLICKED], 0,
+ item);
return 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 )
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_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_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 );
gtk_box_pack_end ( GTK_BOX(vs), vs->status[VIK_STATUSBAR_INFO], TRUE, TRUE, 1);
{
if ( field >= 0 && field < VIK_STATUSBAR_NUM_TYPES )
{
- if ( field == VIK_STATUSBAR_ZOOM )
+ if ( field == VIK_STATUSBAR_ITEMS || field == VIK_STATUSBAR_ZOOM )
{
gtk_button_set_label ( GTK_BUTTON(vs->status[field]), message);
}