Merge lp:~mitya57/url-dispatcher/qtquickcontrols into lp:url-dispatcher

[Dmitry Shachnev]

Ported the GUI from Ubuntu UI Toolkit to Qt Quick Controls.

Ported away from Ubuntu UI Toolkit, which is going to be removed.

I used Qt Quick Controls 1, as in Controls 2 the dialogs support is still in beta and API will change in the future.

[Dimitri John Ledkov (xnox)]

review: Approve (yolo)

=== modified file 'data/bad-url.qml'
--- data/bad-url.qml	2016-08-18 02:11:21 +0000
+++ data/bad-url.qml	2017-08-21 13:04:24 +0000
@@ -14,29 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-import Ubuntu.Components.Popups 1.0
-
-MainView {
-	applicationName: "com.canonical.url-dispatcher.bad-url-prompt"
-	automaticOrientation: true
-	backgroundColor: "transparent"
-	anchors.fill: parent
-
-	Component {
-		id: dialog
-		Dialog {
-			title: i18n.tr("Unrecognized Address")
-			text: i18n.tr("Ubuntu can't open addresses of type “%1”.").arg(Qt.application.arguments[2].split(':')[0])
-
-			Button {
-				text: i18n.tr("OK")
-				color: UbuntuColors.orange
-				onClicked: Qt.quit()
-			}
-		}
-	}
-
-	Component.onCompleted: PopupUtils.open(dialog)
+import QtQuick 2.2
+import QtQuick.Dialogs 1.1
+
+MessageDialog {
+	id: dialog
+	title: qsTr("Unrecognized Address")
+	text: qsTr("Ubuntu can't open addresses of type “%1”.").arg(Qt.application.arguments[2].split(':')[0])
+	onAccepted: Qt.quit()
+	Component.onCompleted: visible = true
 }

=== modified file 'debian/control'
--- debian/control	2017-03-28 18:28:11 +0000
+++ debian/control	2017-08-21 13:04:24 +0000
@@ -45,7 +45,7 @@
          ${shlibs:Depends},
 # For the bad URL dialog
          qtchooser,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin,
+         qml-module-qtquick-dialogs,
 Description: service to allow sending of URLs and get handlers started
  Allows applications to request a URL to be opened and handled by another
  process without seeing the list of other applications on the system or
@@ -71,6 +71,9 @@
          ${misc:Depends},
          ${shlibs:Depends},
          qtchooser,
+         qml-module-qtquick-controls,
+         qml-module-qtquick-layouts,
+         qml-module-qtquick-window2,
 Description: GUI tools for working with the URL Dispatcher.
  Allows applications to request a URL to be opened and handled by another
  process without seeing the list of other applications on the system or

=== modified file 'gui/url-dispatcher-gui.qml'
--- gui/url-dispatcher-gui.qml	2016-08-17 22:00:22 +0000
+++ gui/url-dispatcher-gui.qml	2017-08-21 13:04:24 +0000
@@ -1,59 +1,32 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3
-
-MainView {
-	applicationName: "url-dispatcher-gui"
-
-	Page {
-		header: PageHeader {
-			title: "URL Dispatcher GUI"
-			flickable: flickme
+import QtQuick.Window 2.2
+import QtQuick.Controls 1.4
+import QtQuick.Layouts 1.3
+
+Window {
+	visible: true
+	title: "URL Dispatcher GUI"
+	width: 360
+	height: 100
+
+	ColumnLayout {
+		anchors.fill: parent
+
+		TextField {
+			anchors.left: parent.left
+			anchors.right: parent.right
+			id: textbox
+			placeholderText: "URL (e.g. 'http://ubuntu.com')"
 		}
 
-		Flickable {
-			id: flickme
-			anchors.fill: parent
-
-			Column {
-				anchors.fill: parent
-
-				ListItem {
-					contentItem.anchors {
-						leftMargin: units.gu(2)
-						rightMargin: units.gu(2)
-						topMargin: units.gu(1)
-						bottomMargin: units.gu(1)
-					}
-
-					TextField {
-						id: textbox
-						anchors.fill: parent
-						placeholderText: "URL (e.g. 'http://ubuntu.com')"
-					}
-				}
-
-				ListItem {
-					contentItem.anchors {
-						leftMargin: units.gu(2)
-						rightMargin: units.gu(2)
-						topMargin: units.gu(1)
-						bottomMargin: units.gu(1)
-					}
-
-					Button {
-						anchors.fill: parent
-						text: "Send URL"
-						onClicked: {
-							console.log("Sending URL: " + textbox.text)
-							Qt.openUrlExternally(textbox.text)
-						}
-					}
-				}
+		Button {
+			anchors.left: parent.left
+			anchors.right: parent.right
+			text: "Send URL"
+			onClicked: {
+				console.log("Sending URL: " + textbox.text)
+				Qt.openUrlExternally(textbox.text)
 			}
 		}
-
 	}
-
-
 }