diff --git a/OpenPage/coffees/dialogs.coffee b/OpenPage/coffees/dialogs.coffee
index eca18c1..85c7699 100644
--- a/OpenPage/coffees/dialogs.coffee
+++ b/OpenPage/coffees/dialogs.coffee
@@ -28,22 +28,22 @@ HyperLinkDialog.scheme = """
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
diff --git a/ShowCase/assets/scheme.html b/ShowCase/assets/scheme.html
index a80cf64..4614dec 100644
--- a/ShowCase/assets/scheme.html
+++ b/ShowCase/assets/scheme.html
@@ -1,47 +1,47 @@
-
+
-
-
+
+
-
+
-
+
-
+ icon="os://packages/DummyApp/icon.png">
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/ShowCase/build/debug/main.js b/ShowCase/build/debug/main.js
index 3816eec..833b90d 100644
--- a/ShowCase/build/debug/main.js
+++ b/ShowCase/build/debug/main.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
(function() {
var Ant, ShowCase;
diff --git a/ShowCase/build/debug/package.json b/ShowCase/build/debug/package.json
index 58b489e..cac90c1 100644
--- a/ShowCase/build/debug/package.json
+++ b/ShowCase/build/debug/package.json
@@ -7,7 +7,7 @@
"email": "xsang.le@gmail.com",
"licences": "GPLv3"
},
- "version":"0.0.4-a",
+ "version":"0.0.5-a",
"category":"Other",
"mimes":["none"],
"iconclass": "fa fa-delicious",
diff --git a/ShowCase/build/debug/scheme.html b/ShowCase/build/debug/scheme.html
index a80cf64..341cfa5 100644
--- a/ShowCase/build/debug/scheme.html
+++ b/ShowCase/build/debug/scheme.html
@@ -1,47 +1,47 @@
-
+
-
-
+
+
-
+
-
+
-
+ icon="os://packages/DummyApp/icon.png" >
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/ShowCase/build/release/ShowCase.zip b/ShowCase/build/release/ShowCase.zip
index bcb6534..805ad36 100644
Binary files a/ShowCase/build/release/ShowCase.zip and b/ShowCase/build/release/ShowCase.zip differ
diff --git a/ShowCase/coffees/main.coffee b/ShowCase/coffees/main.coffee
index fd74508..7730e0d 100644
--- a/ShowCase/coffees/main.coffee
+++ b/ShowCase/coffees/main.coffee
@@ -9,7 +9,9 @@ class ShowCase extends this.OS.application.BaseApplication
@observable.on "btclick", (e) =>
@notify "button clicked"
-
+
+ @bindKey("CTRL-SHIFT-P", (e) => @notify("CTRL-SHIFT-P shortcut executed"))
+
list = @find 'list'
list.data = [
@@ -137,7 +139,8 @@ class ShowCase extends this.OS.application.BaseApplication
{ text: "Selection dialog", id: "selection" },
{ text: "About dialog", id: "about" },
{ text: "File dialog", id: "file" },
- { text: "Text dialog", id: "text" }
+ { text: "Text dialog", id: "text" },
+ { text: "Multi-input dialog", id: "minputs" }
]
btrun.onbtclick = (e) =>
@@ -208,6 +211,23 @@ class ShowCase extends this.OS.application.BaseApplication
})
.then (d) =>
@notify d
+ when "minputs"
+ @openDialog("MultiInputDialog", {
+ title: "Multi-inputs",
+ model: {
+ name: "Your name",
+ email: "Your email",
+ where: "Your address"
+ },
+ allow_empty: false,
+ data: {
+ name: "John Doe",
+ email: "jd@mail.com",
+ where: "Anywhere on Earth"
+ }
+ })
+ .then (d) =>
+ @notify JSON.stringify(d)
else return
diff --git a/ShowCase/package.json b/ShowCase/package.json
index 58b489e..cac90c1 100644
--- a/ShowCase/package.json
+++ b/ShowCase/package.json
@@ -7,7 +7,7 @@
"email": "xsang.le@gmail.com",
"licences": "GPLv3"
},
- "version":"0.0.4-a",
+ "version":"0.0.5-a",
"category":"Other",
"mimes":["none"],
"iconclass": "fa fa-delicious",