window: Move from AdwLeaflet to GtkStack

mpobaschnig · Mar 15, 2022 · 61c8441 · 61c8441
1 parent 421fd54
commit 61c8441
Show file tree

Hide file tree

Showing 8 changed files with 196 additions and 398 deletions.
diff --git a/data/resources/ui/window.ui b/data/resources/ui/window.ui
@@ -36,14 +36,42 @@
             <child>
               <object class="GtkOverlay" id="overlay">
                 <child>
-                  <object class="AdwLeaflet" id="window_leaflet">
-                    <property name="can_unfold">False</property>
-                    <property name="hexpand">True</property>
+                  <object class="GtkStack" id="window_stack">
+                    <property name="transition-type">crossfade</property>
                     <child>
-                      <object class="VStartPage" id="start_page"/>
+                      <object class="GtkStackPage">
+                        <property name="name">start</property>
+                        <property name="child">
+                          <object class="AdwStatusPage" id="start_page_status_page">
+                            <property name="vexpand">True</property>
+                            <property name="title" translatable="yes">Welcome to Vaults</property>
+                            <property name="description" translatable="yes">Add or Import a Vault.</property>
+                          </object>
+                        </property>
+                      </object>
                     </child>
                     <child>
-                      <object class="VVaultsPage" id="vaults_page"/>
+                      <object class="GtkStackPage">
+                        <property name="name">vaults</property>
+                        <property name="child">
+                          <object class="AdwClamp">
+                            <property name="margin-top">12</property>
+                            <property name="margin-bottom">12</property>
+                            <property name="margin-start">12</property>
+                            <property name="margin-end">12</property>
+                            <property name="hexpand">True</property>
+                            <child>
+                              <object class="GtkListBox" id="vaults_list_box">
+                                <property name="selection-mode">none</property>
+                                <property name="valign">start</property>
+                                <style>
+                                  <class name="content"/>
+                                </style>
+                              </object>
+                            </child>
+                          </object>
+                        </property>
+                      </object>
                     </child>
                   </object>
                 </child>

diff --git a/src/meson.build b/src/meson.build
@@ -24,8 +24,6 @@ sources = files(
   'backend/mod.rs',
 
   'ui/pages/mod.rs',
-  'ui/pages/start_page.rs',
-  'ui/pages/vaults_page.rs',
   'ui/pages/vaults_page_row.rs',
   'ui/pages/vaults_page_row_settings_dialog.rs',
   'ui/pages/vaults_page_row_password_prompt_dialog.rs',

diff --git a/src/ui/mod.rs b/src/ui/mod.rs
@@ -9,4 +9,4 @@ pub use add_new_vault_dialog::AddNewVaultDialog;
 pub use import_vault_dialog::ImportVaultDialog;
 pub use preferences::PreferencesWindow;
 pub use window::ApplicationWindow;
-pub use window::VView;
+pub use window::View;
diff --git a/src/ui/pages/mod.rs b/src/ui/pages/mod.rs
@@ -1,11 +1,7 @@
-mod start_page;
-mod vaults_page;
 mod vaults_page_row;
 mod vaults_page_row_password_prompt_dialog;
 mod vaults_page_row_settings_dialog;
 
-pub use start_page::VStartPage;
-pub use vaults_page::VVaultsPage;
 pub use vaults_page_row::VaultsPageRow;
 pub use vaults_page_row_password_prompt_dialog::VaultsPageRowPasswordPromptDialog;
 pub use vaults_page_row_settings_dialog::VaultsPageRowSettingsDialog;
diff --git a/src/ui/pages/start_page.rs b/src/ui/pages/start_page.rs
diff --git a/src/ui/pages/vaults_page.rs b/src/ui/pages/vaults_page.rs