From 4d2125fe2d8d05f4e0e1b821cb25240e8f1e9d55 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Fri, 3 Aug 2018 21:23:34 +0200
Subject: [PATCH] fix suggested port in manual connection dialog

---
 nymea-app/ui/ConnectPage.qml                  | 2 +-
 nymea-app/ui/connection/ManualConnectPage.qml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nymea-app/ui/ConnectPage.qml b/nymea-app/ui/ConnectPage.qml
index 307b12c0..4edf95ee 100644
--- a/nymea-app/ui/ConnectPage.qml
+++ b/nymea-app/ui/ConnectPage.qml
@@ -312,7 +312,7 @@ Page {
                     running: parent.visible
                 }
                 Label {
-                    text: qsTr("Trying to connect...")
+                    text: qsTr("Trying to connect to %1...").arg(Engine.connection.url)
                     font.pixelSize: app.largeFont
                     Layout.fillWidth: true
                     wrapMode: Text.WordWrap
diff --git a/nymea-app/ui/connection/ManualConnectPage.qml b/nymea-app/ui/connection/ManualConnectPage.qml
index 9d53e60f..4c6d3c26 100644
--- a/nymea-app/ui/connection/ManualConnectPage.qml
+++ b/nymea-app/ui/connection/ManualConnectPage.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.9
+import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import Nymea 1.0
@@ -41,7 +41,9 @@ Page {
             TextField {
                 id: portTextInput
                 Layout.fillWidth: true
-                placeholderText: connectionTypeComboBox.currentIndex === 0 ? "2222" : "4444"
+                placeholderText: connectionTypeComboBox.currentIndex === 0 ?
+                                     secureCheckBox.checked ? "2223" : "2222"
+                                   : secureCheckBox.checked ? "4445" : "4444"
                 validator: IntValidator{bottom: 1; top: 65535;}
             }