diff --git a/wpgtk/gui/color_grid.py b/wpgtk/gui/color_grid.py index 8da93be..73deb44 100644 --- a/wpgtk/gui/color_grid.py +++ b/wpgtk/gui/color_grid.py @@ -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 diff --git a/wpgtk/gui/keyword_dialog.py b/wpgtk/gui/keyword_dialog.py index 35b6af0..ddf3850 100644 --- a/wpgtk/gui/keyword_dialog.py +++ b/wpgtk/gui/keyword_dialog.py @@ -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): diff --git a/wpgtk/gui/keyword_grid.py b/wpgtk/gui/keyword_grid.py index 05ab348..3fc77df 100644 --- a/wpgtk/gui/keyword_grid.py +++ b/wpgtk/gui/keyword_grid.py @@ -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 diff --git a/wpgtk/gui/option_grid.py b/wpgtk/gui/option_grid.py index 97a6a17..6f642aa 100644 --- a/wpgtk/gui/option_grid.py +++ b/wpgtk/gui/option_grid.py @@ -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 diff --git a/wpgtk/gui/template_grid.py b/wpgtk/gui/template_grid.py index 8b2f72a..84839f6 100644 --- a/wpgtk/gui/template_grid.py +++ b/wpgtk/gui/template_grid.py @@ -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' diff --git a/wpgtk/gui/theme_picker.py b/wpgtk/gui/theme_picker.py index bc5062a..b375baa 100755 --- a/wpgtk/gui/theme_picker.py +++ b/wpgtk/gui/theme_picker.py @@ -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