From 0e543414ad08a512ef6845dd7635ecb01b813706 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Tue, 24 Oct 2023 06:13:02 +0200 Subject: [PATCH] :tada: Backport changes from main --- prefs.js | 53 +------------------- resources/credits/sponsors.json | 86 --------------------------------- resources/ui/common/menus.ui | 32 +++++++----- 3 files changed, 22 insertions(+), 149 deletions(-) delete mode 100644 resources/credits/sponsors.json diff --git a/prefs.js b/prefs.js index 3c21118..3bcac78 100644 --- a/prefs.js +++ b/prefs.js @@ -516,6 +516,8 @@ GitHub: https://github.com/spon addURIAction('donate-kofi', 'https://ko-fi.com/schneegans'); addURIAction('donate-github', 'https://github.com/sponsors/Schneegans'); addURIAction('donate-paypal', 'https://www.paypal.me/simonschneegans'); + addURIAction('donate-crypto', 'https://schneegans.cb.id'); + addURIAction('show-sponsors', 'https://schneegans.github.io/sponsors'); addURIAction('wallpapers', 'https://github.com/Schneegans/ai-wallpapers'); addURIAction('profile-dir', `file://${GLib.get_user_config_dir()}/burn-my-windows/profiles`); // clang-format on @@ -547,74 +549,23 @@ GitHub: https://github.com/spon } }); - const sponsors = this._getJSONResource('/credits/sponsors.json'); let dialog; // We try to use the special Adw.AboutWindow if it is available. if (utils.isADW() && Adw.AboutWindow) { - let formatSponsors = (sponsors) => { - return sponsors.map(s => { - if (s.url == '') - return s.name; - else - return `${s.name} ${s.url}`; - }); - }; - dialog = new Adw.AboutWindow({transient_for: window, modal: true}); dialog.set_application_icon('burn-my-windows-symbolic'); dialog.set_application_name('Burn-My-Windows'); dialog.set_version(`${Me.metadata.version}`); dialog.set_developer_name('Simon Schneegans'); dialog.set_issue_url('https://github.com/Schneegans/Burn-My-Windows/issues'); - if (sponsors.gold.length > 0) { - dialog.add_credit_section(_('Gold Sponsors'), - formatSponsors(sponsors.gold)); - } - if (sponsors.silver.length > 0) { - dialog.add_credit_section(_('Silver Sponsors'), - formatSponsors(sponsors.silver)); - } - if (sponsors.bronze.length > 0) { - dialog.add_credit_section(_('Bronze Sponsors'), - formatSponsors(sponsors.bronze)); - } - if (sponsors.past.length > 0) { - dialog.add_credit_section(_('Past Sponsors'), - formatSponsors(sponsors.past)); - } } else { - let formatSponsors = (sponsors) => { - return sponsors.map(s => { - if (s.url == '') - return s.name; - else - return `${s.name}`; - }); - }; - dialog = new Gtk.AboutDialog({transient_for: window, modal: true}); dialog.set_logo_icon_name('burn-my-windows-symbolic'); dialog.set_program_name(`Burn-My-Windows ${Me.metadata.version}`); dialog.set_authors(['Simon Schneegans']); - if (sponsors.gold.length > 0) { - dialog.add_credit_section(_('Gold Sponsors'), - formatSponsors(sponsors.gold)); - } - if (sponsors.silver.length > 0) { - dialog.add_credit_section(_('Silver Sponsors'), - formatSponsors(sponsors.silver)); - } - if (sponsors.bronze.length > 0) { - dialog.add_credit_section(_('Bronze Sponsors'), - formatSponsors(sponsors.bronze)); - } - if (sponsors.past.length > 0) { - dialog.add_credit_section(_('Past Sponsors'), - formatSponsors(sponsors.past)); - } } dialog.set_translator_credits([...translators].join('\n')); diff --git a/resources/credits/sponsors.json b/resources/credits/sponsors.json deleted file mode 100644 index d405744..0000000 --- a/resources/credits/sponsors.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "gold": [ - { - "name": "D3vil0p3r", - "url": "https://github.com/D3vil0p3r" - }, - { - "name": "Maxence Sebald", - "url": "" - } - ], - "silver": [ - { - "name": "@danielheadbang", - "url": "https://github.com/danielheadbang" - }, - { - "name": "Jorge Castro", - "url": "https://github.com/castrojo" - } - ], - "bronze": [ - { - "name": "@SubOptimal", - "url": "https://github.com/SubOptimal" - }, - { - "name": "@vlazic", - "url": "https://github.com/vlazic" - } - ], - "past": [ - { - "name": "Dennis ten Hoove", - "url": "https://github.com/dennis1248" - }, - { - "name": "@MRR-dev", - "url": "https://github.com/MRR-dev" - }, - { - "name": "Angel Brielez", - "url": "https://github.com/AngelBrielez" - }, - { - "name": "@taconomix", - "url": "https://github.com/taconomix" - }, - { - "name": "@enolive", - "url": "https://github.com/enolive" - }, - { - "name": "@Aggraxis", - "url": "https://github.com/Aggraxis" - }, - { - "name": "tj3k", - "url": "https://twitter.com/tjiiik" - }, - { - "name": "@wolfyrion", - "url": "https://github.com/wolfyrion" - }, - { - "name": "@MrTomRod", - "url": "https://github.com/MrTomRod" - }, - { - "name": "Pouhiou", - "url": "" - }, - { - "name": "DAPREMONT Christophe", - "url": "" - }, - { - "name": "@manero6", - "url": "https://github.com/manero6" - }, - { - "name": "@RickStanley", - "url": "https://github.com/RickStanley" - } - ] -} \ No newline at end of file diff --git a/resources/ui/common/menus.ui b/resources/ui/common/menus.ui index 41a848c..e5942bb 100644 --- a/resources/ui/common/menus.ui +++ b/resources/ui/common/menus.ui @@ -21,20 +21,12 @@ SPDX-License-Identifier: GPL-3.0-or-later View Matching Wallpapers prefs.wallpapers + + View Donors Hall-of-Fame + prefs.show-sponsors +
- - Report a Bug - prefs.bugs - - - Create an Effect - prefs.new-effect - - - Translate - prefs.translate - Donate @@ -49,7 +41,23 @@ SPDX-License-Identifier: GPL-3.0-or-later PayPal prefs.donate-paypal + + Crypto + prefs.donate-crypto + + + Report a Bug + prefs.bugs + + + Create an Effect + prefs.new-effect + + + Translate + prefs.translate +