From e5d2657bb9b44e118603023b656744ae73b25789 Mon Sep 17 00:00:00 2001 From: GeoffreyCoulaud Date: Sun, 21 May 2023 18:15:04 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20More=20rebase=20conflicts=20reso?= =?UTF-8?q?lved?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/details_window.py | 2 +- src/game.py | 4 ++-- src/importers/bottles_importer.py | 2 +- src/importers/heroic_importer.py | 2 +- src/importers/itch_importer.py | 2 +- src/importers/lutris_importer.py | 2 +- src/importers/steam_importer.py | 2 +- src/main.py | 2 +- src/preferences.py | 2 +- src/utils/importer.py | 2 +- src/utils/save_cover.py | 2 +- src/utils/steamgriddb.py | 2 +- src/window.py | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/details_window.py b/src/details_window.py index c1ec7c3..bfa89fc 100644 --- a/src/details_window.py +++ b/src/details_window.py @@ -25,7 +25,7 @@ from gi.repository import Adw, Gio, GLib, Gtk from PIL import Image # TODO use SGDBHelper -import src.shared +import src.shared as shared from src.game import Game from src.game_cover import GameCover from src.utils.create_dialog import create_dialog diff --git a/src/game.py b/src/game.py index b3ef0c7..d46dd05 100644 --- a/src/game.py +++ b/src/game.py @@ -26,7 +26,7 @@ from time import time from gi.repository import Adw, Gio, Gtk -import src.shared +import src.shared as shared from src.game_cover import GameCover @@ -60,7 +60,7 @@ class Game(Gtk.Box): blacklisted = None game_cover = None - def __init__(self, win, data, allow_side_effects=True, **kwargs): + def __init__(self, data, allow_side_effects=True, **kwargs): super().__init__(**kwargs) self.win = shared.win diff --git a/src/importers/bottles_importer.py b/src/importers/bottles_importer.py index 2af8a84..260543a 100644 --- a/src/importers/bottles_importer.py +++ b/src/importers/bottles_importer.py @@ -22,7 +22,7 @@ from time import time import yaml -import src.shared +import src.shared as shared from src.utils.check_install import check_install diff --git a/src/importers/heroic_importer.py b/src/importers/heroic_importer.py index 77359e4..a2c9412 100644 --- a/src/importers/heroic_importer.py +++ b/src/importers/heroic_importer.py @@ -23,7 +23,7 @@ from hashlib import sha256 from pathlib import Path from time import time -import src.shared +import src.shared as shared from src.utils.check_install import check_install diff --git a/src/importers/itch_importer.py b/src/importers/itch_importer.py index 4b89f6b..ee68384 100644 --- a/src/importers/itch_importer.py +++ b/src/importers/itch_importer.py @@ -26,7 +26,7 @@ from time import time import requests from gi.repository import GdkPixbuf, Gio -import src.shared +import src.shared as shared from src.utils.check_install import check_install from src.utils.save_cover import resize_cover diff --git a/src/importers/lutris_importer.py b/src/importers/lutris_importer.py index d9032c3..62d352a 100644 --- a/src/importers/lutris_importer.py +++ b/src/importers/lutris_importer.py @@ -22,7 +22,7 @@ from shutil import copyfile from sqlite3 import connect from time import time -import src.shared +import src.shared as shared from src.utils.check_install import check_install diff --git a/src/importers/steam_importer.py b/src/importers/steam_importer.py index e0984b5..4a6bc34 100644 --- a/src/importers/steam_importer.py +++ b/src/importers/steam_importer.py @@ -25,7 +25,7 @@ from time import time import requests from gi.repository import Gio -import src.shared +import src.shared as shared from src.utils.check_install import check_install diff --git a/src/main.py b/src/main.py index 54e7445..05e4c4e 100644 --- a/src/main.py +++ b/src/main.py @@ -29,7 +29,7 @@ gi.require_version("Adw", "1") # pylint: disable=wrong-import-position from gi.repository import Adw, Gio, GLib, Gtk -import src.shared +import src.shared as shared from src.details_window import DetailsWindow from src.importer.importer import Importer from src.importer.sources.lutris_source import ( diff --git a/src/preferences.py b/src/preferences.py index 81302db..9df90b5 100644 --- a/src/preferences.py +++ b/src/preferences.py @@ -24,7 +24,7 @@ from pathlib import Path from gi.repository import Adw, Gio, GLib, Gtk # pylint: disable=unused-import -import src.shared +import src.shared as shared # TODO use the new sources from src.importers.bottles_importer import bottles_installed diff --git a/src/utils/importer.py b/src/utils/importer.py index ad18cc0..9929757 100644 --- a/src/utils/importer.py +++ b/src/utils/importer.py @@ -19,7 +19,7 @@ from gi.repository import Adw, GLib, Gtk -import src.shared +import src.shared as shared from .create_dialog import create_dialog from .game import Game from .save_cover import resize_cover, save_cover diff --git a/src/utils/save_cover.py b/src/utils/save_cover.py index ed5a14f..5a2cef5 100644 --- a/src/utils/save_cover.py +++ b/src/utils/save_cover.py @@ -24,7 +24,7 @@ from shutil import copyfile from gi.repository import Gio from PIL import Image, ImageSequence -import src.shared +import src.shared as shared def resize_cover(cover_path=None, pixbuf=None): diff --git a/src/utils/steamgriddb.py b/src/utils/steamgriddb.py index c2e36ee..abf268c 100644 --- a/src/utils/steamgriddb.py +++ b/src/utils/steamgriddb.py @@ -5,7 +5,7 @@ import requests from gi.repository import Gio from requests import HTTPError -import src.shared +import src.shared as shared from src.utils.create_dialog import create_dialog from src.utils.save_cover import resize_cover, save_cover diff --git a/src/window.py b/src/window.py index 843a6fe..b97914e 100644 --- a/src/window.py +++ b/src/window.py @@ -22,7 +22,7 @@ from datetime import datetime from gi.repository import Adw, Gio, GLib, Gtk -import src.shared +import src.shared as shared from src.game import Game