search: Open event from search results

And this finally hooks up the last missing bit from the
search engine: opening events from search results.

All the necessary plumbing is there for extending search
with other commands or results, such as go to date, etc.
This commit is contained in:
Georges Basile Stavracas Neto
2019-04-29 17:08:54 -03:00
parent 1aecd1043d
commit d6c5bf032d
5 changed files with 51 additions and 4 deletions
+14
View File
@@ -22,6 +22,7 @@
#include "gcal-context.h"
#include "gcal-search-button.h"
#include "gcal-search-hit.h"
#include <math.h>
@@ -119,6 +120,14 @@ on_search_entry_changed_cb (GcalSearchButton *self)
g_object_ref (self));
}
static void
on_search_entry_suggestion_activated_cb (DzlSuggestionEntry *entry,
GcalSearchHit *search_hit,
GcalSearchButton *self)
{
gcal_search_hit_activate (search_hit, GTK_WIDGET (self));
}
static void
on_unfocus_action_activated_cb (GSimpleAction *action,
GVariant *param,
@@ -257,6 +266,11 @@ gcal_search_button_init (GcalSearchButton *self)
G_CALLBACK (on_search_entry_changed_cb),
self,
G_CONNECT_SWAPPED);
g_signal_connect_object (entry,
"suggestion-activated",
G_CALLBACK (on_search_entry_suggestion_activated_cb),
self,
0);
dzl_suggestion_entry_set_position_func (entry,
position_suggestion_popover_func,
-2
View File
@@ -107,8 +107,6 @@ search_func (GTask *task,
start,
end);
//e_cal_data_model_unsubscribe (self->data_model, E_CAL_DATA_MODEL_SUBSCRIBER (model));
g_task_return_pointer (task, g_steal_pointer (&model), g_object_unref);
}
+21 -2
View File
@@ -62,8 +62,7 @@ set_event (GcalSearchHitEvent *self,
dzl_suggestion_set_id (suggestion, gcal_event_get_uid (event));
dzl_suggestion_set_title (suggestion, gcal_event_get_summary (event));
/* FIXME: use a better date description */
date_string = g_date_time_format (gcal_event_get_date_start (event), "%x %X %z");
date_string = gcal_event_format_date (event);
dzl_suggestion_set_subtitle (suggestion, date_string);
}
@@ -98,6 +97,25 @@ gcal_search_hit_event_get_icon_surface (DzlSuggestion *suggestion,
* GcalSearchHit interface
*/
static void
gcal_search_hit_event_activate (GcalSearchHit *search_hit,
GtkWidget *for_widget)
{
GcalSearchHitEvent *self;
GApplication *application;
const gchar *event_uid;
self = GCAL_SEARCH_HIT_EVENT (search_hit);
event_uid = gcal_event_get_uid (self->event);
application = g_application_get_default ();
g_assert (application != NULL);
g_action_group_activate_action (G_ACTION_GROUP (application),
"open-event",
g_variant_new_string (event_uid));
}
static gint
gcal_search_hit_event_get_priority (GcalSearchHit *search_hit)
{
@@ -125,6 +143,7 @@ gcal_search_hit_event_compare (GcalSearchHit *a,
static void
gcal_search_hit_interface_init (GcalSearchHitInterface *iface)
{
iface->activate = gcal_search_hit_event_activate;
iface->get_priority = gcal_search_hit_event_get_priority;
iface->compare = gcal_search_hit_event_compare;
}
+10
View File
@@ -27,6 +27,16 @@ gcal_search_hit_default_init (GcalSearchHitInterface *iface)
{
}
void
gcal_search_hit_activate (GcalSearchHit *self,
GtkWidget *for_widget)
{
g_return_if_fail (GCAL_IS_SEARCH_HIT (self));
g_return_if_fail (GCAL_SEARCH_HIT_GET_IFACE (self)->activate);
GCAL_SEARCH_HIT_GET_IFACE (self)->activate (self, for_widget);
}
gint
gcal_search_hit_get_priority (GcalSearchHit *self)
{
+6
View File
@@ -31,12 +31,18 @@ struct _GcalSearchHitInterface
{
GTypeInterface parent;
void (*activate) (GcalSearchHit *self,
GtkWidget *for_widget);
gint (*get_priority) (GcalSearchHit *self);
gint (*compare) (GcalSearchHit *a,
GcalSearchHit *b);
};
void gcal_search_hit_activate (GcalSearchHit *self,
GtkWidget *for_widget);
gint gcal_search_hit_get_priority (GcalSearchHit *self);
gint gcal_search_hit_compare (GcalSearchHit *a,