remove star imports from tk and ttk

fishy/gui/config_top.py

@@ -7,8 +7,8 @@ from fishy.helper import helper
 
 from fishy import web
 
-from tkinter import *
+import tkinter as tk
-from tkinter.ttk import *
+import tkinter.ttk as ttk
 
 from fishy.helper.config import config
 from fishy.helper.popup import PopUp
@@ -19,7 +19,7 @@ if typing.TYPE_CHECKING:
 
 def start_fullfisher_config(gui: 'GUI'):
     top = PopUp(helper.empty_function, gui._root, background=gui._root["background"])
-    controls_frame = Frame(top)
+    controls_frame = ttk.Frame(top)
     top.title("Config")
 
     def file_name():
@@ -38,10 +38,10 @@ def start_fullfisher_config(gui: 'GUI'):
 
         file_name_label.set(file_name())
 
-    file_name_label = StringVar(value=file_name())
+    file_name_label = tk.StringVar(value=file_name())
-    Label(controls_frame, textvariable=file_name_label).grid(row=0, column=0)
+    ttk.Label(controls_frame, textvariable=file_name_label).grid(row=0, column=0)
-    Button(controls_frame, text="Select fishy file", command=select_file).grid(row=0, column=1)
+    ttk.Button(controls_frame, text="Select fishy file", command=select_file).grid(row=0, column=1)
-    Label(controls_frame, text="Use semi-fisher config for rest").grid(row=2, column=0, columnspan=2)
+    ttk.Label(controls_frame, text="Use semi-fisher config for rest").grid(row=2, column=0, columnspan=2)
 
     controls_frame.pack(padx=(5, 5), pady=(5, 5))
     top.start()
@@ -69,42 +69,42 @@ def start_semifisher_config(gui: 'GUI'):
         event.widget.insert(0, str(event.char))
 
     top = PopUp(save, gui._root, background=gui._root["background"])
-    controls_frame = Frame(top)
+    controls_frame = ttk.Frame(top)
     top.title("Config")
 
-    Label(controls_frame, text="Notification:").grid(row=0, column=0)
+    ttk.Label(controls_frame, text="Notification:").grid(row=0, column=0)
 
-    gui._notify = IntVar(0)
+    gui._notify = tk.IntVar(0)
-    gui._notify_check = Checkbutton(controls_frame, command=toggle_sub, variable=gui._notify)
+    gui._notify_check = ttk.Checkbutton(controls_frame, command=toggle_sub, variable=gui._notify)
     gui._notify_check.grid(row=0, column=1)
-    gui._notify_check['state'] = DISABLED
+    gui._notify_check['state'] = tk.DISABLED
     is_subbed = web.is_subbed()
     if is_subbed[1]:
-        gui._notify_check['state'] = NORMAL
+        gui._notify_check['state'] = tk.NORMAL
         gui._notify.set(is_subbed[0])
 
-    Label(controls_frame, text="Fullscreen: ").grid(row=1, column=0, pady=(5, 5))
+    ttk.Label(controls_frame, text="Fullscreen: ").grid(row=1, column=0, pady=(5, 5))
-    borderless = Checkbutton(controls_frame, var=BooleanVar(value=config.get("borderless")))
+    borderless = ttk.Checkbutton(controls_frame, var=tk.BooleanVar(value=config.get("borderless")))
     borderless.grid(row=1, column=1)
 
-    Label(controls_frame, text="Action Key:").grid(row=2, column=0)
+    ttk.Label(controls_frame, text="Action Key:").grid(row=2, column=0)
-    action_key_entry = Entry(controls_frame, justify=CENTER)
+    action_key_entry = ttk.Entry(controls_frame, justify=tk.CENTER)
     action_key_entry.grid(row=2, column=1)
     action_key_entry.insert(0, config.get("action_key", "e"))
     action_key_entry.bind("<KeyRelease>", del_entry_key)
 
-    Label(controls_frame, text="Looting Key:").grid(row=4, column=0, pady=(5, 5))
+    ttk.Label(controls_frame, text="Looting Key:").grid(row=4, column=0, pady=(5, 5))
-    collect_key_entry = Entry(controls_frame, justify=CENTER)
+    collect_key_entry = ttk.Entry(controls_frame, justify=tk.CENTER)
     collect_key_entry.grid(row=4, column=1, pady=(5, 5))
     collect_key_entry.insert(0, config.get("collect_key", "r"))
     collect_key_entry.bind("<KeyRelease>", del_entry_key)
 
-    Label(controls_frame, text="Sound Notification: ").grid(row=5, column=0, pady=(5, 5))
+    ttk.Label(controls_frame, text="Sound Notification: ").grid(row=5, column=0, pady=(5, 5))
-    sound = Checkbutton(controls_frame, var=BooleanVar(value=config.get("sound_notification")))
+    sound = ttk.Checkbutton(controls_frame, var=tk.BooleanVar(value=config.get("sound_notification")))
     sound.grid(row=5, column=1)
 
-    Label(controls_frame, text="Human-Like Delay: ").grid(row=6, column=0, pady=(5, 5))
+    ttk.Label(controls_frame, text="Human-Like Delay: ").grid(row=6, column=0, pady=(5, 5))
-    jitter = Checkbutton(controls_frame, var=BooleanVar(value=config.get("jitter")))
+    jitter = ttk.Checkbutton(controls_frame, var=tk.BooleanVar(value=config.get("jitter")))
     jitter.grid(row=6, column=1)
 
     controls_frame.pack(padx=(5, 5), pady=(5, 5))

fishy/gui/discord_login.py

@@ -1,7 +1,6 @@
 import time
-from tkinter import *
+import tkinter as tk
-from tkinter import messagebox
+import tkinter.ttk as ttk
-from tkinter.ttk import *
 
 import typing
 
@@ -34,14 +33,14 @@ def discord_login(gui: 'GUI'):
         code = int(login_code.get()) if login_code.get().isdigit() else 0
         if web.login(config.get("uid"), code):
             gui.login.set(1)
-            messagebox.showinfo("Note!", "Logged in successfuly!")
+            tk.messagebox.showinfo("Note!", "Login successful!")
             quit_top()
         else:
-            messagebox.showerror("Error", "Logged wasn't successful")
+            tk.messagebox.showerror("Error", "Login was not successful!")
 
     top_running = [True]
 
-    top = Toplevel(background=gui._root["background"])
+    top = tk.Toplevel(background=gui._root["background"])
     top.minsize(width=300, height=300)
     top.title("Notification Setup")
 
@@ -58,8 +57,8 @@ def discord_login(gui: 'GUI'):
     html_label.pack(pady=(20, 5))
     html_label.fit_height()
 
-    login_code = Entry(top, justify=CENTER, font="Calibri 15")
+    login_code = ttk.Entry(top, justify=tk.CENTER, font="Calibri 15")
-    login_code.pack(padx=(15, 15), expand=True, fill=BOTH)
+    login_code.pack(padx=(15, 15), expand=True, fill=tk.BOTH)
 
     html_label = HTMLLabel(top,
                            html=f'<div style="color: {gui._console["fg"]}; text-align: center">'
@@ -69,7 +68,7 @@ def discord_login(gui: 'GUI'):
     html_label.pack(pady=(5, 5))
     html_label.fit_height()
 
-    Button(top, text="REGISTER", command=check).pack(pady=(5, 20))
+    ttk.Button(top, text="REGISTER", command=check).pack(pady=(5, 20))
 
     top.protocol("WM_DELETE_WINDOW", quit_top)
     top.grab_set()

fishy/gui/gui.py

@@ -1,7 +1,7 @@
 import logging
 import uuid
-from tkinter import OptionMenu, Button, IntVar
 from typing import List, Callable, Optional, Dict, Any
+import tkinter as tk
 import queue
 import threading
 
@@ -35,8 +35,8 @@ class GUI:
         self._console = None
         self._start_button = None
         self._notify_check = None
-        self._engine_select: Optional[OptionMenu] = None
+        self._engine_select: Optional[tk.OptionMenu] = None
-        self._config_button: Optional[Button] = None
+        self._config_button: Optional[tk.Button] = None
         self._engine_var = None
 
         self._thread = threading.Thread(target=self.create, args=())

fishy/gui/main_gui.py

@@ -1,7 +1,7 @@
 import logging
 import time
-from tkinter import *
+import tkinter as tk
-from tkinter.ttk import *
+import tkinter.ttk as ttk
 
 from fishy.web import web
 from ttkthemes import ThemedTk
@@ -36,14 +36,14 @@ def _create(gui: 'GUI'):
     gui._root.iconbitmap(helper.manifest_file('icon.ico'))
 
     # region menu
-    menubar = Menu(gui._root)
+    menubar = tk.Menu(gui._root)
 
-    filemenu = Menu(menubar, tearoff=0)
+    filemenu = tk.Menu(menubar, tearoff=0)
 
     login = web.is_logged_in()
-    gui.login = IntVar()
+    gui.login = tk.IntVar()
     gui.login.set(1 if login > 0 else 0)
-    state = DISABLED if login == -1 else ACTIVE
+    state = tk.DISABLED if login == -1 else tk.ACTIVE
     filemenu.add_checkbutton(label="Login", command=lambda: discord_login(gui), variable=gui.login, state=state)
     filemenu.add_command(label="Create Shortcut", command=lambda: helper.create_shortcut(False))
     # filemenu.add_command(label="Create Anti-Ghost Shortcut", command=lambda: helper.create_shortcut(True))
@@ -52,7 +52,7 @@ def _create(gui: 'GUI'):
         config.set("dark_mode", not config.get("dark_mode", True))
         gui._start_restart = True
 
-    dark_mode_var = IntVar()
+    dark_mode_var = tk.IntVar()
     dark_mode_var.set(int(config.get('dark_mode', True)))
     filemenu.add_checkbutton(label="Dark Mode", command=_toggle_mode,
                              variable=dark_mode_var)
@@ -72,11 +72,11 @@ def _create(gui: 'GUI'):
     filemenu.add_command(label=chaEntry, command=installer)
     menubar.add_cascade(label="Options", menu=filemenu)
 
-    debug_menu = Menu(menubar, tearoff=0)
+    debug_menu = tk.Menu(menubar, tearoff=0)
     debug_menu.add_command(label="Check PixelVal",
                            command=lambda: gui.engine.check_pixel_val())
 
-    debug_var = IntVar()
+    debug_var = tk.IntVar()
     debug_var.set(int(config.get('debug', False)))
 
     def keep_console():
@@ -87,7 +87,7 @@ def _create(gui: 'GUI'):
     debug_menu.add_command(label="Restart", command=helper.restart)
     menubar.add_cascade(label="Debug", menu=debug_menu)
 
-    help_menu = Menu(menubar, tearoff=0)
+    help_menu = tk.Menu(menubar, tearoff=0)
     help_menu.add_command(label="Need Help?", command=lambda: helper.open_web("http://discord.definex.in"))
     help_menu.add_command(label="Donate", command=lambda: helper.open_web("https://paypal.me/AdamSaudagar"))
     menubar.add_cascade(label="Help", menu=help_menu)
@@ -96,29 +96,29 @@ def _create(gui: 'GUI'):
     # endregion
 
     # region console
-    gui._console = Text(gui._root, state='disabled', wrap='none', background="#707070", fg="#ffffff")
+    gui._console = tk.Text(gui._root, state='disabled', wrap='none', background="#707070", fg="#ffffff")
-    gui._console.pack(fill=BOTH, expand=True, pady=(15, 15), padx=(10, 10))
+    gui._console.pack(fill=tk.BOTH, expand=True, pady=(15, 15), padx=(10, 10))
-    gui._console.mark_set("sentinel", INSERT)
+    gui._console.mark_set("sentinel", tk.INSERT)
-    gui._console.config(state=DISABLED)
+    gui._console.config(state=tk.DISABLED)
     # endregion
 
     # region controls
-    start_frame = Frame(gui._root)
+    start_frame = ttk.Frame(gui._root)
 
-    gui._engine_var = StringVar(start_frame)
+    gui._engine_var = tk.StringVar(start_frame)
     labels = list(engines.keys())
     last_started = config.get("last_started", labels[0])
-    gui._engine_select = OptionMenu(start_frame, gui._engine_var, last_started, *labels)
+    gui._engine_select = ttk.OptionMenu(start_frame, gui._engine_var, last_started, *labels)
-    gui._engine_select.pack(side=LEFT)
+    gui._engine_select.pack(side=tk.LEFT)
 
-    gui._config_button = Button(start_frame, text="⚙", width=0, command=lambda: engines[gui._engine_var.get()][0]())
+    gui._config_button = ttk.Button(start_frame, text="⚙", width=0, command=lambda: engines[gui._engine_var.get()][0]())
-    gui._config_button.pack(side=RIGHT)
+    gui._config_button.pack(side=tk.RIGHT)
 
-    gui._start_button = Button(start_frame, text=gui._get_start_stop_text(), width=25,
+    gui._start_button = ttk.Button(start_frame, text=gui._get_start_stop_text(), width=25,
                                command=gui.funcs.start_engine)
-    gui._start_button.pack(side=RIGHT)
+    gui._start_button.pack(side=tk.RIGHT)
 
-    start_frame.pack(padx=(10, 10), pady=(5, 15), fill=X)
+    start_frame.pack(padx=(10, 10), pady=(5, 15), fill=tk.X)
     # endregion
 
     _apply_theme(gui)
@@ -132,7 +132,7 @@ def _create(gui: 'GUI'):
     # noinspection PyProtectedMember
     def set_destroy():
         if gui._bot_running:
-            if not messagebox.askyesno(title="Quit?", message="Bot engine running. Quit Anyway?"):
+            if not tk.messagebox.askyesno(title="Quit?", message="Bot engine running. Quit Anyway?"):
                 return
 
         config.set("win_loc", gui._root.geometry())

fishy/gui/splash.py

@@ -1,6 +1,6 @@
 import time
 from multiprocessing import Process
-from tkinter import *
+import tkinter as tk
 from PIL import Image, ImageTk
 
 from fishy.helper.config import config
@@ -9,7 +9,7 @@ from fishy.helper import helper
 
 def show(win_loc):
     dim=(300,200)
-    top = Tk()
+    top = tk.Tk()
 
     top.overrideredirect(True)
     top.lift()
@@ -18,11 +18,11 @@ def show(win_loc):
     top.resizable(False, False)
     top.iconbitmap(helper.manifest_file('icon.ico'))
 
-    canvas = Canvas(top, width=dim[0], height=dim[1], bg='white')
+    canvas = tk.Canvas(top, width=dim[0], height=dim[1], bg='white')
     canvas.pack()
     top.image = Image.open(helper.manifest_file('fishybot_logo.png')).resize(dim)
     top.image = ImageTk.PhotoImage(top.image)
-    canvas.create_image(0, 0, anchor=NW, image=top.image)
+    canvas.create_image(0, 0, anchor=tk.NW, image=top.image)
 
     # Position splash at the center of the main window
 

fishy/gui/terms_gui.py

@@ -1,6 +1,6 @@
 import webbrowser
-from tkinter import *
+import tkinter as tk
-from tkinter.ttk import *
+import tkinter.ttk as ttk
 import re
 
 from PIL import Image, ImageTk
@@ -25,41 +25,41 @@ def _run_terms_window():
         root.destroy()
 
     def disable_enable_button():
-        accept_button.config(state=NORMAL if check_value.get() else DISABLED)
+        accept_button.config(state=tk.NORMAL if check_value.get() else tk.DISABLED)
 
-    root = Tk()
+    root = tk.Tk()
     message = f'I agree to the [Terms of Service and Privacy Policy]({web.get_terms_page()})'
     root.title("EULA")
     root.resizable(False, False)
     root.iconbitmap(helper.manifest_file('icon.ico'))
 
-    f = Frame(root)
+    f = ttk.Frame(root)
-    canvas = Canvas(f, width=300, height=200)
+    canvas = tk.Canvas(f, width=300, height=200)
     canvas.pack()
     root.image = Image.open(helper.manifest_file('fishybot_logo.png')).resize((300, 200))
     root.image = ImageTk.PhotoImage(root.image)
-    canvas.create_image(0, 0, anchor=NW, image=root.image)
+    canvas.create_image(0, 0, anchor=tk.NW, image=root.image)
 
-    check_value = IntVar(0)
+    check_value = tk.IntVar(0)
 
-    g1 = Frame(f)
+    g1 = ttk.Frame(f)
-    Checkbutton(g1, command=disable_enable_button, variable=check_value).pack(side=LEFT)
+    ttk.Checkbutton(g1, command=disable_enable_button, variable=check_value).pack(side=tk.LEFT)
-    text = Text(g1, width=len(hyperlinkPattern.sub(r'\g<title>', message)),
+    text = tk.Text(g1, width=len(hyperlinkPattern.sub(r'\g<title>', message)),
                 height=1, borderwidth=0, highlightthickness=0)
     text["background"] = root["background"]
 
     _format_hyper_link(text, message)
-    text.config(state=DISABLED)
+    text.config(state=tk.DISABLED)
-    text.pack(side=LEFT)
+    text.pack(side=tk.LEFT)
     g1.pack()
 
     f.pack(padx=(10, 10), pady=(20, 20))
 
-    g2 = Frame(f)
+    g2 = ttk.Frame(f)
-    accept_button = Button(g2, text="Accept",
+    accept_button = ttk.Button(g2, text="Accept",
                            command=accept)
     accept_button.grid(row=0, column=0)
-    Button(g2, text="Deny",
+    ttk.Button(g2, text="Deny",
            command=lambda: root.destroy()).grid(row=0, column=1)
     g2.pack(pady=(5, 0))
     disable_enable_button()

fishy/gui/update_dialog.py

@@ -1,19 +1,19 @@
 from multiprocessing import Process, Manager
-from tkinter import *
+import tkinter as tk
 import time
 
 from fishy import helper
 
 def show(currentversion, newversion, returns):
-    top = Tk()
+    top = tk.Tk()
     top.title("A wild fishy update appeared!")
     top.iconbitmap(helper.manifest_file('icon.ico'))
 
-    dialogLabel = Label(top, text="There is a new fishy update available ("+currentversion+"->"+newversion+"). Do you want to update now?")
+    dialogLabel = tk.Label(top, text="There is a new fishy update available ("+currentversion+"->"+newversion+"). Do you want to update now?")
     dialogLabel.grid(row=0, columnspan=2, padx=5, pady=5)
 
-    cbVar = IntVar()
+    cbVar = tk.IntVar()
-    dialogCheckbutton = Checkbutton(top, text="don't ask again", variable=cbVar)
+    dialogCheckbutton = tk.Checkbutton(top, text="don't ask again", variable=cbVar)
     dialogCheckbutton.grid(row=1, columnspan=2, padx=5, pady=0)
     top.update()
     buttonWidth = int(dialogLabel.winfo_width()/2)-20
@@ -26,10 +26,10 @@ def show(currentversion, newversion, returns):
         returns[0],returns[1]=False, bool(cbVar.get())
         top.destroy()
 
-    pixelVirtual = PhotoImage(width=1, height=1) # trick to use buttonWidth as pixels, not #symbols
+    pixelVirtual = tk.PhotoImage(width=1, height=1) # trick to use buttonWidth as pixels, not #symbols
-    dialogBtnNo = Button(top, text="No " + str(chr(10005)),  fg='red4', command=_clickNo, image=pixelVirtual, width=buttonWidth, compound="c")
+    dialogBtnNo = tk.Button(top, text="No " + str(chr(10005)),  fg='red4', command=_clickNo, image=pixelVirtual, width=buttonWidth, compound="c")
     dialogBtnNo.grid(row=2, column=0, padx=5, pady=5)
-    dialogBtnYes = Button(top, text="Yes " + str(chr(10003)),  fg='green', command=_clickYes, image=pixelVirtual, width=buttonWidth, compound="c")
+    dialogBtnYes = tk.Button(top, text="Yes " + str(chr(10003)),  fg='green', command=_clickYes, image=pixelVirtual, width=buttonWidth, compound="c")
     dialogBtnYes.grid(row=2, column=1, padx=5, pady=5)
     dialogBtnYes.focus_set()