Move MW to Bottom

Gui.py

@@ -14,7 +14,7 @@ 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.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
@@ -132,8 +132,8 @@ def guiMain(args=None):
     self.pages["randomizer"].notebook.add(self.pages["randomizer"].pages["dungeon"], text="Dungeon Shuffle")
 
     # Multiworld
-    self.pages["randomizer"].pages["multiworld"],self.settings = multiworld_page(self.pages["randomizer"].notebook,self.settings)
+#    self.pages["randomizer"].pages["multiworld"],self.settings = multiworld_page(self.pages["randomizer"].notebook,self.settings)
-    self.pages["randomizer"].notebook.add(self.pages["randomizer"].pages["multiworld"], text="Multiworld")
+#    self.pages["randomizer"].notebook.add(self.pages["randomizer"].pages["multiworld"], text="Multiworld")
 
     # Game Options
     self.pages["randomizer"].pages["gameoptions"] = gameoptions_page(self, self.pages["randomizer"].notebook)

resources/app/gui/lang/en.json

@@ -256,10 +256,8 @@
     "randomizer.item.sortingalgo.balanced": "Balanced",
 
 
-    "randomizer.multiworld.worlds": "Worlds",
+    "bottom.content.worlds": "Worlds",
-    "randomizer.multiworld.names": "Player names",
+    "bottom.content.names": "Player names",
-
-
     "bottom.content.seed": "Seed #",
     "bottom.content.generationcount": "Count",
     "bottom.content.go": "Generate Patched Rom",

source/classes/constants.py

@@ -90,9 +90,6 @@ SETTINGSTOPROCESS = {
       "experimental": "experimental",
       "dungeon_counters": "dungeon_counters"
     },
-    "multiworld": {
-      "names": "names"
-    },
     "gameoptions": {
       "hints": "hints",
       "nobgm": "disablemusic",
@@ -113,6 +110,7 @@ SETTINGSTOPROCESS = {
   },
   "bottom": {
     "content": {
+      "names": "names",
       "seed": "seed",
       "generationcount": "count"
     }

source/gui/bottom.py

@@ -7,6 +7,7 @@ from CLI import parse_arguments
 from Main import main
 from Utils import local_path, output_path, open_file
 import source.classes.constants as CONST
+from source.gui.randomize.multiworld import multiworld_page
 import source.gui.widgets as widgets
 from source.classes.Empty import Empty
 
@@ -18,6 +19,10 @@ def bottom_frame(self, parent, args=None):
     # Bottom Frame options
     self.widgets = {}
 
+    mw,_ = multiworld_page(self, parent.settings)
+    mw.pack(fill=X, expand=True)
+    self.widgets = mw.widgets
+
     # Seed input
     # widget ID
     widget = "seed"

source/gui/loadcliargs.py

@@ -96,8 +96,8 @@ def loadcliargs(gui, args, settings=None):
         gui.pages[mainpage].pages[subpage].widgets[widget].pieces["button"].configure(text=label)
 
         # Get Multiworld Worlds count
-        mainpage = "randomizer"
+        mainpage = "bottom"
-        subpage = "multiworld"
+        subpage = "content"
         widget = "worlds"
         setting = "multi"
         # set textbox/frame label
@@ -108,8 +108,8 @@ def loadcliargs(gui, args, settings=None):
             gui.pages[mainpage].pages[subpage].widgets[widget].storageVar.set(str(args[setting]))
 
         # Set Multiworld Names
-        mainpage = "randomizer"
+        mainpage = "bottom"
-        subpage = "multiworld"
+        subpage = "content"
         widget = "names"
         # set textbox/frame label
         label = fish.translate("gui","gui",mainpage + '.' + subpage + '.' + widget)