From 40a557d312b2be5caf62fc2f9e338578f293e3cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org>
Date: Mon, 2 Sep 2013 13:31:50 +0200
Subject: [PATCH] Missing files

---
 qmlpackages/blank/contents/loader.qml   |  9 ++--
 qmlpackages/desktop/contents/loader.qml | 64 +++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 qmlpackages/desktop/contents/loader.qml

diff --git a/qmlpackages/blank/contents/loader.qml b/qmlpackages/blank/contents/loader.qml
index 2cf2602f6..02475e9b9 100644
--- a/qmlpackages/blank/contents/loader.qml
+++ b/qmlpackages/blank/contents/loader.qml
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2
-import org.kde.plasma.hardware 0.1 as Hardware
+import org.kde.solid 1.0 as Solid
 import org.kde.plasma.platformcomponents 1.0 as Platform
 import QtQuick.Window 2.0
 
@@ -27,14 +27,17 @@ Item {
     id: main
 
     property string shell  : "org.kde.blank"
-    property bool willing  : hardware.touchscreenPresent
+    property bool willing  : keyboards.count != 1
     property int  priority : 0
 
     // This is not needed, but allows the
     // handler to know whether its shell is loaded
     property bool loaded   : false
 
-    Hardware.Interface { id: hardware }
+    Solid.Devices {
+        id: keyboards
+        query: "IS Keyboard"
+    }
 
     Platform.Application {
         application: "xterm"
diff --git a/qmlpackages/desktop/contents/loader.qml b/qmlpackages/desktop/contents/loader.qml
new file mode 100644
index 000000000..dc2fc67de
--- /dev/null
+++ b/qmlpackages/desktop/contents/loader.qml
@@ -0,0 +1,64 @@
+/*   vim:set foldmethod=marker:
+ *
+ *   Copyright (C) 2013 Ivan Cukic <ivan.cukic(at)kde.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   or (at your option) any later version, 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, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import QtQuick 2
+import org.kde.solid 1.0 as Solid
+import QtQuick.Window 2.0
+
+Item {
+    id: main
+
+    property string shell  : "org.kde.desktop"
+    property bool willing  : keyboards.count == 1
+    property int  priority : 1
+
+    // This is not needed, but allows the
+    // handler to know whether its shell is loaded
+    property bool loaded   : false
+
+    Solid.Devices {
+        id: keyboards
+        query: "IS Keyboard"
+    }
+
+    // TODO: This is not needed - just for testing purposes
+    Window {
+        id: desktopDialog
+
+        visible: main.loaded
+
+        width: 500
+        height: 500
+
+        Rectangle {
+            anchors.fill: parent
+            color: "white"
+        }
+
+        Text {
+            anchors.fill: parent
+            font.pointSize: 32
+            text: "Desktop"
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment:   Text.AlignVCenter
+        }
+    }
+}
+