Compare commits

...

6 Commits

Author SHA1 Message Date
kramo
6b1fe1bd8d Fix typo 2024-04-07 21:22:21 +02:00
kramo
4198810cca v2.8.3 2024-04-07 21:14:41 +02:00
Weblate (bot)
451819a005 Translated using Weblate (Polish) (#246)
Currently translated at 77.1% (108 of 140 strings)


Translate-URL: https://hosted.weblate.org/projects/cartridges/cartridges/pl/
Translation: Cartridges/Cartridges

Co-authored-by: Igor Popowicz <igorpopowicz12@gmail.com>
2024-04-07 21:09:47 +02:00
kramo
a0fe463f03 Change app ID to page.kramo.Cartridges (#247)
* Change app id to page.kramo.Cartridges

* Update metainfo formatting, add replaces tag
2024-04-07 21:04:44 +02:00
kramo
d9384308fe Make it so only one preferences dialog can be open 2024-04-05 11:57:22 +02:00
kramo
f4b44477e9 Update blueprint-compiler, format .blp files 2024-03-30 13:43:54 +01:00
25 changed files with 408 additions and 361 deletions

View File

@@ -19,8 +19,8 @@ jobs:
- name: Flatpak Builder
uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
with:
bundle: hu.kramo.Cartridges.Devel.flatpak
manifest-path: flatpak/hu.kramo.Cartridges.Devel.json
bundle: page.kramo.Cartridges.Devel.flatpak
manifest-path: flatpak/page.kramo.Cartridges.Devel.json
# windows:
# name: Windows

View File

@@ -23,7 +23,7 @@ jobs:
shell: python
run: |
import re, textwrap
open_file = open("./data/hu.kramo.Cartridges.metainfo.xml.in", "r", encoding="utf-8")
open_file = open("./data/page.kramo.Cartridges.metainfo.xml.in", "r", encoding="utf-8")
string = open_file.read()
open_file.close()
string = re.findall("<release.*>\s*<description.*>\n([\s\S]*?)\s*</description>\s*<\/release>", string)[0]

View File

@@ -7,12 +7,12 @@
[discord-image]: https://img.shields.io/discord/1088155799299313754?color=%235865F2&label=discord&logo=discord&logoColor=%23FFFFFF&style=for-the-badge
[matrix-url]: https://matrix.to/#/#cartridges:matrix.org
[matrix-image]: https://img.shields.io/matrix/cartridges:matrix.org?label=Matrix&logo=matrix&color=%230dbd8b&style=for-the-badge
[flathub-url]: https://flathub.org/apps/hu.kramo.Cartridges
[flathub-image]: https://img.shields.io/flathub/v/hu.kramo.Cartridges?logo=flathub&style=for-the-badge
[installs-image]: https://img.shields.io/flathub/downloads/hu.kramo.Cartridges?style=for-the-badge
[flathub-url]: https://flathub.org/apps/page.kramo.Cartridges
[flathub-image]: https://img.shields.io/flathub/v/page.kramo.Cartridges?logo=flathub&style=for-the-badge
[installs-image]: https://img.shields.io/flathub/downloads/page.kramo.Cartridges?style=for-the-badge
<div align="center">
<img src="data/icons/hicolor/scalable/apps/hu.kramo.Cartridges.svg" width="128" height="128">
<img src="data/icons/hicolor/scalable/apps/page.kramo.Cartridges.svg" width="128" height="128">
# Cartridges
@@ -69,7 +69,7 @@ Thank you for your generosity! 💜
The app is available on Flathub.
<a href=https://flathub.org/apps/hu.kramo.Cartridges><img width='240' alt='Download on Flathub' src='https://dl.flathub.org/assets/badges/flathub-badge-en.png'/></a>
<a href=https://flathub.org/apps/page.kramo.Cartridges><img width='240' alt='Download on Flathub' src='https://dl.flathub.org/assets/badges/flathub-badge-en.png'/></a>
## Windows

View File

@@ -46,11 +46,18 @@ class FlatpakSourceIterable(SourceIterable):
return
blacklist = (
{"hu.kramo.Cartridges", "hu.kramo.Cartridges.Devel"}
{
"hu.kramo.Cartridges",
"hu.kramo.Cartridges.Devel",
"page.kramo.Cartridges",
"page.kramo.Cartridges.Devel",
}
if shared.schema.get_boolean("flatpak-import-launchers")
else {
"hu.kramo.Cartridges",
"hu.kramo.Cartridges.Devel",
"page.kramo.Cartridges",
"page.kramo.Cartridges.Devel",
"com.valvesoftware.Steam",
"net.lutris.Lutris",
"com.heroicgameslauncher.hgl",

View File

@@ -285,6 +285,9 @@ class CartridgesApplication(Adw.Application):
page_name: Optional[str] = None,
expander_row: Optional[str] = None,
) -> CartridgesWindow:
if CartridgesPreferences.is_open:
return
win = CartridgesPreferences()
if page_name:
win.set_visible_page_name(page_name)

View File

@@ -118,8 +118,15 @@ class CartridgesPreferences(Adw.PreferencesDialog):
removed_games: set[Game] = set()
warning_menu_buttons: dict = {}
is_open = False
def __init__(self, **kwargs: Any) -> None:
super().__init__(**kwargs)
# Make it so only one dialog can be open at a time
self.__class__.is_open = True
self.connect("closed", lambda *_: self.set_is_open(False))
self.file_chooser = Gtk.FileDialog()
self.toast = Adw.Toast.new(_("All games removed"))
@@ -247,6 +254,9 @@ class CartridgesPreferences(Adw.PreferencesDialog):
self.sgdb_key_entry_row.connect("changed", set_sgdb_sensitive)
set_sgdb_sensitive(self.sgdb_key_entry_row)
def set_is_open(self, is_open: bool) -> None:
self.__class__.is_open = is_open
def get_switch(self, setting: str) -> Any:
return getattr(self, f'{setting.replace("-", "_")}_switch')

View File

@@ -5,7 +5,6 @@ template $DetailsDialog : Adw.Dialog {
content-width: 480;
Adw.ToolbarView {
[top]
Adw.HeaderBar HeaderBar {
show-start-title-buttons: false;
@@ -29,6 +28,7 @@ template $DetailsDialog : Adw.Dialog {
Adw.PreferencesGroup cover_group {
Adw.Clamp cover_clamp {
maximum-size: 200;
Overlay {
[overlay]
Spinner spinner {
@@ -50,7 +50,8 @@ template $DetailsDialog : Adw.Dialog {
margin-end: 6;
styles [
"circular", "osd"
"circular",
"osd"
]
}
@@ -68,7 +69,8 @@ template $DetailsDialog : Adw.Dialog {
margin-end: 6;
styles [
"circular", "osd"
"circular",
"osd"
]
}
}
@@ -90,10 +92,12 @@ template $DetailsDialog : Adw.Dialog {
Adw.EntryRow name {
title: _("Title");
}
Adw.EntryRow developer {
title: _("Developer (optional)");
}
}
Adw.PreferencesGroup {
Adw.EntryRow executable {
title: _("Executable");
@@ -135,7 +139,6 @@ template $DetailsDialog : Adw.Dialog {
"flat"
]
}
}
}
}

View File

@@ -139,6 +139,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
Button steam_data_file_chooser_button {
icon-name: "folder-symbolic";
valign: center;
styles [
"flat"
]
@@ -161,6 +162,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
Button lutris_data_file_chooser_button {
icon-name: "folder-symbolic";
valign: center;
styles [
"flat"
]
@@ -191,6 +193,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
Button heroic_config_file_chooser_button {
icon-name: "folder-symbolic";
valign: center;
styles [
"flat"
]
@@ -229,6 +232,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
Button bottles_data_file_chooser_button {
icon-name: "folder-symbolic";
valign: center;
styles [
"flat"
]
@@ -251,6 +255,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
Button itch_config_file_chooser_button {
icon-name: "folder-symbolic";
valign: center;
styles [
"flat"
]
@@ -273,6 +278,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
Button legendary_config_file_chooser_button {
icon-name: "folder-symbolic";
valign: center;
styles [
"flat"
]
@@ -295,6 +301,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
Button retroarch_config_file_chooser_button {
icon-name: "folder-symbolic";
valign: center;
styles [
"flat"
]
@@ -318,6 +325,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
Button flatpak_system_data_file_chooser_button {
icon-name: "folder-symbolic";
valign: center;
styles [
"flat"
]
@@ -331,6 +339,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
Button flatpak_user_data_file_chooser_button {
icon-name: "folder-symbolic";
valign: center;
styles [
"flat"
]
@@ -394,6 +403,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
label: _("Update");
valign: center;
}
Spinner sgdb_spinner {
valign: center;
}

View File

@@ -50,6 +50,7 @@ template $CartridgesWindow : Adw.ApplicationWindow {
Adw.Breakpoint {
condition ("max-width: 564px")
setters {
overlay_split_view.collapsed: true;
details_view_box.orientation: vertical;
@@ -80,6 +81,7 @@ template $CartridgesWindow : Adw.ApplicationWindow {
[sidebar]
Adw.NavigationPage {
title: _("Cartridges");
Adw.ToolbarView {
[top]
Adw.HeaderBar {
@@ -103,17 +105,22 @@ template $CartridgesWindow : Adw.ApplicationWindow {
Image {
icon-name: "view-grid-symbolic";
}
Label {
halign: start;
label: _("All Games");
}
Label all_games_no_label {
hexpand: true;
halign: end;
styles ["dim-label"]
styles [
"dim-label"
]
}
}
Box added_row_box {
margin-top: 12;
margin-bottom: 12;
@@ -123,43 +130,55 @@ template $CartridgesWindow : Adw.ApplicationWindow {
Image {
icon-name: "list-add-symbolic";
}
Label {
halign: start;
label: _("Added");
margin-end: 6;
}
Label added_games_no_label {
hexpand: true;
halign: end;
margin-end: 6;
styles ["dim-label"]
styles [
"dim-label"
]
}
}
ListBoxRow {
selectable: false;
activatable: false;
Label {
label: _("Imported");
styles ["heading"]
styles [
"heading"
]
halign: start;
}
}
styles ["navigation-sidebar"]
styles [
"navigation-sidebar"
]
}
}
}
}
Adw.ToolbarView library_view {
[top]
Adw.HeaderBar header_bar {
[start]
Revealer {
transition-type: slide_right;
reveal-child: bind overlay_split_view.show-sidebar inverted;
Button show_sidebar_button {
icon-name: "sidebar-show-symbolic";
action-name: "win.show_sidebar";
@@ -303,10 +322,8 @@ Adw.NavigationPage details_page {
[overlay]
Adw.ToolbarView details_view_toolbar_view {
[top]
Adw.HeaderBar {
}
Adw.HeaderBar {}
ScrolledWindow {
Box details_view_box {
@@ -541,7 +558,6 @@ menu add_games {
menu search {
section {
label: "Search on…";
item (_("IGDB"), "app.igdb_search")
item (_("SteamGridDB"), "app.sgdb_search")
item (_("ProtonDB"), "app.protondb_search")

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 618 B

After

Width:  |  Height:  |  Size: 618 B

View File

@@ -24,7 +24,7 @@ gnome.compile_resources('cartridges',
desktop_file = i18n.merge_file(
input: configure_file(
input: 'hu.kramo.Cartridges.desktop.in',
input: 'page.kramo.Cartridges.desktop.in',
output: app_id + '.desktop.in',
configuration: conf
),
@@ -42,7 +42,7 @@ endif
appstream_file = i18n.merge_file(
input: configure_file(
input: 'hu.kramo.Cartridges.metainfo.xml.in',
input: 'page.kramo.Cartridges.metainfo.xml.in',
output: app_id + '.metainfo.xml.in',
configuration: conf
),
@@ -63,7 +63,7 @@ endif
install_data(
configure_file(
input: 'hu.kramo.Cartridges.gschema.xml.in',
input: 'page.kramo.Cartridges.gschema.xml.in',
output: app_id + '.gschema.xml',
configuration: conf
),

View File

@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>@APP_ID@</id>
<replaces>
<id>hu.kramo.Cartridges</id>
</replaces>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
<name>Cartridges</name>
@@ -51,12 +54,10 @@
</screenshots>
<content_rating type="oars-1.1" />
<releases>
<release version="2.8.2" date="2024-03-29">
<release version="2.8.3" date="2024-04-07">
<description translate="no">
<ul>
<li>Improved notifications for launching games via the GNOME search provider</li>
<li>Updated app metadata</li>
<li>Fixed an issue with translations</li>
<li>Fixed an issue with the preferences dialog</li>
</ul>
</description>
</release>

View File

@@ -1,5 +1,5 @@
{
"id" : "hu.kramo.Cartridges.Devel",
"id" : "page.kramo.Cartridges.Devel",
"runtime" : "org.gnome.Platform",
"runtime-version" : "46",
"sdk" : "org.gnome.Sdk",
@@ -112,7 +112,7 @@
{
"type" : "git",
"url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler",
"tag" : "v0.10.0"
"tag" : "v0.12.0"
}
],
"cleanup" : [

View File

@@ -1,5 +1,5 @@
project('cartridges',
version: '2.8.2',
version: '2.8.3',
meson_version: '>= 0.59.0',
default_options: [ 'warning_level=2', 'werror=false', ],
)
@@ -16,11 +16,11 @@ libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
profile = get_option('profile')
if profile == 'development'
app_id = 'hu.kramo.Cartridges.Devel'
prefix = '/hu/kramo/Cartridges/Devel'
app_id = 'page.kramo.Cartridges.Devel'
prefix = '/page/kramo/Cartridges/Devel'
elif profile == 'release'
app_id = 'hu.kramo.Cartridges'
prefix = '/hu/kramo/Cartridges'
app_id = 'page.kramo.Cartridges'
prefix = '/page/kramo/Cartridges'
endif
conf = configuration_data()

View File

@@ -5,22 +5,23 @@
# Kshyso <Kshysio@protonmail.com>, 2023.
# Eryk Michalak <gnu.ewm@protonmail.com>, 2023.
# Michaks <fexwex3@gmail.com>, 2023.
# Igor Popowicz <igorpopowicz12@gmail.com>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: Cartridges\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-03-29 14:27+0100\n"
"PO-Revision-Date: 2023-07-24 13:05+0000\n"
"Last-Translator: Michaks <fexwex3@gmail.com>\n"
"PO-Revision-Date: 2024-04-01 16:01+0000\n"
"Last-Translator: Igor Popowicz <igorpopowicz12@gmail.com>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/cartridges/"
"cartridges/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 5.0-dev\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Weblate 5.5-dev\n"
#: data/hu.kramo.Cartridges.desktop.in:3
#: data/hu.kramo.Cartridges.metainfo.xml.in:6
@@ -81,21 +82,19 @@ msgstr "Nowa okładka"
#: data/gtk/details-dialog.blp:64
msgid "Delete Cover"
msgstr "Usuń osłonę"
msgstr "Usuń okładkę"
#: data/gtk/details-dialog.blp:91 data/gtk/game.blp:81
msgid "Title"
msgstr "Tytuł"
#: data/gtk/details-dialog.blp:94
#, fuzzy
#| msgid "The developer or publisher (optional)"
msgid "Developer (optional)"
msgstr "Twórca lub wydawca (opcjonalnie)"
#: data/gtk/details-dialog.blp:99
msgid "Executable"
msgstr "Wykonywalne"
msgstr "Plik wykonywalny"
#: data/gtk/details-dialog.blp:105
msgid "Select File"
@@ -132,7 +131,7 @@ msgstr "Szukaj"
#: data/gtk/help-overlay.blp:24 data/gtk/window.blp:526
msgid "Keyboard Shortcuts"
msgstr "Skróty klawiaturowe"
msgstr "Skróty klawiszy"
#: data/gtk/help-overlay.blp:29 cartridges/game.py:103
#: cartridges/preferences.py:126 cartridges/importer/importer.py:394
@@ -253,7 +252,7 @@ msgstr "Heroic"
#: data/gtk/preferences.blp:201
msgid "Import Epic Games"
msgstr "Zaimportuj Epic Games"
msgstr "Importuj gry Epic Games"
#: data/gtk/preferences.blp:205
msgid "Import GOG Games"
@@ -488,10 +487,8 @@ msgid "Add"
msgstr ""
#: cartridges/details_dialog.py:90
#, fuzzy
#| msgid "Executable"
msgid "Executables"
msgstr "Wykonywalne"
msgstr "Pliki wykonywalne"
#. Translate this string as you would translate "file"
#: cartridges/details_dialog.py:105

View File

@@ -11,14 +11,14 @@ configure_file(
)
configure_file(
input: 'hu.kramo.Cartridges.SearchProvider.service.in',
input: 'page.kramo.Cartridges.SearchProvider.service.in',
output: app_id + '.SearchProvider.service',
configuration: conf,
install_dir: service_dir
)
configure_file(
input: 'hu.kramo.Cartridges.SearchProvider.ini',
input: 'page.kramo.Cartridges.SearchProvider.ini',
output: app_id + '.SearchProvider.ini',
configuration: conf,
install_dir: serarch_provider_dir

View File

@@ -1,7 +1,7 @@
[wrap-git]
directory = blueprint-compiler
url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
revision = v0.10.0
revision = v0.12.0
depth = 1
[provide]