[gnome-todo] window: Move leaflet to task lists workspace



commit ed56879164cb327d20b0ce30865b3931ad5f5323
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Sep 14 15:10:35 2021 -0300

    window: Move leaflet to task lists workspace

 src/gui/gtd-window.ui                              |  52 ++----
 .../gtd-task-lists-workspace.ui                    | 200 +++++++++++----------
 2 files changed, 125 insertions(+), 127 deletions(-)
---
diff --git a/src/gui/gtd-window.ui b/src/gui/gtd-window.ui
index 8e87532b..b3b29642 100644
--- a/src/gui/gtd-window.ui
+++ b/src/gui/gtd-window.ui
@@ -16,45 +16,27 @@
       <class name="org-gnome-Todo"/>
     </style>
 
-
-    <!-- Main leaflet -->
     <child>
-      <object class="AdwLeaflet" id="content_box">
-        <property name="can-swipe-back">true</property>
-        <property name="width-request">360</property>
+      <object class="GtkOverlay" id="overlay">
+        <child type="overlay">
+          <object class="GtdNotificationWidget" id="notification_widget">
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="valign">start</property>
+          </object>
+        </child>
 
+        <!-- Main Stack -->
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
+          <object class="GtkStack" id="stack">
             <property name="hexpand">true</property>
-
-            <child>
-              <object class="GtkOverlay" id="overlay">
-                <child type="overlay">
-                  <object class="GtdNotificationWidget" id="notification_widget">
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="valign">start</property>
-                  </object>
-                </child>
-
-                <!-- Main Stack -->
-                <child>
-                  <object class="GtkStack" id="stack">
-                    <property name="hexpand">true</property>
-                    <property name="vexpand">true</property>
-                    <property name="transition_duration">250</property>
-                    <property name="transition_type">crossfade</property>
-                    <signal name="notify::visible-child" handler="on_stack_visible_child_cb" 
object="GtdWindow" swapped="no"/>
-                    <style>
-                      <class name="background"/>
-                    </style>
-                  </object>
-                </child>
-
-              </object>
-            </child>
-
+            <property name="vexpand">true</property>
+            <property name="transition_duration">250</property>
+            <property name="transition_type">crossfade</property>
+            <signal name="notify::visible-child" handler="on_stack_visible_child_cb" object="GtdWindow" 
swapped="no"/>
+            <style>
+              <class name="background"/>
+            </style>
           </object>
         </child>
 
diff --git a/src/plugins/task-lists-workspace/gtd-task-lists-workspace.ui 
b/src/plugins/task-lists-workspace/gtd-task-lists-workspace.ui
index 57f7c1f0..f3d0678d 100644
--- a/src/plugins/task-lists-workspace/gtd-task-lists-workspace.ui
+++ b/src/plugins/task-lists-workspace/gtd-task-lists-workspace.ui
@@ -1,110 +1,126 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="GtdTaskListsWorkspace" parent="GtkBox">
-    <property name="orientation">vertical</property>
 
+    <!-- Main leaflet -->
     <child>
-      <object class="AdwHeaderBar" id="headerbar">
-        <property name="hexpand">1</property>
-        <property name="show-end-title-buttons">1</property>
+      <object class="AdwLeaflet" id="content_box">
+        <property name="can-swipe-back">true</property>
+        <property name="width-request">360</property>
 
-        <!-- New List -->
         <child>
-          <object class="GtkMenuButton" id="new_list_button">
-            <property name="can_focus">1</property>
-            <property name="label" translatable="yes">New List</property>
-            <property name="receives_default">1</property>
-            <property name="popover">new_list_popover</property>
-            <property name="halign">start</property>
-          </object>
-        </child>
-
-        <child>
-          <object class="GtkButton" id="back_button">
-            <property name="visible" bind-source="new_list_button" bind-property="visible" 
bind-flags="sync-create|invert-boolean" />
-            <property name="can_focus">1</property>
-            <property name="receives_default">1</property>
-            <property name="halign">start</property>
-            <property name="icon-name">go-previous-symbolic</property>
-            <signal name="clicked" handler="on_back_button_clicked_cb" object="GtdTaskListsWorkspace" 
swapped="no" />
-          </object>
-        </child>
-
-        <child>
-          <object class="GtkToggleButton" id="toggle_sidebar_button">
-            <property name="can_focus">1</property>
-            <property name="icon-name">builder-view-left-pane-symbolic</property>
-            <property name="active" bind-source="flap" bind-property="reveal-flap" 
bind-flags="sync-create|bidirectional"/>
-          </object>
-        </child>
-
-        <child>
-          <object class="GtkBox" id="panel_box_start">
-            <property name="spacing">6</property>
-          </object>
-        </child>
-
-        <!-- Omni Area -->
-        <child type="title">
-          <object class="GtdOmniArea" id="omni_area">
-          </object>
-        </child>
-
-        <child type="end">
-          <object class="GtkMenuButton" id="primary_menu_button">
-            <property name="icon-name">open-menu-symbolic</property>
-          </object>
-        </child>
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <property name="hexpand">true</property>
 
-        <child type="end">
-          <object class="GtkMenuButton" id="gear_menu_button">
-            <property name="can_focus">1</property>
-            <property name="icon-name">view-more-symbolic</property>
-          </object>
-        </child>
+            <child>
+              <object class="AdwHeaderBar" id="headerbar">
+                <property name="hexpand">1</property>
+                <property name="show-end-title-buttons">1</property>
+
+                <!-- New List -->
+                <child>
+                  <object class="GtkMenuButton" id="new_list_button">
+                    <property name="can_focus">1</property>
+                    <property name="label" translatable="yes">New List</property>
+                    <property name="receives_default">1</property>
+                    <property name="popover">new_list_popover</property>
+                    <property name="halign">start</property>
+                  </object>
+                </child>
+
+                <child>
+                  <object class="GtkButton" id="back_button">
+                    <property name="visible" bind-source="new_list_button" bind-property="visible" 
bind-flags="sync-create|invert-boolean" />
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="halign">start</property>
+                    <property name="icon-name">go-previous-symbolic</property>
+                    <signal name="clicked" handler="on_back_button_clicked_cb" 
object="GtdTaskListsWorkspace" swapped="no" />
+                  </object>
+                </child>
+
+                <child>
+                  <object class="GtkToggleButton" id="toggle_sidebar_button">
+                    <property name="can_focus">1</property>
+                    <property name="icon-name">builder-view-left-pane-symbolic</property>
+                    <property name="active" bind-source="flap" bind-property="reveal-flap" 
bind-flags="sync-create|bidirectional"/>
+                  </object>
+                </child>
+
+                <child>
+                  <object class="GtkBox" id="panel_box_start">
+                    <property name="spacing">6</property>
+                  </object>
+                </child>
+
+                <!-- Omni Area -->
+                <child type="title">
+                  <object class="GtdOmniArea" id="omni_area">
+                  </object>
+                </child>
+
+                <child type="end">
+                  <object class="GtkMenuButton" id="primary_menu_button">
+                    <property name="icon-name">open-menu-symbolic</property>
+                  </object>
+                </child>
+
+                <child type="end">
+                  <object class="GtkMenuButton" id="gear_menu_button">
+                    <property name="can_focus">1</property>
+                    <property name="icon-name">view-more-symbolic</property>
+                  </object>
+                </child>
+
+                <child type="end">
+                  <object class="GtkBox" id="panel_box_end">
+                    <property name="spacing">6</property>
+                  </object>
+                </child>
+
+              </object>
+            </child>
+
+            <child>
+              <object class="AdwFlap" id="flap">
+                <property name="hexpand">true</property>
+                <property name="vexpand">true</property>
+                <property name="modal">true</property>
+                <property name="swipe-to-open">true</property>
+                <property name="swipe-to-close">true</property>
+
+                <!-- Sidebar -->
+                <property name="flap">
+                  <object class="GtdSidebar" id="sidebar">
+                    <property name="can_focus">False</property>
+                    <property name="vexpand">True</property>
+                  </object>
+                </property>
+
+                <!-- Panels Stack -->
+                <property name="content">
+                  <object class="GtkStack" id="stack">
+                    <property name="hexpand">true</property>
+                    <property name="vexpand">true</property>
+                    <property name="transition_duration">250</property>
+                    <property name="transition_type">crossfade</property>
+                    <signal name="notify::visible-child" handler="on_stack_visible_child_cb" 
object="GtdTaskListsWorkspace" swapped="yes"/>
+                    <style>
+                      <class name="background"/>
+                    </style>
+                  </object>
+                </property>
+
+              </object>
+            </child>
 
-        <child type="end">
-          <object class="GtkBox" id="panel_box_end">
-            <property name="spacing">6</property>
           </object>
         </child>
 
       </object>
     </child>
 
-    <child>
-      <object class="AdwFlap" id="flap">
-        <property name="hexpand">true</property>
-        <property name="vexpand">true</property>
-        <property name="modal">true</property>
-        <property name="swipe-to-open">true</property>
-        <property name="swipe-to-close">true</property>
-
-        <!-- Sidebar -->
-        <property name="flap">
-          <object class="GtdSidebar" id="sidebar">
-            <property name="can_focus">False</property>
-            <property name="vexpand">True</property>
-          </object>
-        </property>
-
-        <!-- Panels Stack -->
-        <property name="content">
-          <object class="GtkStack" id="stack">
-            <property name="hexpand">true</property>
-            <property name="vexpand">true</property>
-            <property name="transition_duration">250</property>
-            <property name="transition_type">crossfade</property>
-            <signal name="notify::visible-child" handler="on_stack_visible_child_cb" 
object="GtdTaskListsWorkspace" swapped="yes"/>
-            <style>
-              <class name="background"/>
-            </style>
-          </object>
-        </property>
-
-      </object>
-    </child>
-
   </template>
 
   <object class="GtdProviderPopover" id="new_list_popover">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]