From 74f3e8954785d0616d7e191654be5e13be0d1963 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Thu, 27 Feb 2020 01:10:49 -0800 Subject: [PATCH] Move GUI to Source folder to avoid conflicts --- CLI.py | 2 +- Gui.py | 24 +++++++++---------- ItemList.py | 2 +- classes/__init__.py | 1 - gui/__init__.py | 1 - gui/about/__init__.py | 1 - gui/adjust/__init__.py | 1 - gui/custom/__init__.py | 1 - gui/randomize/__init__.py | 1 - gui/startinventory/__init__.py | 1 - source/__init__.py | 1 + {classes => source/classes}/SpriteSelector.py | 0 source/classes/__init__.py | 1 + {classes => source/classes}/constants.py | 0 source/gui/__init__.py | 1 + source/gui/about/__init__.py | 1 + source/gui/adjust/__init__.py | 1 + {gui => source/gui}/adjust/overview.py | 4 ++-- {gui => source/gui}/bottom.py | 4 ++-- source/gui/custom/__init__.py | 1 + {gui => source/gui}/custom/overview.py | 4 ++-- {gui => source/gui}/loadcliargs.py | 6 ++--- source/gui/randomize/__init__.py | 1 + {gui => source/gui}/randomize/dungeon.py | 2 +- {gui => source/gui}/randomize/enemizer.py | 2 +- {gui => source/gui}/randomize/entrando.py | 2 +- {gui => source/gui}/randomize/gameoptions.py | 4 ++-- {gui => source/gui}/randomize/generation.py | 2 +- {gui => source/gui}/randomize/item.py | 2 +- {gui => source/gui}/randomize/multiworld.py | 2 +- source/gui/startinventory/__init__.py | 1 + .../gui}/startinventory/overview.py | 4 ++-- {gui => source/gui}/widgets.py | 0 33 files changed, 41 insertions(+), 40 deletions(-) delete mode 100644 classes/__init__.py delete mode 100644 gui/__init__.py delete mode 100644 gui/about/__init__.py delete mode 100644 gui/adjust/__init__.py delete mode 100644 gui/custom/__init__.py delete mode 100644 gui/randomize/__init__.py delete mode 100644 gui/startinventory/__init__.py create mode 100644 source/__init__.py rename {classes => source/classes}/SpriteSelector.py (100%) create mode 100644 source/classes/__init__.py rename {classes => source/classes}/constants.py (100%) create mode 100644 source/gui/__init__.py create mode 100644 source/gui/about/__init__.py create mode 100644 source/gui/adjust/__init__.py rename {gui => source/gui}/adjust/overview.py (97%) rename {gui => source/gui}/bottom.py (98%) create mode 100644 source/gui/custom/__init__.py rename {gui => source/gui}/custom/overview.py (95%) rename {gui => source/gui}/loadcliargs.py (95%) create mode 100644 source/gui/randomize/__init__.py rename {gui => source/gui}/randomize/dungeon.py (97%) rename {gui => source/gui}/randomize/enemizer.py (98%) rename {gui => source/gui}/randomize/entrando.py (96%) rename {gui => source/gui}/randomize/gameoptions.py (96%) rename {gui => source/gui}/randomize/generation.py (97%) rename {gui => source/gui}/randomize/item.py (96%) rename {gui => source/gui}/randomize/multiworld.py (97%) create mode 100644 source/gui/startinventory/__init__.py rename {gui => source/gui}/startinventory/overview.py (96%) rename {gui => source/gui}/widgets.py (100%) diff --git a/CLI.py b/CLI.py index 69a00b09..60391631 100644 --- a/CLI.py +++ b/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): diff --git a/Gui.py b/Gui.py index 40605db6..76215dce 100755 --- a/Gui.py +++ b/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 gui.startinventory.overview import startinventory_page -from gui.custom.overview import custom_page -from gui.loadcliargs import loadcliargs, loadadjustargs -from gui.randomize.item import item_page -from gui.randomize.entrando import entrando_page -from gui.randomize.enemizer import enemizer_page -from gui.randomize.dungeon import dungeon_page -from gui.randomize.multiworld import multiworld_page -from gui.randomize.gameoptions import gameoptions_page -from gui.randomize.generation import generation_page -from gui.bottom import bottom_frame, create_guiargs +from source.gui.adjust.overview import adjust_page +from source.gui.startinventory.overview import startinventory_page +from source.gui.custom.overview import custom_page +from source.gui.loadcliargs import loadcliargs, loadadjustargs +from source.gui.randomize.item import item_page +from source.gui.randomize.entrando import entrando_page +from source.gui.randomize.enemizer import enemizer_page +from source.gui.randomize.dungeon import dungeon_page +from source.gui.randomize.multiworld import multiworld_page +from source.gui.randomize.gameoptions import gameoptions_page +from source.gui.randomize.generation import generation_page +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 diff --git a/ItemList.py b/ItemList.py index 971424fc..7c7684d0 100644 --- a/ItemList.py +++ b/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. diff --git a/classes/__init__.py b/classes/__init__.py deleted file mode 100644 index a9d60931..00000000 --- a/classes/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# do nothing, just exist to make "classes" package diff --git a/gui/__init__.py b/gui/__init__.py deleted file mode 100644 index 8c5232bc..00000000 --- a/gui/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# do nothing, just exist to make "gui" package diff --git a/gui/about/__init__.py b/gui/about/__init__.py deleted file mode 100644 index 1ad9a517..00000000 --- a/gui/about/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# do nothing, just exist to make "gui.about" package diff --git a/gui/adjust/__init__.py b/gui/adjust/__init__.py deleted file mode 100644 index 3e1ae764..00000000 --- a/gui/adjust/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# do nothing, just exist to make "gui.adjust" package diff --git a/gui/custom/__init__.py b/gui/custom/__init__.py deleted file mode 100644 index 33cec31c..00000000 --- a/gui/custom/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# do nothing, just exist to make "gui.custom" package diff --git a/gui/randomize/__init__.py b/gui/randomize/__init__.py deleted file mode 100644 index ecf3a271..00000000 --- a/gui/randomize/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# do nothing, just exist to make "gui.randomize" package diff --git a/gui/startinventory/__init__.py b/gui/startinventory/__init__.py deleted file mode 100644 index fa319bae..00000000 --- a/gui/startinventory/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# do nothing, just exist to make "gui.startinventory" package diff --git a/source/__init__.py b/source/__init__.py new file mode 100644 index 00000000..724252e9 --- /dev/null +++ b/source/__init__.py @@ -0,0 +1 @@ +# do nothing, just exist to make "source" package diff --git a/classes/SpriteSelector.py b/source/classes/SpriteSelector.py similarity index 100% rename from classes/SpriteSelector.py rename to source/classes/SpriteSelector.py diff --git a/source/classes/__init__.py b/source/classes/__init__.py new file mode 100644 index 00000000..68fbbf63 --- /dev/null +++ b/source/classes/__init__.py @@ -0,0 +1 @@ +# do nothing, just exist to make "source.classes" package diff --git a/classes/constants.py b/source/classes/constants.py similarity index 100% rename from classes/constants.py rename to source/classes/constants.py diff --git a/source/gui/__init__.py b/source/gui/__init__.py new file mode 100644 index 00000000..00601e6a --- /dev/null +++ b/source/gui/__init__.py @@ -0,0 +1 @@ +# do nothing, just exist to make "source.gui" package diff --git a/source/gui/about/__init__.py b/source/gui/about/__init__.py new file mode 100644 index 00000000..5f70030c --- /dev/null +++ b/source/gui/about/__init__.py @@ -0,0 +1 @@ +# do nothing, just exist to make "source.gui.about" package diff --git a/source/gui/adjust/__init__.py b/source/gui/adjust/__init__.py new file mode 100644 index 00000000..a838ecf0 --- /dev/null +++ b/source/gui/adjust/__init__.py @@ -0,0 +1 @@ +# do nothing, just exist to make "source.gui.adjust" package diff --git a/gui/adjust/overview.py b/source/gui/adjust/overview.py similarity index 97% rename from gui/adjust/overview.py rename to source/gui/adjust/overview.py index 8e3a7851..b7fcb78f 100644 --- a/gui/adjust/overview.py +++ b/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 -import gui.widgets as widgets +from source.classes.SpriteSelector import SpriteSelector +import source.gui.widgets as widgets import json import logging import os diff --git a/gui/bottom.py b/source/gui/bottom.py similarity index 98% rename from gui/bottom.py rename to source/gui/bottom.py index 22d94d35..90fdc8c0 100644 --- a/gui/bottom.py +++ b/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 gui.widgets as widgets +import source.classes.constants as CONST +import source.gui.widgets as widgets def bottom_frame(self, parent, args=None): diff --git a/source/gui/custom/__init__.py b/source/gui/custom/__init__.py new file mode 100644 index 00000000..febb4d06 --- /dev/null +++ b/source/gui/custom/__init__.py @@ -0,0 +1 @@ +# do nothing, just exist to make "source.gui.custom" package diff --git a/gui/custom/overview.py b/source/gui/custom/overview.py similarity index 95% rename from gui/custom/overview.py rename to source/gui/custom/overview.py index e7c7fa63..54c4f7f3 100644 --- a/gui/custom/overview.py +++ b/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 diff --git a/gui/loadcliargs.py b/source/gui/loadcliargs.py similarity index 95% rename from gui/loadcliargs.py rename to source/gui/loadcliargs.py index 14a8b007..462c5de6 100644 --- a/gui/loadcliargs.py +++ b/source/gui/loadcliargs.py @@ -1,7 +1,7 @@ -from classes.SpriteSelector import SpriteSelector as spriteSelector -from gui.randomize.gameoptions import set_sprite +from source.classes.SpriteSelector import SpriteSelector as spriteSelector +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: diff --git a/source/gui/randomize/__init__.py b/source/gui/randomize/__init__.py new file mode 100644 index 00000000..564c2ab5 --- /dev/null +++ b/source/gui/randomize/__init__.py @@ -0,0 +1 @@ +# do nothing, just exist to make "source.gui.randomize" package diff --git a/gui/randomize/dungeon.py b/source/gui/randomize/dungeon.py similarity index 97% rename from gui/randomize/dungeon.py rename to source/gui/randomize/dungeon.py index 1d575521..11dd1b58 100644 --- a/gui/randomize/dungeon.py +++ b/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 diff --git a/gui/randomize/enemizer.py b/source/gui/randomize/enemizer.py similarity index 98% rename from gui/randomize/enemizer.py rename to source/gui/randomize/enemizer.py index cb78281c..26aab8ec 100644 --- a/gui/randomize/enemizer.py +++ b/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 diff --git a/gui/randomize/entrando.py b/source/gui/randomize/entrando.py similarity index 96% rename from gui/randomize/entrando.py rename to source/gui/randomize/entrando.py index 3ad6bac4..e094dc3b 100644 --- a/gui/randomize/entrando.py +++ b/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 diff --git a/gui/randomize/gameoptions.py b/source/gui/randomize/gameoptions.py similarity index 96% rename from gui/randomize/gameoptions.py rename to source/gui/randomize/gameoptions.py index eb107df4..3369f33f 100644 --- a/gui/randomize/gameoptions.py +++ b/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 gui.widgets as widgets +import source.classes.SpriteSelector as spriteSelector +import source.gui.widgets as widgets import json import os diff --git a/gui/randomize/generation.py b/source/gui/randomize/generation.py similarity index 97% rename from gui/randomize/generation.py rename to source/gui/randomize/generation.py index d5f5ce1c..725c0ad9 100644 --- a/gui/randomize/generation.py +++ b/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 diff --git a/gui/randomize/item.py b/source/gui/randomize/item.py similarity index 96% rename from gui/randomize/item.py rename to source/gui/randomize/item.py index f962d574..45714dfd 100644 --- a/gui/randomize/item.py +++ b/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 diff --git a/gui/randomize/multiworld.py b/source/gui/randomize/multiworld.py similarity index 97% rename from gui/randomize/multiworld.py rename to source/gui/randomize/multiworld.py index 646b02d1..3d67d38e 100644 --- a/gui/randomize/multiworld.py +++ b/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 diff --git a/source/gui/startinventory/__init__.py b/source/gui/startinventory/__init__.py new file mode 100644 index 00000000..024e33ee --- /dev/null +++ b/source/gui/startinventory/__init__.py @@ -0,0 +1 @@ +# do nothing, just exist to make "source.gui.startinventory" package diff --git a/gui/startinventory/overview.py b/source/gui/startinventory/overview.py similarity index 96% rename from gui/startinventory/overview.py rename to source/gui/startinventory/overview.py index aaa601b3..46dd74dc 100644 --- a/gui/startinventory/overview.py +++ b/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 diff --git a/gui/widgets.py b/source/gui/widgets.py similarity index 100% rename from gui/widgets.py rename to source/gui/widgets.py