diff --git a/desktop/mypaint-ora-thumbnailer.py b/desktop/mypaint-ora-thumbnailer.py index c0069cdf9..849e4306f 100644 --- a/desktop/mypaint-ora-thumbnailer.py +++ b/desktop/mypaint-ora-thumbnailer.py @@ -32,7 +32,7 @@ gi.require_version("GdkPixbuf", "2.0") try: - from gi.repository import GdkPixbuf + from lib.gibindings import GdkPixbuf except: raise diff --git a/gui/accelmap.py b/gui/accelmap.py index 372f1bbb5..ceb023c56 100644 --- a/gui/accelmap.py +++ b/gui/accelmap.py @@ -14,9 +14,9 @@ from __future__ import division, print_function import logging -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import Pango +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import Pango from lib.gettext import gettext as _ import lib.xml diff --git a/gui/application.py b/gui/application.py index afcf8c6ec..5e25afde4 100644 --- a/gui/application.py +++ b/gui/application.py @@ -37,11 +37,11 @@ import logging import json -from gi.repository import GObject -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GdkPixbuf -from gi.repository import GLib +from lib.gibindings import GObject +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GdkPixbuf +from lib.gibindings import GLib from gettext import gettext as _ import lib.observable diff --git a/gui/autorecover.py b/gui/autorecover.py index 560132254..db6483250 100644 --- a/gui/autorecover.py +++ b/gui/autorecover.py @@ -16,7 +16,7 @@ import shutil import logging -from gi.repository import Gtk +from lib.gibindings import Gtk import lib.document import lib.helpers diff --git a/gui/backgroundwindow.py b/gui/backgroundwindow.py index ae2cccd56..a35def74c 100644 --- a/gui/backgroundwindow.py +++ b/gui/backgroundwindow.py @@ -17,8 +17,8 @@ import logging from gettext import gettext as _ -from gi.repository import Gtk -from gi.repository import GdkPixbuf +from lib.gibindings import Gtk +from lib.gibindings import GdkPixbuf from . import pixbuflist from . import windowing diff --git a/gui/brusheditor.py b/gui/brusheditor.py index 2e2483ebc..2a38f90c7 100644 --- a/gui/brusheditor.py +++ b/gui/brusheditor.py @@ -18,10 +18,10 @@ import os import logging -from gi.repository import Gtk -from gi.repository import Pango -from gi.repository import GLib -from gi.repository import GdkPixbuf +from lib.gibindings import Gtk +from lib.gibindings import Pango +from lib.gibindings import GLib +from lib.gibindings import GdkPixbuf from lib.gettext import C_ from lib import brushsettings diff --git a/gui/brushiconeditor.py b/gui/brushiconeditor.py index ede18328b..1e423cf5c 100644 --- a/gui/brushiconeditor.py +++ b/gui/brushiconeditor.py @@ -12,8 +12,8 @@ import logging from gettext import gettext as _ -from gi.repository import Gtk -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import GLib from . import tileddrawwidget from . import windowing diff --git a/gui/brushmanager.py b/gui/brushmanager.py index dd75235d0..cb8584a0f 100644 --- a/gui/brushmanager.py +++ b/gui/brushmanager.py @@ -28,8 +28,8 @@ from lib.gettext import C_ from lib.helpers import utf8 -from gi.repository import Gtk -from gi.repository import GdkPixbuf +from lib.gibindings import Gtk +from lib.gibindings import GdkPixbuf from . import dialogs from lib.brush import BrushInfo diff --git a/gui/brushselectionwindow.py b/gui/brushselectionwindow.py index d1f7d08f3..6c0a687f9 100644 --- a/gui/brushselectionwindow.py +++ b/gui/brushselectionwindow.py @@ -20,9 +20,9 @@ from __future__ import division, print_function import logging -from gi.repository import Gtk -from gi.repository import GdkPixbuf -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import GdkPixbuf +from lib.gibindings import GLib from lib.gettext import C_ from lib.gettext import ngettext diff --git a/gui/builderhacks.py b/gui/builderhacks.py index 28f11c87f..96cb17209 100755 --- a/gui/builderhacks.py +++ b/gui/builderhacks.py @@ -13,7 +13,7 @@ ## Imports from __future__ import division, print_function -from gi.repository import Gtk +from lib.gibindings import Gtk import lib.xml diff --git a/gui/buttonmap.py b/gui/buttonmap.py index 75fc26058..5af54e66e 100644 --- a/gui/buttonmap.py +++ b/gui/buttonmap.py @@ -12,10 +12,10 @@ from gettext import gettext as _ import logging -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GObject -from gi.repository import Pango +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GObject +from lib.gibindings import Pango import lib.xml from . import widgets diff --git a/gui/colors/adjbases.py b/gui/colors/adjbases.py index 27b3a08b2..1b5b726c1 100644 --- a/gui/colors/adjbases.py +++ b/gui/colors/adjbases.py @@ -20,10 +20,10 @@ import logging from gettext import gettext as _ -from gi.repository import GObject -from gi.repository import Gdk -from gi.repository import Gtk -from gi.repository import GdkPixbuf +from lib.gibindings import GObject +from lib.gibindings import Gdk +from lib.gibindings import Gtk +from lib.gibindings import GdkPixbuf import cairo from .util import clamp diff --git a/gui/colors/bases.py b/gui/colors/bases.py index ba063b127..3bc795d39 100644 --- a/gui/colors/bases.py +++ b/gui/colors/bases.py @@ -14,8 +14,8 @@ import logging logger = logging.getLogger(__name__) -from gi.repository import Gtk -from gi.repository import Gdk +from lib.gibindings import Gtk +from lib.gibindings import Gdk import cairo diff --git a/gui/colors/changers.py b/gui/colors/changers.py index ab62fd024..e1f83e989 100644 --- a/gui/colors/changers.py +++ b/gui/colors/changers.py @@ -13,8 +13,8 @@ ## Imports from __future__ import division, print_function -from gi.repository import GdkPixbuf -from gi.repository import Gdk +from lib.gibindings import GdkPixbuf +from lib.gibindings import Gdk import lib.color import gui.colors @@ -123,7 +123,7 @@ class Rings (_CColorChanger): if __name__ == '__main__': - from gi.repository import Gtk + from lib.gibindings import Gtk import os import sys mgr = gui.colors.ColorManager(prefs={}, datapath='.') diff --git a/gui/colors/hcywheel.py b/gui/colors/hcywheel.py index 14fde9ebf..1aaed1fa5 100644 --- a/gui/colors/hcywheel.py +++ b/gui/colors/hcywheel.py @@ -18,8 +18,8 @@ import re import os.path -from gi.repository import Gtk -from gi.repository import Gdk +from lib.gibindings import Gtk +from lib.gibindings import Gdk import cairo from .adjbases import ColorManager diff --git a/gui/colors/hsvcube.py b/gui/colors/hsvcube.py index a84cb0bb7..b4ce4c1cf 100644 --- a/gui/colors/hsvcube.py +++ b/gui/colors/hsvcube.py @@ -16,7 +16,7 @@ from gettext import gettext as _ import cairo -from gi.repository import Gtk +from lib.gibindings import Gtk from .util import clamp from .util import draw_marker_circle diff --git a/gui/colors/hsvsquare.py b/gui/colors/hsvsquare.py index 19cf6c53a..a13c77777 100644 --- a/gui/colors/hsvsquare.py +++ b/gui/colors/hsvsquare.py @@ -15,7 +15,7 @@ import math from gettext import gettext as _ -from gi.repository import Gtk +from lib.gibindings import Gtk import cairo from .util import clamp diff --git a/gui/colors/hsvwheel.py b/gui/colors/hsvwheel.py index e16fb22f3..ef247e26e 100644 --- a/gui/colors/hsvwheel.py +++ b/gui/colors/hsvwheel.py @@ -14,8 +14,8 @@ from gettext import gettext as _ -from gi.repository import Gtk -from gi.repository import Gdk +from lib.gibindings import Gtk +from lib.gibindings import Gdk from .adjbases import HueSaturationWheelAdjuster from .sliders import HSVValueSlider diff --git a/gui/colors/paletteview.py b/gui/colors/paletteview.py index 1da21b5c7..b1efbd9f9 100644 --- a/gui/colors/paletteview.py +++ b/gui/colors/paletteview.py @@ -24,9 +24,9 @@ import logging from io import open -from gi.repository import Gdk -from gi.repository import Gtk -from gi.repository import GLib +from lib.gibindings import Gdk +from lib.gibindings import Gtk +from lib.gibindings import GLib import cairo from lib.gettext import C_ diff --git a/gui/colors/sliders.py b/gui/colors/sliders.py index 0bbe39eb9..9c65c2111 100644 --- a/gui/colors/sliders.py +++ b/gui/colors/sliders.py @@ -12,7 +12,7 @@ from __future__ import division, print_function -from gi.repository import Gtk +from lib.gibindings import Gtk from lib.color import RGBColor from lib.color import HSVColor diff --git a/gui/colors/uimisc.py b/gui/colors/uimisc.py index 92ea0803c..69b10640d 100644 --- a/gui/colors/uimisc.py +++ b/gui/colors/uimisc.py @@ -12,7 +12,7 @@ from __future__ import division, print_function -from gi.repository import Gtk +from lib.gibindings import Gtk ## Layout constants ## diff --git a/gui/colortools.py b/gui/colortools.py index bb41925ab..ac9cf9293 100644 --- a/gui/colortools.py +++ b/gui/colortools.py @@ -11,7 +11,7 @@ from __future__ import division, print_function -from gi.repository import Gtk +from lib.gibindings import Gtk from lib.gettext import C_ diff --git a/gui/compatibility.py b/gui/compatibility.py index 98b12b79c..fc1f1be64 100644 --- a/gui/compatibility.py +++ b/gui/compatibility.py @@ -9,7 +9,7 @@ from logging import getLogger -from gi.repository import Gtk +from lib.gibindings import Gtk from . import compatconfig as config diff --git a/gui/cursor.py b/gui/cursor.py index 4bb080da9..990f8be7d 100644 --- a/gui/cursor.py +++ b/gui/cursor.py @@ -15,9 +15,9 @@ import gui.drawutils from lib.pycompat import xrange -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GdkPixbuf +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GdkPixbuf logger = logging.getLogger(__name__) diff --git a/gui/curve.py b/gui/curve.py index a8122ba5b..6a7682932 100644 --- a/gui/curve.py +++ b/gui/curve.py @@ -13,7 +13,7 @@ import logging from math import pi -from gi.repository import Gtk, Gdk +from lib.gibindings import Gtk, Gdk from lib.helpers import clamp diff --git a/gui/device.py b/gui/device.py index 97a95ce28..97b0fe15c 100644 --- a/gui/device.py +++ b/gui/device.py @@ -18,9 +18,9 @@ import re from lib.gettext import C_ -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import Pango +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import Pango from lib.observable import event import gui.application diff --git a/gui/dialogs.py b/gui/dialogs.py index d1f05ad46..b4371c81d 100644 --- a/gui/dialogs.py +++ b/gui/dialogs.py @@ -13,9 +13,9 @@ ## Imports from __future__ import division, print_function -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GdkPixbuf +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GdkPixbuf from gettext import gettext as _ from fnmatch import fnmatch diff --git a/gui/document.py b/gui/document.py index afbf20662..22b646120 100644 --- a/gui/document.py +++ b/gui/document.py @@ -25,9 +25,9 @@ import weakref import logging -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib import lib.document import lib.layer diff --git a/gui/drawutils.py b/gui/drawutils.py index 8f9745c22..b81fd1608 100644 --- a/gui/drawutils.py +++ b/gui/drawutils.py @@ -28,9 +28,9 @@ import numpy import cairo -from gi.repository import GdkPixbuf -from gi.repository import Gdk -from gi.repository import Gtk +from lib.gibindings import GdkPixbuf +from lib.gibindings import Gdk +from lib.gibindings import Gtk logger = logging.getLogger(__name__) diff --git a/gui/drawwindow.py b/gui/drawwindow.py index ed8e71484..5eb84ef2f 100644 --- a/gui/drawwindow.py +++ b/gui/drawwindow.py @@ -26,8 +26,8 @@ import math import xml.etree.ElementTree as ET -from gi.repository import Gtk -from gi.repository import Gdk +from lib.gibindings import Gtk +from lib.gibindings import Gdk from . import compatibility from . import historypopup diff --git a/gui/externalapp.py b/gui/externalapp.py index a493f0902..2bc37dea9 100644 --- a/gui/externalapp.py +++ b/gui/externalapp.py @@ -24,9 +24,9 @@ from lib.gettext import C_ from lib.layer.core import LayerBase # noqa -from gi.repository import Gio -from gi.repository import Pango -from gi.repository import Gtk +from lib.gibindings import Gio +from lib.gibindings import Pango +from lib.gibindings import Gtk import lib.xml diff --git a/gui/factoryaction.py b/gui/factoryaction.py index 0be81ddca..d22a80358 100644 --- a/gui/factoryaction.py +++ b/gui/factoryaction.py @@ -14,8 +14,8 @@ from warnings import warn import gi -from gi.repository import Gtk -from gi.repository import GObject +from lib.gibindings import Gtk +from lib.gibindings import GObject class FactoryAction (Gtk.Action): diff --git a/gui/filehandling.py b/gui/filehandling.py index f19fbf1ef..9eecb2d15 100644 --- a/gui/filehandling.py +++ b/gui/filehandling.py @@ -23,8 +23,8 @@ from collections import OrderedDict import time -from gi.repository import Gtk -from gi.repository import Pango +from lib.gibindings import Gtk +from lib.gibindings import Pango from lib import helpers from lib import fileutils diff --git a/gui/fill.py b/gui/fill.py index 28c4ffcc7..37420e937 100644 --- a/gui/fill.py +++ b/gui/fill.py @@ -13,9 +13,9 @@ from __future__ import division, print_function import weakref -from gi.repository import Gtk -from gi.repository import Pango -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Pango +from lib.gibindings import GLib from gettext import gettext as _ from lib.gettext import C_ diff --git a/gui/footer.py b/gui/footer.py index 2b67ed9d8..ab90e19b5 100644 --- a/gui/footer.py +++ b/gui/footer.py @@ -17,8 +17,8 @@ import cairo -from gi.repository import Gdk -from gi.repository import GdkPixbuf +from lib.gibindings import Gdk +from lib.gibindings import GdkPixbuf import gui.brushmanager from gui.quickchoice import BrushChooserPopup # noqa diff --git a/gui/framewindow.py b/gui/framewindow.py index c353d12f8..979d70392 100644 --- a/gui/framewindow.py +++ b/gui/framewindow.py @@ -14,8 +14,8 @@ import math import functools -from gi.repository import Gtk -from gi.repository import Gdk +from lib.gibindings import Gtk +from lib.gibindings import Gdk from gettext import gettext as _ import cairo diff --git a/gui/freehand.py b/gui/freehand.py index 7d929258b..014cfdcf8 100644 --- a/gui/freehand.py +++ b/gui/freehand.py @@ -16,9 +16,9 @@ from collections import deque from gettext import gettext as _ -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib import numpy as np from gui.tileddrawwidget import TiledDrawWidget diff --git a/gui/gtkexcepthook.py b/gui/gtkexcepthook.py index 0893e7e83..153bdde52 100644 --- a/gui/gtkexcepthook.py +++ b/gui/gtkexcepthook.py @@ -28,9 +28,9 @@ from gettext import gettext as _ import textwrap -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import Pango +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import Pango import lib.meta diff --git a/gui/history.py b/gui/history.py index 9fec3cc6d..d31231b8e 100644 --- a/gui/history.py +++ b/gui/history.py @@ -14,9 +14,9 @@ from __future__ import division, print_function -from gi.repository import Gtk -from gi.repository import GLib -from gi.repository import GdkPixbuf +from lib.gibindings import Gtk +from lib.gibindings import GLib +from lib.gibindings import GdkPixbuf from lib.color import RGBColor from .colors import ColorAdjuster diff --git a/gui/historypopup.py b/gui/historypopup.py index 37deee85d..1764f61b9 100644 --- a/gui/historypopup.py +++ b/gui/historypopup.py @@ -9,8 +9,8 @@ from __future__ import division, print_function -from gi.repository import Gtk -from gi.repository import Gdk +from lib.gibindings import Gtk +from lib.gibindings import Gdk import cairo from . import windowing diff --git a/gui/inktool.py b/gui/inktool.py index f8414a09b..bbe5d7347 100644 --- a/gui/inktool.py +++ b/gui/inktool.py @@ -17,8 +17,8 @@ from logging import getLogger from gettext import gettext as _ -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gdk +from lib.gibindings import GLib import numpy as np import gui.mode diff --git a/gui/inputtestwindow.py b/gui/inputtestwindow.py index e4a1100d3..41bbd1720 100644 --- a/gui/inputtestwindow.py +++ b/gui/inputtestwindow.py @@ -11,10 +11,10 @@ import logging from gettext import gettext as _ -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib -from gi.repository import Pango +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib +from lib.gibindings import Pango from . import windowing diff --git a/gui/keyboard.py b/gui/keyboard.py index bb52f65ee..7a1d6017b 100644 --- a/gui/keyboard.py +++ b/gui/keyboard.py @@ -18,8 +18,8 @@ from __future__ import division, print_function import logging -from gi.repository import Gtk -from gi.repository import Gdk +from lib.gibindings import Gtk +from lib.gibindings import Gdk import gui.document import gui.tileddrawwidget diff --git a/gui/layermanip.py b/gui/layermanip.py index 136362635..3667d9e9a 100644 --- a/gui/layermanip.py +++ b/gui/layermanip.py @@ -13,8 +13,8 @@ from gettext import gettext as _ -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gdk +from lib.gibindings import GLib import gui.mode import lib.command diff --git a/gui/layermodes.py b/gui/layermodes.py index 75e48af57..cd92fbbad 100644 --- a/gui/layermodes.py +++ b/gui/layermodes.py @@ -13,7 +13,7 @@ from __future__ import division, print_function -from gi.repository import Gtk +from lib.gibindings import Gtk from lib.modes import STACK_MODES from lib.modes import STANDARD_MODES diff --git a/gui/layerprops.py b/gui/layerprops.py index 1fba938bd..17b1df519 100644 --- a/gui/layerprops.py +++ b/gui/layerprops.py @@ -26,9 +26,9 @@ import gui.mvp import cairo -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GdkPixbuf +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GdkPixbuf # Module constants: diff --git a/gui/layers.py b/gui/layers.py index ce3fe9a3a..cd6e80650 100644 --- a/gui/layers.py +++ b/gui/layers.py @@ -25,12 +25,12 @@ import gui.drawutils from lib.pycompat import unicode -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GObject -from gi.repository import GLib -from gi.repository import Pango -from gi.repository import GdkPixbuf +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GObject +from lib.gibindings import GLib +from lib.gibindings import Pango +from lib.gibindings import GdkPixbuf import sys import logging diff --git a/gui/layerswindow.py b/gui/layerswindow.py index 4757d6d3b..59d944ea6 100644 --- a/gui/layerswindow.py +++ b/gui/layerswindow.py @@ -19,8 +19,8 @@ import os.path from logging import getLogger -from gi.repository import Gtk -from gi.repository import GObject +from lib.gibindings import Gtk +from lib.gibindings import GObject import lib.layer import lib.xml diff --git a/gui/layervis.py b/gui/layervis.py index 3d750a726..80c24052d 100644 --- a/gui/layervis.py +++ b/gui/layervis.py @@ -21,7 +21,7 @@ from lib.gettext import C_ from lib.xml import escape -from gi.repository import Gtk +from lib.gibindings import Gtk # Module vars: diff --git a/gui/linemode.py b/gui/linemode.py index 3a01660d5..d227c9ce7 100644 --- a/gui/linemode.py +++ b/gui/linemode.py @@ -22,9 +22,9 @@ import logging from gettext import gettext as _ -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib from .curve import CurveWidget import gui.mode diff --git a/gui/main.py b/gui/main.py index 542d5d125..d12e17f3e 100644 --- a/gui/main.py +++ b/gui/main.py @@ -18,7 +18,7 @@ import logging import warnings -from gi.repository import GdkPixbuf +from lib.gibindings import GdkPixbuf from optparse import OptionParser import lib.config @@ -202,13 +202,15 @@ def run(): # Gtk must not be imported before init_gettext # has been run - else locales will not be set # up properly (e.g: left-to-right interfaces for right-to-left scripts) - from gi.repository import Gtk + # Note that this is not the first import of Gtk in the __program__; + # it is imported indirectly via the import of gui.application + from lib.gibindings import Gtk settings = Gtk.Settings.get_default() dark = app.preferences.get("ui.dark_theme_variant", True) settings.set_property("gtk-application-prefer-dark-theme", dark) if debug and options.run_and_quit: - from gi.repository import GLib + from lib.gibindings import GLib GLib.timeout_add(1000, lambda *a: Gtk.main_quit()) else: from gui import gtkexcepthook diff --git a/gui/meta.py b/gui/meta.py index 641988b1c..f5b4a3265 100644 --- a/gui/meta.py +++ b/gui/meta.py @@ -22,9 +22,9 @@ import os import platform -from gi.repository import Gtk -from gi.repository import GdkPixbuf -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import GdkPixbuf +from lib.gibindings import GLib import cairo from lib.gettext import C_ diff --git a/gui/mode.py b/gui/mode.py index d2569a41a..ddc46f6f9 100644 --- a/gui/mode.py +++ b/gui/mode.py @@ -15,9 +15,9 @@ import math from gettext import gettext as _ -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib import lib.command from lib.document import Document diff --git a/gui/mvp.py b/gui/mvp.py index 9c7ba61a8..9048ee560 100644 --- a/gui/mvp.py +++ b/gui/mvp.py @@ -17,7 +17,7 @@ import functools import logging -from gi.repository import Gtk +from lib.gibindings import Gtk logger = logging.getLogger(__name__) diff --git a/gui/objfactory.py b/gui/objfactory.py index 44c3b67f3..b7972c1fa 100644 --- a/gui/objfactory.py +++ b/gui/objfactory.py @@ -14,7 +14,7 @@ import logging from warnings import warn -from gi.repository import GObject +from lib.gibindings import GObject from lib.observable import event @@ -29,7 +29,7 @@ class ConstructError (Exception): Raised when an object cannot be looked up by GType name: >>> import gi - >>> from gi.repository import Gtk + >>> from lib.gibindings import Gtk >>> make_widget = ObjFactory(gtype=Gtk.Entry) >>> make_widget("NonExist12345") # doctest: +IGNORE_EXCEPTION_DETAIL Traceback (most recent call last): @@ -56,7 +56,7 @@ class ObjFactory (object): containing any construction parameters needed. >>> import gi - >>> from gi.repository import Gtk + >>> from lib.gibindings import Gtk >>> make_widget = ObjFactory(gtype=Gtk.Widget) >>> w1 = make_widget.get("GtkLabel", "Hello, World",) >>> w1 is not None diff --git a/gui/optionspanel.py b/gui/optionspanel.py index b6bee1910..06a1b5eb2 100644 --- a/gui/optionspanel.py +++ b/gui/optionspanel.py @@ -17,7 +17,7 @@ import lib.xml from lib.gettext import C_ -from gi.repository import Gtk +from lib.gibindings import Gtk logger = logging.getLogger(__name__) diff --git a/gui/overlays.py b/gui/overlays.py index e2b908fe4..a9bfe2d09 100644 --- a/gui/overlays.py +++ b/gui/overlays.py @@ -15,9 +15,9 @@ from math import pi from gettext import gettext as _ -from gi.repository import Pango -from gi.repository import PangoCairo -from gi.repository import GLib +from lib.gibindings import Pango +from lib.gibindings import PangoCairo +from lib.gibindings import GLib import cairo from lib.helpers import clamp diff --git a/gui/picker.py b/gui/picker.py index 06706c488..341d3dd81 100644 --- a/gui/picker.py +++ b/gui/picker.py @@ -23,9 +23,9 @@ from lib.gettext import C_ import gui.cursor -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib import abc import logging diff --git a/gui/pixbuflist.py b/gui/pixbuflist.py index 9fb7e6f02..7c2bcea53 100644 --- a/gui/pixbuflist.py +++ b/gui/pixbuflist.py @@ -12,10 +12,10 @@ from math import ceil import logging -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GdkPixbuf -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GdkPixbuf +from lib.gibindings import GLib from lib import helpers from lib.observable import event diff --git a/gui/preferenceswindow.py b/gui/preferenceswindow.py index ccdcd3713..de02edd76 100644 --- a/gui/preferenceswindow.py +++ b/gui/preferenceswindow.py @@ -15,7 +15,7 @@ from logging import getLogger from gettext import gettext as _ -from gi.repository import Gtk +from lib.gibindings import Gtk from gui.compatibility import CompatibilityPreferences import lib.config diff --git a/gui/previewwindow.py b/gui/previewwindow.py index 6061f8d23..7cf9a134a 100644 --- a/gui/previewwindow.py +++ b/gui/previewwindow.py @@ -15,9 +15,9 @@ from gettext import gettext as _ -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib import cairo import gui.mode diff --git a/gui/profiling.py b/gui/profiling.py index c6b03c4f6..080b34deb 100644 --- a/gui/profiling.py +++ b/gui/profiling.py @@ -18,8 +18,8 @@ import shutil import logging -from gi.repository import GLib -from gi.repository import Gtk +from lib.gibindings import GLib +from lib.gibindings import Gtk import lib.fileutils diff --git a/gui/quickchoice.py b/gui/quickchoice.py index 2e60f2d77..bd9e24da2 100644 --- a/gui/quickchoice.py +++ b/gui/quickchoice.py @@ -13,7 +13,7 @@ from __future__ import division, print_function import abc -from gi.repository import Gtk +from lib.gibindings import Gtk from .pixbuflist import PixbufList from . import brushmanager diff --git a/gui/scratchwindow.py b/gui/scratchwindow.py index 972a79b3b..80b4e00f2 100644 --- a/gui/scratchwindow.py +++ b/gui/scratchwindow.py @@ -18,7 +18,7 @@ from .toolstack import SizedVBoxToolWidget, TOOL_WIDGET_NATURAL_HEIGHT_SHORT from .widgets import inline_toolbar -from gi.repository import Gtk +from lib.gibindings import Gtk logger = logging.getLogger(__name__) diff --git a/gui/spinbox.py b/gui/spinbox.py index c76508af9..8d91d93ad 100644 --- a/gui/spinbox.py +++ b/gui/spinbox.py @@ -10,7 +10,7 @@ from gettext import gettext as _ -from gi.repository import Gtk +from lib.gibindings import Gtk from .widgets import borderless_button diff --git a/gui/stategroup.py b/gui/stategroup.py index cc41badc8..09aa6a632 100644 --- a/gui/stategroup.py +++ b/gui/stategroup.py @@ -12,9 +12,9 @@ import logging logger = logging.getLogger(__name__) -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib class StateGroup (object): diff --git a/gui/symmetry.py b/gui/symmetry.py index 2467cd00c..b767b17fa 100644 --- a/gui/symmetry.py +++ b/gui/symmetry.py @@ -27,8 +27,8 @@ import gui.drawutils from lib.gettext import C_ -from gi.repository import Gdk -from gi.repository import Gtk +from lib.gibindings import Gdk +from lib.gibindings import Gtk ## Module settings diff --git a/gui/tileddrawwidget.py b/gui/tileddrawwidget.py index b429f6afe..59fdfea68 100644 --- a/gui/tileddrawwidget.py +++ b/gui/tileddrawwidget.py @@ -18,9 +18,9 @@ import contextlib import logging -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib import cairo import numpy as np diff --git a/gui/toolbar.py b/gui/toolbar.py index d2a224e51..fbcb8eadf 100644 --- a/gui/toolbar.py +++ b/gui/toolbar.py @@ -15,7 +15,7 @@ import os from gettext import gettext as _ -from gi.repository import Gtk +from lib.gibindings import Gtk from . import widgets diff --git a/gui/toolstack.py b/gui/toolstack.py index 03b443ff1..3e5378bd6 100644 --- a/gui/toolstack.py +++ b/gui/toolstack.py @@ -13,10 +13,10 @@ import logging import weakref -from gi.repository import GObject -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import GObject +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib from gui.windowing import set_initial_window_position diff --git a/gui/topbar.py b/gui/topbar.py index 31a28409d..a0e9b3ce1 100644 --- a/gui/topbar.py +++ b/gui/topbar.py @@ -13,9 +13,9 @@ from __future__ import division, print_function import logging -from gi.repository import GObject -from gi.repository import Gtk -from gi.repository import Gdk +from lib.gibindings import GObject +from lib.gibindings import Gtk +from lib.gibindings import Gdk from gettext import gettext as _ logger = logging.getLogger(__name__) diff --git a/gui/uicolor.py b/gui/uicolor.py index c478cd3ae..791267279 100644 --- a/gui/uicolor.py +++ b/gui/uicolor.py @@ -20,7 +20,7 @@ import struct -from gi.repository import Gdk +from lib.gibindings import Gdk from lib.color import RGBColor from lib.helpers import clamp diff --git a/gui/userconfig.py b/gui/userconfig.py index c0b0db354..582d7f133 100644 --- a/gui/userconfig.py +++ b/gui/userconfig.py @@ -13,7 +13,7 @@ import json import logging -from gi.repository import GLib +from lib.gibindings import GLib import lib.glib from lib.eotf import DEFAULT_EOTF diff --git a/gui/widgets.py b/gui/widgets.py index e19506db9..77b98f93b 100644 --- a/gui/widgets.py +++ b/gui/widgets.py @@ -11,8 +11,8 @@ from __future__ import division, print_function import functools -from gi.repository import Gtk -from gi.repository import Gdk +from lib.gibindings import Gtk +from lib.gibindings import Gdk # Exact icon sizes diff --git a/gui/windowing.py b/gui/windowing.py index 37b718a50..0c6977b98 100644 --- a/gui/windowing.py +++ b/gui/windowing.py @@ -14,9 +14,9 @@ from __future__ import division, print_function import logging -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib from lib.helpers import clamp, Rect from lib.pycompat import xrange diff --git a/gui/workspace.py b/gui/workspace.py index 3def13045..f65b33f0a 100644 --- a/gui/workspace.py +++ b/gui/workspace.py @@ -14,10 +14,10 @@ from warnings import warn import logging -from gi.repository import GObject -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from lib.gibindings import GObject +from lib.gibindings import Gtk +from lib.gibindings import Gdk +from lib.gibindings import GLib from gui.toolstack import ToolStack, ToolStackWindow from gui.windowing import set_initial_window_position diff --git a/lib/color.py b/lib/color.py index f0b88d62e..ba0a3f425 100644 --- a/lib/color.py +++ b/lib/color.py @@ -25,7 +25,7 @@ import re import colorsys -from gi.repository import GdkPixbuf +from lib.gibindings import GdkPixbuf from lib.pycompat import xrange from lib.pycompat import PY3 diff --git a/lib/document.py b/lib/document.py index b29da4192..cce4c7eb9 100644 --- a/lib/document.py +++ b/lib/document.py @@ -28,8 +28,8 @@ from lib.fileutils import safename from lib.naming import make_unique_name -from gi.repository import GObject -from gi.repository import GLib +from lib.gibindings import GObject +from lib.gibindings import GLib import lib.meta import lib.helpers as helpers @@ -2030,7 +2030,7 @@ def _save_layers_to_new_orazip(root_stack, filename, bbox=None, :rtype: GdkPixbuf :returns: Thumbnail preview image (256x256 max) of what was saved - >>> from gi.repository import GdkPixbuf + >>> from lib.gibindings import GdkPixbuf >>> from lib.layer.test import make_test_stack >>> root, leaves = make_test_stack() >>> import tempfile diff --git a/lib/fileutils.py b/lib/fileutils.py index 6ed298afe..0ddba9ffa 100644 --- a/lib/fileutils.py +++ b/lib/fileutils.py @@ -25,8 +25,8 @@ import lib.helpers from lib.pycompat import unicode -from gi.repository import GLib -from gi.repository import Gio +from lib.gibindings import GLib +from lib.gibindings import Gio logger = logging.getLogger(__name__) diff --git a/lib/floodfill.py b/lib/floodfill.py index 2940935c2..c929ad0b0 100644 --- a/lib/floodfill.py +++ b/lib/floodfill.py @@ -13,7 +13,7 @@ import numpy as np import threading -from gi.repository import GLib +from lib.gibindings import GLib import lib.helpers import lib.mypaintlib as myplib diff --git a/lib/gettext.py b/lib/gettext.py index 0f7941518..dca275587 100644 --- a/lib/gettext.py +++ b/lib/gettext.py @@ -27,7 +27,7 @@ from __future__ import absolute_import, division, print_function from warnings import warn -from gi.repository import GLib +from lib.gibindings import GLib # Set the default encoding like PyGTK from lib.pycompat import PY3 diff --git a/lib/glib.py b/lib/glib.py index c77a1a08a..ef5d75b88 100644 --- a/lib/glib.py +++ b/lib/glib.py @@ -26,7 +26,7 @@ from lib.pycompat import PY3 from lib.pycompat import unicode -from gi.repository import GLib +from lib.gibindings import GLib logger = logging.getLogger(__name__) diff --git a/lib/helpers.py b/lib/helpers.py index 7c2329632..95aaebdf6 100644 --- a/lib/helpers.py +++ b/lib/helpers.py @@ -19,7 +19,7 @@ import logging import sys -from gi.repository import GdkPixbuf +from lib.gibindings import GdkPixbuf from lib.gettext import C_ from . import mypaintlib diff --git a/lib/idletask.py b/lib/idletask.py index dad4559c4..e3ba2e28e 100644 --- a/lib/idletask.py +++ b/lib/idletask.py @@ -14,7 +14,7 @@ import collections -from gi.repository import GLib +from lib.gibindings import GLib class Processor (object): diff --git a/lib/layer/tree.py b/lib/layer/tree.py index cb5d9a9b8..8f94349ba 100644 --- a/lib/layer/tree.py +++ b/lib/layer/tree.py @@ -23,8 +23,8 @@ from warnings import warn import contextlib -from gi.repository import GdkPixbuf -from gi.repository import GLib +from lib.gibindings import GdkPixbuf +from lib.gibindings import GLib import numpy as np from lib.eotf import eotf diff --git a/lib/pixbuf.py b/lib/pixbuf.py index 98bb564a9..dd07c3464 100644 --- a/lib/pixbuf.py +++ b/lib/pixbuf.py @@ -22,7 +22,7 @@ from __future__ import division, print_function -from gi.repository import GdkPixbuf +from lib.gibindings import GdkPixbuf import lib.fileutils import lib.feedback diff --git a/lib/pixbufsurface.py b/lib/pixbufsurface.py index 170055948..ff3997c3a 100644 --- a/lib/pixbufsurface.py +++ b/lib/pixbufsurface.py @@ -14,8 +14,8 @@ import contextlib from logging import getLogger -from gi.repository import GdkPixbuf -from gi.repository import Gdk +from lib.gibindings import GdkPixbuf +from lib.gibindings import Gdk import cairo from . import mypaintlib diff --git a/tests/rendering.py b/tests/rendering.py index 010c996e6..2f8f3ef11 100755 --- a/tests/rendering.py +++ b/tests/rendering.py @@ -291,7 +291,7 @@ def setUpClass(cls): cls._tdw = None cls._model = None - from gi.repository import Gdk + from lib.gibindings import Gdk if Gdk.Display.get_default() is None: return diff --git a/tests/unported/guicontrol.py b/tests/unported/guicontrol.py index acd0d2279..017a75d87 100644 --- a/tests/unported/guicontrol.py +++ b/tests/unported/guicontrol.py @@ -10,8 +10,8 @@ import gi try: gi.require_version("Gtk", "3.0") - from gi.repository import Gtk - from gi.repository import GObject + from lib.gibindings import Gtk + from lib.gibindings import GObject except: raise