Add a main controller and options stage

lexun · Jan 26, 2015 · aaa71ed · aaa71ed
1 parent 06606b1
commit aaa71ed
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/lib/launchpad.rb b/lib/launchpad.rb
@@ -1,6 +1,7 @@
 require 'lib/launchpad/settings'
 require 'lib/launchpad/index'
 require 'lib/launchpad/gui/application'
+require 'lib/launchpad/gui/controllers/main_controller'
 
 # The main top level module for the launchpad gem.
 module Launchpad

diff --git a/lib/launchpad/gui/application.rb b/lib/launchpad/gui/application.rb
@@ -10,7 +10,7 @@ class Application < JRubyFX::Application
     #   automatically provided when {.launch} is called.
     def start(stage)
       with(stage, title: 'Launchpad', resizable: false) do
-        fxml 'main.fxml'
+        fxml MainController
         show
       end
     end

diff --git a/lib/launchpad/gui/controllers/main_controller.rb b/lib/launchpad/gui/controllers/main_controller.rb
@@ -0,0 +1,14 @@
+module Launchpad
+  # Main application GUI controller
+  class MainController
+    include JRubyFX::Controller
+    fxml 'main.fxml'
+
+    # Triggered when the options button is pressed
+    def show_options
+      @options ||= stage title: 'Options'
+      @options.on_close_request { @options = nil }
+      @options.show
+    end
+  end
+end
diff --git a/lib/launchpad/gui/fxml/main.fxml b/lib/launchpad/gui/fxml/main.fxml
@@ -19,7 +19,7 @@
          <children>
             <Button layoutX="720.0" layoutY="11.0" mnemonicParsing="false" text="Launch" />
             <Button layoutX="662.0" layoutY="11.0" mnemonicParsing="false" text="Scan" />
-            <Button layoutX="585.0" layoutY="11.0" mnemonicParsing="false" text="Options" />
+            <Button layoutX="585.0" layoutY="11.0" mnemonicParsing="false" onAction="#show_options" text="Options" />
             <ProgressBar layoutX="14.0" layoutY="11.0" prefHeight="27.0" prefWidth="559.0" progress="0.0" />
             <Label layoutX="33.0" layoutY="17.0" text="Info" />
          </children>

diff --git a/spec/lib/launchpad/gui/application_spec.rb b/spec/lib/launchpad/gui/application_spec.rb
@@ -13,7 +13,7 @@
     it 'should set up the stage' do
       expect(stage).to have_received(:title=).with 'Launchpad'
       expect(stage).to have_received(:resizable=).with false
-      expect(stage).to have_received(:fxml).with 'main.fxml'
+      expect(stage).to have_received(:fxml).with Launchpad::MainController
       expect(stage).to have_received(:show)
     end