Merge pull request #110 from izumiya-keisuke/issue

[other] fix gui notice

pon2.nimble

@@ -1,8 +1,8 @@
 # Package
 
-version = "0.14.0"
+version = "0.15.0"
 author = "Keisuke Izumiya"
-description = "Puyo Puyo and Nazo Puyo Application"
+description = "Application for Puyo Puyo and Nazo Puyo"
 license = "Apache-2.0"
 
 srcDir = "src"
@@ -90,5 +90,4 @@ task web, "Make Web Pages":
   rmDir "src/htmldocs"
 
   # assets
-  exec "nim c -r assets/pairs/generate.nim"
   cpDir "assets", "www/assets"

src/pon2.nim

@@ -32,24 +32,15 @@ when isMainModule:
     elif defined(pon2.marathon):
       import std/[sugar]
       import karax/[karax]
-      import ./pon2pkg/app/[marathon as marathonModule]
       import ./pon2pkg/private/main/[web]
 
-      var marathon = initMarathon()
-
-      setRenderer () => marathon.initMainMarathonNode
+      setRenderer () => initMainMarathonNode()
     else:
       import std/[sugar]
-      import ./pon2pkg/app/[gui]
       import ./pon2pkg/private/main/[web]
       import karax/[karax]
 
-      var
-        pageInitialized = false
-        guiApplication: GuiApplication
-
-      setRenderer (routerData: RouterData) =>
-        routerData.initGuiApplicationNode(pageInitialized, guiApplication)
+      setRenderer (routerData: RouterData) => routerData.initMainGuiApplicationNode
   else:
     import std/[tables]
     import ./pon2pkg/private/main/[native]

src/pon2pkg/app.nim

@@ -25,36 +25,38 @@ export
   generate.GenerateError, generate.GenerateRequirementColor,
   generate.GenerateRequirement, generate.generate
 export
-  gui.GuiApplicationReplay, gui.GuiApplication, gui.initGuiApplication, gui.replay,
+  gui.GuiApplicationReplay, gui.GuiApplication, gui.initGuiApplication, gui.simulator,
+  gui.simulatorRef, gui.replaySimulator, gui.replaySimulatorRef, gui.replay,
   gui.focusEditor, gui.solving, gui.permuting, gui.progressBar, gui.toggleFocus,
   gui.solve, gui.permute, gui.nextReplay, gui.prevReplay, gui.operate
 export key.KeyEvent, key.initKeyEvent
 export
   marathon.MarathonMatchResult, marathon.Marathon, marathon.initMarathon,
-  marathon.matchResult, marathon.focusSimulator, marathon.toggleFocus,
-  marathon.nextResultPage, marathon.prevResultPage, marathon.match, marathon.play,
-  marathon.operate
+  marathon.simulator, marathon.simulatorRef, marathon.matchResult,
+  marathon.focusSimulator, marathon.toggleFocus, marathon.nextResultPage,
+  marathon.prevResultPage, marathon.match, marathon.play, marathon.operate
 export
   nazopuyo.NazoPuyoWrap, nazopuyo.initNazoPuyoWrap, nazopuyo.get, nazopuyo.rule,
   nazopuyo.`rule=`, nazopuyo.`==`
 export permute.permute
 export
   simulator.SimulatorKind, simulator.SimulatorMode, simulator.SimulatorState,
   simulator.SimulatorEditing, simulator.Simulator, simulator.initSimulator,
-  simulator.rule, simulator.kind, simulator.mode, simulator.`rule=`, simulator.`kind=`,
-  simulator.`mode=`, simulator.nazoPuyoWrap, simulator.originalNazoPuyoWrap,
-  simulator.`pairsPositions=`, simulator.editing, simulator.`editingCell=`,
-  simulator.editor, simulator.state, simulator.score, simulator.operatingPosition,
-  simulator.toggleInserting, simulator.toggleFocus, simulator.moveCursorUp,
-  simulator.moveCursorDown, simulator.moveCursorRight, simulator.moveCursorLeft,
-  simulator.deletePairPosition, simulator.writeCell, simulator.shiftFieldUp,
-  simulator.shiftFieldDown, simulator.shiftFieldRight, simulator.shiftFieldLeft,
-  simulator.flipFieldV, simulator.flipFieldH, simulator.`requirementKind=`,
-  simulator.`requirementColor=`, simulator.`requirementNumber=`, simulator.undo,
-  simulator.redo, simulator.moveOperatingPositionRight,
-  simulator.moveOperatingPositionLeft, simulator.rotateOperatingPositionRight,
-  simulator.rotateOperatingPositionLeft, simulator.forward, simulator.backward,
-  simulator.reset, simulator.toUri, simulator.parseSimulator, simulator.operate
+  simulator.copy, simulator.rule, simulator.kind, simulator.mode, simulator.`rule=`,
+  simulator.`kind=`, simulator.`mode=`, simulator.nazoPuyoWrap,
+  simulator.initialNazoPuyoWrap, simulator.`pairsPositions=`, simulator.editing,
+  simulator.`editingCell=`, simulator.editor, simulator.state, simulator.score,
+  simulator.operatingPosition, simulator.toggleInserting, simulator.toggleFocus,
+  simulator.moveCursorUp, simulator.moveCursorDown, simulator.moveCursorRight,
+  simulator.moveCursorLeft, simulator.deletePairPosition, simulator.writeCell,
+  simulator.shiftFieldUp, simulator.shiftFieldDown, simulator.shiftFieldRight,
+  simulator.shiftFieldLeft, simulator.flipFieldV, simulator.flipFieldH, simulator.flip,
+  simulator.`requirementKind=`, simulator.`requirementColor=`,
+  simulator.`requirementNumber=`, simulator.undo, simulator.redo,
+  simulator.moveOperatingPositionRight, simulator.moveOperatingPositionLeft,
+  simulator.rotateOperatingPositionRight, simulator.rotateOperatingPositionLeft,
+  simulator.forward, simulator.backward, simulator.reset, simulator.toUri,
+  simulator.parseSimulator, simulator.operate
 export solve.solve
 
 when defined(js):
@@ -66,17 +68,12 @@ when defined(js):
   export
     marathon.runKeyboardEventHandler, marathon.initKeyboardEventHandler,
     marathon.initMarathonNode
-  export
-    simulator.runKeyboardEventHandler, simulator.initKeyboardEventHandler,
-    simulator.initSimulatorNode
+  export simulator.initSimulatorNode
 else:
   export color.toNiguiColor
   export
     gui.GuiApplicationControl, gui.GuiApplicationWindow, gui.runKeyboardEventHandler,
     gui.initKeyboardEventHandler, gui.initGuiApplicationControl,
     gui.initGuiApplicationWindow
   export key.toKeyEvent
-  export
-    simulator.SimulatorControl, simulator.SimulatorWindow,
-    simulator.runKeyboardEventHandler, simulator.initKeyboardEventHandler,
-    simulator.initSimulatorControl, simulator.initSimulatorWindow
+  export simulator.SimulatorControl, simulator.initSimulatorControl