Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actions menu and download pop-up improvements #300

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Actions menu and download pop-up improvements #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
539a04f
use adwpreference for actions menu
PhilippKosarev Nov 18, 2024
0aa6f94
improved actions menu
PhilippKosarev Dec 8, 2024
e51480e
merge main
PhilippKosarev Dec 10, 2024
513b9ac
align asset details to top
PhilippKosarev Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 51 additions & 125 deletions data/resources/ui/download_manager/download_item.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
79 changes: 23 additions & 56 deletions data/resources/ui/logged_in/library/actions/add_to_project.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,37 @@
<?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>
</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>
Expand Down
Loading
Loading