Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port search subsystem to GTK4

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2022-02-11 09:18:38 -03:00
parent bd2ac18c19
commit 74c410bd85
15 changed files with 939 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/search/gcal-search-engine.c
-2
View File
@@ -27,8 +27,6 @@
#include "gcal-timeline.h"
#include "gcal-timeline-subscriber.h"
#include <dazzle.h>
typedef struct
{
GcalSearchEngine *engine;
src/search/gcal-search-hit-event.c
+19 -46
View File
@@ -26,15 +26,12 @@
struct _GcalSearchHitEvent
{
DzlSuggestion parent;
GcalSearchHit parent;
GcalEvent *event;
};
static void gcal_search_hit_interface_init (GcalSearchHitInterface *iface);
G_DEFINE_TYPE_WITH_CODE (GcalSearchHitEvent, gcal_search_hit_event, DZL_TYPE_SUGGESTION,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_SEARCH_HIT, gcal_search_hit_interface_init))
G_DEFINE_TYPE (GcalSearchHitEvent, gcal_search_hit_event, GCAL_TYPE_SEARCH_HIT)
enum
{
@@ -52,49 +49,31 @@ static GParamSpec *properties [N_PROPS];
static void
set_event (GcalSearchHitEvent *self,
GcalEvent *event)
{
g_autofree gchar *date_string = NULL;
DzlSuggestion *suggestion;
self->event = g_object_ref (event);
suggestion = DZL_SUGGESTION (self);
dzl_suggestion_set_id (suggestion, gcal_event_get_uid (event));
dzl_suggestion_set_title (suggestion, gcal_event_get_summary (event));
date_string = gcal_event_format_date (event);
dzl_suggestion_set_subtitle (suggestion, date_string);
}
/*
* DzlSuggestion overrides
*/
static GdkPaintable*
gcal_search_hit_event_get_paintable (DzlSuggestion *suggestion,
GtkWidget *widget)
{
g_autoptr (GdkPaintable) paintable = NULL;
GcalSearchHitEvent *self;
g_autofree gchar *date_string = NULL;
GcalSearchHit *search_hit;
const GdkRGBA *color;
GcalCalendar *calendar;
self = GCAL_SEARCH_HIT_EVENT (suggestion);
calendar = gcal_event_get_calendar (self->event);
self->event = g_object_ref (event);
search_hit = GCAL_SEARCH_HIT (self);
gcal_search_hit_set_id (search_hit, gcal_event_get_uid (event));
gcal_search_hit_set_title (search_hit, gcal_event_get_summary (event));
date_string = gcal_event_format_date (event);
gcal_search_hit_set_subtitle (search_hit, date_string);
calendar = gcal_event_get_calendar (self->event);
color = gcal_calendar_get_color (calendar);
paintable = get_circle_paintable_from_color (color, 16);
/* Inject our custom style class into the given widget */
gtk_style_context_add_class (gtk_widget_get_style_context (widget), "calendar-color-image");
return g_steal_pointer (&paintable);
gcal_search_hit_set_primary_icon (search_hit, paintable);
}
/*
* GcalSearchHit interface
* GcalSearchHit overrides
*/
static void
@@ -140,14 +119,6 @@ gcal_search_hit_event_compare (GcalSearchHit *a,
return -gcal_event_compare_with_current (event_a, event_b, now_utc);
}
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;
}
/*
* GObject overrides
@@ -206,13 +177,15 @@ static void
gcal_search_hit_event_class_init (GcalSearchHitEventClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
DzlSuggestionClass *suggestion_class = DZL_SUGGESTION_CLASS (klass);
GcalSearchHitClass *search_hit_class = GCAL_SEARCH_HIT_CLASS (klass);
object_class->finalize = gcal_search_hit_event_finalize;
object_class->get_property = gcal_search_hit_event_get_property;
object_class->set_property = gcal_search_hit_event_set_property;
suggestion_class->get_icon_surface = gcal_search_hit_event_get_icon_surface;
search_hit_class->activate = gcal_search_hit_event_activate;
search_hit_class->get_priority = gcal_search_hit_event_get_priority;
search_hit_class->compare = gcal_search_hit_event_compare;
properties[PROP_EVENT] = g_param_spec_object ("event",
"Event",
src/search/gcal-search-hit-event.h
+2 -3
View File
@@ -21,13 +21,12 @@
#pragma once
#include "gcal-event.h"
#include <dazzle.h>
#include "gcal-search-hit.h"
G_BEGIN_DECLS
#define GCAL_TYPE_SEARCH_HIT_EVENT (gcal_search_hit_event_get_type())
G_DECLARE_FINAL_TYPE (GcalSearchHitEvent, gcal_search_hit_event, GCAL, SEARCH_HIT_EVENT, DzlSuggestion)
G_DECLARE_FINAL_TYPE (GcalSearchHitEvent, gcal_search_hit_event, GCAL, SEARCH_HIT_EVENT, GcalSearchHit)
GcalSearchHitEvent* gcal_search_hit_event_new (GcalEvent *event);
src/search/gcal-search-hit.c
+291 -8
View File
@@ -20,30 +20,313 @@
#include "gcal-search-hit.h"
G_DEFINE_INTERFACE (GcalSearchHit, gcal_search_hit, DZL_TYPE_SUGGESTION)
typedef struct
{
gchar *id;
gchar *title;
gchar *subtitle;
GdkPaintable *primary_icon;
} GcalSearchHitPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (GcalSearchHit, gcal_search_hit, G_TYPE_OBJECT)
enum
{
PROP_0,
PROP_ID,
PROP_SUBTITLE,
PROP_TITLE,
PROP_PRIMARY_ICON,
N_PROPS,
};
static GParamSpec *properties [N_PROPS];
/*
* GcalSearchHit overrides
*/
static void
gcal_search_hit_default_init (GcalSearchHitInterface *iface)
gcal_search_hit_real_activate (GcalSearchHit *self,
GtkWidget *for_widget)
{
}
static gint
gcal_search_hit_real_compare (GcalSearchHit *a,
GcalSearchHit *b)
{
return 0;
}
static gint
gcal_search_hit_real_get_priority (GcalSearchHit *self)
{
return 0;
}
/*
* GObject overrides
*/
static void
gcal_search_hit_finalize (GObject *object)
{
GcalSearchHit *self = (GcalSearchHit *)object;
GcalSearchHitPrivate *priv = gcal_search_hit_get_instance_private (self);
g_clear_pointer (&priv->id, g_free);
g_clear_pointer (&priv->title, g_free);
g_clear_pointer (&priv->subtitle, g_free);
g_clear_object (&priv->primary_icon);
G_OBJECT_CLASS (gcal_search_hit_parent_class)->finalize (object);
}
static void
gcal_search_hit_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GcalSearchHit *self = GCAL_SEARCH_HIT (object);
switch (prop_id)
{
case PROP_ID:
g_value_set_string (value, gcal_search_hit_get_id (self));
break;
case PROP_TITLE:
g_value_set_string (value, gcal_search_hit_get_title (self));
break;
case PROP_SUBTITLE:
g_value_set_string (value, gcal_search_hit_get_subtitle (self));
break;
case PROP_PRIMARY_ICON:
g_value_take_object (value, gcal_search_hit_get_primary_icon (self));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
gcal_search_hit_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
GcalSearchHit *self = GCAL_SEARCH_HIT (object);
switch (prop_id)
{
case PROP_ID:
gcal_search_hit_set_id (self, g_value_get_string (value));
break;
case PROP_TITLE:
gcal_search_hit_set_title (self, g_value_get_string (value));
break;
case PROP_SUBTITLE:
gcal_search_hit_set_subtitle (self, g_value_get_string (value));
break;
case PROP_PRIMARY_ICON:
gcal_search_hit_set_primary_icon (self, g_value_get_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
gcal_search_hit_class_init (GcalSearchHitClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gcal_search_hit_finalize;
object_class->get_property = gcal_search_hit_get_property;
object_class->set_property = gcal_search_hit_set_property;
klass->activate = gcal_search_hit_real_activate;
klass->compare = gcal_search_hit_real_compare;
klass->get_priority = gcal_search_hit_real_get_priority;
properties [PROP_ID] =
g_param_spec_string ("id",
"Id",
"The suggestion identifier",
NULL,
G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
properties [PROP_TITLE] =
g_param_spec_string ("title",
"Title",
"The title of the suggestion",
NULL,
(G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
properties [PROP_SUBTITLE] =
g_param_spec_string ("subtitle",
"Subtitle",
"The subtitle of the suggestion",
NULL,
(G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
properties [PROP_PRIMARY_ICON] =
g_param_spec_object ("primary-icon",
"Primary icon",
"The primary icon for the suggestion",
GDK_TYPE_PAINTABLE,
G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (object_class, N_PROPS, properties);
}
static void
gcal_search_hit_init (GcalSearchHit *self)
{
}
/**
* gcal_search_hit_new:
*
* Create a new #GcalSearchHit.
*
* Returns: (transfer full): a newly created #GcalSearchHit
*/
GcalSearchHit *
gcal_search_hit_new (void)
{
return g_object_new (GCAL_TYPE_SEARCH_HIT, NULL);
}
const gchar *
gcal_search_hit_get_id (GcalSearchHit *self)
{
GcalSearchHitPrivate *priv = gcal_search_hit_get_instance_private (self);
g_return_val_if_fail (GCAL_IS_SEARCH_HIT (self), NULL);
return priv->id;
}
void
gcal_search_hit_set_id (GcalSearchHit *self,
const gchar *id)
{
GcalSearchHitPrivate *priv = gcal_search_hit_get_instance_private (self);
g_return_if_fail (GCAL_IS_SEARCH_HIT (self));
if (g_strcmp0 (priv->id, id) != 0)
{
g_free (priv->id);
priv->id = g_strdup (id);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_ID]);
}
}
const gchar *
gcal_search_hit_get_title (GcalSearchHit *self)
{
GcalSearchHitPrivate *priv = gcal_search_hit_get_instance_private (self);
g_return_val_if_fail (GCAL_IS_SEARCH_HIT (self), NULL);
return priv->title;
}
void
gcal_search_hit_set_title (GcalSearchHit *self,
const gchar *title)
{
GcalSearchHitPrivate *priv = gcal_search_hit_get_instance_private (self);
g_return_if_fail (GCAL_IS_SEARCH_HIT (self));
if (g_strcmp0 (priv->title, title) != 0)
{
g_clear_pointer (&priv->title, g_free);
priv->title = g_strdup (title);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_TITLE]);
}
}
const gchar *
gcal_search_hit_get_subtitle (GcalSearchHit *self)
{
GcalSearchHitPrivate *priv = gcal_search_hit_get_instance_private (self);
g_return_val_if_fail (GCAL_IS_SEARCH_HIT (self), NULL);
return priv->subtitle;
}
void
gcal_search_hit_set_subtitle (GcalSearchHit *self,
const gchar *subtitle)
{
GcalSearchHitPrivate *priv = gcal_search_hit_get_instance_private (self);
g_return_if_fail (GCAL_IS_SEARCH_HIT (self));
if (g_strcmp0 (priv->subtitle, subtitle) != 0)
{
g_clear_pointer (&priv->subtitle, g_free);
priv->subtitle = g_strdup (subtitle);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_SUBTITLE]);
}
}
GdkPaintable *
gcal_search_hit_get_primary_icon (GcalSearchHit *self)
{
GcalSearchHitPrivate *priv = gcal_search_hit_get_instance_private (self);
g_return_val_if_fail (GCAL_IS_SEARCH_HIT (self), NULL);
return priv->primary_icon;
}
void
gcal_search_hit_set_primary_icon (GcalSearchHit *self,
GdkPaintable *primary_icon)
{
GcalSearchHitPrivate *priv = gcal_search_hit_get_instance_private (self);
g_return_if_fail (GCAL_IS_SEARCH_HIT (self));
g_return_if_fail (!primary_icon || GDK_IS_PAINTABLE (primary_icon));
if (g_set_object (&priv->primary_icon, primary_icon))
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_PRIMARY_ICON]);
}
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);
GCAL_SEARCH_HIT_GET_CLASS (self)->activate (self, for_widget);
}
gint
gcal_search_hit_get_priority (GcalSearchHit *self)
{
g_return_val_if_fail (GCAL_IS_SEARCH_HIT (self), 0);
g_return_val_if_fail (GCAL_SEARCH_HIT_GET_IFACE (self)->get_priority, 0);
return GCAL_SEARCH_HIT_GET_IFACE (self)->get_priority (self);
return GCAL_SEARCH_HIT_GET_CLASS (self)->get_priority (self);
}
gint
@@ -51,7 +334,7 @@ gcal_search_hit_compare (GcalSearchHit *a,
GcalSearchHit *b)
{
g_return_val_if_fail (GCAL_IS_SEARCH_HIT (a), 0);
g_return_val_if_fail (GCAL_SEARCH_HIT_GET_IFACE (a)->compare, 0);
g_return_val_if_fail (GCAL_IS_SEARCH_HIT (b), 0);
return GCAL_SEARCH_HIT_GET_IFACE (a)->compare (a, b);
return GCAL_SEARCH_HIT_GET_CLASS (a)->compare (a, b);
}
src/search/gcal-search-hit.h
+26 -4
View File
@@ -20,16 +20,16 @@
#pragma once
#include <dazzle.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
#define GCAL_TYPE_SEARCH_HIT (gcal_search_hit_get_type ())
G_DECLARE_INTERFACE (GcalSearchHit, gcal_search_hit, GCAL, SEARCH_HIT, DzlSuggestion)
G_DECLARE_DERIVABLE_TYPE (GcalSearchHit, gcal_search_hit, GCAL, SEARCH_HIT, GObject)
struct _GcalSearchHitInterface
struct _GcalSearchHitClass
{
GTypeInterface parent;
GObjectClass parent_class;
void (*activate) (GcalSearchHit *self,
GtkWidget *for_widget);
@@ -40,6 +40,28 @@ struct _GcalSearchHitInterface
GcalSearchHit *b);
};
GcalSearchHit * gcal_search_hit_new (void);
const gchar * gcal_search_hit_get_id (GcalSearchHit *self);
void gcal_search_hit_set_id (GcalSearchHit *self,
const gchar *id);
const gchar * gcal_search_hit_get_title (GcalSearchHit *self);
void gcal_search_hit_set_title (GcalSearchHit *self,
const gchar *title);
const gchar * gcal_search_hit_get_subtitle (GcalSearchHit *self);
void gcal_search_hit_set_subtitle (GcalSearchHit *self,
const gchar *subtitle);
GdkPaintable * gcal_search_hit_get_primary_icon (GcalSearchHit *self);
void gcal_search_hit_set_primary_icon (GcalSearchHit *self,
GdkPaintable *paintable);
void gcal_search_hit_activate (GcalSearchHit *self,
GtkWidget *for_widget);
src/search/gcal-search-model.c
+2 -4
View File
@@ -29,8 +29,6 @@
#include "gcal-search-model.h"
#include "gcal-utils.h"
#include <dazzle.h>
#define MIN_RESULTS 5
#define WAIT_FOR_RESULTS_MS 0.150
@@ -155,7 +153,7 @@ gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface)
static GType
gcal_search_model_get_item_type (GListModel *model)
{
return DZL_TYPE_SUGGESTION;
return GCAL_TYPE_SEARCH_HIT;
}
static guint
@@ -212,7 +210,7 @@ gcal_search_model_class_init (GcalSearchModelClass *klass)
static void
gcal_search_model_init (GcalSearchModel *self)
{
self->model = (GListModel*) g_list_store_new (DZL_TYPE_SUGGESTION);
self->model = (GListModel*) g_list_store_new (GCAL_TYPE_SEARCH_HIT);
g_signal_connect_object (self->model, "items-changed", G_CALLBACK (on_model_items_changed_cb), self, 0);
}