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

Boxed-list info rows #294

Merged
merged 6 commits into from
Dec 8, 2024
Merged

Boxed-list info rows #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ebe411
compact asset detail and fixed scrolling
PhilippKosarev Oct 10, 2024
2a8d0cf
add icon to Actions button in library tab
PhilippKosarev Oct 11, 2024
6d56ef0
boxed-list info rows
PhilippKosarev Nov 14, 2024
55a98bb
remove heading style from info rows
PhilippKosarev Nov 14, 2024
f74e444
fix file permissions
PhilippKosarev Nov 18, 2024
e16ac57
give back executable permission to some files
PhilippKosarev Nov 18, 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
63 changes: 32 additions & 31 deletions data/resources/ui/logged_in/engines/engine_detail.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,50 @@
<interface>
<template class="EpicEngineDetails" parent="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="hexpand">true</property>
<property name="halign">fill</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<child>
<object class="GtkButton" id="launch_button">
<property name="name">engine_launch_button</property>
<property name="action-name">engine_details.launch</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="css-classes">suggested-action
pill</property>
<child>
<object class="AdwButtonContent">
<property name="icon-name">media-playback-start-symbolic</property>
<property name="label" translatable="yes">Launch</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkSeparator"/>
</child>
<child>
<object class="GtkRevealer" id="details_revealer">
<property name="reveal-child">true</property>
<property name="vexpand">True</property>
<child>
<object class="GtkScrolledWindow">
<object class="AdwPreferencesPage">
<child>
<object class="GtkBox">
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<object class="AdwPreferencesGroup">
<child>
<object class="GtkButton" id="launch_button">
<property name="halign">start</property>
<property name="name">engine_launch_button</property>
<property name="action-name">engine_details.launch</property>
<property name="css-classes">suggested-action
pill</property>
<child>
<object class="AdwButtonContent">
<property name="icon-name">media-playback-start-symbolic</property>
<property name="label" translatable="yes">Launch</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="AdwPreferencesGroup">
<property name="title">General</property>
<child>
<object class="GtkListBox" id="details">
<property name="selection-mode">GTK_SELECTION_NONE</property>
<property name="css-classes">boxed-list</property>
</object>
</child>
</object>
</child>
<child>
<object class="AdwPreferencesGroup">
<property name="title">Details</property>
<child>
<object class="AdwExpanderRow" id="logs_row">
<object class="AdwExpanderRow" id="logs_row">
<property name="title" translatable="yes">Logs</property>
<property name="expanded">0</property>
<child>
Expand Down
6 changes: 4 additions & 2 deletions data/resources/ui/logged_in/engines/engines_side.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="css-classes">background</property>
<child>
<object class="GtkBox">
<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="margin-end">96</property>
<property name="spacing">12</property>
<child>
<object class="GtkButton">
Expand All @@ -34,11 +35,12 @@ pill</property>
</child>
<child>
<object class="GtkLabel" id="title">
<property name="hexpand">true</property>
<property name="halign">center</property>
<property name="label" bind-source="EpicEnginesSide"
bind-property="title"
bind-flags="sync-create"/>
<property name="ellipsize">middle</property>
<property name="halign">center</property>
<property name="use-markup">true</property>
<property name="css-classes">title-1</property>
</object>
Expand Down
1 change: 1 addition & 0 deletions data/resources/ui/logged_in/engines/epic_download.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<child>
<object class="GtkListBox" id="details">
<property name="selection-mode">GTK_SELECTION_NONE</property>
<property name="css-classes">background</property>
<child>
<object class="GtkListBoxRow">
<child>
Expand Down
58 changes: 32 additions & 26 deletions data/resources/ui/logged_in/library/asset_detail.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<!-- TODO: GtkInfoBar is deprecated, switch to AdwBanner -->
<object class="GtkInfoBar" id="warning">
<property name="css-classes">warning</property>
<property name="message-type">GTK_MESSAGE_ERROR</property>
Expand All @@ -28,8 +29,8 @@
<child>
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="margin-top">24</property>
<property name="margin-bottom">24</property>
<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="spacing">6</property>
Expand All @@ -45,10 +46,11 @@ pill</property>
</child>
<child>
<object class="GtkLabel" id="title">
<property name="css-classes">title-1</property>
<property name="ellipsize">middle</property>
<property name="halign">center</property>
<property name="hexpand">true</property>
<property name="halign">center</property>
<property name="ellipsize">middle</property>
<!-- <property name="selectable">true</property> --> <!-- setting this messes up titles for some reason -->
<property name="css-classes">title-1</property>
</object>
</child>
<child>
Expand All @@ -69,8 +71,8 @@ circular</property>
<property name="halign">fill</property>
<property name="css-classes">linked</property>
<property name="margin-bottom">12</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-start">24</property>
<property name="margin-end">24</property>
<child>
<object class="GtkButton" id="information_button">
<property name="hexpand">true</property>
Expand All @@ -86,11 +88,17 @@ circular</property>
</object>
</child>
<child>
<!-- TODO: switch to GtkDropDown? -->
<object class="GtkMenuButton" id="actions_menu">
<property name="direction">down</property>
<property name="hexpand">true</property>
<property name="valign">center</property>
<property name="label" translatable="yes">Actions</property>
<child>
<object class="AdwButtonContent">
<property name="icon-name">view-more-symbolic</property>
<property name="label" translatable="yes">Actions</property>
</object>
</child>
<property name="popover">
<object class="GtkPopover">
<child>
Expand All @@ -113,26 +121,24 @@ circular</property>
<object class="GtkRevealer" id="details_revealer">
<property name="reveal-child">true</property>
<child>
<object class="GtkScrolledWindow">
<object class="AdwPreferencesPage">
<child>
<object class="GtkBox" id="details">
<property name="orientation">vertical</property>
<property name="vexpand">true</property>
<child>
<object class="EpicImageOverlay" id="images">
<property name="hexpand" bind-source="EpicAssetDetails" bind-property="expanded" bind-flags="sync-create"/>
<property name="vexpand">false</property>
</object>
</child>
<object class="AdwPreferencesGroup">
<child>
<object class="GtkSeparator">
<property name="orientation">horizontal</property>
</object>
</child>
<child>
<object class="GtkListBox" id="details_box">
<property name="selection-mode">GTK_SELECTION_NONE</property>
<property name="vexpand">true</property>
<object class="GtkBox" id="details">
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="EpicImageOverlay" id="images">
<property name="hexpand" bind-source="EpicAssetDetails" bind-property="expanded" bind-flags="sync-create"/>
</object>
</child>
<child>
<object class="GtkListBox" id="details_box">
<property name="selection-mode">GTK_SELECTION_NONE</property>
<property name="css-classes">boxed-list</property>
</object>
</child>
</object>
</child>
</object>
Expand Down
27 changes: 11 additions & 16 deletions data/resources/ui/logged_in/library/image_stack.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,22 @@
<child>
<object class="GtkOverlay" id="navigation">
<property name="hexpand" bind-source="EpicImageOverlay" bind-property="hexpand" bind-flags="sync-create"/>
<property name="child">
<object class="AdwClamp">
<property name="orientation">vertical</property>
<property name="maximum-size">300</property>
<property name="height-request">400</property>
<child>
<object class="AdwCarousel" id="stack">
<property name="vexpand">True</property>
<property name="hexpand">True</property>
</object>
</child>
</object>
</property>
<child>
<object class="AdwCarousel" id="stack">
<property name="vexpand">true</property>
<property name="height-request">320</property>
<property name="hexpand">true</property>
<property name="allow-scroll-wheel">false</property>
</object>
</child>
<child type="overlay">
<object class="GtkButton">
<property name="halign">start</property>
<property name="valign">center</property>
<property name="margin-start">12</property>
<property name="css-classes">osd
circular</property>
<property name="opacity">0.75</property>
<property name="opacity">0.8</property>
<property name="icon-name">go-previous-symbolic</property>
<property name="action-name">image_stack.prev</property>
<property name="tooltip-text" translatable="yes">Previous Image</property>
Expand All @@ -43,7 +38,7 @@ circular</property>
<property name="margin-end">12</property>
<property name="css-classes">osd
circular</property>
<property name="opacity">0.75</property>
<property name="opacity">0.8</property>
<property name="icon-name">go-next-symbolic</property>
<property name="action-name">image_stack.next</property>
<property name="tooltip-text" translatable="yes">Next Image</property>
Expand All @@ -52,7 +47,7 @@ circular</property>
</object>
</child>
<child>
<object class="AdwCarouselIndicatorLines">
<object class="AdwCarouselIndicatorDots">
<property name="carousel">stack</property>
</object>
</child>
Expand Down
Loading
Loading