Move GUI to Source folder to avoid conflicts

CLI.py

@@ -13,7 +13,7 @@ from Rom import get_sprite_from_name
 from Utils import is_bundled, close_console
 from Fill import FillError
 
-import classes.constants as CONST
+import source.classes.constants as CONST
 
 
 class ArgumentDefaultsHelpFormatter(argparse.RawTextHelpFormatter):

Gui.py

@@ -7,18 +7,18 @@ from tkinter import Tk, Button, BOTTOM, TOP, StringVar, BooleanVar, X, BOTH, RIG
 from argparse import Namespace
 from CLI import get_settings, get_args_priority
 from DungeonRandomizer import parse_arguments
-from gui.adjust.overview import adjust_page
+from source.gui.adjust.overview import adjust_page
-from gui.startinventory.overview import startinventory_page
+from source.gui.startinventory.overview import startinventory_page
-from gui.custom.overview import custom_page
+from source.gui.custom.overview import custom_page
-from gui.loadcliargs import loadcliargs, loadadjustargs
+from source.gui.loadcliargs import loadcliargs, loadadjustargs
-from gui.randomize.item import item_page
+from source.gui.randomize.item import item_page
-from gui.randomize.entrando import entrando_page
+from source.gui.randomize.entrando import entrando_page
-from gui.randomize.enemizer import enemizer_page
+from source.gui.randomize.enemizer import enemizer_page
-from gui.randomize.dungeon import dungeon_page
+from source.gui.randomize.dungeon import dungeon_page
-from gui.randomize.multiworld import multiworld_page
+from source.gui.randomize.multiworld import multiworld_page
-from gui.randomize.gameoptions import gameoptions_page
+from source.gui.randomize.gameoptions import gameoptions_page
-from gui.randomize.generation import generation_page
+from source.gui.randomize.generation import generation_page
-from gui.bottom import bottom_frame, create_guiargs
+from source.gui.bottom import bottom_frame, create_guiargs
 from GuiUtils import set_icon
 from Main import __version__ as ESVersion
 from Rom import get_sprite_from_name

ItemList.py

@@ -9,7 +9,7 @@ from EntranceShuffle import connect_entrance
 from Fill import FillError, fill_restrictive
 from Items import ItemFactory
 
-import classes.constants as CONST
+import source.classes.constants as CONST
 
 
 #This file sets the item pools for various modes. Timed modes and triforce hunt are enforced first, and then extra items are specified per mode to fill in the remaining space.

classes/__init__.py

@@ -1 +0,0 @@
-# do nothing, just exist to make "classes" package

gui/__init__.py

@@ -1 +0,0 @@
-# do nothing, just exist to make "gui" package

gui/about/__init__.py

@@ -1 +0,0 @@
-# do nothing, just exist to make "gui.about" package

gui/adjust/__init__.py

@@ -1 +0,0 @@
-# do nothing, just exist to make "gui.adjust" package

gui/custom/__init__.py

@@ -1 +0,0 @@
-# do nothing, just exist to make "gui.custom" package

gui/randomize/__init__.py

@@ -1 +0,0 @@
-# do nothing, just exist to make "gui.randomize" package

gui/startinventory/__init__.py

@@ -1 +0,0 @@
-# do nothing, just exist to make "gui.startinventory" package

source/__init__.py

@@ -0,0 +1 @@
+# do nothing, just exist to make "source" package

source/classes/__init__.py

@@ -0,0 +1 @@
+# do nothing, just exist to make "source.classes" package

source/gui/__init__.py

@@ -0,0 +1 @@
+# do nothing, just exist to make "source.gui" package

source/gui/about/__init__.py

@@ -0,0 +1 @@
+# do nothing, just exist to make "source.gui.about" package

source/gui/adjust/__init__.py

@@ -0,0 +1 @@
+# do nothing, just exist to make "source.gui.adjust" package

source/gui/adjust/overview.py

@@ -1,8 +1,8 @@
 from tkinter import ttk, filedialog, messagebox, IntVar, StringVar, Button, Checkbutton, Entry, Frame, Label, OptionMenu, E, W, LEFT, RIGHT, X, BOTTOM
 from AdjusterMain import adjust
 from argparse import Namespace
-from classes.SpriteSelector import SpriteSelector
+from source.classes.SpriteSelector import SpriteSelector
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 import json
 import logging
 import os

source/gui/bottom.py

@@ -7,8 +7,8 @@ import random
 from CLI import parse_arguments, get_settings
 from Main import main
 from Utils import local_path, output_path, open_file
-import classes.constants as CONST
+import source.classes.constants as CONST
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 
 
 def bottom_frame(self, parent, args=None):

source/gui/custom/__init__.py

@@ -0,0 +1 @@
+# do nothing, just exist to make "source.gui.custom" package

source/gui/custom/overview.py

@@ -1,9 +1,9 @@
 from tkinter import ttk, StringVar, Entry, Frame, Label, N, E, W, LEFT, RIGHT, X, VERTICAL, Y
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 import json
 import os
 
-import classes.constants as CONST
+import source.classes.constants as CONST
 
 def custom_page(top,parent):
     # Custom Item Pool

source/gui/loadcliargs.py

@@ -1,7 +1,7 @@
-from classes.SpriteSelector import SpriteSelector as spriteSelector
+from source.classes.SpriteSelector import SpriteSelector as spriteSelector
-from gui.randomize.gameoptions import set_sprite
+from source.gui.randomize.gameoptions import set_sprite
 from Rom import Sprite
-import classes.constants as CONST
+import source.classes.constants as CONST
 
 def loadcliargs(gui, args, settings=None):
     if args is not None:

source/gui/randomize/__init__.py

@@ -0,0 +1 @@
+# do nothing, just exist to make "source.gui.randomize" package

source/gui/randomize/dungeon.py

@@ -1,5 +1,5 @@
 from tkinter import ttk, IntVar, StringVar, Checkbutton, Frame, Label, OptionMenu, E, W, LEFT, RIGHT
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 import json
 import os
 

source/gui/randomize/enemizer.py

@@ -1,6 +1,6 @@
 import os
 from tkinter import ttk, filedialog, IntVar, StringVar, Button, Checkbutton, Entry, Frame, Label, LabelFrame, OptionMenu, N, E, W, LEFT, RIGHT, BOTTOM, X
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 import json
 import os
 import webbrowser

source/gui/randomize/entrando.py

@@ -1,5 +1,5 @@
 from tkinter import ttk, IntVar, StringVar, Checkbutton, Frame, Label, OptionMenu, E, W, LEFT, RIGHT
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 import json
 import os
 

source/gui/randomize/gameoptions.py

@@ -1,7 +1,7 @@
 from tkinter import ttk, IntVar, StringVar, Button, Checkbutton, Entry, Frame, Label, OptionMenu, E, W, LEFT, RIGHT
 from functools import partial
-import classes.SpriteSelector as spriteSelector
+import source.classes.SpriteSelector as spriteSelector
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 import json
 import os
 

source/gui/randomize/generation.py

@@ -1,6 +1,6 @@
 import os
 from tkinter import ttk, filedialog, IntVar, StringVar, Button, Checkbutton, Entry, Frame, Label, E, W, LEFT, RIGHT, X
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 import json
 import os
 

source/gui/randomize/item.py

@@ -1,5 +1,5 @@
 from tkinter import ttk, IntVar, StringVar, Checkbutton, Frame, Label, OptionMenu, E, W, LEFT, RIGHT
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 import json
 import os
  

source/gui/randomize/multiworld.py

@@ -1,5 +1,5 @@
 from tkinter import ttk, StringVar, Entry, Frame, Label, Spinbox, N, E, W, X, LEFT, RIGHT
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 import json
 import os
 

source/gui/startinventory/__init__.py

@@ -0,0 +1 @@
+# do nothing, just exist to make "source.gui.startinventory" package

source/gui/startinventory/overview.py

@@ -1,9 +1,9 @@
 from tkinter import ttk, StringVar, Entry, Frame, Label, N, E, W, LEFT, RIGHT, X, VERTICAL, Y
-import gui.widgets as widgets
+import source.gui.widgets as widgets
 import json
 import os
 
-import classes.constants as CONST
+import source.classes.constants as CONST
 
 def startinventory_page(top,parent):
     # Starting Inventory