Add Version Info

Change-Id: I9c8d36e9c4d9068e7c7bcb8834d84dd2cf810874
Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io>

diff --git a/app/Settings.qml b/app/Settings.qml
index 4fcda79..b3a622a 100644 (file)
--- a/app/Settings.qml
+++ b/app/Settings.qml
@@ -22,6 +22,7 @@ import 'datetime'
 import 'bluetooth'
 import 'wifi'
 import 'example'
+import 'version'
 
 ApplicationWindow {
     id: root
@@ -60,6 +61,8 @@ ApplicationWindow {
 
         Wifi {}
 
-        Example {}
+//        Example {}
+
+        Version {}
     }
 }

diff --git a/app/SettingsLauncher.qml b/app/SettingsLauncher.qml
index c627324..4591cb4 100644 (file)
--- a/app/SettingsLauncher.qml
+++ b/app/SettingsLauncher.qml
@@ -40,14 +40,14 @@ Page {
                     Layout.preferredWidth: 100
                     Layout.preferredHeight: 100
                     Image {
-                        anchors.centerIn: parent
+                        anchors.fill: parent
                         source: model.icon
                     }
                 }
                 Label {
                     Layout.fillWidth: true
                     text: model.title.toUpperCase()
-                    color: '#59FF7F'
+                    color: '#66FF99'
                 }
                 Switch {
                     id: checkedSwitch

diff --git a/app/app.pro b/app/app.pro
index fcfa050..d05b9ca 100644 (file)
--- a/app/app.pro
+++ b/app/app.pro
@@ -9,7 +9,8 @@ RESOURCES += \
     datetime/datetime.qrc \
     wifi/wifi.qrc \
     bluetooth/bluetooth.qrc \
-    example/example.qrc
+    example/example.qrc \
+    version/version.qrc
 
 
 include(app.pri)

diff --git a/app/main.cpp b/app/main.cpp
index 9c01cac..fd8201e 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -17,6 +17,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QUrlQuery>
+#include <QtCore/QFile>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
 #include <QtGui/QGuiApplication>
@@ -89,6 +90,14 @@ int main(int argc, char *argv[])
         context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
     }
 
+    QFile version("/proc/version");
+    if (version.open(QFile::ReadOnly)) {
+        QStringList data = QString::fromLocal8Bit(version.readAll()).split(QLatin1Char(' '));
+        engine.rootContext()->setContextProperty("kernel", data.at(2));
+        version.close();
+    } else {
+        qWarning() << version.errorString();
+    }
     DBus dbus;
     engine.rootContext()->setContextProperty("dbus", &dbus);
     engine.load(QUrl(QStringLiteral("qrc:/Settings.qml")));

diff --git a/app/version/Version.qml b/app/version/Version.qml
new file mode 100644 (file)
index 0000000..b4d55c8
--- /dev/null
+++ b/app/version/Version.qml
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2016 The Qt Company Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import QtQuick 2.6
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0
+import QtQuick.Window 2.2
+import AGL.Demo.Controls 1.0
+import '..'
+
+SettingPage {
+    id: root
+    icon: '/version/images/icon.svg'
+    title: 'Version Info'
+
+    ColumnLayout {
+        id: container
+        anchors.fill: parent
+        anchors.margins: 100
+        Label {
+            Layout.fillWidth: true
+            Layout.preferredHeight: 500
+            text: 'Automotive\nGrade Linux'
+            font.pixelSize: 128
+            horizontalAlignment: Label.AlignHCenter
+            verticalAlignment: Label.AlignVCenter
+            clip: true
+            Image {
+                anchors.centerIn: parent
+                source: './images/agl_slide_0.png'
+                z: -1
+                opacity: 0.5
+            }
+        }
+
+        GridLayout {
+            columns: 2
+            rowSpacing: 20
+            columnSpacing: 20
+            Label {
+                text: 'AGL:'
+                font.pixelSize: 48
+            }
+            Label {
+                text: '3.0 (Charming Chinook)'
+                font.pixelSize: 48
+                Layout.fillWidth: true
+            }
+            Label {
+                text: 'Kernel:'
+                font.pixelSize: 48
+            }
+            Label {
+                text: kernel
+                font.pixelSize: 48
+                Layout.fillWidth: true
+            }
+        }
+
+        Item {
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+        }
+    }
+}

diff --git a/app/version/images/agl_slide_0.png b/app/version/images/agl_slide_0.png
new file mode 100644 (file)
index 0000000..755e620
Binary files /dev/null and b/app/version/images/agl_slide_0.png differ

diff --git a/app/version/images/icon.svg b/app/version/images/icon.svg
new file mode 100644 (file)
index 0000000..97758e9
--- /dev/null
+++ b/app/version/images/icon.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:i="&amp;ns_ai;"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 215 215"
+   style="enable-background:new 0 0 215 215;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="icon.svg"><metadata
+     id="metadata83"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs81" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1464"
+     id="namedview79"
+     showgrid="false"
+     inkscape:zoom="1.0976744"
+     inkscape:cx="-373.06144"
+     inkscape:cy="107.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style3">
+       .st0{fill:#8BC53F;}
+       .st1{fill:#FFFFFF;}
+</style><switch
+     id="switch5"><g
+       i:extraneous="self"
+       id="g7"><g
+         id="g9"><path
+           class="st0"
+           d="M113.3,150.3h4.2v15.3h9.5v3.8h-13.7V150.3z"
+           id="path11" /><path
+           class="st0"
+           d="M130.4,150.3h4.2v19.1h-4.2V150.3z"
+           id="path13" /><path
+           class="st0"
+           d="M139.4,150.3h3.9l9,11.8v-11.8h4.2v19.1h-3.6l-9.3-12.2v12.2h-4.2V150.3z"
+           id="path15" /><path
+           class="st0"
+           d="M168.9,169.7c-2.6,0-4.6-0.7-6.1-2.1c-1.5-1.4-2.2-3.5-2.2-6.4v-10.9h4.2v10.8c0,1.6,0.4,2.7,1.1,3.5     c0.7,0.8,1.7,1.2,3,1.2c1.3,0,2.3-0.4,3-1.1c0.7-0.8,1.1-1.9,1.1-3.4v-11h4.2v10.8c0,1.5-0.2,2.7-0.6,3.8c-0.4,1.1-1,2-1.7,2.7     c-0.7,0.7-1.6,1.3-2.7,1.6C171.4,169.5,170.2,169.7,168.9,169.7z"
+           id="path17" /><path
+           class="st0"
+           d="M186.8,159.7l-6.4-9.4h4.9l4,6.2l4-6.2h4.8l-6.4,9.3l6.7,9.8h-4.9l-4.3-6.6l-4.3,6.6h-4.8L186.8,159.7z"
+           id="path19" /><path
+           class="st1"
+           d="M24.1,126.9h2l8.4,18.6h-2.2l-2.2-4.9H20l-2.2,4.9h-2.1L24.1,126.9z M29.2,138.7l-4.2-9.4l-4.2,9.4H29.2z"
+           id="path21" /><path
+           class="st1"
+           d="M37.2,137.7V127h2.1v10.6c0,4,2.1,6.2,5.6,6.2c3.4,0,5.6-2.1,5.6-6.1V127h2.1v10.6c0,5.4-3.1,8.2-7.7,8.2     C40.3,145.7,37.2,142.9,37.2,137.7z"
+           id="path23" /><path
+           class="st1"
+           d="M62.4,128.9h-6.2V127h14.5v1.9h-6.2v16.5h-2.1V128.9z"
+           id="path25" /><path
+           class="st1"
+           d="M72.5,136.3L72.5,136.3c0-5.1,3.8-9.6,9.4-9.6c5.6,0,9.4,4.4,9.4,9.5c0,0,0,0,0,0.1c0,5.1-3.8,9.5-9.4,9.5     C76.3,145.8,72.5,141.4,72.5,136.3z M89.2,136.3L89.2,136.3c0-4.2-3.1-7.7-7.3-7.7c-4.2,0-7.2,3.4-7.2,7.6v0.1     c0,4.2,3.1,7.6,7.3,7.6C86.1,143.8,89.2,140.5,89.2,136.3z"
+           id="path27" /><path
+           class="st1"
+           d="M95.7,127h2.1l6.7,10.1l6.7-10.1h2.1v18.5h-2.1v-15l-6.7,9.9h-0.1l-6.7-9.9v14.9h-2V127z"
+           id="path29" /><path
+           class="st1"
+           d="M144.7,128.9h-6.2V127H153v1.9h-6.2v16.5h-2.1V128.9z"
+           id="path31" /><path
+           class="st1"
+           d="M157.1,127h2.1v18.5h-2.1V127z"
+           id="path33" /><path
+           class="st1"
+           d="M163,127h2.3l6.6,15.9l6.6-15.9h2.2l-7.9,18.6h-1.8L163,127z"
+           id="path35" /><path
+           class="st1"
+           d="M184.3,127h13.3v1.9h-11.3v6.3h10.1v1.9h-10.1v6.5h11.4v1.9h-13.5V127z"
+           id="path37" /><rect
+           x="105.1"
+           y="55.1"
+           class="st1"
+           width="3.8"
+           height="16.8"
+           id="rect39" /><rect
+           x="68.8"
+           y="69.6"
+           transform="matrix(0.707 -0.7072 0.7072 0.707 -34.4212 72.8166)"
+           class="st1"
+           width="3.8"
+           height="16.8"
+           id="rect41" /><rect
+           x="154.6"
+           y="104.5"
+           class="st1"
+           width="16.8"
+           height="3.8"
+           id="rect43" /><rect
+           x="46.9"
+           y="104.5"
+           class="st1"
+           width="16.8"
+           height="3.8"
+           id="rect45" /><path
+           class="st1"
+           d="M43.2,113.9c2.1-34.7,31-62.4,66.2-62.4c35.2,0,64.2,27.6,66.2,62.4h6.4c-2.1-38.3-33.8-68.8-72.6-68.8     s-70.5,30.5-72.6,68.8H43.2z"
+           id="path47" /><circle
+           class="st0"
+           cx="107"
+           cy="114.9"
+           r="6.7"
+           id="circle49" /><rect
+           x="106.6"
+           y="88.5"
+           transform="matrix(0.7071 -0.7071 0.7071 0.7071 -25.0917 120.249)"
+           class="st0"
+           width="52"
+           height="3.8"
+           id="rect51" /><rect
+           x="86.4"
+           y="78"
+           class="st0"
+           width="9.2"
+           height="9.2"
+           id="rect53" /><rect
+           x="97.1"
+           y="78"
+           class="st0"
+           width="9.2"
+           height="9.2"
+           id="rect55" /><rect
+           x="107.8"
+           y="78"
+           class="st0"
+           width="9.2"
+           height="9.2"
+           id="rect57" /><rect
+           x="118.4"
+           y="78"
+           class="st0"
+           width="9.2"
+           height="9.2"
+           id="rect59" /><g
+           id="g61"><path
+             class="st1"
+             d="M34.6,153.7l-1.5,1.4c-1.1-1-2.2-1.8-3.5-2.4c-1.3-0.5-2.5-0.8-3.7-0.8c-1.5,0-2.9,0.4-4.2,1.1      c-1.3,0.7-2.4,1.7-3.1,3c-0.7,1.2-1.1,2.6-1.1,4c0,1.4,0.4,2.8,1.1,4.1c0.8,1.3,1.8,2.3,3.2,3c1.3,0.7,2.8,1.1,4.4,1.1      c1.9,0,3.6-0.5,4.9-1.6c1.3-1.1,2.1-2.5,2.4-4.3h-6v-1.8h8.2c0,2.9-0.9,5.2-2.6,7c-1.7,1.7-4,2.6-6.9,2.6      c-3.5,0-6.3-1.2-8.3-3.6c-1.6-1.8-2.4-4-2.4-6.4c0-1.8,0.5-3.5,1.4-5c0.9-1.5,2.1-2.8,3.7-3.6c1.6-0.9,3.3-1.3,5.3-1.3      c1.6,0,3.1,0.3,4.5,0.9C31.9,151.5,33.3,152.4,34.6,153.7z"
+             id="path63" /><path
+             class="st1"
+             d="M39.4,150.5h3.8c2.1,0,3.5,0.1,4.3,0.3c1.1,0.3,2,0.8,2.7,1.7c0.7,0.8,1.1,1.9,1.1,3.1c0,1-0.2,1.9-0.7,2.7      c-0.5,0.8-1.2,1.4-2.1,1.8c-0.9,0.4-2.1,0.6-3.7,0.6l6.8,8.8h-2.3l-6.8-8.8h-1.1v8.8h-1.9V150.5z M41.3,152.3v6.4l3.3,0      c1.3,0,2.2-0.1,2.8-0.4c0.6-0.2,1.1-0.6,1.4-1.2c0.3-0.5,0.5-1.1,0.5-1.8c0-0.6-0.2-1.2-0.5-1.7s-0.8-0.9-1.4-1.1      c-0.6-0.2-1.5-0.3-2.8-0.3H41.3z"
+             id="path65" /><path
+             class="st1"
+             d="M63.1,150.5l8.8,18.9h-2l-3-6.2h-8.2l-2.9,6.2h-2.1l8.9-18.9H63.1z M62.8,154.5l-3.2,6.9H66L62.8,154.5z"
+             id="path67" /><path
+             class="st1"
+             d="M74.8,169.4v-18.9h3.9c2.8,0,4.9,0.2,6.2,0.7c1.8,0.6,3.3,1.8,4.3,3.3c1,1.6,1.6,3.5,1.6,5.7      c0,1.9-0.4,3.6-1.2,5c-0.8,1.4-1.9,2.5-3.2,3.2c-1.3,0.7-3.1,1-5.5,1H74.8z M76.6,167.6h2.2c2.6,0,4.4-0.2,5.4-0.5      c1.4-0.5,2.5-1.3,3.4-2.5c0.8-1.2,1.2-2.7,1.2-4.4c0-1.8-0.4-3.4-1.3-4.7c-0.9-1.3-2.1-2.2-3.7-2.7c-1.2-0.4-3.1-0.5-5.9-0.5      h-1.3V167.6z"
+             id="path69" /><path
+             class="st1"
+             d="M94.5,150.5h10.9v1.9h-9v5.9h8.9v1.9h-8.9v7.4h8.9v1.9H94.5V150.5z"
+             id="path71" /></g><g
+           id="g73"><polygon
+             class="st1"
+             points="120.9,141.8 120.9,134.4 117.2,134.4 117.2,145.4 128.2,145.4 128.2,141.8     "
+             id="polygon75" /><polygon
+             class="st1"
+             points="135.6,127 117.2,127 117.2,132.6 120.9,132.6 120.9,130.7 131.9,130.7 131.9,141.8 130.1,141.8       130.1,145.4 135.6,145.4     "
+             id="polygon77" /></g></g></g></switch></svg>
\ No newline at end of file

diff --git a/app/version/version.qrc b/app/version/version.qrc
new file mode 100644 (file)
index 0000000..0453cc0
--- /dev/null
+++ b/app/version/version.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/version">
+        <file>Version.qml</file>
+        <file>images/icon.svg</file>
+        <file>images/agl_slide_0.png</file>
+    </qresource>
+</RCC>