Skip to content

Fix order of calls to require_version and added missing calls #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Almamu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix order of calls to require_version and added missing calls #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
634d698
Fix order of calls to require_version and added missing calls
Almamu Oct 27, 2022
c5cf23c
Fix GdkPixbuf versions
Almamu Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion wpgtk/gui/color_grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

from .color_picker import ColorDialog
from gi import require_version
from gi.repository import Gtk, Gdk, GdkPixbuf
require_version("Gtk", "3.0")
require_version("Gdk", "3.0")
require_version('GdkPixbuf', '2.0')
from gi.repository import Gtk, Gdk, GdkPixbuf

# TODO: remove current_walls call, use simple ist
# TODO: use simple text combo
Expand Down
2 changes: 1 addition & 1 deletion wpgtk/gui/keyword_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from gi import require_version
from gi.repository import Gtk
require_version("Gtk", "3.0")
from gi.repository import Gtk


class KeywordDialog(Gtk.Dialog):
Expand Down
2 changes: 1 addition & 1 deletion wpgtk/gui/keyword_grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
from ..data import keywords
from ..data.config import user_keywords, settings, write_conf
from gi import require_version
require_version("Gtk", "3.0")
from gi.repository import Gtk
from .keyword_dialog import KeywordDialog
require_version("Gtk", "3.0")

PAD = 10

Expand Down
5 changes: 3 additions & 2 deletions wpgtk/gui/option_grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from gi.repository import Gtk, Gdk
from gi import require_version
require_version("Gtk", "3.0")
require_version("Gdk", "3.0")
from gi.repository import Gtk, Gdk
from ..data.config import settings, write_conf
from pywal import colors
# making sure it uses v3.0
require_version("Gtk", "3.0")

PAD = 10

Expand Down
5 changes: 3 additions & 2 deletions wpgtk/gui/template_grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
from ..data.config import OPT_DIR, settings
from ..data import files

from gi.repository import Gtk
from gi.repository.GdkPixbuf import Pixbuf
from gi import require_version
require_version("Gtk", "3.0")
require_version("GdkPixbuf", "2.0")
from gi.repository import Gtk
from gi.repository.GdkPixbuf import Pixbuf

PAD = 10
icon = 'document-open'
Expand Down
3 changes: 2 additions & 1 deletion wpgtk/gui/theme_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
from ..data.config import WALL_DIR, WPG_DIR, __version__

from gi import require_version
from gi.repository import Gtk, GdkPixbuf
require_version('Gtk', '3.0')
require_version('GdkPixbuf', '2.0')
from gi.repository import Gtk, GdkPixbuf

PAD = 10

Expand Down