From 539a04f2482edef31c3b33dd0d9039b42eac9df5 Mon Sep 17 00:00:00 2001
From: Philipp Kosarev <philipp.kosarev@gmail.com>
Date: Mon, 18 Nov 2024 15:37:29 +0000
Subject: [PATCH 1/2] use adwpreference for actions menu

---
 .../ui/download_manager/download_item.ui      | 176 +++++-------------
 .../library/actions/add_to_project.ui         |  81 +++-----
 .../library/actions/asset_actions.ui          | 133 ++++++-------
 .../library/actions/create_asset_project.ui   |  80 +++-----
 .../library/actions/download_detail.ui        |  46 ++---
 .../logged_in/library/actions/local_asset.ui  |  61 ++----
 .../ui/logged_in/library/asset_detail.ui      |   3 +-
 .../resources/ui/logged_in/library/library.ui |   3 +-
 .../ui/logged_in/projects/project.ui          |   2 +
 .../ui/logged_in/projects/projects.ui         |   1 -
 .../widgets/download_manager/download_item.rs |  34 +---
 .../widgets/logged_in/library/actions/mod.rs  | 151 ++++++---------
 12 files changed, 250 insertions(+), 521 deletions(-)

diff --git a/data/resources/ui/download_manager/download_item.ui b/data/resources/ui/download_manager/download_item.ui
index abf031e..c26addb 100755
--- a/data/resources/ui/download_manager/download_item.ui
+++ b/data/resources/ui/download_manager/download_item.ui
@@ -2,152 +2,78 @@
 <interface>
     <template class="EpicDownloadItem" parent="GtkBox">
         <property name="hexpand">true</property>
-        <style>
-            <class name="card" />
-        </style>
-        <child>
-            <object class="GtkImage" id="image">
-                <property name="name">thumbnail</property>
-                <property name="icon-name">edit-select-all-symbolic</property>
-                <property name="width-request">64</property>
-                <property name="height-request">64</property>
-            </object>
-        </child>
+        <property name="width-request">425</property>
+        <property name="height-request">75</property>
+        <property name="margin-start">6</property>
+        <property name="margin-end">6</property>
+        <property name="spacing">16</property>
         <child>
             <object class="GtkBox">
-                <property name="hexpand">true</property>
+                <property name="valign">center</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
                 <child>
                     <object class="GtkLabel">
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
-                        <property name="can-focus">0</property>
                         <property name="label" translatable="yes" bind-source="EpicDownloadItem" bind-property="label" bind-flags="sync-create"/>
-                        <property name="use-markup">true</property>
-                        <property name="hexpand">True</property>
                         <property name="ellipsize">middle</property>
                         <property name="halign">start</property>
+                        <property name="css-classes">title-4</property>
+                        <property name="valign">end</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkLabel">
+                        <property name="label" translatable="yes" bind-source="EpicDownloadItem" bind-property="status" bind-flags="sync-create"/>
+                        <property name="visible">false</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkProgressBar" id="download_progress">
+                        <property name="valign">center</property>
+                        <property name="hexpand">true</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkProgressBar" id="extraction_progress">
+                        <property name="valign">center</property>
+                        <property name="visible">false</property>
                     </object>
                 </child>
                 <child>
-                    <object class="GtkStack" id="stack">
-                        <property name="vexpand">True</property>
-                        <property name="transition-type">crossfade</property>
-                        <child>
-                            <object class="GtkStackPage">
-                                <property name="name">label</property>
-                                <property name="child">
-                                    <object class="GtkLabel">
-                                        <property name="margin-start">5</property>
-                                        <property name="margin-end">5</property>
-                                        <property name="can-focus">0</property>
-                                        <property name="label" translatable="yes" bind-source="EpicDownloadItem" bind-property="status" bind-flags="sync-create"/>
-                                        <property name="use-markup">1</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="halign">start</property>
-                                    </object>
-                                </property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkStackPage">
-                                <property name="name">progress</property>
-                                <property name="child">
-                                    <object class="GtkBox">
-                                        <property name="margin-start">5</property>
-                                        <property name="orientation">vertical</property>
-                                        <child>
-                                            <object class="GtkBox">
-                                                <property name="spacing">5</property>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="can-focus">0</property>
-                                                        <property name="label" translatable="yes">Download</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkProgressBar" id="download_progress">
-                                                        <property name="hexpand">true</property>
-                                                        <property name="valign">center</property>
-                                                        <property name="can-focus">0</property>
-                                                    </object>
-                                                </child>
-                                            </object>
-                                        </child>
-                                        <child>
-                                            <object class="GtkBox">
-                                                <property name="spacing">5</property>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="can-focus">0</property>
-                                                        <property name="label" translatable="yes">Extraction</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkProgressBar" id="extraction_progress">
-                                                        <property name="hexpand">true</property>
-                                                        <property name="valign">center</property>
-                                                        <property name="can-focus">0</property>
-                                                    </object>
-                                                </child>
-                                            </object>
-                                        </child>
-                                    </object>
-                                </property>
-                            </object>
-                        </child>
+                    <object class="GtkLabel" id="speed">
+                        <property name="label" translatable="yes" bind-source="EpicDownloadItem" bind-property="speed" bind-flags="sync-create"/>
+                        <property name="halign">start</property>
+                        <property name="valign">start</property>
                     </object>
                 </child>
             </object>
         </child>
         <child>
             <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <property name="valign">center</property>
+                <property name="halign">end</property>
+                <property name="spacing">8</property>
                 <child>
-                    <object class="GtkBox">
-                        <child>
-                            <object class="GtkButton">
-                                <property name="margin-start">5</property>
-                                <property name="halign">center</property>
-                                <property name="valign">center</property>
-                                <property name="action-name">download_item.open</property>
-                                <property name="icon-name">folder-open-symbolic</property>
-                                <property name="css-classes">circular</property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkButton" id="pause_button">
-                                <property name="margin-start">5</property>
-                                <property name="halign">center</property>
-                                <property name="valign">center</property>
-                                <property name="action-name">download_item.pause</property>
-                                <property name="icon-name">media-playback-pause-symbolic</property>
-                                <style>
-                                    <class name="circular"/>
-                                    <class name="suggested-action"/>
-                                </style>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkButton">
-                                <property name="margin-start">5</property>
-                                <property name="halign">center</property>
-                                <property name="valign">center</property>
-                                <property name="action-name">download_item.cancel</property>
-                                <property name="icon-name">process-stop-symbolic</property>
-                                <style>
-                                    <class name="circular"/>
-                                    <class name="destructive-action"/>
-                                </style>
-                            </object>
-                        </child>
+                    <object class="GtkButton" id="pause_button">
+                        <property name="valign">center</property>
+                        <property name="action-name">download_item.pause</property>
+                        <property name="icon-name">media-playback-pause-symbolic</property>
+                        <property name="css-classes">circular</property>
                     </object>
                 </child>
                 <child>
-                    <object class="GtkLabel" id="speed">
-                        <property name="label" translatable="yes" bind-source="EpicDownloadItem" bind-property="speed" bind-flags="sync-create"/>
-                        <property name="use-markup">true</property>
+                    <object class="GtkButton">
+                        <property name="valign">center</property>
+                        <property name="action-name">download_item.cancel</property>
+                        <property name="icon-name">process-stop-symbolic</property>
+                        <property name="css-classes">circular</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkButton">
+                        <property name="valign">center</property>
+                        <property name="action-name">download_item.open</property>
+                        <property name="icon-name">folder-open-symbolic</property>
+                        <property name="css-classes">circular</property>
                     </object>
                 </child>
             </object>
diff --git a/data/resources/ui/logged_in/library/actions/add_to_project.ui b/data/resources/ui/logged_in/library/actions/add_to_project.ui
index 3f3f650..c2f3acc 100755
--- a/data/resources/ui/logged_in/library/actions/add_to_project.ui
+++ b/data/resources/ui/logged_in/library/actions/add_to_project.ui
@@ -1,70 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <template class="EpicAddToProject" parent="GtkBox">
-        <property name="orientation">vertical</property>
+        <property name="css-classes">linked</property>
+        <child> <!-- TODO: Switch to GtkDropDown -->
+            <object class="GtkComboBoxText" id="select_target_directory">
+                <property name="valign">center</property>
+                <property name="sensitive">false</property>
+                <!-- TODO: using this row crashes the whole app, so locking for now -->
+            </object>
+        </child>
         <child>
-            <object class="GtkBox" id="setup">
-                <property name="spacing">5</property>
-                <property name="orientation">vertical</property>
-                <child>
-                    <object class="GtkBox">
-                        <property name="spacing">5</property>
-                        <child>
-                            <object class="GtkLabel">
-                                <property name="can-focus">0</property>
-                                <property name="label" translatable="yes">Select target</property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkComboBoxText" id="select_target_directory">
-                                <property name="hexpand">true</property>
-                            </object>
-                        </child>
-                    </object>
-                </child>
+            <object class="GtkButton">
+                <property name="valign">center</property>
+                <property name="action-name">download_details.download_all</property>
                 <child>
-                    <object class="GtkInfoBar" id="warning_row">
-                        <property name="visible">false</property>
-                        <property name="message-type">GTK_MESSAGE_WARNING</property>
-                        <child>
-                            <object class="GtkLabel">
-                                <property name="can-focus">0</property>
-                                <property name="xalign">0</property>
-                                <property name="hexpand">true</property>
-                                <property name="label" translatable="yes">Asset already exists in the target project</property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkCheckButton" id="overwrite">
-                                <property name="label">Overwrite?</property>
-                            </object>
-                        </child>
+                    <object class="AdwButtonContent">
+                        <property name="icon-name">document-new-symbolic</property>
+                        <!-- <property name="label" translatable="yes">Add</property> -->
                     </object>
                 </child>
             </object>
         </child>
         <child>
-            <object class="GtkBox">
-                <property name="halign">end</property>
+            <object class="GtkInfoBar" id="warning_row">
+                <property name="visible">false</property>
+                <property name="message-type">GTK_MESSAGE_WARNING</property>
+                <child>
+                    <object class="GtkLabel">
+                        <property name="hexpand">true</property>
+                        <property name="label" translatable="yes">Asset already exists in the target project</property>
+                    </object>
+                </child>
                 <child>
-                    <object class="GtkButton">
-                        <property name="action-name">download_details.download_all</property>
-                        <child>
-                            <object class="GtkBox">
-                                <property name="valign">center</property>
-                                <property name="halign">center</property>
-                                <child>
-                                    <object class="GtkImage">
-                                        <property name="icon-name">document-new-symbolic</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel">
-                                        <property name="label" translatable="yes">Add</property>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
+                    <object class="GtkCheckButton" id="overwrite">
+                        <property name="label">Overwrite?</property>
                     </object>
                 </child>
             </object>
diff --git a/data/resources/ui/logged_in/library/actions/asset_actions.ui b/data/resources/ui/logged_in/library/actions/asset_actions.ui
index 71dea06..365a63b 100755
--- a/data/resources/ui/logged_in/library/actions/asset_actions.ui
+++ b/data/resources/ui/logged_in/library/actions/asset_actions.ui
@@ -3,120 +3,99 @@
     <template class="EpicAssetActions" parent="GtkBox">
         <property name="orientation">vertical</property>
         <child>
-            <object class="GtkScrolledWindow">
-                <property name="vexpand">true</property>
-                <property name="hscrollbar-policy">never</property>
+            <object class="AdwPreferencesPage">
                 <child>
-                    <object class="GtkBox">
-                        <property name="orientation">vertical</property>
+                    <object class="AdwPreferencesGroup">
+                        <property name="title">Details</property>
                         <child>
-                            <object class="GtkListBox">
+                            <object class="GtkListBox" id="additional_details">
                                 <property name="selection-mode">GTK_SELECTION_NONE</property>
-                                <child>
-                                    <object class="GtkListBoxRow">
-                                        <child>
-                                            <object class="GtkBox" id="version_row">
-                                                <property name="spacing">5</property>
-                                                <property name="margin-start">5</property>
-                                                <property name="margin-end">5</property>
-                                                <property name="margin-top">5</property>
-                                                <property name="margin-bottom">5</property>
-                                                <child>
-                                                    <object class="GtkLabel" id="version_label">
-                                                        <property name="xalign">1.0</property>
-                                                        <property name="can-focus">0</property>
-                                                        <property name="label" translatable="yes">Select version</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkComboBoxText" id="select_download_version">
-                                                        <property name="hexpand">true</property>
-                                                    </object>
-                                                </child>
-                                            </object>
-                                        </child>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkRevealer" id="asset_details_revealer">
-                                <property name="reveal-child">true</property>
-                                <child>
-                                    <object class="GtkListBox" id="additional_details">
-                                        <property name="selection-mode">GTK_SELECTION_NONE</property>
-                                    </object>
-                                </child>
+                                <property name="css-classes">boxed-list</property>
                             </object>
                         </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="AdwPreferencesGroup" id="local_group">
+                        <property name="title">Local Files</property>
                         <child>
-                            <object class="GtkBox">
-                                <property name="halign">end</property>
-                                <property name="hexpand">True</property>
+                            <object class="AdwActionRow">
+                                <property name="title" translatable="yes">Path:</property>
                                 <child>
-                                    <object class="GtkButton" id="asset_actions_button">
-                                        <property name="icon-name">go-up-symbolic</property>
-                                        <property name="action-name">asset_actions.show</property>
-                                        <property name="tooltip-text" translatable="yes">Hide Details</property>
+                                    <object class="EpicLocalAssets" id="local_assets">
+                                        <property name="valign">center</property>
                                     </object>
                                 </child>
                             </object>
                         </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="AdwPreferencesGroup">
+                        <property name="title">Download</property>
                         <child>
-                            <object class="GtkSeparator">
-                                <property name="orientation">horizontal</property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="AdwExpanderRow" id="download_row">
-                                <property name="title" translatable="yes">Download</property>
-                                <property name="expanded">0</property>
+                            <object class="AdwActionRow">
+                                <property name="title">Version:</property>
                                 <child>
-                                    <object class="EpicDownloadDetails" id="download_details">
+                                    <object class="GtkComboBoxText" id="select_download_version">
+                                        <property name="halign">center</property>
+                                        <property name="valign">center</property>
                                     </object>
                                 </child>
                             </object>
                         </child>
                         <child>
-                            <object class="AdwExpanderRow" id="local_row">
-                                <property name="title" translatable="yes">Local Files</property>
-                                <property name="expanded">0</property>
+                            <object class="AdwActionRow">
+                                <property name="title">Target:</property>
                                 <child>
-                                    <object class="EpicLocalAssets" id="local_assets">
-                                    </object>
+                                    <object class="EpicDownloadDetails" id="download_details"/>
                                 </child>
                             </object>
                         </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="AdwPreferencesGroup" id="project_group">
+                        <property name="title">Add to project</property>
                         <child>
-                            <object class="AdwExpanderRow" id="project_row">
-                                <property name="title" translatable="yes">Add to project</property>
-                                <property name="expanded">0</property>
+                            <object class="AdwActionRow">
+                                <property name="title" translatable="yes">Target:</property>
                                 <child>
-                                    <object class="EpicAddToProject" id="add_to_project">
-                                    </object>
+                                    <object class="EpicAddToProject" id="add_to_project"/>
                                 </child>
                             </object>
                         </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="AdwPreferencesGroup"  id="new_project_group">
+                        <property name="title">Create Project</property>
                         <child>
-                            <object class="AdwExpanderRow" id="new_project_row">
-                                <property name="title" translatable="yes">Create Project</property>
-                                <property name="expanded">0</property>
+                            <object class="AdwActionRow">
+                                <property name="title" translatable="yes">Target:</property>
                                 <child>
-                                    <object class="EpicCreateAssetProject" id="create_asset_project">
-                                    </object>
+                                    <object class="EpicCreateAssetProject" id="create_asset_project"/>
                                 </child>
                             </object>
                         </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="AdwPreferencesGroup"  id="engine_group">
+                        <property name="title">Add to Engine</property>
                         <child>
-                            <object class="AdwExpanderRow" id="engine_row">
+                            <object class="AdwExpanderRow">
                                 <property name="title" translatable="yes">Add to Engine</property>
-                                <property name="expanded">0</property>
                             </object>
                         </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="AdwPreferencesGroup" id="install_group">
+                        <property name="title">Install</property>
                         <child>
-                            <object class="AdwExpanderRow" id="install_row">
+                            <object class="AdwExpanderRow">
                                 <property name="title" translatable="yes">Install</property>
-                                <property name="expanded">0</property>
                             </object>
                         </child>
                     </object>
@@ -124,4 +103,4 @@
             </object>
         </child>
     </template>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/data/resources/ui/logged_in/library/actions/create_asset_project.ui b/data/resources/ui/logged_in/library/actions/create_asset_project.ui
index 40e75be..2dbf666 100755
--- a/data/resources/ui/logged_in/library/actions/create_asset_project.ui
+++ b/data/resources/ui/logged_in/library/actions/create_asset_project.ui
@@ -1,70 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <template class="EpicCreateAssetProject" parent="GtkBox">
-        <property name="orientation">vertical</property>
+        <property name="css-classes">linked</property>
+        <child> <!-- TODO: Switch to GtkDropDown -->
+            <object class="GtkComboBoxText" id="select_target_directory">
+                <property name="valign">center</property>
+            </object>
+        </child>
         <child>
-            <object class="GtkBox" id="setup">
-                <property name="spacing">5</property>
-                <property name="orientation">vertical</property>
-                <child>
-                    <object class="GtkBox">
-                        <property name="spacing">5</property>
-                        <child>
-                            <object class="GtkLabel">
-                                <property name="can-focus">0</property>
-                                <property name="label" translatable="yes">Select target</property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkComboBoxText" id="select_target_directory">
-                                <property name="hexpand">true</property>
-                            </object>
-                        </child>
-                    </object>
-                </child>
+            <object class="GtkButton">
+                <property name="valign">center</property>
+                <property name="action-name">create_asset_project.create</property>
                 <child>
-                    <object class="GtkInfoBar" id="warning_row">
-                        <property name="visible">false</property>
-                        <property name="message-type">GTK_MESSAGE_WARNING</property>
-                        <child>
-                            <object class="GtkLabel">
-                                <property name="can-focus">0</property>
-                                <property name="xalign">0</property>
-                                <property name="hexpand">true</property>
-                                <property name="label" translatable="yes">Project already exists in the target directory</property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkCheckButton" id="overwrite">
-                                <property name="label">Overwrite?</property>
-                            </object>
-                        </child>
+                    <object class="AdwButtonContent">
+                        <property name="icon-name">document-new-symbolic</property>
+                        <!-- <property name="label" translatable="yes">Create</property> -->
                     </object>
                 </child>
             </object>
         </child>
         <child>
-            <object class="GtkBox">
-                <property name="halign">end</property>
+            <object class="GtkInfoBar" id="warning_row">
+                <!-- <property name="visible">false</property> -->
+                <property name="message-type">GTK_MESSAGE_WARNING</property>
+                <child>
+                    <object class="GtkLabel">
+                        <property name="can-focus">0</property>
+                        <property name="hexpand">true</property>
+                        <property name="label" translatable="yes">Project already exists in the target directory</property>
+                    </object>
+                </child>
                 <child>
-                    <object class="GtkButton">
-                        <property name="action-name">create_asset_project.create</property>
-                        <child>
-                            <object class="GtkBox">
-                                <property name="valign">center</property>
-                                <property name="halign">center</property>
-                                <child>
-                                    <object class="GtkImage">
-                                        <property name="icon-name">insert-object-symbolic</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel">
-                                        <property name="label" translatable="yes">Create</property>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
+                    <object class="GtkCheckButton" id="overwrite">
+                        <property name="label">Overwrite?</property>
                     </object>
                 </child>
             </object>
diff --git a/data/resources/ui/logged_in/library/actions/download_detail.ui b/data/resources/ui/logged_in/library/actions/download_detail.ui
index 837dd9b..2248034 100755
--- a/data/resources/ui/logged_in/library/actions/download_detail.ui
+++ b/data/resources/ui/logged_in/library/actions/download_detail.ui
@@ -1,45 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <template class="EpicDownloadDetails" parent="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-            <object class="GtkBox">
-                <property name="spacing">5</property>
-                <child>
-                    <object class="GtkLabel">
-                        <property name="can-focus">0</property>
-                        <property name="label" translatable="yes">Select target</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkComboBoxText" id="select_target_directory">
-                        <property name="hexpand">true</property>
-                    </object>
-                </child>
+        <property name="css-classes">linked</property>
+        <child> <!-- TODO: Switch to GtkDropDown -->
+            <object class="GtkComboBoxText" id="select_target_directory">
+                <property name="halign">end</property>
+                <property name="valign">center</property>
             </object>
         </child>
         <child>
-            <object class="GtkBox">
-                <property name="halign">end</property>
+            <object class="GtkButton">
+                <property name="action-name">download_details.download_all</property>
+                <property name="valign">center</property>
                 <child>
-                    <object class="GtkButton">
-                        <property name="action-name">download_details.download_all</property>
-                        <child>
-                            <object class="GtkBox">
-                                <property name="valign">center</property>
-                                <property name="halign">center</property>
-                                <child>
-                                    <object class="GtkImage">
-                                        <property name="icon-name">folder-download-symbolic</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel">
-                                        <property name="label" translatable="yes">Download</property>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
+                    <object class="AdwButtonContent">
+                        <property name="icon-name">folder-download-symbolic</property>
+                        <!-- <property name="label" translatable="yes">Download</property> -->
                     </object>
                 </child>
             </object>
diff --git a/data/resources/ui/logged_in/library/actions/local_asset.ui b/data/resources/ui/logged_in/library/actions/local_asset.ui
index a3225e9..a6a017e 100755
--- a/data/resources/ui/logged_in/library/actions/local_asset.ui
+++ b/data/resources/ui/logged_in/library/actions/local_asset.ui
@@ -1,61 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <template class="EpicLocalAsset" parent="GtkBox">
-        <property name="orientation">vertical</property>
+        <property name="spacing">8</property>
         <child>
             <object class="GtkLabel">
-                <property name="can-focus">0</property>
                 <property name="label" translatable="yes" bind-source="EpicLocalAsset" bind-property="label" bind-flags="sync-create"/>
                 <property name="use-markup">true</property>
-                <property name="hexpand">True</property>
                 <property name="ellipsize">middle</property>
-                <property name="halign">start</property>
             </object>
         </child>
         <child>
-            <object class="GtkBox">
-                <property name="spacing">5</property>
-                <property name="halign">end</property>
+            <object class="GtkButton">
+                <property name="margin-start">5</property>
+                <property name="valign">center</property>
+                <property name="action-name">local_asset.open</property>
                 <child>
-                    <object class="GtkButton">
-                        <property name="margin-start">5</property>
-                        <property name="halign">center</property>
-                        <property name="valign">center</property>
-                        <property name="action-name">local_asset.open</property>
-                        <child>
-                            <object class="AdwButtonContent">
-                                <property name="icon-name">folder-open-symbolic</property>
-                                <property name="label" translatable="yes">Open Directory</property>
-                            </object>
-                        </child>
+                    <object class="AdwButtonContent">
+                        <property name="icon-name">folder-open-symbolic</property>
+                        <property name="label" translatable="yes">Open</property>
                     </object>
                 </child>
+            </object>
+        </child>
+        <child>
+            <object class="GtkButton">
+                <property name="css-classes">destructive-action</property>
+                <property name="valign">center</property>
+                <property name="action-name">local_asset.delete</property>
                 <child>
-                    <object class="GtkButton">
-                        <property name="margin-start">5</property>
-                        <property name="halign">center</property>
-                        <property name="valign">center</property>
-                        <property name="action-name">local_asset.delete</property>
-                        <child>
-                            <object class="GtkBox">
-                                <property name="spacing">5</property>
-                                <property name="valign">center</property>
-                                <property name="halign">center</property>
-                                <child>
-                                    <object class="GtkImage">
-                                        <property name="icon-name">user-trash-symbolic</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel">
-                                        <property name="label" translatable="yes">Remove</property>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
-                        <style>
-                            <class name="destructive-action"/>
-                        </style>
+                    <object class="AdwButtonContent">
+                        <property name="icon-name">user-trash-symbolic</property>
+                        <property name="label" translatable="yes">Remove</property>
                     </object>
                 </child>
             </object>
diff --git a/data/resources/ui/logged_in/library/asset_detail.ui b/data/resources/ui/logged_in/library/asset_detail.ui
index 08974d4..feb9938 100755
--- a/data/resources/ui/logged_in/library/asset_detail.ui
+++ b/data/resources/ui/logged_in/library/asset_detail.ui
@@ -88,7 +88,7 @@ circular</property>
                                     </object>
                                 </child>
                                 <child>
-                                    <!-- TODO: switch to GtkDropDown? -->
+                                    <!-- TODO: switch to GtkButton -->
                                     <object class="GtkMenuButton" id="actions_menu">
                                         <property name="direction">down</property>
                                         <property name="hexpand">true</property>
@@ -104,6 +104,7 @@ circular</property>
                                                 <child>
                                                     <object class="GtkBox" id="actions_box">
                                                         <property name="orientation">vertical</property>
+                                                        <property name="spacing">2</property>
                                                     </object>
                                                 </child>
                                             </object>
diff --git a/data/resources/ui/logged_in/library/library.ui b/data/resources/ui/logged_in/library/library.ui
index 372e516..d54253f 100755
--- a/data/resources/ui/logged_in/library/library.ui
+++ b/data/resources/ui/logged_in/library/library.ui
@@ -22,9 +22,10 @@
                                 <property name="orientation">vertical</property>
                                 <child>
                                     <object class="GtkScrolledWindow">
+                                        <property name="margin-top">48</property>
+                                        <property name="margin-bottom">8</property>
                                         <property name="margin-start">8</property>
                                         <property name="margin-end">8</property>
-                                        <property name="margin-top">48</property>
                                         <property name="vexpand">1</property>
                                         <property name="child">
                                             <object class="GtkGridView" id="asset_grid">
diff --git a/data/resources/ui/logged_in/projects/project.ui b/data/resources/ui/logged_in/projects/project.ui
index 0049046..25398bc 100755
--- a/data/resources/ui/logged_in/projects/project.ui
+++ b/data/resources/ui/logged_in/projects/project.ui
@@ -3,6 +3,7 @@
     <requires lib="gtk" version="4.0"/>
     <template class="EpicProject" parent="GtkBox">
         <property name="valign">center</property>
+        <property name="width-request">320</property>
         <child>
             <object class="AdwAvatar" id="thumbnail">
                 <property name="icon-name">ue-logo-symbolic</property>
@@ -19,6 +20,7 @@
                         <property name="label" translatable="yes" bind-source="EpicProject" bind-property="name" bind-flags="sync-create"/>
                         <property name="use-markup">true</property>
                         <property name="halign">start</property>
+                        <property name="ellipsize">end</property>
                     </object>
                 </child>
                 <child>
diff --git a/data/resources/ui/logged_in/projects/projects.ui b/data/resources/ui/logged_in/projects/projects.ui
index 6451fa3..c0d65fb 100755
--- a/data/resources/ui/logged_in/projects/projects.ui
+++ b/data/resources/ui/logged_in/projects/projects.ui
@@ -19,7 +19,6 @@
                         <property name="halign">fill</property>
                         <property name="valign">fill</property>
                         <property name="max-columns">255</property>
-                        <!-- <property name="css-classes">background</property> -->
                     </object>
                 </property>
             </object>
diff --git a/src/ui/widgets/download_manager/download_item.rs b/src/ui/widgets/download_manager/download_item.rs
index 23d6ec1..ec116b6 100755
--- a/src/ui/widgets/download_manager/download_item.rs
+++ b/src/ui/widgets/download_manager/download_item.rs
@@ -51,12 +51,8 @@ pub mod imp {
         pub speed_queue: RefCell<VecDeque<(chrono::DateTime<chrono::Utc>, u128)>>,
         thumbnail: RefCell<Option<Texture>>,
         #[template_child]
-        pub image: TemplateChild<gtk4::Image>,
-        #[template_child]
         pub pause_button: TemplateChild<gtk4::Button>,
         #[template_child]
-        pub stack: TemplateChild<gtk4::Stack>,
-        #[template_child]
         pub download_progress: TemplateChild<gtk4::ProgressBar>,
         #[template_child]
         pub extraction_progress: TemplateChild<gtk4::ProgressBar>,
@@ -91,9 +87,7 @@ pub mod imp {
                 post_actions: RefCell::new(vec![]),
                 speed_queue: RefCell::new(VecDeque::new()),
                 thumbnail: RefCell::new(None),
-                image: TemplateChild::default(),
                 pause_button: TemplateChild::default(),
-                stack: TemplateChild::default(),
                 download_progress: TemplateChild::default(),
                 extraction_progress: TemplateChild::default(),
             }
@@ -150,7 +144,7 @@ pub mod imp {
                     let label = value
                         .get::<Option<String>>()
                         .expect("type conformity checked by `Object::set_property`")
-                        .map(|l| format!("<b><u>{l}</u></b>"));
+                        .map(|l| format!("{l}"));
 
                     self.label.replace(label);
                 }
@@ -176,9 +170,7 @@ pub mod imp {
                     let status = value
                         .get::<Option<String>>()
                         .expect("type conformity checked by `Object::set_property`")
-                        .map(|l| format!("<i>{l}</i>"));
-                    self.stack.set_visible_child_name("label");
-                    self.status.replace(status);
+                        .map(|l| format!("{l}"));
                 }
                 "target" => {
                     let target = value
@@ -228,17 +220,7 @@ pub mod imp {
                         .expect("type conformity checked by `Object::set_property`");
                     self.release.replace(release);
                 }
-                "thumbnail" => {
-                    let thumbnail: Option<Texture> = value
-                        .get()
-                        .expect("type conformity checked by `Object::set_property`");
-
-                    if let Some(tex) = &thumbnail {
-                        self.image.set_from_paintable(Some(tex));
-                    }
-
-                    self.thumbnail.replace(thumbnail);
-                }
+                "thumbnail" => {}
                 _ => unimplemented!(),
             }
         }
@@ -256,7 +238,6 @@ pub mod imp {
                 "item-type" => self.item_type.borrow().to_value(),
                 "speed" => self.speed.borrow().to_value(),
                 "path" => self.path.borrow().to_value(),
-                "thumbnail" => self.thumbnail.borrow().to_value(),
                 _ => unimplemented!(),
             }
         }
@@ -326,12 +307,13 @@ impl EpicDownloadItem {
     fn speed_update(&self) {
         let self_ = self.imp();
         if self.canceled() || self.paused() {
+            self.set_property("speed", "Paused/Cancelled".to_string());
             return;
         }
         if let Some(speed) = {
             let queue = &mut *self_.speed_queue.borrow_mut();
             if queue.len() <= 1 {
-                self.set_property("speed", "0 b/s".to_string());
+                // self.set_property("speed", "Starting download".to_string());
                 return;
             }
             let mut downloaded = 0_u128;
@@ -358,7 +340,7 @@ impl EpicDownloadItem {
             let byte = byte_unit::Byte::from_u128(speed)
                 .unwrap_or_default()
                 .get_appropriate_unit(byte_unit::UnitType::Decimal);
-            self.set_property("speed", format!("{byte:.2}/s"));
+            self.set_property("speed", format!("Downloading - {byte:.1}/s"));
         };
     }
 
@@ -540,7 +522,6 @@ impl EpicDownloadItem {
         if self.canceled() || self.paused() {
             return;
         }
-        self_.stack.set_visible_child_name("progress");
         let new_count = *self_.extracted_files.borrow() + 1;
         let total = *self_.total_files.borrow();
         self_
@@ -566,7 +547,7 @@ impl EpicDownloadItem {
                 }
             }
             self.set_property("status", "Finished".to_string());
-            self.remove_from_parent_with_timer(15);
+            self.remove_from_parent_with_timer(5);
         };
     }
 
@@ -601,7 +582,6 @@ impl EpicDownloadItem {
             queue.push_back((chrono::Utc::now(), size));
         };
 
-        self_.stack.set_visible_child_name("progress");
         let old_size = self.downloaded_size();
         let new_size = old_size + size;
         let total = self.total_size();
diff --git a/src/ui/widgets/logged_in/library/actions/mod.rs b/src/ui/widgets/logged_in/library/actions/mod.rs
index 4a322da..fdfd2ad 100755
--- a/src/ui/widgets/logged_in/library/actions/mod.rs
+++ b/src/ui/widgets/logged_in/library/actions/mod.rs
@@ -50,23 +50,15 @@ pub mod imp {
         #[template_child]
         pub select_download_version: TemplateChild<gtk4::ComboBoxText>,
         #[template_child]
-        pub asset_details_revealer: TemplateChild<gtk4::Revealer>,
+        pub project_group: TemplateChild<adw::PreferencesGroup>,
         #[template_child]
-        pub download_row: TemplateChild<adw::ExpanderRow>,
+        pub new_project_group: TemplateChild<adw::PreferencesGroup>,
         #[template_child]
-        pub project_row: TemplateChild<adw::ExpanderRow>,
+        pub engine_group: TemplateChild<adw::PreferencesGroup>,
         #[template_child]
-        pub new_project_row: TemplateChild<adw::ExpanderRow>,
+        pub install_group: TemplateChild<adw::PreferencesGroup>,
         #[template_child]
-        pub engine_row: TemplateChild<adw::ExpanderRow>,
-        #[template_child]
-        pub install_row: TemplateChild<adw::ExpanderRow>,
-        #[template_child]
-        pub local_row: TemplateChild<adw::ExpanderRow>,
-        #[template_child]
-        pub asset_actions_button: TemplateChild<gtk4::Button>,
-        #[template_child]
-        pub version_label: TemplateChild<gtk4::Label>,
+        pub local_group: TemplateChild<adw::PreferencesGroup>,
         #[template_child]
         pub download_details: TemplateChild<download_detail::EpicDownloadDetails>,
         #[template_child]
@@ -100,15 +92,11 @@ pub mod imp {
                 actions: gio::SimpleActionGroup::new(),
                 download_manager: OnceCell::new(),
                 select_download_version: TemplateChild::default(),
-                asset_details_revealer: TemplateChild::default(),
-                download_row: TemplateChild::default(),
-                project_row: TemplateChild::default(),
-                new_project_row: TemplateChild::default(),
-                engine_row: TemplateChild::default(),
-                install_row: TemplateChild::default(),
-                local_row: TemplateChild::default(),
-                asset_actions_button: TemplateChild::default(),
-                version_label: TemplateChild::default(),
+                project_group: TemplateChild::default(),
+                new_project_group: TemplateChild::default(),
+                engine_group: TemplateChild::default(),
+                install_group: TemplateChild::default(),
+                local_group: TemplateChild::default(),
                 download_details: TemplateChild::default(),
                 additional_details: TemplateChild::default(),
                 add_to_project: TemplateChild::default(),
@@ -132,7 +120,6 @@ pub mod imp {
     impl ObjectImpl for EpicAssetActions {
         fn constructed(&self) {
             self.parent_constructed();
-            self.details_group.add_widget(&*self.version_label);
             let obj = self.obj();
             obj.setup_actions();
             obj.setup_events();
@@ -282,7 +269,7 @@ impl EpicAssetActions {
             clone!(@weak self as aa => @default-return None, move |_| {
                 let self_ = aa.imp();
                 if self_.local_assets.empty() {
-                    self_.local_row.set_visible(false);
+                    self_.local_group.set_visible(false);
                     aa.refresh_asset();
                 }
                 None
@@ -306,55 +293,18 @@ impl EpicAssetActions {
         let self_ = self.imp();
         let actions = &self_.actions;
         self.insert_action_group("asset_actions", Some(actions));
-
-        action!(
-            actions,
-            "show",
-            clone!(@weak self as download_details => move |_, _| {
-                download_details.show();
-            })
-        );
-    }
-
-    fn show(&self) {
-        let self_ = self.imp();
-        if self_.asset_details_revealer.reveals_child() {
-            self_.asset_details_revealer.set_reveal_child(false);
-            self_.asset_actions_button.set_icon_name("go-down-symbolic");
-            self_
-                .asset_actions_button
-                .set_tooltip_text(Some("Show details"));
-        } else {
-            self_.asset_details_revealer.set_reveal_child(true);
-            self_.asset_actions_button.set_icon_name("go-up-symbolic");
-            self_
-                .asset_actions_button
-                .set_tooltip_text(Some("Hide details"));
-        }
     }
 
     pub fn set_action(&self, action: &Action) {
         let self_ = self.imp();
         match action {
-            Action::Download => {
-                self_.download_row.set_expanded(true);
-            }
-            Action::AddToProject => {
-                self_.project_row.set_expanded(true);
-            }
-            Action::AddToEngine => {
-                self_.engine_row.set_expanded(true);
-            }
-            Action::CreateProject => {
-                self_.new_project_row.set_expanded(true);
-            }
-            Action::Install => {
-                self_.install_row.set_expanded(true);
-            }
+            Action::Download => {}
+            Action::AddToProject => {}
+            Action::AddToEngine => {}
+            Action::CreateProject => {}
+            Action::Install => {}
             Action::Play => {}
-            Action::Local => {
-                self_.local_row.set_expanded(true);
-            }
+            Action::Local => {}
         }
     }
 
@@ -375,8 +325,7 @@ impl EpicAssetActions {
         self_.create_asset_project.set_asset(&asset.clone());
         self_.local_assets.set_asset(&asset.clone());
         self_.select_download_version.remove_all();
-        self_.local_row.set_visible(false);
-        self_.local_row.set_expanded(false);
+        self_.local_group.set_visible(false);
         let vaults = self_.settings.strv("unreal-vault-directories");
         if let Some(releases) = asset.sorted_releases() {
             for (id, release) in releases.iter().enumerate() {
@@ -384,7 +333,7 @@ impl EpicAssetActions {
                     if !crate::models::asset_data::AssetData::downloaded_locations(&vaults, app)
                         .is_empty()
                     {
-                        self_.local_row.set_visible(true);
+                        self_.local_group.set_visible(true);
                     }
                 }
                 self_.select_download_version.append(
@@ -404,33 +353,29 @@ impl EpicAssetActions {
         }
 
         if let Some(kind) = crate::models::asset_data::AssetData::decide_kind(asset) {
-            self_.project_row.set_visible(false);
-            self_.new_project_row.set_visible(false);
-            self_.engine_row.set_visible(false);
-            self_.install_row.set_visible(false);
-            self_.download_row.set_expanded(false);
-            self_.project_row.set_expanded(false);
-            self_.new_project_row.set_expanded(false);
-            self_.engine_row.set_expanded(false);
-            self_.install_row.set_expanded(false);
+            self_.project_group.set_visible(false);
+            self_.new_project_group.set_visible(false);
+            self_.engine_group.set_visible(false);
+            self_.install_group.set_visible(false);
             match kind {
                 AssetType::Asset => {
-                    self_.project_row.set_visible(true);
+                    self_.project_group.set_visible(true);
                 }
                 AssetType::Project => {
-                    self_.project_row.set_visible(true);
-                    self_.new_project_row.set_visible(true);
+                    self_.project_group.set_visible(true);
+                    self_.new_project_group.set_visible(true);
                 }
                 AssetType::Game | AssetType::Engine | AssetType::Plugin => {}
             };
         }
 
-        let size_label = gtk4::Label::new(Some("loading..."));
-        self.add_detail("Download Size", &size_label);
+        // TODO: Switch to self.add_detail_exp()
+        let size_label = gtk4::Label::new(Some("Loading..."));
+        self.add_detail("Download Size:", &size_label);
         self_.size_label.replace(size_label);
 
-        let size_label = gtk4::Label::new(Some("loading..."));
-        self.add_detail("Size", &size_label);
+        let size_label = gtk4::Label::new(Some("Loading..."));
+        self.add_detail("Size:", &size_label);
         self_.disk_size_label.replace(size_label);
     }
 
@@ -473,6 +418,15 @@ impl EpicAssetActions {
             ));
     }
 
+    fn add_detail_exp(&self, text: &str) {
+        let self_ = self.imp();
+        self_
+            .additional_details
+            .append(&crate::window::EpicAssetManagerWindow::create_info_row(
+                text,
+            ));
+    }
+
     pub fn version_selected(&self) {
         let self_ = self.imp();
         while let Some(el) = self_.additional_details.first_child() {
@@ -492,26 +446,25 @@ impl EpicAssetActions {
             if let Some(asset_info) = &*self_.asset.borrow() {
                 if let Some(release) = asset_info.release_info(&id) {
                     if let Some(ref compatible) = release.compatible_apps {
-                        self.add_detail(
-                            "Supported versions",
-                            &gtk4::Label::new(Some(&compatible.join(", ").replace("UE_", ""))),
-                        );
+                        let text = &compatible.join(", ").replace("UE_", "");
+                        let text = format!("Supported versions: {text}");
+                        self.add_detail_exp(&text);
                     }
                     if let Some(ref platforms) = release.platform {
-                        self.add_detail(
-                            "Platforms",
-                            &gtk4::Label::new(Some(&platforms.join(", "))),
-                        );
+                        let text = &platforms.join(", ");
+                        let text = format!("Platforms: {text}");
+                        self.add_detail_exp(&text);
                     }
                     if let Some(ref date) = release.date_added {
-                        self.add_detail(
-                            "Release Date",
-                            &gtk4::Label::new(Some(&date.naive_local().format("%F").to_string())),
-                        );
+                        let text = &date.naive_local().format("%F").to_string();
+                        let text = format!("Release Date: {text}");
+                        self.add_detail_exp(&text);
                     }
                     if let Some(ref note) = release.release_note {
                         if !note.is_empty() {
-                            self.add_detail("Release Note", &gtk4::Label::new(Some(note)));
+                            let text = &note;
+                            let text = format!("Release Note: {text}");
+                            self.add_detail_exp(&text);
                         }
                     }
                     let (sender, receiver) = glib::MainContext::channel::<(

From 513b9ac5aca069c9242bf1e3b5c0c63ac2827738 Mon Sep 17 00:00:00 2001
From: Philipp Kosarev <philipp.kosarev@gmail.com>
Date: Tue, 10 Dec 2024 23:17:34 +0000
Subject: [PATCH 2/2] align asset details to top

---
 data/resources/ui/logged_in/library/asset_detail.ui | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/resources/ui/logged_in/library/asset_detail.ui b/data/resources/ui/logged_in/library/asset_detail.ui
index 2968726..b786c69 100644
--- a/data/resources/ui/logged_in/library/asset_detail.ui
+++ b/data/resources/ui/logged_in/library/asset_detail.ui
@@ -129,6 +129,7 @@ circular</property>
                                                 <child>
                                                     <object class="GtkBox" id="details">
                                                         <property name="orientation">vertical</property>
+                                                        <property name="valign">start</property>
                                                         <property name="spacing">12</property>
                                                         <child>
                                                             <object class="EpicImageOverlay" id="images">