Compare commits

...

5 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
20 changed files with 63 additions and 45 deletions

View File

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

View File

@@ -23,7 +23,7 @@ jobs:
shell: python shell: python
run: | run: |
import re, textwrap 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() string = open_file.read()
open_file.close() open_file.close()
string = re.findall("<release.*>\s*<description.*>\n([\s\S]*?)\s*</description>\s*<\/release>", string)[0] 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 [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-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 [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-url]: https://flathub.org/apps/page.kramo.Cartridges
[flathub-image]: https://img.shields.io/flathub/v/hu.kramo.Cartridges?logo=flathub&style=for-the-badge [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/hu.kramo.Cartridges?style=for-the-badge [installs-image]: https://img.shields.io/flathub/downloads/page.kramo.Cartridges?style=for-the-badge
<div align="center"> <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 # Cartridges
@@ -69,7 +69,7 @@ Thank you for your generosity! 💜
The app is available on Flathub. 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 ## Windows

View File

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

View File

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

View File

@@ -118,8 +118,15 @@ class CartridgesPreferences(Adw.PreferencesDialog):
removed_games: set[Game] = set() removed_games: set[Game] = set()
warning_menu_buttons: dict = {} warning_menu_buttons: dict = {}
is_open = False
def __init__(self, **kwargs: Any) -> None: def __init__(self, **kwargs: Any) -> None:
super().__init__(**kwargs) 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.file_chooser = Gtk.FileDialog()
self.toast = Adw.Toast.new(_("All games removed")) 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) self.sgdb_key_entry_row.connect("changed", set_sgdb_sensitive)
set_sgdb_sensitive(self.sgdb_key_entry_row) 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: def get_switch(self, setting: str) -> Any:
return getattr(self, f'{setting.replace("-", "_")}_switch') return getattr(self, f'{setting.replace("-", "_")}_switch')

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( desktop_file = i18n.merge_file(
input: configure_file( input: configure_file(
input: 'hu.kramo.Cartridges.desktop.in', input: 'page.kramo.Cartridges.desktop.in',
output: app_id + '.desktop.in', output: app_id + '.desktop.in',
configuration: conf configuration: conf
), ),
@@ -42,7 +42,7 @@ endif
appstream_file = i18n.merge_file( appstream_file = i18n.merge_file(
input: configure_file( input: configure_file(
input: 'hu.kramo.Cartridges.metainfo.xml.in', input: 'page.kramo.Cartridges.metainfo.xml.in',
output: app_id + '.metainfo.xml.in', output: app_id + '.metainfo.xml.in',
configuration: conf configuration: conf
), ),
@@ -63,7 +63,7 @@ endif
install_data( install_data(
configure_file( configure_file(
input: 'hu.kramo.Cartridges.gschema.xml.in', input: 'page.kramo.Cartridges.gschema.xml.in',
output: app_id + '.gschema.xml', output: app_id + '.gschema.xml',
configuration: conf configuration: conf
), ),

View File

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

View File

@@ -1,5 +1,5 @@
{ {
"id" : "hu.kramo.Cartridges.Devel", "id" : "page.kramo.Cartridges.Devel",
"runtime" : "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"runtime-version" : "46", "runtime-version" : "46",
"sdk" : "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",

View File

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

View File

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

View File

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