From 42f832c1c5cea948ee380bf79fb57c40230561d1 Mon Sep 17 00:00:00 2001 From: trigg Date: Sat, 3 Oct 2020 13:01:01 +0100 Subject: [PATCH] - Clean imports --- discover_overlay/discord_connector.py | 1 + discover_overlay/discover_overlay.py | 15 +-------------- discover_overlay/draggable_window.py | 5 +---- discover_overlay/image_getter.py | 3 +-- discover_overlay/overlay.py | 5 +---- discover_overlay/settings.py | 5 +---- discover_overlay/text_overlay.py | 7 +------ discover_overlay/text_settings.py | 5 +---- discover_overlay/voice_overlay.py | 5 +---- discover_overlay/voice_settings.py | 5 +---- 10 files changed, 10 insertions(+), 46 deletions(-) diff --git a/discover_overlay/discord_connector.py b/discover_overlay/discord_connector.py index 6cba8a2..6424e1c 100644 --- a/discover_overlay/discord_connector.py +++ b/discover_overlay/discord_connector.py @@ -3,6 +3,7 @@ import select import time import json import re +import sys import requests import logging import calendar diff --git a/discover_overlay/discover_overlay.py b/discover_overlay/discover_overlay.py index 362a9f2..60ddaef 100755 --- a/discover_overlay/discover_overlay.py +++ b/discover_overlay/discover_overlay.py @@ -12,21 +12,8 @@ # along with this program. If not, see . import gi gi.require_version("Gtk", "3.0") -gi.require_version('PangoCairo', '1.0') -gi.require_version('GdkPixbuf', '2.0') -from gi.repository.GdkPixbuf import Pixbuf -from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Gdk, Pango, PangoCairo -import os -import sys -import json -import math -import time -import cairo -import base64 +from gi.repository import Gtk, GLib import select -import urllib -import requests -import websocket from .voice_settings import VoiceSettingsWindow from .text_settings import TextSettingsWindow from .voice_overlay import VoiceOverlayWindow diff --git a/discover_overlay/draggable_window.py b/discover_overlay/draggable_window.py index f2da1b9..e277dcc 100644 --- a/discover_overlay/draggable_window.py +++ b/discover_overlay/draggable_window.py @@ -1,10 +1,7 @@ import gi gi.require_version("Gtk", "3.0") -gi.require_version('PangoCairo', '1.0') -gi.require_version('GdkPixbuf', '2.0') import cairo -from gi.repository.GdkPixbuf import Pixbuf -from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Gdk, Pango, PangoCairo +from gi.repository import Gtk, Gdk import logging diff --git a/discover_overlay/image_getter.py b/discover_overlay/image_getter.py index 674c7b8..16d3ffb 100644 --- a/discover_overlay/image_getter.py +++ b/discover_overlay/image_getter.py @@ -1,12 +1,11 @@ import gi gi.require_version("Gtk", "3.0") -gi.require_version('PangoCairo', '1.0') gi.require_version('GdkPixbuf', '2.0') import urllib import requests import threading from gi.repository.GdkPixbuf import Pixbuf -from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Gdk, Pango, PangoCairo +from gi.repository import Gtk, Gio, GdkPixbuf, Gdk import cairo import logging import PIL.Image as Image diff --git a/discover_overlay/overlay.py b/discover_overlay/overlay.py index c7b8953..4df097b 100644 --- a/discover_overlay/overlay.py +++ b/discover_overlay/overlay.py @@ -1,9 +1,6 @@ import gi gi.require_version("Gtk", "3.0") -gi.require_version('PangoCairo', '1.0') -gi.require_version('GdkPixbuf', '2.0') -from gi.repository.GdkPixbuf import Pixbuf -from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Gdk, Pango, PangoCairo +from gi.repository import Gtk, Gdk import cairo import logging diff --git a/discover_overlay/settings.py b/discover_overlay/settings.py index 0443a76..a839f0c 100644 --- a/discover_overlay/settings.py +++ b/discover_overlay/settings.py @@ -1,11 +1,8 @@ import gi gi.require_version("Gtk", "3.0") -gi.require_version('PangoCairo', '1.0') -gi.require_version('GdkPixbuf', '2.0') import sys import os -from gi.repository.GdkPixbuf import Pixbuf -from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Gdk, Pango, PangoCairo +from gi.repository import Gtk, Gdk import logging diff --git a/discover_overlay/text_overlay.py b/discover_overlay/text_overlay.py index f1dd23b..4e2a917 100644 --- a/discover_overlay/text_overlay.py +++ b/discover_overlay/text_overlay.py @@ -1,15 +1,12 @@ import gi gi.require_version("Gtk", "3.0") gi.require_version('PangoCairo', '1.0') -gi.require_version('GdkPixbuf', '2.0') import math from .overlay import OverlayWindow -from gi.repository.GdkPixbuf import Pixbuf -from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Gdk, Pango, PangoCairo +from gi.repository import Gtk, Gdk, Pango, PangoCairo import cairo import logging import time -import sys import re from .image_getter import get_surface @@ -171,8 +168,6 @@ class TextOverlayWindow(OverlayWindow): self.context.set_source_surface(pix, 0, y - h) self.context.rectangle(0, y - h, w, h) self.context.fill() - # Gdk.cairo_set_source_pixbuf(self.context, pix, 0, y - h) - # self.context.paint() return y - h return y diff --git a/discover_overlay/text_settings.py b/discover_overlay/text_settings.py index 157f8ab..b1df793 100644 --- a/discover_overlay/text_settings.py +++ b/discover_overlay/text_settings.py @@ -1,13 +1,10 @@ import gi gi.require_version("Gtk", "3.0") -gi.require_version('PangoCairo', '1.0') -gi.require_version('GdkPixbuf', '2.0') import json from configparser import ConfigParser from .draggable_window import DraggableWindow from .settings import SettingsWindow -from gi.repository.GdkPixbuf import Pixbuf -from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Gdk, Pango, PangoCairo +from gi.repository import Gtk, Gdk import logging diff --git a/discover_overlay/voice_overlay.py b/discover_overlay/voice_overlay.py index b29d35c..f98740e 100644 --- a/discover_overlay/voice_overlay.py +++ b/discover_overlay/voice_overlay.py @@ -1,13 +1,10 @@ import gi gi.require_version("Gtk", "3.0") -gi.require_version('PangoCairo', '1.0') -gi.require_version('GdkPixbuf', '2.0') import math from .overlay import OverlayWindow from .image_getter import get_image -from gi.repository.GdkPixbuf import Pixbuf -from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Gdk, Pango, PangoCairo +from gi.repository import Gtk, Gdk import cairo import logging diff --git a/discover_overlay/voice_settings.py b/discover_overlay/voice_settings.py index de39dc8..9550aed 100644 --- a/discover_overlay/voice_settings.py +++ b/discover_overlay/voice_settings.py @@ -1,13 +1,10 @@ import gi gi.require_version("Gtk", "3.0") -gi.require_version('PangoCairo', '1.0') -gi.require_version('GdkPixbuf', '2.0') import json from configparser import ConfigParser from .draggable_window import DraggableWindow from .settings import SettingsWindow -from gi.repository.GdkPixbuf import Pixbuf -from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Gdk, Pango, PangoCairo +from gi.repository import Gtk, Gdk import logging