🎉 Backport changes from main

This commit is contained in:
Simon Schneegans
2023-10-24 06:13:02 +02:00
parent 265ebb8a4c
commit 0e543414ad
3 changed files with 22 additions and 149 deletions
+2 -51
View File
@@ -516,6 +516,8 @@ GitHub: <a href='https://github.com/sponsors/schneegans'>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: <a href='https://github.com/sponsors/schneegans'>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 `<a href="${s.url}">${s.name}</a>`;
});
};
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'));
-86
View File
@@ -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"
}
]
}
+20 -12
View File
@@ -21,20 +21,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
<attribute name="label" translatable="yes">View Matching Wallpapers</attribute>
<attribute name="action">prefs.wallpapers</attribute>
</item>
<item>
<attribute name="label" translatable="yes">View Donors Hall-of-Fame</attribute>
<attribute name="action">prefs.show-sponsors</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">Report a Bug</attribute>
<attribute name="action">prefs.bugs</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Create an Effect</attribute>
<attribute name="action">prefs.new-effect</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Translate</attribute>
<attribute name="action">prefs.translate</attribute>
</item>
<submenu>
<attribute name="label" translatable="yes">Donate</attribute>
<item>
@@ -49,7 +41,23 @@ SPDX-License-Identifier: GPL-3.0-or-later
<attribute name="label">PayPal</attribute>
<attribute name="action">prefs.donate-paypal</attribute>
</item>
<item>
<attribute name="label">Crypto</attribute>
<attribute name="action">prefs.donate-crypto</attribute>
</item>
</submenu>
<item>
<attribute name="label" translatable="yes">Report a Bug</attribute>
<attribute name="action">prefs.bugs</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Create an Effect</attribute>
<attribute name="action">prefs.new-effect</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Translate</attribute>
<attribute name="action">prefs.translate</attribute>
</item>
</section>
<section>
<item>