From 327dab50c887d2818cac9109049bf5fc1f391a17 Mon Sep 17 00:00:00 2001
From: "Javier S. Pedro" <dev.git@javispedro.com>
Date: Sat, 27 Sep 2014 18:15:22 +0200
Subject: enable all the builtin watchfaces

---
 qml/pages/AddWidget.qml              |   5 ++++-
 qml/pages/MainPage.qml               |   2 +-
 qml/watch/faces/builtinface0.qml     |  11 +++++++++++
 qml/watch/faces/builtinface1.qml     |  11 +++++++++++
 qml/watch/faces/builtinface2.png     | Bin 0 -> 906 bytes
 qml/watch/faces/builtinface2.qml     |  11 +++++++++++
 qml/watch/faces/builtinface4.qml     |   2 +-
 qml/watch/faces/builtinface5.png     | Bin 0 -> 1663 bytes
 qml/watch/faces/builtinface5.qml     |  11 +++++++++++
 qml/watch/faces/builtinface_what.png | Bin 906 -> 0 bytes
 10 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 qml/watch/faces/builtinface0.qml
 create mode 100644 qml/watch/faces/builtinface1.qml
 create mode 100644 qml/watch/faces/builtinface2.png
 create mode 100644 qml/watch/faces/builtinface2.qml
 create mode 100644 qml/watch/faces/builtinface5.png
 create mode 100644 qml/watch/faces/builtinface5.qml
 delete mode 100644 qml/watch/faces/builtinface_what.png

(limited to 'qml')

diff --git a/qml/pages/AddWidget.qml b/qml/pages/AddWidget.qml
index 5c3086e..c854c7c 100644
--- a/qml/pages/AddWidget.qml
+++ b/qml/pages/AddWidget.qml
@@ -19,13 +19,14 @@ Page {
 		}
 
 		delegate : BackgroundItem {
+			id: widgetDelegate
 			contentHeight: Theme.itemSizeSmall
 
 			Label {
 				anchors.left: parent.left
 				anchors.margins: Theme.paddingLarge
 				anchors.verticalCenter: parent.verticalCenter
-				text: model.description
+				text: model.description + (!widgetDelegate.enabled ? qsTr(" (does not fit)") : "")
 				truncationMode: TruncationMode.Elide
 				color: highlighted ? Theme.highlightColor : Theme.primaryColor
 			}
@@ -34,6 +35,8 @@ Page {
 				curWidgets.addWidget(model.url, addToPage, addToPos, model.size);
 				pageStack.pop();
 			}
+
+			enabled: !curWidgets.widgetOverlaps(addToPage, addToPos, model.size);
 		}
 	}
 }
diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
index b25ff06..20d602f 100644
--- a/qml/pages/MainPage.qml
+++ b/qml/pages/MainPage.qml
@@ -227,7 +227,7 @@ Page {
 
 			Label {
 				x: Theme.paddingLarge
-				text: "TODO"
+				text: "TODO: List of notification types"
 			}
 		}
 	}
diff --git a/qml/watch/faces/builtinface0.qml b/qml/watch/faces/builtinface0.qml
new file mode 100644
index 0000000..a8df091
--- /dev/null
+++ b/qml/watch/faces/builtinface0.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.0
+
+Rectangle {
+	width: 96/2
+	height: 96/2
+
+	Image {
+		anchors.fill: parent
+		source: "builtinface0.png"
+	}
+}
diff --git a/qml/watch/faces/builtinface1.qml b/qml/watch/faces/builtinface1.qml
new file mode 100644
index 0000000..3d4bb57
--- /dev/null
+++ b/qml/watch/faces/builtinface1.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.0
+
+Rectangle {
+	width: 96
+	height: 96/2
+
+	Image {
+		anchors.fill: parent
+		source: "builtinface3.png"
+	}
+}
diff --git a/qml/watch/faces/builtinface2.png b/qml/watch/faces/builtinface2.png
new file mode 100644
index 0000000..3ade62b
Binary files /dev/null and b/qml/watch/faces/builtinface2.png differ
diff --git a/qml/watch/faces/builtinface2.qml b/qml/watch/faces/builtinface2.qml
new file mode 100644
index 0000000..7c4542a
--- /dev/null
+++ b/qml/watch/faces/builtinface2.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.0
+
+Rectangle {
+	width: 96
+	height: 96
+
+	Image {
+		anchors.fill: parent
+		source: "builtinface2.png"
+	}
+}
diff --git a/qml/watch/faces/builtinface4.qml b/qml/watch/faces/builtinface4.qml
index f9eff50..ca542d4 100644
--- a/qml/watch/faces/builtinface4.qml
+++ b/qml/watch/faces/builtinface4.qml
@@ -6,6 +6,6 @@ Rectangle {
 
 	Image {
 		anchors.fill: parent
-		source: "builtinface4.png"
+		source: "builtinface3.png"
 	}
 }
diff --git a/qml/watch/faces/builtinface5.png b/qml/watch/faces/builtinface5.png
new file mode 100644
index 0000000..d084bb0
Binary files /dev/null and b/qml/watch/faces/builtinface5.png differ
diff --git a/qml/watch/faces/builtinface5.qml b/qml/watch/faces/builtinface5.qml
new file mode 100644
index 0000000..e64703c
--- /dev/null
+++ b/qml/watch/faces/builtinface5.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.0
+
+Rectangle {
+	width: 96
+	height: 96
+
+	Image {
+		anchors.fill: parent
+		source: "builtinface5.png"
+	}
+}
diff --git a/qml/watch/faces/builtinface_what.png b/qml/watch/faces/builtinface_what.png
deleted file mode 100644
index 3ade62b..0000000
Binary files a/qml/watch/faces/builtinface_what.png and /dev/null differ
-- 
cgit v1.2.3