Add support for dialogs (Issue #162).

scalafx-demos/src/main/scala/scalafx/controls/DialogsDemo.scala

@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2011-2015, ScalaFX Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the ScalaFX Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE SCALAFX PROJECT OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package scalafx.controls
+
+import java.io.{FileNotFoundException, PrintWriter, StringWriter}
+
+import scala.language.implicitConversions
+import scalafx.Includes._
+import scalafx.application.JFXApp
+import scalafx.application.JFXApp.PrimaryStage
+import scalafx.geometry.{Insets, Pos}
+import scalafx.scene.Scene
+import scalafx.scene.control.Alert.AlertType
+import scalafx.scene.control._
+import scalafx.scene.layout.{GridPane, Priority, VBox}
+
+/**
+ * Based on JavaFX version discussed in blog: [[http://code.makery.ch/blog/javafx-dialogs-official/ JavaFX Dialogs]]
+ */
+object DialogsDemo extends JFXApp {
+
+
+  stage = new PrimaryStage {
+    scene = new Scene {
+      title = "Dialogs Demo"
+      root = new VBox {
+        children = Seq(
+          button("Information", informationDialog),
+          button("Without Header Text", withoutHeader),
+          button("Warning", warningDialog),
+          button("Error", errorDialog),
+          button("Exception", exceptionDialog),
+          button("Confirmation", confirmationDialog),
+          button("Confirmation Dialog with Custom Actions", confirmationWithCustomActions),
+          button("Text Input", textInputDialog),
+          button("Choice", choiceDialog)
+        )
+        spacing = 6
+        padding = Insets(10)
+        alignment = Pos.Center
+      }
+    }
+  }
+
+  def button[R](text: String, action: () => R) = new Button(text) {
+    onAction = handle {action()}
+    alignmentInParent = Pos.Center
+    hgrow = Priority.Always
+    maxWidth = Double.MaxValue
+    padding = Insets(7)
+  }
+
+  def informationDialog(): Unit = {
+    new Alert(AlertType.Information) {
+      title = "Information Dialog"
+      headerText = "Look, an Information Dialog"
+      contentText = "I have a great message for you!"
+    }.showAndWait()
+  }
+
+  def withoutHeader(): Unit = {
+    new Alert(AlertType.Information) {
+      title = "Information Dialog"
+      headerText = None
+      contentText = "I have a great message for you!"
+    }.showAndWait()
+  }
+
+  def warningDialog(): Unit = {
+    new Alert(AlertType.Warning) {
+      title = "Warning Dialog"
+      headerText = "Look, an Warning Dialog"
+      contentText = "Careful with the next step!"
+    }.showAndWait()
+  }
+
+  def errorDialog(): Unit = {
+    new Alert(AlertType.Error) {
+      title = "Error Dialog"
+      headerText = "Look, an Error Dialog"
+      contentText = "Ooops, there was an error!"
+    }.showAndWait()
+  }
+
+  def exceptionDialog(): Unit = {
+
+    // Create expandable Exception.
+    val exceptionText = {
+      val ex = new FileNotFoundException("Could not find file blabla.txt")
+      val sw = new StringWriter()
+      val pw = new PrintWriter(sw)
+      ex.printStackTrace(pw)
+      sw.toString
+    }
+    val label = new Label("The exception stacktrace was:")
+    val textArea = new TextArea {
+      text = exceptionText
+      editable = false
+      wrapText = true
+      maxWidth = Double.MaxValue
+      maxHeight = Double.MaxValue
+      vgrow = Priority.Always
+      hgrow = Priority.Always
+    }
+    val expContent = new GridPane {
+      maxWidth = Double.MaxValue
+      add(label, 0, 0)
+      add(textArea, 0, 1)
+    }
+
+    new Alert(AlertType.Error) {
+      title = "Exception Dialog"
+      headerText = "Look, an Exception Dialog"
+      contentText = "Could not find file blabla.txt!"
+      // Set expandable Exception into the dialog pane.
+      dialogPane().expandableContent = expContent
+    }.showAndWait()
+  }
+
+  def confirmationDialog(): Unit = {
+    val alert = new Alert(AlertType.Confirmation) {
+      title = "Confirmation Dialog"
+      headerText = "Look, a Confirmation Dialog"
+      contentText = "Are you ok with this?"
+    }
+
+    val result = alert.showAndWait()
+
+    ButtonType(result) match {
+      case Some(ButtonType.OK) => println("OK")
+      case _                   => println("Cancel or closed")
+    }
+  }
+
+  def confirmationWithCustomActions(): Unit = {
+    val ButtonTypeOne = new ButtonType("One")
+    val ButtonTypeTwo = new ButtonType("Two")
+    val ButtonTypeThree = new ButtonType("Three")
+
+    val alert = new Alert(AlertType.Confirmation) {
+      title = "Confirmation Dialog with Custom Actions"
+      headerText = "Look, a Confirmation Dialog with Custom Actions"
+      contentText = "Choose your option."
+      // Note that we override here default dialog buttons, OK and Cancel, with new ones.
+      // We could also just add to existing button using `++=`.
+      buttonTypes = Seq(ButtonTypeOne, ButtonTypeTwo, ButtonTypeThree, ButtonType.Cancel)
+    }
+
+    val result = alert.showAndWait()
+
+    ButtonType(result) match {
+      case Some(ButtonTypeOne)   => println("... user chose \"One\"")
+      case Some(ButtonTypeTwo)   => println("... user chose \"Two\"")
+      case Some(ButtonTypeThree) => println("... user chose \"Three\"")
+      case _                     => println("... user chose CANCEL or closed the dialog")
+    }
+  }
+
+  def textInputDialog(): Unit = {
+    val dialog = new TextInputDialog("walter") {
+      title = "Text Input Dialog"
+      headerText = "Look, a Text Input Dialog"
+      contentText = "Please enter your name:"
+    }
+
+    val result = dialog.showAndWait()
+    result match {
+      case Some(name) => println("Your name: " + name)
+      case None       => println("Dialog was canceled.")
+    }
+  }
+
+  def choiceDialog(): Unit = {
+
+    val choices = Seq("a", "b", "c")
+
+    val dialog = new ChoiceDialog("b", choices) {
+      title = "Choice Dialog"
+      headerText = "Look, a Choice Dialog"
+      contentText = "Choose your letter:"
+
+    }
+
+    val result = dialog.showAndWait()
+
+    result match {
+      case Some(choice) => println("Your choice: " + choice)
+      case None         => println("No selection")
+    }
+  }
+
+}

scalafx-demos/src/main/scala/scalafx/controls/LoginDialogDemo.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014, ScalaFX Project
+ * Copyright (c) 2011-2015, ScalaFX Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,15 +33,20 @@ import scalafx.geometry.Insets
 import scalafx.scene.Scene
 import scalafx.scene.control.ButtonBar.ButtonData
 import scalafx.scene.control._
-import scalafx.scene.image.ImageView
-import scalafx.scene.layout.GridPane
+import scalafx.scene.image.{Image, ImageView}
+import scalafx.scene.layout.{GridPane, VBox}
 
 object LoginDialogDemo extends JFXApp {
 
   stage = new JFXApp.PrimaryStage {
+    icons += new Image("/scalafx/sfx.png")
     scene = new Scene {
-      content = new Button("Show Login Dialog") {
-        onAction = handle {onShowLoginDialog()}
+      title = "Custom Dialog Demo"
+      content = new VBox {
+        children = new Button("Show Login Dialog") {
+          onAction = handle {onShowLoginDialog()}
+        }
+        padding = Insets(top = 24, right = 64, bottom = 24, left = 64)
       }
     }
   }
@@ -53,29 +58,30 @@ object LoginDialogDemo extends JFXApp {
       headerText = "Look, a Custom Login Dialog"
       graphic = new ImageView(this.getClass.getResource("login_icon.png").toString)
     }
+    dialog.initOwner(stage)
 
     // Set the button types.
     val loginButtonType = new ButtonType("Login", ButtonData.OKDone)
-    dialog.dialogPane().buttonTypes ++= Seq(loginButtonType, ButtonType.Cancel)
+    dialog.dialogPane().buttonTypes = Seq(loginButtonType, ButtonType.Cancel)
 
     // Create the username and password labels and fields.
-    val grid = new GridPane() {
-      hgap = 10
-      vgap = 10
-      padding = Insets(20, 100, 10, 10)
-    }
-
     val username = new TextField() {
       promptText = "Username"
     }
     val password = new PasswordField() {
       promptText = "Password"
     }
 
-    grid.add(new Label("Username:"), 0, 0)
-    grid.add(username, 1, 0)
-    grid.add(new Label("Password:"), 0, 1)
-    grid.add(password, 1, 1)
+    val grid = new GridPane() {
+      hgap = 10
+      vgap = 10
+      padding = Insets(20, 100, 10, 10)
+
+      add(new Label("Username:"), 0, 0)
+      add(username, 1, 0)
+      add(new Label("Password:"), 0, 1)
+      add(password, 1, 1)
+    }
 
     // Enable/Disable login button depending on whether a username was entered.
     val loginButton = dialog.dialogPane().lookupButton(loginButtonType)

scalafx-demos/src/main/scala/scalafx/controls/PaginationSample.scala

@@ -52,7 +52,7 @@ object PaginationSample extends JFXApp {
           new Label( """|Search results
                        |for %s""".stripMargin.format(link.text.value)))
       }
-      }
+    }
 
     val page = pageIndex * itemsPerPage
     new VBox(5) {