Skip to content

Commit

Permalink
Libadwaita 1.5 updates (#68)
Browse files Browse the repository at this point in the history
  • Loading branch information
tfuxu authored Apr 3, 2024
2 parents f2aa883 + 403a06d commit f3be311
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions build-aux/flatpak/io.github.tfuxu.Halftone.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"app-id" : "io.github.tfuxu.Halftone",
"runtime" : "org.gnome.Platform",
"runtime-version" : "45",
"runtime-version" : "46",
"sdk" : "org.gnome.Sdk",
"command" : "halftone",
"finish-args" : [
Expand Down Expand Up @@ -34,7 +34,7 @@
{
"type" : "git",
"url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler",
"tag" : "v0.10.0"
"tag" : "v0.12.0"
}
]
},
Expand All @@ -49,7 +49,7 @@
{
"type": "git",
"url": "https://github.com/ImageMagick/ImageMagick.git",
"tag": "7.1.1-21"
"tag": "7.1.1-29"
}
]
},
Expand Down
7 changes: 3 additions & 4 deletions halftone/views/about_window.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023, tfuxu <https://github.com/tfuxu>
# Copyright 2023-2024, tfuxu <https://github.com/tfuxu>
# SPDX-License-Identifier: GPL-3.0-or-later

from gi.repository import Gtk, Adw
Expand All @@ -14,9 +14,8 @@ def __init__(self, parent):
self.setup()

def setup(self):
self.about_window = Adw.AboutWindow(
self.about_window = Adw.AboutDialog(
application_name="Halftone",
transient_for=self.app.get_active_window(),
application_icon=constants.app_id,
developer_name="tfuxu",
website=constants.project_url,
Expand All @@ -39,4 +38,4 @@ def setup(self):
)

def show_about(self):
self.about_window.present()
self.about_window.present(self.parent)
4 changes: 2 additions & 2 deletions local.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/bash

# Copyright (C) 2022-2023, Gradience Team
# Copyright 2023, tfuxu <https://github.com/tfuxu>
# Copyright 2023-2024, tfuxu <https://github.com/tfuxu>
# SPDX-License-Identifier: GPL-3.0-or-later

read -p "Do you want to install Python requirements? [N/y] " answer

if [[ "$answer" == "y" ]]; then
pip3 install -r requirements.txt
pip3 install -r requirements-dev.txt
elif [[ "$answer" == "n" || "$answer" == "" ]]; then
echo "Skipping requirements installation"
fi
Expand Down
10 changes: 5 additions & 5 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
project('halftone',
version: '0.6.0',
meson_version: '>= 0.59.0',
default_options: [ 'warning_level=2',
'werror=false',
default_options: ['warning_level=2',
'werror=false',
],
)

Expand Down Expand Up @@ -45,9 +45,9 @@ endif

# Required dependencies
dependency('glib-2.0')
dependency('gtk4', version: '>= 4.5.0')
dependency('libadwaita-1', version: '>= 1.2.0')
dependency('pygobject-3.0', version: '>= 3.42.0')
dependency('gtk4', version: '>= 4.12.0')
dependency('libadwaita-1', version: '>= 1.5.0')
dependency('pygobject-3.0', version: '>= 3.48.0')

# Python installation directory
PY_INSTALLDIR = python.find_installation('python3')
Expand Down
1 change: 1 addition & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

pycairo
pygobject
pygobject-stubs

0 comments on commit f3be311

Please sign in to comment.