diff --git a/GuiUtils.py b/GuiUtils.py index 9e9e33e9..9ce6fee6 100644 --- a/GuiUtils.py +++ b/GuiUtils.py @@ -5,10 +5,8 @@ import tkinter as tk from Utils import local_path def set_icon(window): - er16 = tk.PhotoImage(file=local_path('data', 'ER16.gif')) - er32 = tk.PhotoImage(file=local_path('data', 'ER32.gif')) - er48 = tk.PhotoImage(file=local_path('data', 'ER32.gif')) - window.tk.call('wm', 'iconphoto', window._w, er16, er32, er48) # pylint: disable=protected-access + logo = tk.PhotoImage(file=local_path('data', 'icon.png')) + window.tk.call('wm', 'iconphoto', window._w, logo) # Although tkinter is intended to be thread safe, there are many reports of issues # some which may be platform specific, or depend on if the TCL library was compiled without diff --git a/LttPAdjuster.py b/LttPAdjuster.py index 0cb3597b..01f5fec9 100644 --- a/LttPAdjuster.py +++ b/LttPAdjuster.py @@ -153,8 +153,8 @@ def adjust(args): def adjustGUI(): - from tkinter import Checkbutton, OptionMenu, Toplevel, LabelFrame, PhotoImage, Tk, LEFT, RIGHT, BOTTOM, TOP, \ - StringVar, IntVar, Frame, Label, W, E, X, BOTH, Entry, Spinbox, Button, filedialog, messagebox, ttk + from tkinter import Tk, LEFT, BOTTOM, TOP, \ + StringVar, Frame, Label, X, Entry, Button, filedialog, messagebox, ttk from Gui import get_rom_options_frame, get_rom_frame from GuiUtils import set_icon from argparse import Namespace diff --git a/LttPClient.py b/LttPClient.py index a29fcdc9..92c4aca7 100644 --- a/LttPClient.py +++ b/LttPClient.py @@ -8,8 +8,6 @@ import base64 import shutil from json import loads, dumps -from random import randrange - from Utils import get_item_name_from_id exit_func = atexit.register(input, "Press enter to close.") diff --git a/data/ER.icns b/data/ER.icns deleted file mode 100644 index e3a6fbfa..00000000 Binary files a/data/ER.icns and /dev/null differ diff --git a/data/ER.ico b/data/ER.ico deleted file mode 100644 index b9b60360..00000000 Binary files a/data/ER.ico and /dev/null differ diff --git a/data/ER16.gif b/data/ER16.gif deleted file mode 100644 index 5806c8fd..00000000 Binary files a/data/ER16.gif and /dev/null differ diff --git a/data/ER32.gif b/data/ER32.gif deleted file mode 100644 index b72c0bcc..00000000 Binary files a/data/ER32.gif and /dev/null differ diff --git a/data/ER48.gif b/data/ER48.gif deleted file mode 100644 index 06d7af55..00000000 Binary files a/data/ER48.gif and /dev/null differ diff --git a/data/icon.png b/data/icon.png new file mode 100644 index 00000000..0cf21041 Binary files /dev/null and b/data/icon.png differ