Merge branch 'main' into jsdeliver

This commit is contained in:
David Lapshin 2023-05-10 16:56:07 +03:00 committed by GitHub
commit 89cfe7b277
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 557 additions and 44 deletions

View file

@ -1,19 +0,0 @@
# Sync repo to the Codeberg mirror
name: Mirror Sync
on:
push:
branches: ["main"]
workflow_dispatch: # Manual dispatch
schedule:
- cron: "0 */6 * * *"
jobs:
codeberg:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: pixta-dev/repository-mirroring-action@v1
with:
target_repo_url: "git@codeberg.org:GradienceTeam/Gradience.git"
ssh_private_key: ${{ secrets.CODEBERG_SSH }}

View file

@ -301,8 +301,8 @@ Special thanks to:
This README is based on README from [Kooha](https://github.com/SeaDve/Kooha) by [Dave Patrick Caberto](https://github.com/SeaDve)
## Mirrors
## 🪞 Mirrors
- [Gitlab](https://gitlab.com/GradienceTeam/Gradience)
- [Github](https://github.com/GradienceTeam/Gradience)
- [Codeberg](https://codeberg.org/GradienceTeam/Gradience)
- [GitLab](https://gitlab.com/GradienceTeam/Gradience)
- [GitHub](https://github.com/GradienceTeam/Gradience)
- [Codeberg](https://codeberg.org/GradienceTeam/Gradience)

View file

@ -27,7 +27,6 @@
<file preprocess="xml-stripblanks">ui/theming_empty_group.ui</file>
<file preprocess="xml-stripblanks">ui/welcome_window.ui</file>
<file preprocess="xml-stripblanks">ui/window.ui</file>
<file>images/welcome-dark.svg</file>
<file>images/welcome.svg</file>
<file>style.css</file>
</gresource>

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -56,7 +56,7 @@ template GradienceWelcomeWindow: Adw.Window {
Gtk.Image img_welcome {
resource: "/com/github/GradienceTeam/Gradience/images/welcome.svg";
pixel-size: 256;
pixel-size: 300;
}
Adw.StatusPage page_welcome {

View file

@ -51,11 +51,6 @@ class GradienceWelcomeWindow(Adw.Window):
img_welcome = Gtk.Template.Child()
label_skip = Gtk.Template.Child()
images = [
f"{rootdir}/images/welcome.svg",
f"{rootdir}/images/welcome-dark.svg",
]
carousel_pages = [
"welcome", # 0
"release", # 1
@ -88,9 +83,6 @@ class GradienceWelcomeWindow(Adw.Window):
self.btn_next.connect("clicked", self.next_page)
self.btn_install.connect("clicked", self.install_runner)
self.btn_agree.connect("clicked", self.agree)
self.settings.connect(
"notify::gtk-application-prefer-dark-theme", self.theme_changed
)
self.connect("close-request", self.quit)
if self.update:
@ -100,17 +92,8 @@ class GradienceWelcomeWindow(Adw.Window):
self.btn_close.set_sensitive(False)
if self.settings.get_property("gtk-application-prefer-dark-theme"):
self.img_welcome.set_from_resource(self.images[1])
self.page_changed()
def theme_changed(self, settings, key):
self.img_welcome.set_from_resource(
self.images[settings.get_property(
"gtk-application-prefer-dark-theme")]
)
def get_page(self, index):
return self.carousel_pages[index]