From 98c7ee02f21cc5e6ae42a52ac9e62c11f8080939 Mon Sep 17 00:00:00 2001
From: "Mike A. Trethewey" <miketrethewey@gmail.com>
Date: Sat, 8 Feb 2020 10:17:55 -0800
Subject: [PATCH] Move everything out of work area

Move stuff to a throwaway tab for now
Create packages for eventual destinations of stuff
---
 Gui.py                    | 24 +++++++++++++-----------
 gui/__init__.py           |  1 +
 gui/about/__init__.py     |  1 +
 gui/adjust/__init__.py    |  1 +
 gui/custom/__init__.py    |  1 +
 gui/randomize/__init__.py |  1 +
 6 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 gui/__init__.py
 create mode 100644 gui/about/__init__.py
 create mode 100644 gui/adjust/__init__.py
 create mode 100644 gui/custom/__init__.py
 create mode 100644 gui/randomize/__init__.py

diff --git a/Gui.py b/Gui.py
index 9df8dffa..659f7eaa 100755
--- a/Gui.py
+++ b/Gui.py
@@ -28,9 +28,11 @@ def guiMain(args=None):
     randomizerWindow = ttk.Frame(notebook)
     adjustWindow = ttk.Frame(notebook)
     customWindow = ttk.Frame(notebook)
+    sortWindow = ttk.Frame(notebook)
     notebook.add(randomizerWindow, text='Randomize')
     notebook.add(adjustWindow, text='Adjust')
     notebook.add(customWindow, text='Custom')
+    notebook.add(sortWindow, text='SORT')
     notebook.pack()
 
     # Shared Controls
@@ -55,7 +57,7 @@ def guiMain(args=None):
 
     # randomizer controls
 
-    topFrame = Frame(randomizerWindow)
+    topFrame = Frame(sortWindow)
     rightHalfFrame = Frame(topFrame)
     checkBoxFrame = Frame(rightHalfFrame)
 
@@ -338,7 +340,7 @@ def guiMain(args=None):
     accessibilityFrame.pack(expand=True, anchor=E)
     algorithmFrame.pack(expand=True, anchor=E)
 
-    enemizerFrame = LabelFrame(randomizerWindow, text="Enemizer", padx=5, pady=2)
+    enemizerFrame = LabelFrame(sortWindow, text="Enemizer", padx=5, pady=2)
     enemizerFrame.columnconfigure(0, weight=1)
     enemizerFrame.columnconfigure(1, weight=1)
     enemizerFrame.columnconfigure(2, weight=1)
@@ -400,18 +402,18 @@ def guiMain(args=None):
 
     bottomFrame = Frame(randomizerWindow, pady=5)
 
-    worldLabel = Label(bottomFrame, text='Worlds')
+    worldLabel = Label(sortWindow, text='Worlds')
     worldVar = StringVar()
-    worldSpinbox = Spinbox(bottomFrame, from_=1, to=100, width=5, textvariable=worldVar)
-    namesLabel = Label(bottomFrame, text='Player names')
+    worldSpinbox = Spinbox(sortWindow, from_=1, to=100, width=5, textvariable=worldVar)
+    namesLabel = Label(sortWindow, text='Player names')
     namesVar = StringVar()
-    namesEntry = Entry(bottomFrame, textvariable=namesVar)
-    seedLabel = Label(bottomFrame, text='Seed #')
+    namesEntry = Entry(sortWindow, textvariable=namesVar)
+    seedLabel = Label(farBottomFrame, text='Seed #')
     seedVar = StringVar()
-    seedEntry = Entry(bottomFrame, width=15, textvariable=seedVar)
-    countLabel = Label(bottomFrame, text='Count')
+    seedEntry = Entry(farBottomFrame, width=15, textvariable=seedVar)
+    countLabel = Label(farBottomFrame, text='Count')
     countVar = StringVar()
-    countSpinbox = Spinbox(bottomFrame, from_=1, to=100, width=5, textvariable=countVar)
+    countSpinbox = Spinbox(farBottomFrame, from_=1, to=100, width=5, textvariable=countVar)
 
     def generateRom():
         guiargs = Namespace()
@@ -491,7 +493,7 @@ def guiMain(args=None):
         else:
             messagebox.showinfo(title="Success", message="Rom patched successfully")
 
-    generateButton = Button(bottomFrame, text='Generate Patched Rom', command=generateRom)
+    generateButton = Button(farBottomFrame, text='Generate Patched Rom', command=generateRom)
 
     worldLabel.pack(side=LEFT)
     worldSpinbox.pack(side=LEFT)
diff --git a/gui/__init__.py b/gui/__init__.py
new file mode 100644
index 00000000..8c5232bc
--- /dev/null
+++ b/gui/__init__.py
@@ -0,0 +1 @@
+# do nothing, just exist to make "gui" package
diff --git a/gui/about/__init__.py b/gui/about/__init__.py
new file mode 100644
index 00000000..1ad9a517
--- /dev/null
+++ b/gui/about/__init__.py
@@ -0,0 +1 @@
+# do nothing, just exist to make "gui.about" package
diff --git a/gui/adjust/__init__.py b/gui/adjust/__init__.py
new file mode 100644
index 00000000..3e1ae764
--- /dev/null
+++ b/gui/adjust/__init__.py
@@ -0,0 +1 @@
+# do nothing, just exist to make "gui.adjust" package
diff --git a/gui/custom/__init__.py b/gui/custom/__init__.py
new file mode 100644
index 00000000..33cec31c
--- /dev/null
+++ b/gui/custom/__init__.py
@@ -0,0 +1 @@
+# do nothing, just exist to make "gui.custom" package
diff --git a/gui/randomize/__init__.py b/gui/randomize/__init__.py
new file mode 100644
index 00000000..ecf3a271
--- /dev/null
+++ b/gui/randomize/__init__.py
@@ -0,0 +1 @@
+# do nothing, just exist to make "gui.randomize" package