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

calendar-management: Introduce GcalEditCalendarPage

Browse Source 
This is the second of the three original pages we used to have.
This one edits calendars.
This commit is contained in:
Georges Basile Stavracas Neto
2019-06-24 21:32:58 -03:00
parent db4613ae71
commit 9cc07c5786
8 changed files with 675 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/calendar.gresource.xml
+1
View File
@@ -8,6 +8,7 @@
<file alias="calendars-page.ui" compressed="true">ui/calendars-page.ui</file>
<file alias="date-chooser.ui" compressed="true">ui/date-chooser.ui</file>
<file alias="date-selector.ui" compressed="true">ui/date-selector.ui</file>
<file alias="edit-calendar-page.ui" compressed="true">ui/edit-calendar-page.ui</file>
<file alias="edit-dialog.ui" compressed="true">ui/edit-dialog.ui</file>
<file alias="event-widget.ui" compressed="true">ui/event-widget.ui</file>
<file alias="month-cell.ui" compressed="true">ui/month-cell.ui</file>
data/meson.build
+1
View File
@@ -89,6 +89,7 @@ resource_data = files(
'ui/date-chooser.ui',
'ui/date-selector.ui',
'ui/edit-dialog.ui',
'ui/edit-calendar-page.ui',
'ui/help-overlay.ui',
'ui/menus.ui',
'ui/month-cell.ui',
data/ui/calendar-management-dialog.ui
-198
View File
@@ -28,204 +28,6 @@
<property name="vhomogeneous">False</property>
<property name="transition_type">crossfade</property>
<signal name="notify::visible-child-name" handler="stack_visible_child_name_changed" object="GcalCalendarManagementDialog" swapped="no"/>
<child>
<object class="GtkGrid" id="edit_grid">
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">18</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="default_check">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="draw_indicator">True</property>
<signal name="notify::active" handler="default_check_toggled" object="GcalCalendarManagementDialog" swapped="no"/>
<child>
<object class="GtkLabel" id="default_check_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Add new events to this calendar by default</property>
<property name="xalign">0</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="remove_button">
<property name="label" translatable="yes">Remove Calendar</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="valign">end</property>
<property name="margin_top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<signal name="clicked" handler="remove_button_clicked" object="GcalCalendarManagementDialog" swapped="no"/>
<style>
<class name="destructive-action"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="calendar_visible_check">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="draw_indicator">True</property>
<signal name="notify::active" handler="calendar_visible_check_toggled" object="GcalCalendarManagementDialog" swapped="no"/>
<child>
<object class="GtkLabel" id="display_calendar_check_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Display calendar</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="calendar_color_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
<signal name="color-set" handler="color_set" object="GcalCalendarManagementDialog" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<signal name="notify::text" handler="name_entry_text_changed" object="GcalCalendarManagementDialog" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="calendar_dim_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Calendar name</property>
<property name="xalign">1</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="color_dim_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Color</property>
<property name="xalign">1</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="account_dim_label">
<property name="visible" bind-source="account_box" bind-property="visible" bind-flags="default|sync-create"/>
<property name="label" translatable="yes">Account</property>
<property name="xalign">1</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="location_dim_label">
<property name="visible" bind-source="calendar_url_button" bind-property="visible" bind-flags="default|sync-create"/>
<property name="label" translatable="yes">Location</property>
<property name="xalign">1</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="account_box">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="account_label">
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkButton" id="settings_button">
<property name="label" translatable="yes">Settings</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="settings_button_clicked" object="GcalCalendarManagementDialog" swapped="no"/>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLinkButton" id="calendar_url_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
</object>
<packing>
<property name="name">edit</property>
<property name="title" translatable="yes">Edit Calendar</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="web_source_grid">
<property name="visible">True</property>
data/ui/edit-calendar-page.ui
+214
View File
@@ -0,0 +1,214 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="GcalEditCalendarPage" parent="GtkBox">
<property name="visible">True</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">18</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<!-- Online Accounts -->
<child>
<object class="GtkLabel" id="account_dim_label">
<property name="visible" bind-source="account_box" bind-property="visible" bind-flags="default" />
<property name="label" translatable="yes">Account</property>
<property name="xalign">1</property>
<style>
<class name="dim-label" />
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="account_box">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="account_label">
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkButton" id="settings_button">
<property name="label" translatable="yes">Settings</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_settings_button_clicked_cb" object="GcalEditCalendarPage" swapped="no" />
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="top_attach">0</property>
<property name="left_attach">1</property>
</packing>
</child>
<!-- Location (URL, file path) -->
<child>
<object class="GtkLabel" id="location_dim_label">
<property name="visible" bind-source="calendar_url_button" bind-property="visible" bind-flags="default" />
<property name="label" translatable="yes">Location</property>
<property name="xalign">1</property>
<style>
<class name="dim-label" />
</style>
</object>
<packing>
<property name="top_attach">1</property>
<property name="left_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLinkButton" id="calendar_url_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="left_attach">1</property>
</packing>
</child>
<!-- Calendar name -->
<child>
<object class="GtkLabel" id="calendar_dim_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Calendar name</property>
<property name="xalign">1</property>
<style>
<class name="dim-label" />
</style>
</object>
<packing>
<property name="top_attach">2</property>
<property name="left_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="left_attach">1</property>
</packing>
</child>
<!-- Color -->
<child>
<object class="GtkLabel" id="color_dim_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Color</property>
<property name="xalign">1</property>
<style>
<class name="dim-label" />
</style>
</object>
<packing>
<property name="top_attach">3</property>
<property name="left_attach">0</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="calendar_color_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
</object>
<packing>
<property name="top_attach">3</property>
<property name="left_attach">1</property>
</packing>
</child>
<!-- Calendar visibility -->
<child>
<object class="GtkCheckButton" id="calendar_visible_check">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="display_calendar_check_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Display calendar</property>
</object>
</child>
</object>
<packing>
<property name="top_attach">4</property>
<property name="left_attach">0</property>
<property name="width">2</property>
</packing>
</child>
<!-- Default calendar -->
<child>
<object class="GtkCheckButton" id="default_check">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="default_check_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Add new events to this calendar by default</property>
<property name="xalign">0</property>
</object>
</child>
</object>
<packing>
<property name="top_attach">5</property>
<property name="left_attach">0</property>
<property name="width">2</property>
</packing>
</child>
<!-- Remove button -->
<child>
<object class="GtkButton" id="remove_button">
<property name="label" translatable="yes">Remove Calendar</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="valign">end</property>
<property name="margin_top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<signal name="clicked" handler="on_remove_button_clicked_cb" object="GcalEditCalendarPage" swapped="no" />
<style>
<class name="destructive-action" />
</style>
</object>
<packing>
<property name="top_attach">6</property>
<property name="left_attach">0</property>
<property name="width">2</property>
</packing>
</child>
</object>
</child>
</template>
</interface>
src/gui/calendar-management/gcal-calendar-management-dialog.c
+8 -330
View File
@@ -23,6 +23,7 @@
#include "gcal-calendar-management-dialog.h"
#include "gcal-calendar-management-page.h"
#include "gcal-calendars-page.h"
#include "gcal-edit-calendar-page.h"
#include "gcal-new-calendar-page.h"
#include "gcal-utils.h"
@@ -48,6 +49,7 @@ typedef enum
{
GCAL_PAGE_CALENDARS,
GCAL_PAGE_NEW_CALENDAR,
GCAL_PAGE_EDIT_CALENDAR,
N_PAGES,
} GcalPageType;
@@ -57,26 +59,12 @@ struct _GcalCalendarManagementDialog
GtkWidget *add_button;
GtkWidget *back_button;
GtkWidget *calendar_color_button;
GtkWidget *calendar_visible_check;
GtkWidget *cancel_button;
GtkWidget *default_check;
GtkWidget *edit_grid;
GtkWidget *headerbar;
GtkWidget *name_entry;
GtkWidget *notebook;
GtkWidget *remove_button;
GtkWidget *stack;
GtkWidget *web_source_grid;
/* edit page widgets */
GtkWidget *account_box;
GtkWidget *account_label;
GtkWidget *account_dim_label;
GtkWidget *calendar_url_button;
GtkWidget *location_dim_label;
GtkWidget *settings_button;
/* new source details */
GtkWidget *calendar_address_entry;
GtkWidget *web_sources_listbox;
@@ -91,7 +79,6 @@ struct _GcalCalendarManagementDialog
gint calendar_address_id;
gint validate_url_resource_id;
gint notification_timeout_id;
/* flags */
GcalCalendarManagementDialogMode mode;
@@ -152,13 +139,6 @@ static gboolean description_label_link_activated (GtkWidget *w
gchar *uri,
gpointer user_data);
static gboolean is_goa_source (GcalCalendarManagementDialog *dialog,
ESource *source);
static void name_entry_text_changed (GObject *object,
GParamSpec *pspec,
gpointer user_data);
static void on_file_activated (GSimpleAction *action,
GVariant *param,
gpointer user_data);
@@ -175,9 +155,6 @@ static void response_signal (GtkDialog *di
gint response_id,
gpointer user_data);
static void settings_button_clicked (GtkWidget *button,
gpointer user_data);
static gboolean pulse_web_entry (GcalCalendarManagementDialog *dialog);
static void url_entry_text_changed (GObject *object,
@@ -274,20 +251,8 @@ back_button_clicked (GtkButton *button,
gpointer user_data)
{
GcalCalendarManagementDialog *self = GCAL_CALENDAR_MANAGEMENT_DIALOG (user_data);
GcalManager *manager;
manager = gcal_context_get_manager (self->context);
if (gtk_stack_get_visible_child (GTK_STACK (self->stack)) == self->edit_grid)
{
/* Save the source before leaving */
gcal_manager_save_source (manager, self->source);
/* Release the source ref we acquired */
g_clear_object (&self->source);
}
gcal_calendar_management_dialog_set_mode (GCAL_CALENDAR_MANAGEMENT_DIALOG (user_data), GCAL_CALENDAR_MANAGEMENT_MODE_NORMAL);
gcal_calendar_management_dialog_set_mode (self, GCAL_CALENDAR_MANAGEMENT_MODE_NORMAL);
}
static void
@@ -397,47 +362,6 @@ description_label_link_activated (GtkWidget *widget,
return TRUE;
}
static gboolean
is_goa_source (GcalCalendarManagementDialog *dialog,
ESource *source)
{
ESource *parent;
gboolean is_goa;
GcalManager *manager;
g_assert (source && E_IS_SOURCE (source));
manager = gcal_context_get_manager (dialog->context);
parent = gcal_manager_get_source (manager, e_source_get_parent (source));
is_goa = e_source_has_extension (parent, E_SOURCE_EXTENSION_GOA);
g_object_unref (parent);
return is_goa;
}
static void
name_entry_text_changed (GObject *object,
GParamSpec *pspec,
gpointer user_data)
{
GcalCalendarManagementDialog *self = GCAL_CALENDAR_MANAGEMENT_DIALOG (user_data);
gboolean valid = gtk_entry_get_text_length (GTK_ENTRY (object)) > 0;
/*
* Callend when the name entry's text
* is edited. It changes the source's
* display name, but wait's for the
* calendar's ::response signal to
* commit these changes.
*/
gtk_widget_set_sensitive (self->back_button, valid);
gtk_widget_set_sensitive (self->add_button, valid);
if (valid)
e_source_set_display_name (self->source, gtk_entry_get_text (GTK_ENTRY (self->name_entry)));
}
static void
response_signal (GtkDialog *dialog,
gint response_id,
@@ -478,62 +402,6 @@ response_signal (GtkDialog *dialog,
gtk_widget_hide (GTK_WIDGET (dialog));
}
static gboolean
is_remote_source (ESource *source)
{
gboolean has_webdav, has_auth;
g_assert (E_IS_SOURCE (source));
has_webdav = e_source_has_extension (source, E_SOURCE_EXTENSION_WEBDAV_BACKEND);
has_auth = e_source_has_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION);
if (!has_webdav || !has_auth)
return FALSE;
if (has_auth)
{
ESourceAuthentication *auth;
auth = e_source_get_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION);
/* No host is set, it's not a remote source */
if (e_source_authentication_get_host (auth) == NULL)
return FALSE;
}
if (has_webdav)
{
ESourceWebdav *webdav;
webdav = e_source_get_extension (source, E_SOURCE_EXTENSION_WEBDAV_BACKEND);
/* No resource path specified, not a remote source */
if (e_source_webdav_get_resource_path (webdav) == NULL)
return FALSE;
}
return TRUE;
}
static void
settings_button_clicked (GtkWidget *button,
gpointer user_data)
{
GcalCalendarManagementDialog *self;
GApplication *app;
const gchar *account_id;
self = GCAL_CALENDAR_MANAGEMENT_DIALOG (user_data);
/* Selects the account to open */
account_id = g_object_get_data (G_OBJECT (self->account_label), "account-id");
app = g_application_get_default ();
gcal_utils_launch_online_accounts_panel (g_application_get_dbus_connection (app),
(gchar*) account_id,
NULL);
}
#if 0
static void
stack_visible_child_name_changed (GObject *object,
@@ -559,123 +427,6 @@ stack_visible_child_name_changed (GObject *object,
gtk_widget_set_visible (self->cancel_button, FALSE);
gtk_widget_set_visible (self->back_button, FALSE);
}
/*
* Update fields when it goes to the edit page.
* Here, only widgets that depends on the current
* source are updated, while indenpendent widgets
* are updated at #gcal_calendar_management_dialog_set_mode
*/
if (visible_child == self->edit_grid && self->source != NULL)
{
GcalCalendar *default_calendar;
ESource *default_source;
gchar *parent_name;
gboolean creation_mode, is_goa, is_file, is_remote;
default_calendar = gcal_manager_get_default_calendar (manager);
default_source = gcal_calendar_get_source (default_calendar);
creation_mode = (self->mode == GCAL_CALENDAR_MANAGEMENT_MODE_CREATE ||
self->mode == GCAL_CALENDAR_MANAGEMENT_MODE_CREATE_WEB);
is_goa = is_goa_source (GCAL_CALENDAR_MANAGEMENT_DIALOG (user_data), self->source);
is_file = e_source_has_extension (self->source, E_SOURCE_EXTENSION_LOCAL_BACKEND);
is_remote = is_remote_source (self->source);
get_source_parent_name_color (manager, self->source, &parent_name, NULL);
/* update headerbar buttons */
gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (self->headerbar), !creation_mode);
gtk_widget_set_visible (self->calendar_visible_check, !creation_mode);
gtk_widget_set_visible (self->back_button, !creation_mode);
gtk_widget_set_visible (self->add_button, creation_mode);
gtk_widget_set_visible (self->cancel_button, creation_mode);
gtk_widget_set_visible (self->account_box, is_goa);
gtk_widget_set_visible (self->calendar_url_button, !is_goa && (is_file || is_remote));
/* If it's a file, set the file path */
if (is_file)
{
ESourceLocal *local;
GFile *file;
gchar *uri;
local = e_source_get_extension (self->source, E_SOURCE_EXTENSION_LOCAL_BACKEND);
file = e_source_local_get_custom_file (local);
uri = g_file_get_uri (file);
gtk_link_button_set_uri (GTK_LINK_BUTTON (self->calendar_url_button), uri);
gtk_button_set_label (GTK_BUTTON (self->calendar_url_button), uri);
g_free (uri);
}
/* If it's remote, build the uri */
if (is_remote)
{
ESourceAuthentication *auth;
ESourceWebdav *webdav;
g_autoptr (SoupURI) soup;
g_autofree gchar *uri;
auth = e_source_get_extension (self->source, E_SOURCE_EXTENSION_AUTHENTICATION);
webdav = e_source_get_extension (self->source, E_SOURCE_EXTENSION_WEBDAV_BACKEND);
soup = e_source_webdav_dup_soup_uri (webdav);
uri = g_strdup_printf ("%s://%s:%d%s",
soup_uri_get_scheme (soup),
e_source_authentication_get_host (auth),
e_source_authentication_get_port (auth),
e_source_webdav_get_resource_path (webdav));
gtk_link_button_set_uri (GTK_LINK_BUTTON (self->calendar_url_button), uri);
gtk_button_set_label (GTK_BUTTON (self->calendar_url_button), uri);
}
if (is_goa)
{
gchar *name;
get_source_parent_name_color (manager, self->source, &name, NULL);
gtk_label_set_label (GTK_LABEL (self->account_label), name);
}
/* block signals */
g_signal_handlers_block_by_func (self->calendar_visible_check, calendar_visible_check_toggled, user_data);
g_signal_handlers_block_by_func (self->calendar_color_button, color_set, user_data);
g_signal_handlers_block_by_func (self->name_entry, name_entry_text_changed, user_data);
/* color button */
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (self->calendar_color_button),
gcal_calendar_get_color (calendar));
/* entry */
gtk_entry_set_text (GTK_ENTRY (self->name_entry), e_source_get_display_name (self->source));
/* enabled check */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->calendar_visible_check),
gcal_calendar_get_visible (calendar));
/* default source check button */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->default_check), (self->source == default_source));
gtk_widget_set_visible (self->default_check, !gcal_calendar_is_read_only (calendar));
/* title */
if (!creation_mode)
{
gtk_header_bar_set_title (GTK_HEADER_BAR (self->headerbar), gcal_calendar_get_name (calendar));
gtk_header_bar_set_subtitle (GTK_HEADER_BAR (self->headerbar), parent_name);
}
/* toggle the remove button */
gtk_widget_set_visible (self->remove_button, e_source_get_removable (self->source));
/* unblock signals */
g_signal_handlers_unblock_by_func (self->calendar_visible_check, calendar_visible_check_toggled, user_data);
g_signal_handlers_unblock_by_func (self->calendar_color_button, color_set, user_data);
g_signal_handlers_unblock_by_func (self->name_entry, name_entry_text_changed, user_data);
g_object_unref (default_source);
g_free (parent_name);
}
}
#endif
@@ -1285,59 +1036,6 @@ discover_sources_cb (GObject *source,
g_slist_free_full (user_addresses, g_free);
}
#if 0
static void
remove_button_clicked (GtkWidget *button,
gpointer user_data)
{
GcalCalendarManagementDialog *self = GCAL_CALENDAR_MANAGEMENT_DIALOG (user_data);
GcalManager *manager;
manager = gcal_context_get_manager (self->context);
if (self->source != NULL)
{
ESource *removed_source;
GList *children, *l;
gchar *str;
removed_source = self->source;
self->removed_calendar = gcal_manager_get_calendar_from_source (manager, removed_source);
self->source = NULL;
children = gtk_container_get_children (GTK_CONTAINER (self->calendars_listbox));
gtk_revealer_set_reveal_child (GTK_REVEALER (self->notification), TRUE);
/* Remove the listbox entry (if any) */
for (l = children; l != NULL; l = l->next)
{
if (g_object_get_data (l->data, "calendar") == self->removed_calendar)
{
gtk_widget_destroy (l->data);
break;
}
}
/* Update notification label */
str = g_markup_printf_escaped (_("Calendar <b>%s</b> removed"), gcal_calendar_get_name (self->removed_calendar));
gtk_label_set_markup (GTK_LABEL (self->notification_label), str);
/* Remove old notifications */
if (self->notification_timeout_id != 0)
g_source_remove (self->notification_timeout_id);
self->notification_timeout_id = g_timeout_add_seconds (5, hide_notification_scheduled, user_data);
gcal_calendar_set_visible (self->removed_calendar, FALSE);
g_list_free (children);
g_free (str);
}
gcal_calendar_management_dialog_set_mode (GCAL_CALENDAR_MANAGEMENT_DIALOG (user_data), GCAL_CALENDAR_MANAGEMENT_MODE_NORMAL);
}
#endif
static void
set_page (GcalCalendarManagementDialog *self,
const gchar *page_name,
@@ -1358,9 +1056,10 @@ set_page (GcalCalendarManagementDialog *self,
continue;
gtk_stack_set_visible_child (GTK_STACK (self->stack), GTK_WIDGET (page));
gcal_calendar_management_page_activate (page, page_data);
gtk_header_bar_set_title (GTK_HEADER_BAR (self->headerbar),
gcal_calendar_management_page_get_title (page));
gcal_calendar_management_page_activate (page, page_data);
break;
}
@@ -1393,6 +1092,7 @@ setup_context (GcalCalendarManagementDialog *self)
} pages[] = {
{ GCAL_PAGE_CALENDARS, GCAL_TYPE_CALENDARS_PAGE },
{ GCAL_PAGE_NEW_CALENDAR, GCAL_TYPE_NEW_CALENDAR_PAGE },
{ GCAL_PAGE_EDIT_CALENDAR, GCAL_TYPE_EDIT_CALENDAR_PAGE },
};
gint i;
@@ -1438,8 +1138,6 @@ gcal_calendar_management_dialog_constructed (GObject *object)
/* widget responses */
gtk_dialog_set_default_response (GTK_DIALOG (object), GTK_RESPONSE_CANCEL);
g_object_set_data (G_OBJECT (self->remove_button), "response", GINT_TO_POINTER (GCAL_RESPONSE_REMOVE_SOURCE));
/* Action group */
self->action_group = g_simple_action_group_new ();
gtk_widget_insert_action_group (GTK_WIDGET (object), "source", G_ACTION_GROUP (self->action_group));
@@ -1521,27 +1219,16 @@ gcal_calendar_management_dialog_class_init (GcalCalendarManagementDialogClass *k
/* bind things for/from the template class */
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/calendar/calendar-management-dialog.ui");
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, account_box);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, account_label);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, add_button);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, back_button);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, calendar_address_entry);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, calendar_color_button);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, calendar_url_button);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, calendar_visible_check);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, cancel_button);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, credentials_cancel_button);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, credentials_connect_button);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, credentials_dialog);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, credentials_password_entry);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, credentials_user_entry);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, default_check);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, edit_grid);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, headerbar);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, location_dim_label);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, name_entry);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, remove_button);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, settings_button);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, stack);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, web_source_grid);
gtk_widget_class_bind_template_child (widget_class, GcalCalendarManagementDialog, web_sources_listbox);
@@ -1559,9 +1246,7 @@ gcal_calendar_management_dialog_class_init (GcalCalendarManagementDialogClass *k
gtk_widget_class_bind_template_callback (widget_class, color_set);
gtk_widget_class_bind_template_callback (widget_class, default_check_toggled);
gtk_widget_class_bind_template_callback (widget_class, description_label_link_activated);
gtk_widget_class_bind_template_callback (widget_class, name_entry_text_changed);
gtk_widget_class_bind_template_callback (widget_class, response_signal);
gtk_widget_class_bind_template_callback (widget_class, settings_button_clicked);
//gtk_widget_class_bind_template_callback (widget_class, stack_visible_child_name_changed);
gtk_widget_class_bind_template_callback (widget_class, url_entry_text_changed);
}
@@ -1597,7 +1282,7 @@ gcal_calendar_management_dialog_set_mode (GcalCalendarManagementDialog *dial
case GCAL_CALENDAR_MANAGEMENT_MODE_CREATE:
gtk_header_bar_set_title (GTK_HEADER_BAR (dialog->headerbar), _("Add Calendar"));
gtk_header_bar_set_subtitle (GTK_HEADER_BAR (dialog->headerbar), NULL);
gtk_stack_set_visible_child (GTK_STACK (dialog->stack), dialog->edit_grid);
gtk_stack_set_visible_child (GTK_STACK (dialog->stack), GTK_WIDGET (dialog->pages[GCAL_PAGE_EDIT_CALENDAR]));
break;
case GCAL_CALENDAR_MANAGEMENT_MODE_CREATE_WEB:
@@ -1610,14 +1295,7 @@ gcal_calendar_management_dialog_set_mode (GcalCalendarManagementDialog *dial
break;
case GCAL_CALENDAR_MANAGEMENT_MODE_EDIT:
/* Bind title */
if (dialog->title_bind == NULL)
{
dialog->title_bind = g_object_bind_property (dialog->name_entry, "text", dialog->headerbar, "title",
G_BINDING_DEFAULT);
}
gtk_stack_set_visible_child (GTK_STACK (dialog->stack), dialog->edit_grid);
gtk_stack_set_visible_child (GTK_STACK (dialog->stack), GTK_WIDGET (dialog->pages[GCAL_PAGE_EDIT_CALENDAR]));
break;
case GCAL_CALENDAR_MANAGEMENT_MODE_NORMAL:
src/gui/calendar-management/gcal-edit-calendar-page.c
+420
View File
@@ -0,0 +1,420 @@
/* gcal-edit-calendar-page.c
*
* Copyright 2019 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
#define G_LOG_DOMAIN "GcalEditCalendarPage"
#include "gcal-context.h"
#include "gcal-calendar-management-page.h"
#include "gcal-debug.h"
#include "gcal-edit-calendar-page.h"
#include "gcal-utils.h"
struct _GcalEditCalendarPage
{
GtkBox parent;
GtkWidget *account_box;
GtkLabel *account_label;
GtkWidget *account_dim_label;
GtkColorChooser *calendar_color_button;
GtkToggleButton *calendar_visible_check;
GtkWidget *calendar_url_button;
GtkToggleButton *default_check;
GtkWidget *location_dim_label;
GtkEntry *name_entry;
GtkWidget *remove_button;
GcalCalendar *calendar;
GcalContext *context;
};
static void gcal_calendar_management_page_iface_init (GcalCalendarManagementPageInterface *iface);
G_DEFINE_TYPE_WITH_CODE (GcalEditCalendarPage, gcal_edit_calendar_page, GTK_TYPE_BOX,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_CALENDAR_MANAGEMENT_PAGE,
gcal_calendar_management_page_iface_init))
enum
{
PROP_0,
PROP_CONTEXT,
N_PROPS
};
/*
* Auxiliary methods
*/
static gboolean
is_goa_calendar (GcalEditCalendarPage *self,
GcalCalendar *calendar)
{
g_autoptr (ESource) parent = NULL;
GcalManager *manager;
ESource *source;
g_assert (calendar && GCAL_IS_CALENDAR (calendar));
manager = gcal_context_get_manager (self->context);
source = gcal_calendar_get_source (calendar);
parent = gcal_manager_get_source (manager, e_source_get_parent (source));
return e_source_has_extension (parent, E_SOURCE_EXTENSION_GOA);
}
static gboolean
is_remote_source (ESource *source)
{
gboolean has_webdav, has_auth;
g_assert (E_IS_SOURCE (source));
has_webdav = e_source_has_extension (source, E_SOURCE_EXTENSION_WEBDAV_BACKEND);
has_auth = e_source_has_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION);
if (!has_webdav || !has_auth)
return FALSE;
if (has_auth)
{
ESourceAuthentication *auth;
auth = e_source_get_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION);
/* No host is set, it's not a remote source */
if (!e_source_authentication_get_host (auth))
return FALSE;
}
if (has_webdav)
{
ESourceWebdav *webdav;
webdav = e_source_get_extension (source, E_SOURCE_EXTENSION_WEBDAV_BACKEND);
/* No resource path specified, not a remote source */
if (!e_source_webdav_get_resource_path (webdav))
return FALSE;
}
return TRUE;
}
static void
setup_calendar (GcalEditCalendarPage *self,
GcalCalendar *calendar)
{
g_autofree gchar *parent_name = NULL;
GcalCalendar *default_calendar;
GcalManager *manager;
ESource *default_source;
ESource *source;
gboolean is_remote;
gboolean is_file;
gboolean is_goa;
self->calendar = g_object_ref (calendar);
manager = gcal_context_get_manager (self->context);
default_calendar = gcal_manager_get_default_calendar (manager);
default_source = gcal_calendar_get_source (default_calendar);
is_goa = is_goa_calendar (self, calendar);
source = gcal_calendar_get_source (calendar);
is_file = e_source_has_extension (source, E_SOURCE_EXTENSION_LOCAL_BACKEND);
is_remote = is_remote_source (source);
get_source_parent_name_color (manager, source, &parent_name, NULL);
gtk_widget_set_visible (self->account_box, is_goa);
gtk_widget_set_visible (self->calendar_url_button, !is_goa && (is_file || is_remote));
/* If it's a file, set the file path */
if (is_file)
{
g_autofree gchar *uri = NULL;
ESourceLocal *local;
GFile *file;
local = e_source_get_extension (source, E_SOURCE_EXTENSION_LOCAL_BACKEND);
file = e_source_local_get_custom_file (local);
uri = g_file_get_uri (file);
gtk_link_button_set_uri (GTK_LINK_BUTTON (self->calendar_url_button), uri);
gtk_button_set_label (GTK_BUTTON (self->calendar_url_button), uri);
}
/* If it's remote, build the uri */
if (is_remote)
{
ESourceAuthentication *auth;
g_autoptr (SoupURI) soup = NULL;
g_autofree gchar *uri = NULL;
ESourceWebdav *webdav;
auth = e_source_get_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION);
webdav = e_source_get_extension (source, E_SOURCE_EXTENSION_WEBDAV_BACKEND);
soup = e_source_webdav_dup_soup_uri (webdav);
uri = g_strdup_printf ("%s://%s:%d%s",
soup_uri_get_scheme (soup),
e_source_authentication_get_host (auth),
e_source_authentication_get_port (auth),
e_source_webdav_get_resource_path (webdav));
gtk_link_button_set_uri (GTK_LINK_BUTTON (self->calendar_url_button), uri);
gtk_button_set_label (GTK_BUTTON (self->calendar_url_button), uri);
}
if (is_goa)
{
g_autofree gchar *name = NULL;
get_source_parent_name_color (manager, source, &name, NULL);
gtk_label_set_label (self->account_label, name);
}
gtk_color_chooser_set_rgba (self->calendar_color_button, gcal_calendar_get_color (calendar));
gtk_entry_set_text (self->name_entry, gcal_calendar_get_name (calendar));
gtk_toggle_button_set_active (self->calendar_visible_check, gcal_calendar_get_visible (calendar));
gtk_toggle_button_set_active (self->default_check, source == default_source);
gtk_widget_set_visible (GTK_WIDGET (self->default_check), !gcal_calendar_is_read_only (calendar));
gtk_widget_set_visible (self->remove_button, e_source_get_removable (source));
}
static void
update_calendar (GcalEditCalendarPage *self)
{
GcalManager *manager;
GdkRGBA color;
GCAL_ENTRY;
g_assert (self->calendar != NULL);
manager = gcal_context_get_manager (self->context);
gtk_color_chooser_get_rgba (self->calendar_color_button, &color);
gcal_calendar_set_name (self->calendar, gtk_entry_get_text (self->name_entry));
gcal_calendar_set_color (self->calendar, &color);
if (gtk_toggle_button_get_active (self->default_check))
gcal_manager_set_default_calendar (manager, self->calendar);
GCAL_EXIT;
}
/*
* Callbacks
*/
static void
on_remove_button_clicked_cb (GtkButton *button,
GcalEditCalendarPage *self)
{
GcalCalendarManagementPage *page;
GCAL_ENTRY;
page = GCAL_CALENDAR_MANAGEMENT_PAGE (self);
gcal_calendar_management_page_switch_page (page, "calendars", self->calendar);
GCAL_EXIT;
}
static void
on_settings_button_clicked_cb (GtkWidget *button,
GcalEditCalendarPage *self)
{
g_autoptr (ESource) parent = NULL;
GApplication *app;
GcalManager *manager;
ESourceGoa *goa;
ESource *source;
GCAL_ENTRY;
manager = gcal_context_get_manager (self->context);
source = gcal_calendar_get_source (self->calendar);
parent = gcal_manager_get_source (manager, e_source_get_parent (source));
g_assert (e_source_has_extension (parent, E_SOURCE_EXTENSION_GOA));
goa = e_source_get_extension (parent, E_SOURCE_EXTENSION_GOA);
app = g_application_get_default ();
gcal_utils_launch_online_accounts_panel (g_application_get_dbus_connection (app),
e_source_goa_get_account_id (goa),
NULL);
GCAL_EXIT;
}
/*
* GcalCalendarManagementPage iface
*/
static const gchar*
gcal_edit_calendar_page_get_name (GcalCalendarManagementPage *page)
{
return "edit-calendar";
}
static const gchar*
gcal_edit_calendar_page_get_title (GcalCalendarManagementPage *page)
{
GcalEditCalendarPage *self = GCAL_EDIT_CALENDAR_PAGE (page);
return gcal_calendar_get_name (self->calendar);
}
static void
gcal_edit_calendar_page_activate (GcalCalendarManagementPage *page,
gpointer data)
{
GcalEditCalendarPage *self;
GcalCalendar *calendar;
g_assert (GCAL_IS_CALENDAR (data));
self = GCAL_EDIT_CALENDAR_PAGE (page);
calendar = GCAL_CALENDAR (data);
setup_calendar (self, calendar);
}
static void
gcal_edit_calendar_page_deactivate (GcalCalendarManagementPage *page)
{
GcalEditCalendarPage *self;
GcalManager *manager;
GCAL_ENTRY;
self = GCAL_EDIT_CALENDAR_PAGE (page);
manager = gcal_context_get_manager (self->context);
update_calendar (self);
gcal_manager_save_source (manager, gcal_calendar_get_source (self->calendar));
g_clear_object (&self->calendar);
GCAL_EXIT;
}
static void
gcal_calendar_management_page_iface_init (GcalCalendarManagementPageInterface *iface)
{
iface->get_name = gcal_edit_calendar_page_get_name;
iface->get_title = gcal_edit_calendar_page_get_title;
iface->activate = gcal_edit_calendar_page_activate;
iface->deactivate = gcal_edit_calendar_page_deactivate;
}
/*
* GObject overrides
*/
static void
gcal_edit_calendar_page_finalize (GObject *object)
{
GcalEditCalendarPage *self = (GcalEditCalendarPage *)object;
g_clear_object (&self->calendar);
g_clear_object (&self->context);
G_OBJECT_CLASS (gcal_edit_calendar_page_parent_class)->finalize (object);
}
static void
gcal_edit_calendar_page_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GcalEditCalendarPage *self = GCAL_EDIT_CALENDAR_PAGE (object);
switch (prop_id)
{
case PROP_CONTEXT:
g_value_set_object (value, self->context);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
gcal_edit_calendar_page_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
GcalEditCalendarPage *self = GCAL_EDIT_CALENDAR_PAGE (object);
switch (prop_id)
{
case PROP_CONTEXT:
self->context = g_value_dup_object (value);
g_assert (self->context != NULL);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
gcal_edit_calendar_page_class_init (GcalEditCalendarPageClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->finalize = gcal_edit_calendar_page_finalize;
object_class->get_property = gcal_edit_calendar_page_get_property;
object_class->set_property = gcal_edit_calendar_page_set_property;
g_object_class_override_property (object_class, PROP_CONTEXT, "context");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/edit-calendar-page.ui");
gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, account_box);
gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, account_label);
gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, calendar_color_button);
gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, calendar_url_button);
gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, calendar_visible_check);
gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, default_check);
gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, location_dim_label);
gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, name_entry);
gtk_widget_class_bind_template_child (widget_class, GcalEditCalendarPage, remove_button);
gtk_widget_class_bind_template_callback (widget_class, on_remove_button_clicked_cb);
gtk_widget_class_bind_template_callback (widget_class, on_settings_button_clicked_cb);
}
static void
gcal_edit_calendar_page_init (GcalEditCalendarPage *self)
{
gtk_widget_init_template (GTK_WIDGET (self));
}
src/gui/calendar-management/gcal-edit-calendar-page.h
+30
View File
@@ -0,0 +1,30 @@
/* gcal-edit-calendar-page.h
*
* Copyright 2019 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
#include <gtk/gtk.h>
G_BEGIN_DECLS
#define GCAL_TYPE_EDIT_CALENDAR_PAGE (gcal_edit_calendar_page_get_type())
G_DECLARE_FINAL_TYPE (GcalEditCalendarPage, gcal_edit_calendar_page, GCAL, EDIT_CALENDAR_PAGE, GtkBox)
G_END_DECLS
src/meson.build
+1
View File
@@ -105,6 +105,7 @@ sources = files(
'gui/calendar-management/gcal-calendar-management-dialog.c',
'gui/calendar-management/gcal-calendar-management-page.c',
'gui/calendar-management/gcal-calendars-page.c',
'gui/calendar-management/gcal-edit-calendar-page.c',
'gui/calendar-management/gcal-new-calendar-page.c',
'gui/gcal-application.c',
'gui/gcal-calendar-popover.c',