From f06bc265cdc70ef8f5c3f35960d95e9a499fcf1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20G=C3=B6llnitz?= <camelcasenick@bewares.it>
Date: Wed, 4 Jun 2025 03:17:59 +0200
Subject: [PATCH] window: rearrange month and week view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The mock-ups order these by coarse to fine time scales:
year > month > week / multi-day > day | agenda.

Signed-off-by: Markus Göllnitz <camelcasenick@bewares.it>
Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/542>
---
 src/gcal-enums.h       |  2 +-
 src/gui/gcal-window.ui | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/gcal-enums.h b/src/gcal-enums.h
index 2e3cac17..c8df6686 100644
--- a/src/gcal-enums.h
+++ b/src/gcal-enums.h
@@ -41,8 +41,8 @@ typedef enum
  */
 typedef enum
 {
-  GCAL_WINDOW_VIEW_WEEK,
   GCAL_WINDOW_VIEW_MONTH,
+  GCAL_WINDOW_VIEW_WEEK,
   GCAL_WINDOW_VIEW_AGENDA,
 
   GCAL_WINDOW_VIEW_N_VIEWS,
diff --git a/src/gui/gcal-window.ui b/src/gui/gcal-window.ui
index b76ea4c4..0608bd35 100644
--- a/src/gui/gcal-window.ui
+++ b/src/gui/gcal-window.ui
@@ -235,7 +235,7 @@
                     </child>
 
 
-                    <property name="content">
+                <property name="content">
                       <object class="AdwViewStack" id="views_stack">
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
@@ -243,21 +243,6 @@
                         <style>
                           <class name="view" />
                         </style>
-                        <child>
-                          <object class="AdwViewStackPage" id="week_page">
-                            <property name="name">week</property>
-                            <property name="title" translatable="yes">_Week</property>
-                            <property name="use-underline">True</property>
-                            <property name="icon-name">calendar-week-symbolic</property>
-                            <property name="child">
-                              <object class="GcalWeekView" id="week_view">
-                                <property name="active-date" bind-source="GcalWindow" bind-property="active-date" bind-flags="bidirectional" />
-                                <signal name="create-event" handler="show_new_event_widget" object="GcalWindow" swapped="no" />
-                                <signal name="event-activated" handler="event_activated" object="GcalWindow" swapped="no" />
-                              </object>
-                            </property>
-                          </object>
-                        </child>
                         <child>
                           <object class="AdwViewStackPage" id="month_page">
                             <property name="name">month</property>
@@ -274,6 +259,21 @@
                             </property>
                           </object>
                         </child>
+                        <child>
+                          <object class="AdwViewStackPage" id="week_page">
+                            <property name="name">week</property>
+                            <property name="title" translatable="yes">_Week</property>
+                            <property name="use-underline">True</property>
+                            <property name="icon-name">calendar-week-symbolic</property>
+                            <property name="child">
+                              <object class="GcalWeekView" id="week_view">
+                                <property name="active-date" bind-source="GcalWindow" bind-property="active-date" bind-flags="bidirectional" />
+                                <signal name="create-event" handler="show_new_event_widget" object="GcalWindow" swapped="no" />
+                                <signal name="event-activated" handler="event_activated" object="GcalWindow" swapped="no" />
+                              </object>
+                            </property>
+                          </object>
+                        </child>
                         <child>
                           <object class="AdwViewStackPage" id="agenda_page">
                             <property name="name">agenda</property>