X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/c4b6a67dc271ad45f4f4940536c79346f6b1703a..9e405703f8282683491c5652bb1d4cd7cdb135af:/src/vikstatus.c?ds=sidebyside diff --git a/src/vikstatus.c b/src/vikstatus.c index a27e3a36..cbf1afbe 100644 --- a/src/vikstatus.c +++ b/src/vikstatus.c @@ -30,10 +30,11 @@ #include #include "vikstatus.h" +#include "background.h" enum { - ZOOM_CHANGED, + CLICKED, LAST_SIGNAL }; @@ -47,71 +48,60 @@ G_DEFINE_TYPE (VikStatusbar, vik_statusbar, GTK_TYPE_HBOX) static guint vik_statusbar_signals[LAST_SIGNAL] = { 0 }; -static void -selection_done (GtkMenuShell *menushell, - gpointer user_data) -{ - VikStatusbar *vs = VIK_STATUSBAR (user_data); - - GtkWidget *aw = gtk_menu_get_active ( GTK_MENU (menushell) ); - gint active = GPOINTER_TO_INT(gtk_object_get_data ( GTK_OBJECT (aw), "position" )); - - gdouble zoom_request = pow (2, active-2 ); - - g_signal_emit (G_OBJECT (vs), - vik_statusbar_signals[ZOOM_CHANGED], 0, - zoom_request); -} - static gint -zoom_popup_handler (GtkWidget *widget) +forward_signal (GObject *object, gpointer user_data) { - GtkMenu *menu; - - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (GTK_IS_MENU (widget), FALSE); - - /* The "widget" is the menu that was supplied when - * g_signal_connect_swapped() was called. - */ - menu = GTK_MENU (widget); - - gtk_menu_popup (menu, NULL, NULL, NULL, NULL, - 1, gtk_get_current_event_time()); - return TRUE; -} - -static GtkWidget * -create_zoom_menu_all_levels () -{ - GtkWidget *menu = gtk_menu_new (); - char *itemLabels[] = { "0.25", "0.5", "1", "2", "4", "8", "16", "32", "64", "128", "256", "512", "1024", "2048", "4096", "8192", "16384", "32768", NULL }; + gint item = GPOINTER_TO_INT (g_object_get_data ( object, "type" )); + VikStatusbar *vs = VIK_STATUSBAR (user_data); + + // 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); - int i; - for (i = 0 ; itemLabels[i] != NULL ; i++) - { - GtkWidget *item = gtk_menu_item_new_with_label (itemLabels[i]); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - gtk_widget_show (item); - gtk_object_set_data (GTK_OBJECT (item), "position", GINT_TO_POINTER(i)); - } - return menu; + return TRUE; } static void vik_statusbar_class_init (VikStatusbarClass *klass) { - vik_statusbar_signals[ZOOM_CHANGED] = - g_signal_new ("zoom-changed", + vik_statusbar_signals[CLICKED] = + g_signal_new ("clicked", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (VikStatusbarClass, zoom_changed), + G_STRUCT_OFFSET (VikStatusbarClass, clicked), NULL, NULL, - g_cclosure_marshal_VOID__DOUBLE, + g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, - G_TYPE_DOUBLE); + G_TYPE_INT); - klass->zoom_changed = 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 @@ -122,32 +112,38 @@ vik_statusbar_init (VikStatusbar *vs) 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 ); } + 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 ); - GtkWidget *menu = create_zoom_menu_all_levels (); - g_signal_connect ( G_OBJECT(menu), "selection-done", G_CALLBACK(selection_done), vs); - g_signal_connect_swapped ( G_OBJECT(vs->status[VIK_STATUSBAR_ZOOM]), "clicked", G_CALLBACK (zoom_popup_handler), menu); + g_signal_connect ( G_OBJECT(vs->status[VIK_STATUSBAR_ZOOM]), "clicked", G_CALLBACK (forward_signal), vs); gtk_button_set_relief ( GTK_BUTTON(vs->status[VIK_STATUSBAR_ZOOM]), GTK_RELIEF_NONE ); gtk_widget_set_tooltip_text (GTK_WIDGET (vs->status[VIK_STATUSBAR_ZOOM]), _("Current zoom level. Click to select a new one.")); 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 ); 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 @@ -184,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 == 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); }