diff --git a/VERSION b/VERSION index 845639e..0ea3a94 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.4 +0.2.0 diff --git a/lib/application.py b/lib/application.py index 4c69537..e3b65b6 100644 --- a/lib/application.py +++ b/lib/application.py @@ -1,8 +1,9 @@ #!/usr/bin/env python3 from gi import require_version -require_version("Gtk", "3.0") -from gi.repository import Gtk +require_version("Gtk", "4.0") +require_version("Adw", "1") +from gi.repository import Gtk, Adw class AppWindow(Gtk.ApplicationWindow): @@ -12,7 +13,7 @@ def __init__(self, app): self.set_title("Hello World") -class Application(Gtk.Application): +class Application(Adw.Application): def __init__(self): super().__init__() diff --git a/linux/hello-world-gtk.spec b/linux/hello-world-gtk.spec index 3b47ebb..1de2673 100644 --- a/linux/hello-world-gtk.spec +++ b/linux/hello-world-gtk.spec @@ -14,6 +14,13 @@ a = Analysis( ('../VERSION', '.'), ('hello-world-gtk.desktop', '.') ], + hooksconfig={ + "gi": { + "module-versions": { + "Gtk": "4.0" + } + } + }, hiddenimports=[], hookspath=[], runtime_hooks=[], diff --git a/macos/bootstrap.sh b/macos/bootstrap.sh index 47b7b07..89c310d 100644 --- a/macos/bootstrap.sh +++ b/macos/bootstrap.sh @@ -1,5 +1,5 @@ #!/bin/sh -brew install pygobject3 gtk+3 adwaita-icon-theme +brew install pygobject3 gtk4 adwaita-icon-theme libadwaita echo "Done" diff --git a/macos/hello-world-gtk.spec b/macos/hello-world-gtk.spec index 57b1166..2e50c64 100644 --- a/macos/hello-world-gtk.spec +++ b/macos/hello-world-gtk.spec @@ -13,6 +13,13 @@ a = Analysis( ('../LICENSE', '.'), ('../VERSION', '.') ], + hooksconfig={ + "gi": { + "module-versions": { + "Gtk": "4.0" + } + } + }, hiddenimports=[], hookspath=[], runtime_hooks=[], diff --git a/requirements.txt b/requirements.txt index ef376ca..d53b556 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -pyinstaller +git+https://github.com/pyinstaller/pyinstaller.git diff --git a/windows/bootstrap.sh b/windows/bootstrap.sh index ca09b2a..2bbc74a 100644 --- a/windows/bootstrap.sh +++ b/windows/bootstrap.sh @@ -2,6 +2,6 @@ # This script is meant to be run through MinGW -pacman -S --noconfirm mingw-w64-x86_64-gtk3 mingw-w64-x86_64-python-pip mingw-w64-x86_64-python3-gobject mingw-w64-x86_64-nsis mingw-w64-x86_64-nsis-nsisunz zip unzip +pacman -S --noconfirm mingw-w64-x86_64-gtk4 mingw-w64-x86_64-python-pip mingw-w64-x86_64-python3-gobject mingw-w64-x86_64-libadwaita mingw-w64-x86_64-nsis mingw-w64-x86_64-nsis-nsisunz zip unzip echo "Done" diff --git a/windows/hello-world-gtk.spec b/windows/hello-world-gtk.spec index 5981394..5f3557d 100644 --- a/windows/hello-world-gtk.spec +++ b/windows/hello-world-gtk.spec @@ -13,6 +13,13 @@ a = Analysis( ('../LICENSE', '.'), ('../VERSION', '.') ], + hooksconfig={ + "gi": { + "module-versions": { + "Gtk": "4.0" + } + } + }, hiddenimports=[], hookspath=[], runtime_hooks=[],