From 39914a45c6a875cfdc95fb6bce1c02e84c547cde Mon Sep 17 00:00:00 2001 From: Cristian Henzel Date: Wed, 18 May 2011 15:51:13 +0300 Subject: [PATCH] ClipIt-1.4.0-20110518002 + Added: Also added 1-0 shortcuts to the history menu. Changes to be committed: modified: ChangeLog modified: src/main.c --- ChangeLog | 3 ++ src/main.c | 95 +++++++++++++++++++++++++++--------------------------- 2 files changed, 51 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55b38c3..d295243 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +ClipIt-1.4.0-20110518002 - 18 May. 2011 + + Added: Also added 1-0 shortcuts to the history menu. + ClipIt-1.4.0-20110518001 - 18 May. 2011 + Fixed: Re-enabled indicator support. + Added: We are now installing a sepparate icon for clipit (not using it diff --git a/src/main.c b/src/main.c index 4245b68..b4ed52a 100644 --- a/src/main.c +++ b/src/main.c @@ -476,6 +476,53 @@ static gboolean show_actions_menu(gpointer data) return FALSE; } +static gboolean menu_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer user_data) +{ + switch (event->keyval) { + case 0x0030: + item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(9)); + gtk_widget_destroy(widget); + break; + case 0x0031: + item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(0)); + gtk_widget_destroy(widget); + break; + case 0x0032: + item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(1)); + gtk_widget_destroy(widget); + break; + case 0x0033: + item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(2)); + gtk_widget_destroy(widget); + break; + case 0x0034: + item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(3)); + gtk_widget_destroy(widget); + break; + case 0x0035: + item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(4)); + gtk_widget_destroy(widget); + break; + case 0x0036: + item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(5)); + gtk_widget_destroy(widget); + break; + case 0x0037: + item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(6)); + gtk_widget_destroy(widget); + break; + case 0x0038: + item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(7)); + gtk_widget_destroy(widget); + break; + case 0x0039: + item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(8)); + gtk_widget_destroy(widget); + break; + } + return FALSE; +} + /* Generates the small history menu */ static gboolean show_history_menu(gpointer data) { @@ -485,6 +532,7 @@ static gboolean show_history_menu(gpointer data) /* Create the menu */ menu = gtk_menu_new(); g_signal_connect((GObject*)menu, "selection-done", (GCallback)gtk_widget_destroy, NULL); + g_signal_connect((GObject*)menu, "key-press-event", (GCallback)menu_key_pressed, NULL); /* Items */ if ((history != NULL) && (history->data != NULL)) { @@ -569,53 +617,6 @@ static gboolean show_history_menu(gpointer data) return FALSE; } -static gboolean menu_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer user_data) -{ - switch (event->keyval) { - case 0x0030: - item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(9)); - gtk_widget_destroy(widget); - break; - case 0x0031: - item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(0)); - gtk_widget_destroy(widget); - break; - case 0x0032: - item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(1)); - gtk_widget_destroy(widget); - break; - case 0x0033: - item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(2)); - gtk_widget_destroy(widget); - break; - case 0x0034: - item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(3)); - gtk_widget_destroy(widget); - break; - case 0x0035: - item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(4)); - gtk_widget_destroy(widget); - break; - case 0x0036: - item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(5)); - gtk_widget_destroy(widget); - break; - case 0x0037: - item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(6)); - gtk_widget_destroy(widget); - break; - case 0x0038: - item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(7)); - gtk_widget_destroy(widget); - break; - case 0x0039: - item_selected((GtkMenuItem*)widget, GINT_TO_POINTER(8)); - gtk_widget_destroy(widget); - break; - } - return FALSE; -} - #ifdef HAVE_APPINDICATOR void create_app_indicator(gint create)