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

window: reintroduce back and forward buttons

Browse Source 
They reappear in the newest adaptive layout wireframes.

These were dropped in
54a8445abb ("window: Drop the back and forward buttons")

Closes: https://gitlab.gnome.org/GNOME/gnome-calendar/-/issues/933

Signed-off-by: Markus Göllnitz <camelcasenick@bewares.it>
Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/542>
This commit is contained in:
Markus Göllnitz
2025-06-08 09:59:00 +00:00
committed by Marge Bot
parent 4a4dce8ee3
commit 7764b4dc0a
2 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gcal-window.c
+45
View File
@@ -122,6 +122,9 @@ struct _GcalWindow
GtkWidget *last_focused_widget;
GtkButton *next_date_button;
GtkButton *previous_date_button;
/* new event popover widgets */
GtkWidget *quick_add_popover;
@@ -220,6 +223,45 @@ update_today_action_enabled (GcalWindow *window)
GCAL_EXIT;
}
static void
update_view_buttons (GcalWindow *window)
{
GCAL_ENTRY;
switch (gcal_view_get_time_direction (GCAL_VIEW (window->views[window->active_view])))
{
case GTK_ORIENTATION_VERTICAL:
gtk_button_set_icon_name (window->previous_date_button, "go-up-symbolic");
gtk_button_set_icon_name (window->next_date_button, "go-down-symbolic");
break;
case GTK_ORIENTATION_HORIZONTAL:
gtk_button_set_icon_name (window->previous_date_button, "go-previous-symbolic");
gtk_button_set_icon_name (window->next_date_button, "go-next-symbolic");
break;
}
switch (window->active_view)
{
case GCAL_WINDOW_VIEW_WEEK:
gtk_widget_set_tooltip_text (GTK_WIDGET (window->previous_date_button), _("Go to previous week"));
gtk_widget_set_tooltip_text (GTK_WIDGET (window->next_date_button), _("Go to next week"));
break;
case GCAL_WINDOW_VIEW_MONTH:
gtk_widget_set_tooltip_text (GTK_WIDGET (window->previous_date_button), _("Go to previous month"));
gtk_widget_set_tooltip_text (GTK_WIDGET (window->next_date_button), _("Go to next month"));
break;
case GCAL_WINDOW_VIEW_AGENDA:
gtk_widget_set_tooltip_text (GTK_WIDGET (window->previous_date_button), _("Go to previous day"));
gtk_widget_set_tooltip_text (GTK_WIDGET (window->next_date_button), _("Go to next day"));
break;
default:
g_assert_not_reached ();
break;
}
GCAL_EXIT;
}
static void
maybe_add_subscribers_to_timeline (GcalWindow *self)
{
@@ -657,6 +699,7 @@ view_changed (GObject *object,
window->active_view = view_type;
update_today_action_enabled (window);
update_view_buttons (window);
g_object_notify_by_pspec (G_OBJECT (user_data), properties[PROP_ACTIVE_VIEW]);
}
@@ -1308,8 +1351,10 @@ gcal_window_class_init (GcalWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, GcalWindow, header_bar);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, menu_button);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, month_view);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, next_date_button);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, quick_add_popover);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, overlay);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, previous_date_button);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, split_view);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, sync_indicator);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, search_button);
src/gui/gcal-window.ui
+14
View File
@@ -296,6 +296,18 @@
<child type="bottom">
<object class="GtkActionBar">
<child type="start">
<object class="GtkButton" id="previous_date_button">
<property name="icon-name">go-previous-symbolic</property>
<property name="action-name">win.previous-date</property>
</object>
</child>
<child type="start">
<object class="GtkButton" id="next_date_button">
<property name="icon-name">go-next-symbolic</property>
<property name="action-name">win.next-date</property>
</object>
</child>
<child type="start">
<object class="GtkButton">
<property name="action-name">win.today</property>
@@ -362,6 +374,8 @@
<setter object="split_view" property="collapsed">True</setter>
<setter object="view_switcher_bin" property="visible">False</setter> <!-- set child to view_switcher_narrow here once there are multiple mobile-friendly views -->
<setter object="previous_date_button" property="visible">False</setter>
<setter object="next_date_button" property="visible">False</setter>
<setter object="split_view" property="show-sidebar">False</setter>
<setter object="sidebar_button" property="visible">False</setter>