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

quick-add-popover: Receive a context

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2019-04-26 13:36:35 -03:00
parent ab1c0b6ca4
commit 9216e0931c
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-quick-add-popover.c
+23 -19
View File
@@ -43,7 +43,7 @@ struct _GcalQuickAddPopover
gboolean clock_format_24h; gboolean clock_format_24h;
GcalManager *manager; GcalContext *context;
}; };
G_DEFINE_TYPE (GcalQuickAddPopover, gcal_quick_add_popover, GTK_TYPE_POPOVER) G_DEFINE_TYPE (GcalQuickAddPopover, gcal_quick_add_popover, GTK_TYPE_POPOVER)
@@ -52,7 +52,7 @@ enum {
PROP_0, PROP_0,
PROP_DATE_START, PROP_DATE_START,
PROP_DATE_END, PROP_DATE_END,
PROP_MANAGER, PROP_CONTEXT,
N_PROPS N_PROPS
}; };
@@ -481,10 +481,12 @@ update_header (GcalQuickAddPopover *self)
static void static void
update_default_calendar_row (GcalQuickAddPopover *self) update_default_calendar_row (GcalQuickAddPopover *self)
{ {
GcalManager *manager;
GtkWidget *row; GtkWidget *row;
ESource *default_source; ESource *default_source;
default_source = gcal_manager_get_default_source (self->manager); manager = gcal_context_get_manager (self->context);
default_source = gcal_manager_get_default_source (manager);
row = get_row_for_source (self, default_source); row = get_row_for_source (self, default_source);
select_row (self, GTK_LIST_BOX_ROW (row)); select_row (self, GTK_LIST_BOX_ROW (row));
@@ -534,7 +536,7 @@ on_source_changed (GcalManager *manager,
row = get_row_for_source (self, source); row = get_row_for_source (self, source);
/* If the calendar changed from/to read-only, we add or remove it here */ /* If the calendar changed from/to read-only, we add or remove it here */
if (!gcal_manager_is_client_writable (self->manager, source)) if (!gcal_manager_is_client_writable (manager, source))
{ {
if (row) if (row)
gtk_container_remove (GTK_CONTAINER (self->calendars_listbox), row); gtk_container_remove (GTK_CONTAINER (self->calendars_listbox), row);
@@ -543,7 +545,7 @@ on_source_changed (GcalManager *manager,
} }
else if (!row) else if (!row)
{ {
on_source_added (self->manager, on_source_added (manager,
source, source,
is_source_enabled (source), is_source_enabled (source),
self); self);
@@ -633,6 +635,7 @@ edit_or_create_event (GcalQuickAddPopover *self,
GtkWidget *button) GtkWidget *button)
{ {
ECalComponent *component; ECalComponent *component;
GcalManager *manager;
GDateTime *date_start, *date_end; GDateTime *date_start, *date_end;
GTimeZone *tz; GTimeZone *tz;
GcalEvent *event; GcalEvent *event;
@@ -643,6 +646,7 @@ edit_or_create_event (GcalQuickAddPopover *self,
if (!self->selected_row) if (!self->selected_row)
return; return;
manager = gcal_context_get_manager (self->context);
source = g_object_get_data (G_OBJECT (self->selected_row), "source"); source = g_object_get_data (G_OBJECT (self->selected_row), "source");
single_day = datetime_compare_date (self->date_end, self->date_start) == 0; single_day = datetime_compare_date (self->date_end, self->date_start) == 0;
@@ -689,7 +693,7 @@ edit_or_create_event (GcalQuickAddPopover *self,
/* If we clicked edit button, send a signal; otherwise, create the event */ /* If we clicked edit button, send a signal; otherwise, create the event */
if (button == self->add_button) if (button == self->add_button)
gcal_manager_create_event (self->manager, event); gcal_manager_create_event (manager, event);
else else
g_signal_emit (self, signals[EDIT_EVENT], 0, event); g_signal_emit (self, signals[EDIT_EVENT], 0, event);
@@ -727,7 +731,7 @@ gcal_quick_add_popover_finalize (GObject *object)
{ {
GcalQuickAddPopover *self = (GcalQuickAddPopover *)object; GcalQuickAddPopover *self = (GcalQuickAddPopover *)object;
g_clear_object (&self->manager); g_clear_object (&self->context);
G_OBJECT_CLASS (gcal_quick_add_popover_parent_class)->finalize (object); G_OBJECT_CLASS (gcal_quick_add_popover_parent_class)->finalize (object);
} }
@@ -750,8 +754,8 @@ gcal_quick_add_popover_get_property (GObject *object,
g_value_set_boxed (value, self->date_start); g_value_set_boxed (value, self->date_start);
break; break;
case PROP_MANAGER: case PROP_CONTEXT:
g_value_set_object (value, self->manager); g_value_set_object (value, self->context);
break; break;
default: default:
@@ -777,14 +781,14 @@ gcal_quick_add_popover_set_property (GObject *object,
gcal_quick_add_popover_set_date_start (self, g_value_get_boxed (value)); gcal_quick_add_popover_set_date_start (self, g_value_get_boxed (value));
break; break;
case PROP_MANAGER: case PROP_CONTEXT:
if (g_set_object (&self->manager, g_value_get_object (value))) if (g_set_object (&self->context, g_value_get_object (value)))
{ {
GcalManager *manager; GcalManager *manager;
GList *sources, *l; GList *sources, *l;
/* Add currently leaded sources */ /* Add currently loaded sources */
manager = self->manager; manager = gcal_context_get_manager (self->context);
sources = gcal_manager_get_sources_connected (manager); sources = gcal_manager_get_sources_connected (manager);
for (l = sources; l != NULL; l = g_list_next (l)) for (l = sources; l != NULL; l = g_list_next (l))
@@ -798,7 +802,7 @@ gcal_quick_add_popover_set_property (GObject *object,
g_signal_connect (manager, "source-removed", G_CALLBACK (on_source_removed), self); g_signal_connect (manager, "source-removed", G_CALLBACK (on_source_removed), self);
g_signal_connect_swapped (manager, "notify::default-calendar", G_CALLBACK (update_default_calendar_row), self); g_signal_connect_swapped (manager, "notify::default-calendar", G_CALLBACK (update_default_calendar_row), self);
g_object_notify (G_OBJECT (self), "manager"); g_object_notify (G_OBJECT (self), "context");
} }
break; break;
@@ -884,11 +888,11 @@ gcal_quick_add_popover_class_init (GcalQuickAddPopoverClass *klass)
* The manager of the application. * The manager of the application.
*/ */
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_MANAGER, PROP_CONTEXT,
g_param_spec_object ("manager", g_param_spec_object ("context",
"Manager of the application", "Context of the application",
"The singleton manager of the application", "The singleton context of the application",
GCAL_TYPE_MANAGER, GCAL_TYPE_CONTEXT,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/quick-add-popover.ui"); gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/quick-add-popover.ui");
src/gcal-quick-add-popover.h
+1 -1
View File
@@ -19,8 +19,8 @@
#ifndef GCAL_QUICK_ADD_POPOVER_H #ifndef GCAL_QUICK_ADD_POPOVER_H
#define GCAL_QUICK_ADD_POPOVER_H #define GCAL_QUICK_ADD_POPOVER_H
#include "gcal-context.h"
#include "gcal-event.h" #include "gcal-event.h"
#include "gcal-manager.h"
#include <glib.h> #include <glib.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
src/gcal-window.c
+1 -1
View File
@@ -1264,7 +1264,7 @@ gcal_window_constructed (GObject *object)
g_object_bind_property (self, "context", self->year_view, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); g_object_bind_property (self, "context", self->year_view, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
g_object_bind_property (self, "context", self->edit_dialog, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); g_object_bind_property (self, "context", self->edit_dialog, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
g_object_bind_property (self, "context", self->search_popover, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); g_object_bind_property (self, "context", self->search_popover, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
g_object_bind_property (self->context, "manager", self->quick_add_popover, "manager", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); g_object_bind_property (self, "context", self->quick_add_popover, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
GCAL_EXIT; GCAL_EXIT;
} }