From 33e847ef94c3c398cb47d66492d86fa5885396a8 Mon Sep 17 00:00:00 2001
From: kramo <93832451+kra-mo@users.noreply.github.com>
Date: Thu, 13 Jul 2023 14:40:41 +0200
Subject: [PATCH] Added icons to Sources sidebar
---
data/cartridges.gresource.xml.in | 9 +++++++++
data/gtk/window.blp | 3 +--
data/icons/sources/bottles-source-symbolic.svg | 1 +
data/icons/sources/flatpak-source-symbolic.svg | 1 +
data/icons/sources/heroic-source-symbolic.svg | 1 +
data/icons/sources/itch-source-symbolic.svg | 1 +
.../icons/sources/legendary-source-symbolic.svg | 1 +
data/icons/sources/lutris-source-symbolic.svg | 1 +
data/icons/sources/steam-source-symbolic.svg | 1 +
src/main.py | 6 ++++++
src/window.py | 17 +++++++++++++----
11 files changed, 36 insertions(+), 6 deletions(-)
create mode 100644 data/icons/sources/bottles-source-symbolic.svg
create mode 100644 data/icons/sources/flatpak-source-symbolic.svg
create mode 100644 data/icons/sources/heroic-source-symbolic.svg
create mode 100644 data/icons/sources/itch-source-symbolic.svg
create mode 100644 data/icons/sources/legendary-source-symbolic.svg
create mode 100644 data/icons/sources/lutris-source-symbolic.svg
create mode 100644 data/icons/sources/steam-source-symbolic.svg
diff --git a/data/cartridges.gresource.xml.in b/data/cartridges.gresource.xml.in
index 472f6fb..ca018d4 100644
--- a/data/cartridges.gresource.xml.in
+++ b/data/cartridges.gresource.xml.in
@@ -11,4 +11,13 @@
library_placeholder.svg
library_placeholder_small.svg
+
+ icons/sources/bottles-source-symbolic.svg
+ icons/sources/flatpak-source-symbolic.svg
+ icons/sources/heroic-source-symbolic.svg
+ icons/sources/itch-source-symbolic.svg
+ icons/sources/legendary-source-symbolic.svg
+ icons/sources/lutris-source-symbolic.svg
+ icons/sources/steam-source-symbolic.svg
+
diff --git a/data/gtk/window.blp b/data/gtk/window.blp
index 7ea8e64..0788878 100644
--- a/data/gtk/window.blp
+++ b/data/gtk/window.blp
@@ -94,6 +94,7 @@ template $CartridgesWindow : Adw.ApplicationWindow {
margin-top: 12;
margin-bottom: 12;
margin-start: 6;
+ margin-end: 6;
spacing: 12;
Image {
@@ -102,12 +103,10 @@ template $CartridgesWindow : Adw.ApplicationWindow {
Label {
halign: start;
label: _("All Games");
- margin-end: 6;
}
Label all_games_no_label {
hexpand: true;
halign: end;
- margin-end: 6;
styles ["dim-label"]
}
diff --git a/data/icons/sources/bottles-source-symbolic.svg b/data/icons/sources/bottles-source-symbolic.svg
new file mode 100644
index 0000000..fc654c5
--- /dev/null
+++ b/data/icons/sources/bottles-source-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/icons/sources/flatpak-source-symbolic.svg b/data/icons/sources/flatpak-source-symbolic.svg
new file mode 100644
index 0000000..87800a3
--- /dev/null
+++ b/data/icons/sources/flatpak-source-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/icons/sources/heroic-source-symbolic.svg b/data/icons/sources/heroic-source-symbolic.svg
new file mode 100644
index 0000000..63975d1
--- /dev/null
+++ b/data/icons/sources/heroic-source-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/icons/sources/itch-source-symbolic.svg b/data/icons/sources/itch-source-symbolic.svg
new file mode 100644
index 0000000..ff343b3
--- /dev/null
+++ b/data/icons/sources/itch-source-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/icons/sources/legendary-source-symbolic.svg b/data/icons/sources/legendary-source-symbolic.svg
new file mode 100644
index 0000000..3dcacfb
--- /dev/null
+++ b/data/icons/sources/legendary-source-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/icons/sources/lutris-source-symbolic.svg b/data/icons/sources/lutris-source-symbolic.svg
new file mode 100644
index 0000000..a9166c2
--- /dev/null
+++ b/data/icons/sources/lutris-source-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/icons/sources/steam-source-symbolic.svg b/data/icons/sources/steam-source-symbolic.svg
new file mode 100644
index 0000000..f66d4cb
--- /dev/null
+++ b/data/icons/sources/steam-source-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/main.py b/src/main.py
index 8efdadf..feb4b13 100644
--- a/src/main.py
+++ b/src/main.py
@@ -188,6 +188,12 @@ class CartridgesApplication(Adw.Application):
debug_info=debug_str,
debug_info_filename="cartridges.log",
)
+ about.add_legal_section(
+ "Steam Branding",
+ "© 2023 Valve Corporation",
+ Gtk.License.CUSTOM,
+ "Steam and the Steam logo are trademarks and/or registered trademarks of Valve Corporation in the U.S. and/or other countries.", # pylint: disable=line-too-long
+ )
about.present()
def on_preferences_action(
diff --git a/src/window.py b/src/window.py
index cd200d3..6e98551 100644
--- a/src/window.py
+++ b/src/window.py
@@ -126,16 +126,26 @@ class CartridgesWindow(Adw.ApplicationWindow):
if not (removed := get_removed(source_id)):
continue
- row = Gtk.Box(margin_top=12, margin_bottom=12)
+ row = Gtk.Box(
+ margin_top=12,
+ margin_bottom=12,
+ margin_start=6,
+ margin_end=6,
+ spacing=12,
+ )
games_no = len(shared.store.source_games[source_id]) - removed[0]
total_games_no += games_no
+ row.append(
+ Gtk.Image.new_from_icon_name(
+ f'{source_id.split("_")[0]}-source-symbolic'
+ )
+ )
+
row.append(
Gtk.Label(
label=self.get_application().get_source_name(source_id),
halign=Gtk.Align.START,
- margin_start=6,
- margin_end=6,
)
)
@@ -144,7 +154,6 @@ class CartridgesWindow(Adw.ApplicationWindow):
label=games_no,
hexpand=True,
halign=Gtk.Align.END,
- margin_end=6,
)
)