License formatting. Fix cover page information.

8 files changed, 24 insertions, 14 deletions

diff --git a/LICENSE b/LICENSE
index 96a212f..e9efcf5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014, jroivas
+Copyright (c) 2014, Jouni Roivas
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/README.md b/README.md
index 0630434..2a4c8a5 100644
--- a/README.md
+++ b/README.md
@@ -38,3 +38,11 @@ Pressing hangup button in Pebble should end the call.
 
 
 !!! NO WARRANTY OF ANY KIND !!!
+
+
+
+References
+----------
+
+http://pebbledev.org/wiki/Protocol
+https://github.com/Hexxeh/libpebble/
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
index b717b49..aaa33c6 100644
--- a/qml/cover/CoverPage.qml
+++ b/qml/cover/CoverPage.qml
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013 Jouni Roivas
+  Copyright (C) 2014 Jouni Roivas
   Copyright (C) 2013 Jolla Ltd.
   Contact: Thomas Perl <thomas.perl@jollamobile.com>
   All rights reserved.
@@ -13,7 +13,7 @@
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the Jolla Ltd nor the
+    * Neither the name of the authors nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
@@ -41,7 +41,7 @@ CoverBackground {
     Label {
         anchors.top: label.bottom
         anchors.horizontalCenter: parent.horizontalCenter
-        text: watchConnector.name
+        text: watchPage.watchConnector.name
         font.pointSize: Theme.fontSizeSmall
     }
 }
diff --git a/qml/pages/WatchPage.qml b/qml/pages/WatchPage.qml
index 743e130..bf76338 100644
--- a/qml/pages/WatchPage.qml
+++ b/qml/pages/WatchPage.qml
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013 Jouni Roivas
+  Copyright (C) 2014 Jouni Roivas
   Copyright (C) 2013 Jolla Ltd.
   Contact: Thomas Perl <thomas.perl@jollamobile.com>
   All rights reserved.
@@ -13,7 +13,7 @@
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the Jolla Ltd nor the
+    * Neither the name of the authors nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
@@ -41,6 +41,7 @@ import watch 0.1
 
 Page {
     id: page
+    property alias watchConnector: watchConnector
     WatchConnector {
         id: watchConnector
 
diff --git a/qml/waterwatch.qml b/qml/waterwatch.qml
index b41c7f5..cf65076 100644
--- a/qml/waterwatch.qml
+++ b/qml/waterwatch.qml
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013 Jouni Roivas
+  Copyright (C) 2014 Jouni Roivas
   Copyright (C) 2013 Jolla Ltd.
   Contact: Thomas Perl <thomas.perl@jollamobile.com>
   All rights reserved.
@@ -13,7 +13,7 @@
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the Jolla Ltd nor the
+    * Neither the name of the authors nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
@@ -35,7 +35,7 @@ import "pages"
 
 ApplicationWindow
 {
-    initialPage: Component { WatchPage { } }
+    initialPage: WatchPage { id: watchPage }
     cover: Qt.resolvedUrl("cover/CoverPage.qml")
 }
 
diff --git a/src/watchconnector.cpp b/src/watchconnector.cpp
index 55e4b80..fb518ed 100644
--- a/src/watchconnector.cpp
+++ b/src/watchconnector.cpp
@@ -152,6 +152,7 @@ void WatchConnector::disconnected()
     socket->deleteLater();
     socket = nullptr;
     emit connectedChanged();
+    emit nameChanged();
 }
 
 void WatchConnector::sendData(const QByteArray &data)
diff --git a/src/watchconnector.h b/src/watchconnector.h
index 59ea632..198f703 100644
--- a/src/watchconnector.h
+++ b/src/watchconnector.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013 Jouni Roivas
+  Copyright (C) 2014 Jouni Roivas
   All rights reserved.
 
   You may use this file under the terms of BSD license as follows:
@@ -11,7 +11,7 @@
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the Jolla Ltd nor the
+    * Neither the name of the authors nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
@@ -80,7 +80,7 @@ public:
     explicit WatchConnector(QObject *parent = 0);
     virtual ~WatchConnector();
     bool isConnected() const { return is_connected; }
-    QString name() const { if (socket != nullptr) return socket->peerName(); return "";}
+    QString name() const { if (socket != nullptr) return socket->peerName(); return ""; }
 
     QString timeStamp();
     QString decodeEndpoint(unsigned int val);
diff --git a/src/waterwatch.cpp b/src/waterwatch.cpp
index 2f65cc0..02da4b8 100644
--- a/src/waterwatch.cpp
+++ b/src/waterwatch.cpp
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013 Jouni Roivas
+  Copyright (C) 2014 Jouni Roivas
   Copyright (C) 2013 Jolla Ltd.
   Contact: Thomas Perl <thomas.perl@jollamobile.com>
   All rights reserved.
@@ -13,7 +13,7 @@
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the Jolla Ltd nor the
+    * Neither the name of the authors nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.