From 100d3a72fc058898a27057a3f4255646cc985d5d Mon Sep 17 00:00:00 2001
From: Tobias Koenig <tobias.koenig@kdab.com>
Date: Mon, 22 Oct 2012 16:52:06 +0200
Subject: [PATCH] Merge inputdialog.qml into dialogs.qml

---
 dialogs.qml     |   44 ++++++++++++++++++++++++++++++++------------
 inputdialog.qml |   38 --------------------------------------
 2 files changed, 32 insertions(+), 50 deletions(-)
 delete mode 100644 inputdialog.qml

diff --git a/dialogs.qml b/dialogs.qml
index 7de2616..b686c5e 100644
--- a/dialogs.qml
+++ b/dialogs.qml
@@ -16,13 +16,40 @@ Widget {
     id: fontDialog
   }
 
-  InputDialog {
-    id: intInputDialog
+  VBoxLayout {
+    PushButton {
+      text: qsTr("InputDialog::getInt()")
+      onClicked: {
+        var value = InputDialog.getInt(0, qsTr("Integer Input"), qsTr("Percentage..."), 25)
+        console.log("InputDialog.getInt returned " + value)
+      }
+    }
 
-    labelText: qsTr("Percentage")
-  }
+    PushButton {
+      text: qsTr("InputDialog::getDouble()")
+      onClicked: {
+        var value = InputDialog.getDouble(0, qsTr("Double Input"), qsTr("Amount:"), 37.56)
+        console.log("InputDialog.getDouble returned " + value)
+      }
+    }
+
+    PushButton {
+      text: qsTr("InputDialog::getItem()")
+      onClicked: {
+        var items = [ qsTr("Spring"), qsTr("Summer"), qsTr("Autem"), qsTr("Winter") ]
+        var item = InputDialog.getItem(0, qsTr("Item Selection"), qsTr("Season:"), items)
+        console.log("InputDialog.getItem returned " + item)
+      }
+    }
+
+    PushButton {
+      text: qsTr("InputDialog::getText()")
+      onClicked: {
+        var text = InputDialog.getText(0, qsTr("Text Input"), qsTr("User name:"))
+        console.log("InputDialog.getText returned " + text)
+      }
+    }
 
-  VBoxLayout {
     PushButton {
       text: qsTr("Color Dialog...")
       onClicked: {
@@ -61,12 +88,5 @@ Widget {
       }
     }
 
-    PushButton {
-      text: qsTr("Input Dialog (Int)...")
-      onClicked: {
-        if (intInputDialog.exec())
-          console.log(intInputDialog.intValue + "%")
-      }
-    }
   }
 }
diff --git a/inputdialog.qml b/inputdialog.qml
deleted file mode 100644
index 7f4569c..0000000
--- a/inputdialog.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-import QtGui 1.0
-
-Widget {
-  VBoxLayout {
-    PushButton {
-      text: "InputDialog::getDouble"
-      onClicked: {
-        var value = InputDialog.getDouble(0, "Double Input", "A Double number")
-        console.log("InputDialog.getDouble returned " + value)
-      }
-    }
-
-    PushButton {
-      text: "InputDialog::getInt"
-      onClicked: {
-        var value = InputDialog.getInt(0, "Integer Input", "An Integer number")
-        console.log("InputDialog.getInt returned " + value)
-      }
-    }
-
-    PushButton {
-      text: "InputDialog::getItem"
-      onClicked: {
-        var items = [ "Item 1", "Item 2", "Item 3"]
-        var item = InputDialog.getItem(0, "Item Selection", "Select an item", items)
-        console.log("InputDialog.getItem returned " + item)
-      }
-    }
-
-    PushButton {
-      text: "InputDialog::getText"
-      onClicked: {
-        var text = InputDialog.getText(0, "Text Input", "Any text")
-        console.log("InputDialog.getText returned " + text)
-      }
-    }
-  }
-}
-- 
1.7.2.5