Merge lp:~nik90/touch-irc/revamp-connect-page into lp:touch-irc

[Nekhelesh Ramananthan]

- Revamped connectPage
- Adjusted application size slightly
- Moved port, SSL, SASL options to advanced settings category which is not visible by default. It can be toggled on by the user.
- Added copyright license to connectPage.qml

This MP implements the following,
- Revamped connectPage
- Adjusted application size slightly
- Moved port, SSL, SASL options to advanced settings category which is not visible by default. It can be toggled on by the user.
- Added copyright license to connectPage.qml

Unmerged revisions

4. By Nekhelesh Ramananthan on 2014-02-14

Revamped the connect page

=== modified file 'qml/IrcClient/ConnectPage.qml'
--- qml/IrcClient/ConnectPage.qml	2014-02-13 20:24:29 +0000
+++ qml/IrcClient/ConnectPage.qml	2014-02-14 16:53:58 +0000
@@ -1,13 +1,35 @@
+/*
+ * Copyright (C) 2014 Touch Irc Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Nekhelesh Ramananthan <[e-mail]>
+ */
+
 import QtQuick 2.0
-import Ubuntu.Layouts 0.1
+import Communi 3.0
 import Ubuntu.Components 0.1
-import Communi 3.0
+import Ubuntu.Components.ListItems 0.1
+import "components"
 
+// Connect Page - Intial User Setup Page
 Page {
-    id: page
-    title:  qsTr("Login")
+    id: connectPage
+
+    title:  i18n.tr("Login")
+
     property string host: hostField.text || hostField.placeholderText
-    property int port: portField.value
+    property int port: portField.text ? parseInt(portField.text) : parseInt(portField.placeholderText)
     property bool secure: secureField.checked
     property bool sasl: saslField.checked
     property string nickName: nickNameField.text || nickNameField.placeholderText
@@ -15,162 +37,172 @@
     property string userName: userNameField.text || userNameField.placeholderText
     property string password: passwordField.text
     property string channel: channelField.text || channelField.placeholderText
+
     signal accepted()
     signal rejected()
-    Grid{
-        id: grid
-        width: parent.width
-        height: parent.height
-        columns: 2
-        rowSpacing:  units.gu(1.5)
-        columnSpacing: units.gu(1.3)
-
-        anchors{
-         right: parent.right
-         left: parent.left
-         leftMargin: units.gu(2)
-         bottom: parent.bottom
-         top: parent.top
-        topMargin: units.gu(0.5)
-        }
-
-        Label {
-            text: qsTr("Host:")
-            width: 10
-        }
-
-        TextField {
+
+    Column {
+        id: mainColumn
+
+        spacing: units.gu(1.5)
+        anchors {
+            fill: parent
+            margins: units.gu(2)
+        }
+
+        EntryField {
             id: hostField
             focus: true
-            width: parent.width - channelLabel.width*1.88
+            width: parent.width
+            title: i18n.tr("Host: ")
             placeholderText: "irc.freenode.net"
         }
 
-        Label { text: qsTr("Port:") }
-        Row{
-            width: parent.width
-            spacing: 8
-            Slider {
-                id: portField
-                value: 6667
-                width: parent.width - channelLabel.width*2.22
-                minimumValue: 1024
-                maximumValue: 65535
-            }
-            Label{
-                text: Math.round(portField.value)
-            anchors.verticalCenter: portField.verticalCenter
-            }
-        }
-
-
-        Label { text: qsTr("SSL: ") }
-        CheckBox {
-            id: secureField
-            text: qsTr("SSL")
-        }
-        Label { text: qsTr("SASL: ") }
-        CheckBox {
-            id: saslField
-
-            text: qsTr("SASL")
-        }
-        Label { text: qsTr("Nick name:") }
-        TextField {
-
+        EntryField {
             id: nickNameField
-            width: parent.width - channelLabel.width*1.88
-
+            width: parent.width
+            title: i18n.tr("Nick Name:")
             placeholderText: "Nick" + Math.round(Math.random() * 9999)
         }
-        Label { text: qsTr("Real name:") }
-        TextField {
+
+        EntryField {
             id: realNameField
-            width: parent.width - channelLabel.width*1.88
-
-            placeholderText: qsTr("Your Real Name")
+            width: parent.width
+            title: i18n.tr("Real Name:")
+            placeholderText: "Your Real Name"
         }
 
-        Label { text: qsTr("User name:") }
-        TextField {
+        EntryField {
             id: userNameField
-            width: parent.width - channelLabel.width*1.88
-
-            placeholderText: "Your UserName "
+            width: parent.width
+            title: i18n.tr("User Name:")
+            placeholderText: "Your User Name"
         }
 
-        Label { text: qsTr("Password:") }
-        TextField {
+        EntryField {
             id: passwordField
-            width: parent.width - channelLabel.width*1.88
+            width: parent.width
+            title: i18n.tr("Password:")
+            placeholderText: "Your Password"
             echoMode: TextInput.Password
         }
 
-        Label {
-        id: channelLabel
-            text: qsTr("Channel:")
-        }
-        TextField {
+        EntryField {
             id: channelField
-            width: parent.width - channelLabel.width*1.88
+            width: parent.width
+            title: i18n.tr("Channel:")
             placeholderText: "#ubuntu-app-devel"
         }
+
+        ThinDivider {}
+
+        Standard {
+            text: i18n.tr("Show Advanced settings")
+            showDivider: false
+            anchors {
+                left: parent.left
+                right: parent.right
+                margins: units.gu(-2)
+            }
+
+            control: CheckBox {
+                id: advancedSettings
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.right: parent.right
+                onClicked: {
+                    if(checked)
+                        advancedColumn.visible = true
+                    else
+                        advancedColumn.visible = false
+                }
+            }
+        }
+
+        Column {
+            id: advancedColumn
+            visible: false
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            EntryField {
+                id: portField
+                width: parent.width
+                title: i18n.tr("Port:")
+                placeholderText: "6667"
+            }
+
+            Standard {
+                text: i18n.tr("SSL")
+                showDivider: false
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(-2)
+                }
+
+                control: CheckBox {
+                    id: secureField
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.right: parent.right
+                }
+            }
+
+            Standard {
+                text: i18n.tr("SASL")
+                showDivider: false
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(-2)
+                }
+
+                control: CheckBox {
+                    id: saslField
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.right: parent.right
+                }
+            }
+        }
     }
-    Column {
+
+    Row {
         id: row
-        spacing: units.gu(0.5)
-        anchors.bottom: grid.bottom
-        anchors.bottomMargin: units.gu(0.5)
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: grid.width
+        spacing: units.gu(2)
+        anchors {
+            bottom: mainColumn.bottom
+            horizontalCenter: parent.horizontalCenter
+            margins: units.gu(0.5)
+        }
 
         Button {
             id: okButton
-            text: qsTr("Ok")
-            width: parent.width / 1.7
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            onClicked: page.accepted()
+            text: i18n.tr("Ok")
+            width: units.gu(15)
+            onClicked: connectPage.accepted()
         }
 
         Button {
             id: cancelButton
-            text: qsTr("Quit")
-            width: parent.width / 1.7
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            onClicked: page.rejected()
+            text: i18n.tr("Quit")
+            width: units.gu(15)
+            onClicked: connectPage.rejected()
         }
     }
 
-
-    //    }//Grid
-
     Keys.onReturnPressed: {
         if (okButton.enabled)
-            page.accepted()
+            connectPage.accepted()
     }
 
     Keys.onEnterPressed: {
         if (okButton.enabled)
-            page.accepted()
+            connectPage.accepted()
     }
 
     Keys.onEscapePressed: {
         if (cancelButton.enabled)
-            page.rejected()
-    }
-
-    Item {
-        id: settings
-        property alias host: hostField.text
-        property alias port: portField.value
-        property alias secure: secureField.checked
-        property alias sasl: saslField.checked
-        property alias nickName: nickNameField.text
-        property alias realName: realNameField.text
-        property alias userName: userNameField.text
-        property alias password: passwordField.text
-        property alias channel: channelField.text
+            connectPage.rejected()
     }
 }
 
=== added directory 'qml/IrcClient/components'
=== added file 'qml/IrcClient/components/EntryField.qml'
--- qml/IrcClient/components/EntryField.qml	1970-01-01 00:00:00 +0000
+++ qml/IrcClient/components/EntryField.qml	2014-02-14 16:53:58 +0000
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+TextField{
+    id: root
+
+    property alias title: label.text
+
+    primaryItem: Label{
+        id: label
+        anchors.left: parent.left
+        anchors.verticalCenter: parent.verticalCenter
+        color: root.highlighted ? "#2C001E" : Theme.palette.normal.baseText
+    }
+}
 
=== modified file 'qml/IrcClient/main.qml'
--- qml/IrcClient/main.qml	2014-02-13 20:24:29 +0000
+++ qml/IrcClient/main.qml	2014-02-14 16:53:58 +0000
@@ -18,8 +18,8 @@
     applicationName: "irc client"
     automaticOrientation: true
     anchorToKeyboard: true
-    width: units.gu(40)
-    height: units.gu(71)
+    width: units.gu(50)
+    height: units.gu(80)
     property bool isConnected: false
     PageStack{
         id: pageStack