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

event-widget: Fetch 24h setting from context

Browse Source 
Instead of using the auxiliary function.
This commit is contained in:
Georges Basile Stavracas Neto
2023-09-23 02:39:07 -03:00
parent c8543aa822
commit 38108ffa7a
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gcal-event-widget.c
+15 -17
View File
@@ -61,7 +61,6 @@ struct _GcalEventWidget
GtkWidget *preview_popover; GtkWidget *preview_popover;
/* internal data */ /* internal data */
gboolean clock_format_24h : 1;
gboolean read_only : 1; gboolean read_only : 1;
gchar *css_class; gchar *css_class;
@@ -269,8 +268,9 @@ gcal_event_widget_set_event_tooltip (GcalEventWidget *self,
if (multiday) if (multiday)
{ {
if (self->clock_format_24h) switch (gcal_context_get_time_format (self->context))
{ {
case GCAL_TIME_FORMAT_24H:
if (is_ltr) if (is_ltr)
{ {
start = g_date_time_format (tooltip_start, "%x %R"); start = g_date_time_format (tooltip_start, "%x %R");
@@ -281,9 +281,9 @@ gcal_event_widget_set_event_tooltip (GcalEventWidget *self,
start = g_date_time_format (tooltip_start, "%R %x"); start = g_date_time_format (tooltip_start, "%R %x");
end = g_date_time_format (tooltip_end, "%R %x"); end = g_date_time_format (tooltip_end, "%R %x");
} }
} break;
else
{ case GCAL_TIME_FORMAT_12H:
if (is_ltr) if (is_ltr)
{ {
start = g_date_time_format (tooltip_start, "%x %I:%M %P"); start = g_date_time_format (tooltip_start, "%x %I:%M %P");
@@ -294,12 +294,14 @@ gcal_event_widget_set_event_tooltip (GcalEventWidget *self,
start = g_date_time_format (tooltip_start, "%P %M:%I %x"); start = g_date_time_format (tooltip_start, "%P %M:%I %x");
end = g_date_time_format (tooltip_end, "%P %M:%I %x"); end = g_date_time_format (tooltip_end, "%P %M:%I %x");
} }
break;
} }
} }
else else
{ {
if (self->clock_format_24h) switch (gcal_context_get_time_format (self->context))
{ {
case GCAL_TIME_FORMAT_24H:
if (is_ltr) if (is_ltr)
{ {
start = g_date_time_format (tooltip_start, "%x, %R"); start = g_date_time_format (tooltip_start, "%x, %R");
@@ -310,9 +312,9 @@ gcal_event_widget_set_event_tooltip (GcalEventWidget *self,
start = g_date_time_format (tooltip_start, "%R ,%x"); start = g_date_time_format (tooltip_start, "%R ,%x");
end = g_date_time_format (tooltip_end, "%R"); end = g_date_time_format (tooltip_end, "%R");
} }
} break;
else
{ case GCAL_TIME_FORMAT_12H:
if (is_ltr) if (is_ltr)
{ {
start = g_date_time_format (tooltip_start, "%x, %I:%M %P"); start = g_date_time_format (tooltip_start, "%x, %I:%M %P");
@@ -323,6 +325,7 @@ gcal_event_widget_set_event_tooltip (GcalEventWidget *self,
start = g_date_time_format (tooltip_start, "%P %M:%I ,%x"); start = g_date_time_format (tooltip_start, "%P %M:%I ,%x");
end = g_date_time_format (tooltip_end, "%P %M:%I"); end = g_date_time_format (tooltip_end, "%P %M:%I");
} }
break;
} }
} }
} }
@@ -398,7 +401,7 @@ gcal_event_widget_update_timestamp (GcalEventWidget *self)
if (gcal_event_get_all_day (self->event) || gcal_event_is_multiday (self->event)) if (gcal_event_get_all_day (self->event) || gcal_event_is_multiday (self->event))
timestamp_str = g_date_time_format (time, "%a %B %e"); timestamp_str = g_date_time_format (time, "%a %B %e");
else if (self->clock_format_24h) else if (gcal_context_get_time_format (self->context) == GCAL_TIME_FORMAT_24H)
timestamp_str = g_date_time_format (time, "%R"); timestamp_str = g_date_time_format (time, "%R");
else else
timestamp_str = g_date_time_format (time, "%I:%M %P"); timestamp_str = g_date_time_format (time, "%I:%M %P");
@@ -785,20 +788,15 @@ gcal_event_widget_class_init (GcalEventWidgetClass *klass)
static void static void
gcal_event_widget_init (GcalEventWidget *self) gcal_event_widget_init (GcalEventWidget *self)
{ {
GtkWidget *widget;
widget = GTK_WIDGET (self);
self->clock_format_24h = is_clock_format_24h ();
g_type_ensure (GCAL_TYPE_OVERFLOW_BIN); g_type_ensure (GCAL_TYPE_OVERFLOW_BIN);
gtk_widget_init_template (widget); gtk_widget_init_template (GTK_WIDGET (self));
gtk_widget_set_cursor_from_name (GTK_WIDGET (self), "pointer"); gtk_widget_set_cursor_from_name (GTK_WIDGET (self), "pointer");
/* Starts with horizontal */ /* Starts with horizontal */
self->orientation = GTK_ORIENTATION_HORIZONTAL; self->orientation = GTK_ORIENTATION_HORIZONTAL;
gtk_widget_add_css_class (widget, "horizontal"); gtk_widget_add_css_class (GTK_WIDGET (self), "horizontal");
} }
GtkWidget* GtkWidget*