diff options
author | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2017-09-29 21:00:25 +0900 |
---|---|---|
committer | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2017-10-02 17:07:46 +0900 |
commit | 381755e4686a08e766316aaf40e8fdfa202d48d4 (patch) | |
tree | 52cdc8421fec6f467f35489c04336c4e69a72727 /homescreen | |
parent | d32141ad4cdff0c53194b90c54dc92324cd0c31c (diff) |
Add homescreen-2017eel_4.99.1eel/4.99.14.99.1
Add new homescreen-2017 with agl-service-windowmanaeger-2017
and agl-service-homescreen-2017.
About this information see JIRA SPEC-871.
[PatchSet2]
Use aglwgt make package.
Delete homescreensimulator and sampleapptimedate beacuse not use them.
Change-Id: I402134d0386e76b2127ca95b9b0b48c1721b4086
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Diffstat (limited to 'homescreen')
165 files changed, 3024 insertions, 0 deletions
diff --git a/homescreen/LICENSE b/homescreen/LICENSE new file mode 100644 index 0000000..31c692a --- /dev/null +++ b/homescreen/LICENSE @@ -0,0 +1,54 @@ +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + You must give any other recipients of the Work or Derivative Works a copy of this License; and + You must cause any modified files to carry prominent notices stating that You changed the files; and + You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS diff --git a/homescreen/README.md b/homescreen/README.md new file mode 100644 index 0000000..c52a7f8 --- /dev/null +++ b/homescreen/README.md @@ -0,0 +1,10 @@ +AGL Home Screen reference implementation + + +Build with QtCreator 3.5.1 + +AGL repo for source code: +https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen + +AGL repo for bitbake recipe: +https://gerrit.automotivelinux.org/gerrit/#/admin/projects/AGL/meta-agl-demo/recipes-demo-hmi/homescreen/homescreen_git.bb diff --git a/homescreen/conf/HomeScreen.service b/homescreen/conf/HomeScreen.service new file mode 100644 index 0000000..3a89242 --- /dev/null +++ b/homescreen/conf/HomeScreen.service @@ -0,0 +1,17 @@ +[Unit] +Description=AGL reference HomeScreen +Requires=dbus.service afm-user-daemon.service InputEventManager.service HomeScreenAppFrameworkBinderAGL.service +After=dbus.service afm-user-daemon.service InputEventManager.service HomeScreenAppFrameworkBinderAGL.service WindowManager.service +ConditionKernelCommandLine=!agl.nogfx + +[Service] +Type=dbus +BusName=org.agl.homescreen +ExecStart=/usr/AGL/homescreen/HomeScreen +# 4194304(= 1 << 22) is special surface id for HomeScreen +Environment=QT_IVI_SURFACE_ID=4194304 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell LD_PRELOAD=/usr/lib/libEGL.so.1 +Restart=on-failure +RestartSec=5 + +[Install] +WantedBy=default.target diff --git a/homescreen/docs/homescreen_api.md b/homescreen/docs/homescreen_api.md new file mode 100644 index 0000000..8f7b8f4 --- /dev/null +++ b/homescreen/docs/homescreen_api.md @@ -0,0 +1,186 @@ +# HomeScreen API
+The HomeScreen app provides an own interface for some special use cases concerning the surfaces and user inputs.
+
+The interface is implemented as D-Bus interface.
+This is the introspection, describing the interface:
+
+```
+<node>
+ <interface name="org.agl.homescreen">
+ <method name="hardKeyPressed">
+ <arg name="key" type="i" direction="in"/>
+ </method>
+ <method name="getSurfaceStatus">
+ <arg name="surfaceId" type="i" direction="in"/>
+ <arg name="status" type="i" direction="out"/>
+ </method>
+ <method name="requestSurfaceIdToFullScreen">
+ <arg name="surfaceId" type="i" direction="in"/>
+ </method>
+ <method name="getAllSurfacesOfProcess">
+ <arg name="pid" type="i" direction="in"/>
+ <arg name="surfaceIds" type="ai" direction="out"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList<int>"/>
+ </method>
+ <method name="getLayoutRenderAreaForSurfaceId">
+ <arg name="surfaceId" type="i" direction="in"/>
+ <arg name="renderArea" type="(iiii)" direction="out"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QRect"/>
+ </method>
+ <method name="renderSurfaceToAreaAllowed">
+ <arg name="surfaceId" type="i" direction="in"/>
+ <arg name="layoutArea" type="i" direction="in"/>
+ <arg name="allowed" type="b" direction="out"/>
+ </method>
+ <method name="renderSurfaceToArea">
+ <arg name="surfaceId" type="i" direction="in"/>
+ <arg name="layoutArea" type="i" direction="in"/>
+ </method>
+ </interface>
+</node>
+```
+
+These interface will change during further development, so check back frequently.
+
+## User Input Events API calls
+
+### hardKeyPressed
+
+Use hardKeyPressed to inject hard key press events into the HomeScreen app.
+This Interface call can be used by applications like the InputEventManager to inject hard keys into the HomeScreen application.
+
+#### Example
+
+if someone presses the Hard Key “NAV” on the target, this key may be injected using this interface to make the HomeScreen launch the navigation application.
+Right now, only a few keys are defined (in inputevent.hpp):
+
+```
+namespace InputEvent {
+ typedef enum HardKey
+ {
+ HARDKEY_UNDEFINED,
+ HARDKEY_NAV,
+ HARDKEY_MEDIA
+ } eHardKey;
+}
+```
+
+This will change in the future.
+
+![hardKeyPressed](pictures/api_hardKeyPressed.png)
+
+A “normal” application would not need to call this API.
+
+## Surface control API calls
+
+The normal use case when starting an application is:
+The user presses a hard key or uses the app launcher to start an app. The app is then started and is shown full screen.
+The org.agl.homescreen API provides some methods to get information about some status and some methods to show surfaces on the screen.
+
+### getSurfaceStatus
+
+A surface can be visible or invisible (please do not confuse “visible” and “visibility”). This function allows to request the current status.
+
+```
+<method name="getSurfaceStatus">
+ <arg name="surfaceId" type="i" direction="in"/>
+ <arg name="status" type="i" direction="out"/>
+</method>
+```
+
+Right now an application has to pull this information.
+This is not optimal and will change in the future. There are two options:
+
+ - The homescreen API will provide a signal that is emitted every time the visible status of surfaces changes. This would be way more efficient, because it would save time and avoid a re-occurring API call. __UPDATE:__ There is a D-Bus signal implemented in this API
+ - For Qt, there is already a patch available that provides this information as a base class property. See https://codereview.qt-project.org/#/c/176211/ This would be optimal for Qt widget applications. But not useful for other languages, e.g. Java. __UPDATE:__ This patch got reverted in AGL!
+
+#### Current implementation
+
+![getSurfaceStatus](pictures/api_getSurfaceStatus_1.png)
+
+#### Option 1
+
+![getSurfaceStatus](pictures/api_getSurfaceStatus_2.png)
+
+#### Option 2
+
+![getSurfaceStatus](pictures/api_getSurfaceStatus_3.png)
+
+### requestSurfaceIdToFullScreen
+
+This function will set the given surface to full screen.
+
+```
+<method name="requestSurfaceIdToFullScreen">
+ <arg name="surfaceId" type="i" direction="in"/>
+</method>
+```
+
+It will hide all other surfaces.
+
+![requestSurfaceIdToFullScreen](pictures/api_requestSurfaceIdToFullScreen.png)
+
+### getAllSurfacesOfProcess
+
+This returns all surfaces that are created by the given process ID.
+
+```
+<method name="getAllSurfacesOfProcess">
+ <arg name="pid" type="i" direction="in"/>
+ <arg name="surfaceIds" type="ai" direction="out"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList<int>"/>
+</method>
+```
+
+A process can create more than one surface. By default, the surface with the lowest surface ID is shown on the screen. If an application wants to know all surfaces that were created by an application, this method will provide them.
+
+![getAllSurfacesOfProcess](pictures/api_getAllSurfacesOfProcess.png)
+
+### renderSurfaceToAreaAllowed
+
+Before calling renderSurfaceToArea, an application can request, if it is allowed to render the surface to this area. This makes sense for an application that would begin to allocate resources to render. But if it is not allowed to render the surface, the application could avoid allocating the resources.
+
+```
+<method name="renderSurfaceToAreaAllowed">
+ <arg name="surfaceId" type="i" direction="in"/>
+ <arg name="layoutArea" type="i" direction="in"/>
+ <arg name="allowed" type="b" direction="out"/>
+</method>
+```
+
+The call will not affect the current setup, it will only request if it is allowed or not.
+
+![renderSurfaceToAreaAllowed](pictures/api_renderSurfaceToAreaAllowed.png)
+
+### renderSurfaceToArea
+
+By default, the HomeScreen application decides, where to render an applications surface. The concept of Layouts defines this. This API call can override the default behavior. An app can request to render a surface in a specific Layout Area.
+
+```
+<method name="renderSurfaceToArea">
+ <arg name="surfaceId" type="i" direction="in"/>
+ <arg name="layoutArea" type="i" direction="in"/>
+</method>
+```
+
+The surface that was previously rendered in this Layout are will be hidden.
+
+![renderSurfaceToArea](pictures/api_renderSurfaceToArea.png)
+
+The homescreen interface functionality is not fully implemented, but the API is available. For example using the libhomescreen.so.
+
+### surfaceVisibilityChanged
+
+Whenever the visibility property of a surface changes, this signal is emitted.
+
+```
+<signal name="surfaceVisibilityChanged">
+ <arg name="surfaceId" type="i"/>
+ <arg name="visible" type="b"/>
+</signal>
+```
+
+Visibility here means visible. The name of the signal is from the Weston surface property “visibility”.
+See here for reference: https://github.com/ntanibata/wayland-ivi-extension/blob/master/ivi-layermanagement-api/ilmCommon/include/ilm_types.h
+
+![surfaceVisibilityChanged](pictures/api_surfaceVisibilityChanged.png)
diff --git a/homescreen/docs/index.md b/homescreen/docs/index.md new file mode 100644 index 0000000..4322255 --- /dev/null +++ b/homescreen/docs/index.md @@ -0,0 +1,31 @@ +# Welcome to your AGL system! +When booting up an AGL system, the first thing that your eyes will spot is this: + +![AGL HomeScreen Application Launcher](pictures/homescreen_applauncher.png) + +**The AGL HomeScreen!** + +Intended to be used with touch presses, the reference HMI provides access to all pre-installed AGL demo applications as well as in the future access to user installed apps. The list of demo apps contains some automotive applications like HVAC-control, Navigation or Dashboard, as well as some infotainment apps. Radio, Multimedia, Phone... +This applications are already available and were presented at CES 2017. + +## Here are some screenshots of the pre-installed demo applications: + +## HVAC + +![AGL HVAC](pictures/hvac.png) + +## Phone + +![AGL Phone](pictures/phone.png) + +## Dashboard + +![AGL Dashboard](pictures/dashboard.png) + +## Settings + +![AGL Settings](pictures/settings.png) + +#### Note: +* All current demos (including HomeScreen) are optimized for landscape full HD resolution (1080x1920). + diff --git a/homescreen/docs/pictures/api_getAllSurfacesOfProcess.png b/homescreen/docs/pictures/api_getAllSurfacesOfProcess.png Binary files differnew file mode 100644 index 0000000..5c862d7 --- /dev/null +++ b/homescreen/docs/pictures/api_getAllSurfacesOfProcess.png diff --git a/homescreen/docs/pictures/api_getSurfaceStatus_1.png b/homescreen/docs/pictures/api_getSurfaceStatus_1.png Binary files differnew file mode 100644 index 0000000..1e18fcf --- /dev/null +++ b/homescreen/docs/pictures/api_getSurfaceStatus_1.png diff --git a/homescreen/docs/pictures/api_getSurfaceStatus_2.png b/homescreen/docs/pictures/api_getSurfaceStatus_2.png Binary files differnew file mode 100644 index 0000000..e66d708 --- /dev/null +++ b/homescreen/docs/pictures/api_getSurfaceStatus_2.png diff --git a/homescreen/docs/pictures/api_getSurfaceStatus_3.png b/homescreen/docs/pictures/api_getSurfaceStatus_3.png Binary files differnew file mode 100644 index 0000000..50a3b10 --- /dev/null +++ b/homescreen/docs/pictures/api_getSurfaceStatus_3.png diff --git a/homescreen/docs/pictures/api_hardKeyPressed.png b/homescreen/docs/pictures/api_hardKeyPressed.png Binary files differnew file mode 100644 index 0000000..a8a3660 --- /dev/null +++ b/homescreen/docs/pictures/api_hardKeyPressed.png diff --git a/homescreen/docs/pictures/api_renderSurfaceToArea.png b/homescreen/docs/pictures/api_renderSurfaceToArea.png Binary files differnew file mode 100644 index 0000000..a61fc2f --- /dev/null +++ b/homescreen/docs/pictures/api_renderSurfaceToArea.png diff --git a/homescreen/docs/pictures/api_renderSurfaceToAreaAllowed.png b/homescreen/docs/pictures/api_renderSurfaceToAreaAllowed.png Binary files differnew file mode 100644 index 0000000..35dbbcf --- /dev/null +++ b/homescreen/docs/pictures/api_renderSurfaceToAreaAllowed.png diff --git a/homescreen/docs/pictures/api_requestSurfaceIdToFullScreen.png b/homescreen/docs/pictures/api_requestSurfaceIdToFullScreen.png Binary files differnew file mode 100644 index 0000000..6d2f712 --- /dev/null +++ b/homescreen/docs/pictures/api_requestSurfaceIdToFullScreen.png diff --git a/homescreen/docs/pictures/api_surfaceVisibilityChanged.png b/homescreen/docs/pictures/api_surfaceVisibilityChanged.png Binary files differnew file mode 100644 index 0000000..f519757 --- /dev/null +++ b/homescreen/docs/pictures/api_surfaceVisibilityChanged.png diff --git a/homescreen/docs/pictures/dashboard.png b/homescreen/docs/pictures/dashboard.png Binary files differnew file mode 100644 index 0000000..527386d --- /dev/null +++ b/homescreen/docs/pictures/dashboard.png diff --git a/homescreen/docs/pictures/full/dashboard.png b/homescreen/docs/pictures/full/dashboard.png Binary files differnew file mode 100644 index 0000000..e947734 --- /dev/null +++ b/homescreen/docs/pictures/full/dashboard.png diff --git a/homescreen/docs/pictures/full/homescreen_applauncher.png b/homescreen/docs/pictures/full/homescreen_applauncher.png Binary files differnew file mode 100644 index 0000000..b61884a --- /dev/null +++ b/homescreen/docs/pictures/full/homescreen_applauncher.png diff --git a/homescreen/docs/pictures/full/hvac.png b/homescreen/docs/pictures/full/hvac.png Binary files differnew file mode 100644 index 0000000..7e0399a --- /dev/null +++ b/homescreen/docs/pictures/full/hvac.png diff --git a/homescreen/docs/pictures/full/phone.png b/homescreen/docs/pictures/full/phone.png Binary files differnew file mode 100644 index 0000000..f4cc547 --- /dev/null +++ b/homescreen/docs/pictures/full/phone.png diff --git a/homescreen/docs/pictures/full/settings.png b/homescreen/docs/pictures/full/settings.png Binary files differnew file mode 100644 index 0000000..a115ef4 --- /dev/null +++ b/homescreen/docs/pictures/full/settings.png diff --git a/homescreen/docs/pictures/homescreen_applauncher.png b/homescreen/docs/pictures/homescreen_applauncher.png Binary files differnew file mode 100644 index 0000000..e168668 --- /dev/null +++ b/homescreen/docs/pictures/homescreen_applauncher.png diff --git a/homescreen/docs/pictures/hvac.png b/homescreen/docs/pictures/hvac.png Binary files differnew file mode 100644 index 0000000..f9a6030 --- /dev/null +++ b/homescreen/docs/pictures/hvac.png diff --git a/homescreen/docs/pictures/phone.png b/homescreen/docs/pictures/phone.png Binary files differnew file mode 100644 index 0000000..e087594 --- /dev/null +++ b/homescreen/docs/pictures/phone.png diff --git a/homescreen/docs/pictures/settings.png b/homescreen/docs/pictures/settings.png Binary files differnew file mode 100644 index 0000000..c92d835 --- /dev/null +++ b/homescreen/docs/pictures/settings.png diff --git a/homescreen/homescreen.pro b/homescreen/homescreen.pro new file mode 100644 index 0000000..21f742e --- /dev/null +++ b/homescreen/homescreen.pro @@ -0,0 +1,67 @@ +# Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH +# +# 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. + +TEMPLATE = app +TARGET = HomeScreen +QT = qml quick dbus +CONFIG += c++11 link_pkgconfig +DESTDIR = $${OUT_PWD}/../package/root/bin +#PKGCONFIG += libpulse + +LIBS += -lsystemd +LIBS += -lafbwsc +LIBS += -ljson-c +LIBS += -lhomescreen +LIBS += -lwindowmanager + +include(../interfaces/interfaces.pri) + +target.path = /home/root +INSTALLS += target + +SOURCES += \ + src/main.cpp \ + src/homescreencontrolinterface.cpp \ + src/layouthandler.cpp \ + src/applicationmodel.cpp \ + src/appinfo.cpp \ + src/statusbarmodel.cpp \ + src/statusbarserver.cpp \ + src/applicationlauncher.cpp \ + src/mastervolume.cpp \ + src/homescreenhandler.cpp + +HEADERS += \ + src/homescreencontrolinterface.h \ + src/layouthandler.h \ + src/statusbarmodel.h \ + src/statusbarserver.h \ + src/applicationlauncher.h \ + src/applicationmodel.h \ + src/appinfo.h \ + src/mastervolume.h \ + src/homescreenhandler.h + +OTHER_FILES += \ + README.md + +RESOURCES += \ + qml/images/Home/home.qrc \ + qml/images/MediaPlayer/mediaplayer.qrc \ + qml/images/MediaMusic/mediamusic.qrc \ + qml/images/Weather/weather.qrc \ + qml/images/Shortcut/shortcut.qrc \ + qml/images/Status/status.qrc \ + qml/images/images.qrc \ + qml/qml.qrc diff --git a/homescreen/qml/Home.qml b/homescreen/qml/Home.qml new file mode 100644 index 0000000..729ef36 --- /dev/null +++ b/homescreen/qml/Home.qml @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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.2 +import Home 1.0 + +Item { + id: root + + Image { + y: 0 + anchors.fill: parent + anchors.topMargin: -218 + anchors.bottomMargin: -215 + source: './images/AGL_HMI_Background_Car-01.png' + } + + property int pid: -1 + width: 1080 + height: 1487 + + GridView { + id: grid + x: 60 + y: 100 + width: 960 + height: 1280 + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + contentHeight: 320 + flickableDirection: Flickable.AutoFlickDirection + snapMode: GridView.SnapOneRow + visible: true + cellWidth: 320 + cellHeight: 320 + interactive: false + + model: ApplicationModel { id: applicationModel } + delegate: IconItem { + width: grid.cellWidth + height: grid.cellHeight + } + + MouseArea { + id: loc + anchors.fill: parent + property string currentId: '' + property int newIndex: -1 + property int index: grid.indexAt(loc.mouseX, loc.mouseY) + x: 62 + y: 264 + anchors.rightMargin: 0 + anchors.bottomMargin: 0 + anchors.leftMargin: 0 + anchors.topMargin: 0 + onPressAndHold: currentId = applicationModel.id(newIndex = index) + onReleased: { + if (currentId === '') { + pid = launcher.launch(applicationModel.id(loc.index)) + if (1 < pid) { +// layoutHandler.makeMeVisible(pid) + + applicationArea.visible = true + appLauncherAreaLauncher.visible = false + // layoutHandler.showAppLayer(applicationModel.id(loc.index), pid) + } + else { + console.warn("app cannot be launched!") + } + } else { + currentId = '' + } + homescreenHandler.tapShortcut(applicationModel.name(loc.index)) + } + onPositionChanged: { + if (loc.currentId === '') return + if (index < 0) return + if (index === newIndex) return + applicationModel.move(newIndex, newIndex = index) + } + } + } +} diff --git a/homescreen/qml/IconItem.qml b/homescreen/qml/IconItem.qml new file mode 100644 index 0000000..59131c0 --- /dev/null +++ b/homescreen/qml/IconItem.qml @@ -0,0 +1,37 @@ +import QtQuick 2.0 + +Item { + id: main + Image { + id: item; parent: loc + x: main.x + 5; y: main.y + 5 + width: main.width - 10; height: main.height - 10; + source: './images/HMI_AppLauncher_%1_%2-01.png'.arg(model.icon).arg(loc.pressed && (loc.index === model.index || loc.currentId === model.id) ? 'Active' : 'Inactive') + antialiasing: item.state !== '' + Behavior on x { enabled: item.state !== 'active'; NumberAnimation { duration: 400; easing.type: Easing.OutCubic } } + Behavior on y { enabled: item.state !== 'active'; NumberAnimation { duration: 400; easing.type: Easing.OutCubic } } + SequentialAnimation on rotation { + NumberAnimation { to: 5; duration: 100 } + NumberAnimation { to: -5; duration: 200 } + NumberAnimation { to: 0; duration: 100 } + running: loc.currentId !== '' && item.state !== 'active' + loops: Animation.Infinite; alwaysRunToEnd: true + } + states: [ + State { + name: 'active' + when: loc.currentId == model.id + PropertyChanges { target: item; x: loc.mouseX - width/2; y: loc.mouseY - height/2; scale: 1.15; z: 10 } + }, + State { + when: loc.currentId !== '' + PropertyChanges { + target: item + scale: 0.85 + opacity: 0.75 + } + } + ] + transitions: Transition { NumberAnimation { properties: 'scale, opacity, x, y'; duration: 150; easing.type: Easing.OutCubic} } + } +} diff --git a/homescreen/qml/MediaArea.qml b/homescreen/qml/MediaArea.qml new file mode 100644 index 0000000..d7159d2 --- /dev/null +++ b/homescreen/qml/MediaArea.qml @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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.2 +import QtQuick.Controls 1.0 + +StackView { + id: root + width: 1080 + height: 215 + + initialItem: blank + + Component { + id: blank + MediaAreaBlank { +// MouseArea { +// anchors.fill: parent +// onClicked: root.push(mouse.x < 540 ? music : radio) +// } + } + } + + Component { + id: music + MediaAreaMusic { + MouseArea { + anchors.fill: parent + onClicked: root.pop() + } + } + } + + Component { + id: radio + MediaAreaRadio { + MouseArea { + anchors.fill: parent + onClicked: root.pop() + } + } + } +} diff --git a/homescreen/qml/MediaAreaBlank.qml b/homescreen/qml/MediaAreaBlank.qml new file mode 100644 index 0000000..51fa657 --- /dev/null +++ b/homescreen/qml/MediaAreaBlank.qml @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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.2 +import QtQuick.Layouts 1.1 +import QtQuick.Controls 2.0 +import AGL.Demo.Controls 1.0 +import MasterVolume 1.0 + +Image { + width: 1080 + height: 215 + source: './images/Utility_Logo_Background-01.png' + property bool displayVolume: false; + + MouseArea { + anchors.fill: parent + function enableVolumeDisplay() { + if (!displayVolume) { + displayVolume = true + master_volume.visible = true + volume_timer.restart() + } + } + onClicked: enableVolumeDisplay() + } + + Image { + id: logo_image + anchors.centerIn: parent + source: './images/Utility_Logo_Colour-01.png' + } + + Timer { + id: volume_timer + interval: 5000; running: false; repeat: false + onTriggered: displayVolume = false + } + + states: [ + State { when: displayVolume; + PropertyChanges { target: master_volume; opacity: 1.0 } + PropertyChanges { target: slider; enabled: true } + PropertyChanges { target: logo_image; opacity: 0.0 } + }, + State { when: !displayVolume; + PropertyChanges { target: master_volume; opacity: 0.0 } + PropertyChanges { target: slider; enabled: false } + PropertyChanges { target: logo_image; opacity: 1.0 } + } + ] + + transitions: Transition { + NumberAnimation { property: "opacity"; duration: 500} + } + + MasterVolume { + id: mv + objectName: "mv" + onVolumeChanged: slider.value = volume + } + + Item { + id: master_volume + anchors.fill: parent + anchors.centerIn: parent + visible: false + + Label { + font.pixelSize: 36 + anchors.horizontalCenter: parent.horizontalCenter + color: "white" + text: "Master Volume" + } + + RowLayout { + anchors.fill: parent + anchors.centerIn: parent + anchors.margins: 20 + spacing: 20 + Label { + font.pixelSize: 36 + color: "white" + text: "0 %" + } + Slider { + id: slider + Layout.fillWidth: true + from: 0 + to: 65536 + stepSize: 256 + snapMode: Slider.SnapOnRelease + onValueChanged: mv.volume = value + Component.onCompleted: value = mv.volume + onPressedChanged: { + if (pressed) {volume_timer.stop()} + else {volume_timer.restart()} + } + background: Rectangle { + id: slider_bg + height: 16 + color: "#59FF7F" + } + handle: Rectangle { + anchors.verticalCenter: slider_bg.verticalCenter + width: 48 + height: 48 + radius: 24 + x: slider.leftPadding + slider.visualPosition * (slider.availableWidth - width) + y: slider.topPadding + slider.availableHeight / 2 - height / 2 + color: "white" + } + } + Label { + font.pixelSize: 36 + color: "white" + text: "100 %" + } + } + } +} diff --git a/homescreen/qml/MediaAreaMusic.qml b/homescreen/qml/MediaAreaMusic.qml new file mode 100644 index 0000000..927e82c --- /dev/null +++ b/homescreen/qml/MediaAreaMusic.qml @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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.2 +import QtQuick.Layouts 1.1 +import QtQuick.Controls 1.0 + +Image { + width: 1080 + height: 215 + source: './images/Utility_Music_Background-01.png' + + ColumnLayout { + anchors.fill: parent + spacing: 1 + RowLayout { + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredHeight: 107 + spacing: 10 + Image { + source: './images/MediaMusic/AlbumArtwork.png' + width: 105.298 + height: 110.179 + fillMode: Image.PreserveAspectFit + } + Label { + text: 'Come Together - The Beatles' + font.family: 'Roboto' + font.pixelSize: 32 + color: 'white' + } + } + + RowLayout { + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredHeight: 107 + Image { + source: './images/MediaPlayer/AGL_MediaPlayer_BackArrow.png' + } + Image { + source: './images/MediaPlayer/AGL_MediaPlayer_Player_Pause.png' + } + Image { + source: './images/MediaPlayer/AGL_MediaPlayer_ForwardArrow.png' + } + + ProgressBar { + Layout.fillWidth: true + Layout.preferredWidth: 2 + } + + Label { + text: '2:12/4:19' + font.family: 'Roboto' + font.pixelSize: 20 + } + Image { + source: './images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png' + } + Image { + source: './images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png' + } + ProgressBar { + Layout.fillWidth: true + Layout.preferredWidth: 1 + } + } + } +} diff --git a/homescreen/qml/MediaAreaRadio.qml b/homescreen/qml/MediaAreaRadio.qml new file mode 100644 index 0000000..a49f06d --- /dev/null +++ b/homescreen/qml/MediaAreaRadio.qml @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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.2 + +Image { + width: 1080 + height: 215 + source: './images/Utility_Radio_Background-01.png' +} diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml new file mode 100644 index 0000000..94bad5d --- /dev/null +++ b/homescreen/qml/ShortcutArea.qml @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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.2 +import QtQuick.Layouts 1.1 + +Item { + id: root + width: 785 + height: 218 + + + ListModel { + id: applicationModel + ListElement { + name: 'Home' + application: '' + } + ListElement { + name: 'MediaPlayer' + application: 'mediaplayer@0.1' + } + ListElement { +// name: 'HVAC' +// application: 'hvac@0.1' + name: 'Radio' + application: 'radio@0.1' + } + ListElement { + name: 'Navigation' + application: 'navigation@0.1' + } + } + + property int pid: -1 + + RowLayout { + anchors.fill: parent + spacing: 2 + Repeater { + model: applicationModel + delegate: ShortcutIcon { + Layout.fillWidth: true + Layout.fillHeight: true + name: model.name + active: model.application === launcher.current + onClicked: { + if (0 === model.index) { + appLauncherAreaLauncher.visible = true + applicationArea.visible = false +// layoutHandler.hideAppLayer() + launcher.current = '' + } + else { + pid = launcher.launch(model.application) + if (1 < pid) { + applicationArea.visible = true + appLauncherAreaLauncher.visible = false +// layoutHandler.makeMeVisible(pid) +// layoutHandler.showAppLayer(model.application, pid) + } + else { + console.warn("app cannot be launched!") + } + } + homescreenHandler.tapShortcut(model.name) + } + } + } + } +} diff --git a/homescreen/qml/ShortcutIcon.qml b/homescreen/qml/ShortcutIcon.qml new file mode 100644 index 0000000..6f8e05e --- /dev/null +++ b/homescreen/qml/ShortcutIcon.qml @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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.2 + +MouseArea { + id: root + width: 195 + height: 216.8 + property string name: 'Home' + property bool active: false + Image { + id: icon + anchors.fill: parent + source: './images/Shortcut/HMI_Shortcut_%1-01.png'.arg(root.name) + } + Image { + anchors.fill: parent + source: './images/Shortcut/HMI_Shortcut_%1_Active-01.png'.arg(root.name) + opacity: 1.0 - icon.opacity + } + states: [ + State { + when: root.active + PropertyChanges { + target: icon + opacity: 0.0 + } + } + ] + + transitions: [ + Transition { + NumberAnimation { + properties: 'opacity' + easing.type: Easing.OutExpo + } + } + ] +} diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml new file mode 100644 index 0000000..3fc3079 --- /dev/null +++ b/homescreen/qml/StatusArea.qml @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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.2 +import QtQuick.Layouts 1.1 +import QtQuick.Controls 1.0 +import HomeScreen 1.0 + +Item { + id: root + width: 295 + height: 218 + + property date now: new Date + Timer { + interval: 100; running: true; repeat: true; + onTriggered: root.now = new Date + } + + RowLayout { + anchors.fill: parent + spacing: 0 + Item { + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredWidth: 295 - 76 + ColumnLayout { + anchors.fill: parent + anchors.margins: 40 + spacing: 0 + Text { + Layout.fillWidth: true + Layout.fillHeight: true + text: Qt.formatDate(now, 'dddd').toUpperCase() + font.family: 'Roboto' + font.pixelSize: 13 + color: 'white' + verticalAlignment: Text.AlignVCenter +// Rectangle { +// anchors.fill: parent +// anchors.margins: 5 +// color: 'red' +// border.color: 'blue' +// border.width: 1 +// z: -1 +// } + } + Text { + Layout.fillWidth: true + Layout.fillHeight: true + text: Qt.formatTime(now, 'h:mm ap').toUpperCase() + font.family: 'Roboto' + font.pixelSize: 40 + color: 'white' + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + RowLayout { + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredHeight: 20 + Image { + source: './images/Weather/WeatherIcons_Rain-01.png' + } + Text { + text: '64°F' + color: 'white' + font.family: 'Helvetica' + font.pixelSize: 32 + } + } + } + } + ColumnLayout { + id: icons + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredWidth: 76 + spacing: -10 + Repeater { + model: StatusBarModel {} + delegate: Image { + Layout.preferredWidth: 77 + Layout.preferredHeight: 73 + source: model.modelData + fillMode: Image.PreserveAspectFit + } + } + } + } +} diff --git a/homescreen/qml/TopArea.qml b/homescreen/qml/TopArea.qml new file mode 100644 index 0000000..922742d --- /dev/null +++ b/homescreen/qml/TopArea.qml @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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.2 +import QtQuick.Layouts 1.1 + +Image { + width: 1920 + height: 218 + source: './images/TopSection_NoText_NoIcons-01.png' + fillMode: Image.PreserveAspectCrop + + RowLayout { + anchors.fill: parent + spacing: 0 + ShortcutArea { + id: shortcutArea + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredWidth: 785 + } + StatusArea { + id: statusArea + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredWidth: 295 + } + } +} diff --git a/homescreen/qml/images/AGL_HMI_Background_NoCar-01.png b/homescreen/qml/images/AGL_HMI_Background_NoCar-01.png Binary files differnew file mode 100644 index 0000000..595f742 --- /dev/null +++ b/homescreen/qml/images/AGL_HMI_Background_NoCar-01.png diff --git a/homescreen/qml/images/Home/AGL_HMI_Background_Car-01.png b/homescreen/qml/images/Home/AGL_HMI_Background_Car-01.png Binary files differnew file mode 100644 index 0000000..b0072d8 --- /dev/null +++ b/homescreen/qml/images/Home/AGL_HMI_Background_Car-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.png Binary files differnew file mode 100644 index 0000000..888d0bd --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Active-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.png Binary files differnew file mode 100644 index 0000000..ab83b0e --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Connectivity_Inactive-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.png Binary files differnew file mode 100644 index 0000000..11d39e5 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Active-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.png Binary files differnew file mode 100644 index 0000000..6c0b914 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Dashboard_Inactive-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.png Binary files differnew file mode 100644 index 0000000..efc11e9 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Active-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.png Binary files differnew file mode 100644 index 0000000..b528376 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_HVAC_Inactive-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.png Binary files differnew file mode 100644 index 0000000..1c99ac4 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Active-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.png Binary files differnew file mode 100644 index 0000000..0bed61d --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_MediaPlayer_Inactive-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.png Binary files differnew file mode 100644 index 0000000..41c499d --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.png Binary files differnew file mode 100644 index 0000000..93f81af --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.png Binary files differnew file mode 100644 index 0000000..e7ad085 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Active-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.png Binary files differnew file mode 100644 index 0000000..dd40750 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Navigation_Inactive-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.png Binary files differnew file mode 100644 index 0000000..2df01d3 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Active-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.png Binary files differnew file mode 100644 index 0000000..ec62b87 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_POI_Inactive-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.png Binary files differnew file mode 100644 index 0000000..2150581 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Active-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.png Binary files differnew file mode 100644 index 0000000..61dcedc --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Phone_Inactive-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.png Binary files differnew file mode 100644 index 0000000..1aa5a01 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Active-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.png Binary files differnew file mode 100644 index 0000000..616983e --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Radio_Inactive-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.png Binary files differnew file mode 100644 index 0000000..1d13fd6 --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Active-01.png diff --git a/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.png b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.png Binary files differnew file mode 100644 index 0000000..027f1fe --- /dev/null +++ b/homescreen/qml/images/Home/HMI_AppLauncher_Settings_Inactive-01.png diff --git a/homescreen/qml/images/Home/home.qrc b/homescreen/qml/images/Home/home.qrc new file mode 100644 index 0000000..49d19d8 --- /dev/null +++ b/homescreen/qml/images/Home/home.qrc @@ -0,0 +1,25 @@ +<RCC> + <qresource prefix="/images"> + <file>AGL_HMI_Background_Car-01.png</file> + <file>HMI_AppLauncher_Connectivity_Active-01.png</file> + <file>HMI_AppLauncher_Connectivity_Inactive-01.png</file> + <file>HMI_AppLauncher_Dashboard_Active-01.png</file> + <file>HMI_AppLauncher_Dashboard_Inactive-01.png</file> + <file>HMI_AppLauncher_HVAC_Active-01.png</file> + <file>HMI_AppLauncher_HVAC_Inactive-01.png</file> + <file>HMI_AppLauncher_Mixer_Active-01.png</file> + <file>HMI_AppLauncher_Mixer_Inactive-01.png</file> + <file>HMI_AppLauncher_MediaPlayer_Active-01.png</file> + <file>HMI_AppLauncher_MediaPlayer_Inactive-01.png</file> + <file>HMI_AppLauncher_Navigation_Active-01.png</file> + <file>HMI_AppLauncher_Navigation_Inactive-01.png</file> + <file>HMI_AppLauncher_Phone_Active-01.png</file> + <file>HMI_AppLauncher_Phone_Inactive-01.png</file> + <file>HMI_AppLauncher_POI_Active-01.png</file> + <file>HMI_AppLauncher_POI_Inactive-01.png</file> + <file>HMI_AppLauncher_Radio_Active-01.png</file> + <file>HMI_AppLauncher_Radio_Inactive-01.png</file> + <file>HMI_AppLauncher_Settings_Active-01.png</file> + <file>HMI_AppLauncher_Settings_Inactive-01.png</file> + </qresource> +</RCC> diff --git a/homescreen/qml/images/MediaMusic/AlbumArtwork.png b/homescreen/qml/images/MediaMusic/AlbumArtwork.png Binary files differnew file mode 100644 index 0000000..3716ab3 --- /dev/null +++ b/homescreen/qml/images/MediaMusic/AlbumArtwork.png diff --git a/homescreen/qml/images/MediaMusic/BackArrow.png b/homescreen/qml/images/MediaMusic/BackArrow.png Binary files differnew file mode 100644 index 0000000..63e38d9 --- /dev/null +++ b/homescreen/qml/images/MediaMusic/BackArrow.png diff --git a/homescreen/qml/images/MediaMusic/ForwardArrow.png b/homescreen/qml/images/MediaMusic/ForwardArrow.png Binary files differnew file mode 100644 index 0000000..a513705 --- /dev/null +++ b/homescreen/qml/images/MediaMusic/ForwardArrow.png diff --git a/homescreen/qml/images/MediaMusic/ShuffleIcon.png b/homescreen/qml/images/MediaMusic/ShuffleIcon.png Binary files differnew file mode 100644 index 0000000..30f75c5 --- /dev/null +++ b/homescreen/qml/images/MediaMusic/ShuffleIcon.png diff --git a/homescreen/qml/images/MediaMusic/Volume_Loud.png b/homescreen/qml/images/MediaMusic/Volume_Loud.png Binary files differnew file mode 100644 index 0000000..8ea4402 --- /dev/null +++ b/homescreen/qml/images/MediaMusic/Volume_Loud.png diff --git a/homescreen/qml/images/MediaMusic/Volume_Medium.png b/homescreen/qml/images/MediaMusic/Volume_Medium.png Binary files differnew file mode 100644 index 0000000..ae5c82e --- /dev/null +++ b/homescreen/qml/images/MediaMusic/Volume_Medium.png diff --git a/homescreen/qml/images/MediaMusic/Volume_Off.png b/homescreen/qml/images/MediaMusic/Volume_Off.png Binary files differnew file mode 100644 index 0000000..07e3353 --- /dev/null +++ b/homescreen/qml/images/MediaMusic/Volume_Off.png diff --git a/homescreen/qml/images/MediaMusic/mediamusic.qrc b/homescreen/qml/images/MediaMusic/mediamusic.qrc new file mode 100644 index 0000000..b1138c0 --- /dev/null +++ b/homescreen/qml/images/MediaMusic/mediamusic.qrc @@ -0,0 +1,11 @@ +<RCC> + <qresource prefix="/images/MediaMusic"> + <file>AlbumArtwork.png</file> + <file>BackArrow.png</file> + <file>ForwardArrow.png</file> + <file>ShuffleIcon.png</file> + <file>Volume_Loud.png</file> + <file>Volume_Medium.png</file> + <file>Volume_Off.png</file> + </qresource> +</RCC> diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_AlbumArtwork.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_AlbumArtwork.png Binary files differnew file mode 100644 index 0000000..14a52b2 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_AlbumArtwork.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_BackArrow.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_BackArrow.png Binary files differnew file mode 100644 index 0000000..0ec1f67 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_BackArrow.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Active.png Binary files differnew file mode 100644 index 0000000..bc2df1d --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Active.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Inactive.png Binary files differnew file mode 100644 index 0000000..8d8fc02 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Bluetooth_Inactive.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Active.png Binary files differnew file mode 100644 index 0000000..94fe38f --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Active.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Inactive.png Binary files differnew file mode 100644 index 0000000..12609e1 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_CD_Inactive.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_DividingLine.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_DividingLine.png Binary files differnew file mode 100644 index 0000000..299903e --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_DividingLine.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_ForwardArrow.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_ForwardArrow.png Binary files differnew file mode 100644 index 0000000..33cc700 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_ForwardArrow.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Active.png Binary files differnew file mode 100644 index 0000000..9bdb14d --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Active.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Inactive.png Binary files differnew file mode 100644 index 0000000..76b0fc9 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Loop_Inactive.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Pause.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Pause.png Binary files differnew file mode 100644 index 0000000..c423005 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Pause.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Play.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Play.png Binary files differnew file mode 100644 index 0000000..beece66 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Player_Play.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Active.png Binary files differnew file mode 100644 index 0000000..eec608f --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Active.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Inactive.png Binary files differnew file mode 100644 index 0000000..d392a90 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_PlaylistToggle_Inactive.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Active.png Binary files differnew file mode 100644 index 0000000..22319c9 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Active.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Inactive.png Binary files differnew file mode 100644 index 0000000..9fd42e2 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Playlist_Inactive.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Active.png Binary files differnew file mode 100644 index 0000000..eb61b39 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Active.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Inactive.png Binary files differnew file mode 100644 index 0000000..de305f0 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Radio_Inactive.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png Binary files differnew file mode 100644 index 0000000..d97feec --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Active.png diff --git a/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Inactive.png b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Inactive.png Binary files differnew file mode 100644 index 0000000..7f6445d --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/AGL_MediaPlayer_Shuffle_Inactive.png diff --git a/homescreen/qml/images/MediaPlayer/Albums_Active.png b/homescreen/qml/images/MediaPlayer/Albums_Active.png Binary files differnew file mode 100644 index 0000000..1f66e23 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/Albums_Active.png diff --git a/homescreen/qml/images/MediaPlayer/Albums_Inactive.png b/homescreen/qml/images/MediaPlayer/Albums_Inactive.png Binary files differnew file mode 100644 index 0000000..e0e7f00 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/Albums_Inactive.png diff --git a/homescreen/qml/images/MediaPlayer/DividingLine.png b/homescreen/qml/images/MediaPlayer/DividingLine.png Binary files differnew file mode 100644 index 0000000..87f2122 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/DividingLine.png diff --git a/homescreen/qml/images/MediaPlayer/GreenLine.png b/homescreen/qml/images/MediaPlayer/GreenLine.png Binary files differnew file mode 100644 index 0000000..0210b83 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/GreenLine.png diff --git a/homescreen/qml/images/MediaPlayer/Music_Active.png b/homescreen/qml/images/MediaPlayer/Music_Active.png Binary files differnew file mode 100644 index 0000000..36afac7 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/Music_Active.png diff --git a/homescreen/qml/images/MediaPlayer/Music_Inactive.png b/homescreen/qml/images/MediaPlayer/Music_Inactive.png Binary files differnew file mode 100644 index 0000000..9dae353 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/Music_Inactive.png diff --git a/homescreen/qml/images/MediaPlayer/Podcasts_Active.png b/homescreen/qml/images/MediaPlayer/Podcasts_Active.png Binary files differnew file mode 100644 index 0000000..fd2d2c0 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/Podcasts_Active.png diff --git a/homescreen/qml/images/MediaPlayer/Podcasts_Inactive.png b/homescreen/qml/images/MediaPlayer/Podcasts_Inactive.png Binary files differnew file mode 100644 index 0000000..b76b04c --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/Podcasts_Inactive.png diff --git a/homescreen/qml/images/MediaPlayer/Popup_Highlight.png b/homescreen/qml/images/MediaPlayer/Popup_Highlight.png Binary files differnew file mode 100644 index 0000000..ac63673 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/Popup_Highlight.png diff --git a/homescreen/qml/images/MediaPlayer/Popup_PauseIcon.png b/homescreen/qml/images/MediaPlayer/Popup_PauseIcon.png Binary files differnew file mode 100644 index 0000000..2627add --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/Popup_PauseIcon.png diff --git a/homescreen/qml/images/MediaPlayer/Popup_PlayIcon.png b/homescreen/qml/images/MediaPlayer/Popup_PlayIcon.png Binary files differnew file mode 100644 index 0000000..0483e07 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/Popup_PlayIcon.png diff --git a/homescreen/qml/images/MediaPlayer/Popup_VerticalLine.png b/homescreen/qml/images/MediaPlayer/Popup_VerticalLine.png Binary files differnew file mode 100644 index 0000000..6a9db00 --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/Popup_VerticalLine.png diff --git a/homescreen/qml/images/MediaPlayer/X.png b/homescreen/qml/images/MediaPlayer/X.png Binary files differnew file mode 100644 index 0000000..ab392cb --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/X.png diff --git a/homescreen/qml/images/MediaPlayer/mediaplayer.qrc b/homescreen/qml/images/MediaPlayer/mediaplayer.qrc new file mode 100644 index 0000000..1cb17ab --- /dev/null +++ b/homescreen/qml/images/MediaPlayer/mediaplayer.qrc @@ -0,0 +1,37 @@ +<RCC> + <qresource prefix="/images/MediaPlayer"> + <file>AGL_MediaPlayer_AlbumArtwork.png</file> + <file>AGL_MediaPlayer_BackArrow.png</file> + <file>AGL_MediaPlayer_Bluetooth_Active.png</file> + <file>AGL_MediaPlayer_Bluetooth_Inactive.png</file> + <file>AGL_MediaPlayer_CD_Active.png</file> + <file>AGL_MediaPlayer_CD_Inactive.png</file> + <file>AGL_MediaPlayer_DividingLine.png</file> + <file>AGL_MediaPlayer_ForwardArrow.png</file> + <file>AGL_MediaPlayer_Loop_Active.png</file> + <file>AGL_MediaPlayer_Loop_Inactive.png</file> + <file>AGL_MediaPlayer_Player_Pause.png</file> + <file>AGL_MediaPlayer_Player_Play.png</file> + <file>AGL_MediaPlayer_Playlist_Active.png</file> + <file>AGL_MediaPlayer_Playlist_Inactive.png</file> + <file>AGL_MediaPlayer_PlaylistToggle_Active.png</file> + <file>AGL_MediaPlayer_PlaylistToggle_Inactive.png</file> + <file>AGL_MediaPlayer_Radio_Active.png</file> + <file>AGL_MediaPlayer_Radio_Inactive.png</file> + <file>AGL_MediaPlayer_Shuffle_Active.png</file> + <file>AGL_MediaPlayer_Shuffle_Inactive.png</file> + <file>Albums_Active.png</file> + <file>Albums_Inactive.png</file> + <file>DividingLine.png</file> + <file>GreenLine.png</file> + <file>Music_Active.png</file> + <file>Music_Inactive.png</file> + <file>Podcasts_Active.png</file> + <file>Podcasts_Inactive.png</file> + <file>Popup_Highlight.png</file> + <file>Popup_PauseIcon.png</file> + <file>Popup_PlayIcon.png</file> + <file>Popup_VerticalLine.png</file> + <file>X.png</file> + </qresource> +</RCC> diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.png Binary files differnew file mode 100644 index 0000000..f5188f5 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC-01.png diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.png Binary files differnew file mode 100644 index 0000000..abe92d2 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_HVAC_Active-01.png diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.png Binary files differnew file mode 100644 index 0000000..9aca151 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home-01.png diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.png Binary files differnew file mode 100644 index 0000000..696168f --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Home_Active-01.png diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.png Binary files differnew file mode 100644 index 0000000..229860c --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer-01.png diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.png Binary files differnew file mode 100644 index 0000000..b0a023c --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_MediaPlayer_Active-01.png diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.png Binary files differnew file mode 100644 index 0000000..34b0671 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation-01.png diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.png Binary files differnew file mode 100644 index 0000000..98e6146 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Navigation_Active-01.png diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.png Binary files differnew file mode 100644 index 0000000..278bc2a --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio-01.png diff --git a/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.png b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.png Binary files differnew file mode 100644 index 0000000..037e1b5 --- /dev/null +++ b/homescreen/qml/images/Shortcut/HMI_Shortcut_Radio_Active-01.png diff --git a/homescreen/qml/images/Shortcut/shortcut.qrc b/homescreen/qml/images/Shortcut/shortcut.qrc new file mode 100644 index 0000000..1b4d424 --- /dev/null +++ b/homescreen/qml/images/Shortcut/shortcut.qrc @@ -0,0 +1,14 @@ +<RCC> + <qresource prefix="/images/Shortcut"> + <file>HMI_Shortcut_Home_Active-01.png</file> + <file>HMI_Shortcut_Home-01.png</file> + <file>HMI_Shortcut_HVAC_Active-01.png</file> + <file>HMI_Shortcut_HVAC-01.png</file> + <file>HMI_Shortcut_MediaPlayer_Active-01.png</file> + <file>HMI_Shortcut_MediaPlayer-01.png</file> + <file>HMI_Shortcut_Navigation_Active-01.png</file> + <file>HMI_Shortcut_Navigation-01.png</file> + <file>HMI_Shortcut_Radio_Active-01.png</file> + <file>HMI_Shortcut_Radio-01.png</file> + </qresource> +</RCC> diff --git a/homescreen/qml/images/Status/HMI_Status_Bluetooth_Inactive-01.png b/homescreen/qml/images/Status/HMI_Status_Bluetooth_Inactive-01.png Binary files differnew file mode 100644 index 0000000..10bd5a5 --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Bluetooth_Inactive-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Bluetooth_On-01.png b/homescreen/qml/images/Status/HMI_Status_Bluetooth_On-01.png Binary files differnew file mode 100644 index 0000000..1ff96e1 --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Bluetooth_On-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Signal_1Bars-01.png b/homescreen/qml/images/Status/HMI_Status_Signal_1Bars-01.png Binary files differnew file mode 100644 index 0000000..44ef700 --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Signal_1Bars-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Signal_2Bars-01.png b/homescreen/qml/images/Status/HMI_Status_Signal_2Bars-01.png Binary files differnew file mode 100644 index 0000000..fe4e776 --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Signal_2Bars-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Signal_3Bars-01.png b/homescreen/qml/images/Status/HMI_Status_Signal_3Bars-01.png Binary files differnew file mode 100644 index 0000000..892c6ec --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Signal_3Bars-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Signal_4Bars-01.png b/homescreen/qml/images/Status/HMI_Status_Signal_4Bars-01.png Binary files differnew file mode 100644 index 0000000..f4f033b --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Signal_4Bars-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Signal_Full-01.png b/homescreen/qml/images/Status/HMI_Status_Signal_Full-01.png Binary files differnew file mode 100644 index 0000000..18070b9 --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Signal_Full-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Signal_NoBars-01.png b/homescreen/qml/images/Status/HMI_Status_Signal_NoBars-01.png Binary files differnew file mode 100644 index 0000000..1b77207 --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Signal_NoBars-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Wifi_1Bar-01.png b/homescreen/qml/images/Status/HMI_Status_Wifi_1Bar-01.png Binary files differnew file mode 100644 index 0000000..c72461f --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Wifi_1Bar-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Wifi_2Bars-01.png b/homescreen/qml/images/Status/HMI_Status_Wifi_2Bars-01.png Binary files differnew file mode 100644 index 0000000..448dd36 --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Wifi_2Bars-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Wifi_3Bars-01.png b/homescreen/qml/images/Status/HMI_Status_Wifi_3Bars-01.png Binary files differnew file mode 100644 index 0000000..3e407ad --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Wifi_3Bars-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Wifi_Full-01.png b/homescreen/qml/images/Status/HMI_Status_Wifi_Full-01.png Binary files differnew file mode 100644 index 0000000..6f95e97 --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Wifi_Full-01.png diff --git a/homescreen/qml/images/Status/HMI_Status_Wifi_NoBars-01.png b/homescreen/qml/images/Status/HMI_Status_Wifi_NoBars-01.png Binary files differnew file mode 100644 index 0000000..07f4f09 --- /dev/null +++ b/homescreen/qml/images/Status/HMI_Status_Wifi_NoBars-01.png diff --git a/homescreen/qml/images/Status/status.qrc b/homescreen/qml/images/Status/status.qrc new file mode 100644 index 0000000..d29c91a --- /dev/null +++ b/homescreen/qml/images/Status/status.qrc @@ -0,0 +1,17 @@ +<RCC> + <qresource prefix="/images/Status"> + <file>HMI_Status_Wifi_NoBars-01.png</file> + <file>HMI_Status_Bluetooth_Inactive-01.png</file> + <file>HMI_Status_Bluetooth_On-01.png</file> + <file>HMI_Status_Signal_1Bars-01.png</file> + <file>HMI_Status_Signal_2Bars-01.png</file> + <file>HMI_Status_Signal_3Bars-01.png</file> + <file>HMI_Status_Signal_4Bars-01.png</file> + <file>HMI_Status_Signal_Full-01.png</file> + <file>HMI_Status_Signal_NoBars-01.png</file> + <file>HMI_Status_Wifi_1Bar-01.png</file> + <file>HMI_Status_Wifi_2Bars-01.png</file> + <file>HMI_Status_Wifi_3Bars-01.png</file> + <file>HMI_Status_Wifi_Full-01.png</file> + </qresource> +</RCC> diff --git a/homescreen/qml/images/TopSection_NoText_NoIcons-01.png b/homescreen/qml/images/TopSection_NoText_NoIcons-01.png Binary files differnew file mode 100644 index 0000000..cf9ec4e --- /dev/null +++ b/homescreen/qml/images/TopSection_NoText_NoIcons-01.png diff --git a/homescreen/qml/images/Utility_Logo_Background-01.png b/homescreen/qml/images/Utility_Logo_Background-01.png Binary files differnew file mode 100644 index 0000000..21a602d --- /dev/null +++ b/homescreen/qml/images/Utility_Logo_Background-01.png diff --git a/homescreen/qml/images/Utility_Logo_Colour-01.png b/homescreen/qml/images/Utility_Logo_Colour-01.png Binary files differnew file mode 100644 index 0000000..6519a2d --- /dev/null +++ b/homescreen/qml/images/Utility_Logo_Colour-01.png diff --git a/homescreen/qml/images/Utility_Music_Background-01.png b/homescreen/qml/images/Utility_Music_Background-01.png Binary files differnew file mode 100644 index 0000000..c3e9f91 --- /dev/null +++ b/homescreen/qml/images/Utility_Music_Background-01.png diff --git a/homescreen/qml/images/Utility_Radio_Background-01.png b/homescreen/qml/images/Utility_Radio_Background-01.png Binary files differnew file mode 100644 index 0000000..b755843 --- /dev/null +++ b/homescreen/qml/images/Utility_Radio_Background-01.png diff --git a/homescreen/qml/images/Weather/WeatherIcons_ALL-01.png b/homescreen/qml/images/Weather/WeatherIcons_ALL-01.png Binary files differnew file mode 100644 index 0000000..f5f8b19 --- /dev/null +++ b/homescreen/qml/images/Weather/WeatherIcons_ALL-01.png diff --git a/homescreen/qml/images/Weather/WeatherIcons_Cloudy-01.png b/homescreen/qml/images/Weather/WeatherIcons_Cloudy-01.png Binary files differnew file mode 100644 index 0000000..3603a55 --- /dev/null +++ b/homescreen/qml/images/Weather/WeatherIcons_Cloudy-01.png diff --git a/homescreen/qml/images/Weather/WeatherIcons_Moon-01.png b/homescreen/qml/images/Weather/WeatherIcons_Moon-01.png Binary files differnew file mode 100644 index 0000000..8fe1e18 --- /dev/null +++ b/homescreen/qml/images/Weather/WeatherIcons_Moon-01.png diff --git a/homescreen/qml/images/Weather/WeatherIcons_PartiallyCloudy-01.png b/homescreen/qml/images/Weather/WeatherIcons_PartiallyCloudy-01.png Binary files differnew file mode 100644 index 0000000..09cd84f --- /dev/null +++ b/homescreen/qml/images/Weather/WeatherIcons_PartiallyCloudy-01.png diff --git a/homescreen/qml/images/Weather/WeatherIcons_Rain-01.png b/homescreen/qml/images/Weather/WeatherIcons_Rain-01.png Binary files differnew file mode 100644 index 0000000..125b413 --- /dev/null +++ b/homescreen/qml/images/Weather/WeatherIcons_Rain-01.png diff --git a/homescreen/qml/images/Weather/WeatherIcons_Snow-01.png b/homescreen/qml/images/Weather/WeatherIcons_Snow-01.png Binary files differnew file mode 100644 index 0000000..d0a9520 --- /dev/null +++ b/homescreen/qml/images/Weather/WeatherIcons_Snow-01.png diff --git a/homescreen/qml/images/Weather/WeatherIcons_Sun-01.png b/homescreen/qml/images/Weather/WeatherIcons_Sun-01.png Binary files differnew file mode 100644 index 0000000..ee3a744 --- /dev/null +++ b/homescreen/qml/images/Weather/WeatherIcons_Sun-01.png diff --git a/homescreen/qml/images/Weather/WeatherIcons_Thunderstorm-01.png b/homescreen/qml/images/Weather/WeatherIcons_Thunderstorm-01.png Binary files differnew file mode 100644 index 0000000..f6959f4 --- /dev/null +++ b/homescreen/qml/images/Weather/WeatherIcons_Thunderstorm-01.png diff --git a/homescreen/qml/images/Weather/weather.qrc b/homescreen/qml/images/Weather/weather.qrc new file mode 100644 index 0000000..2668fec --- /dev/null +++ b/homescreen/qml/images/Weather/weather.qrc @@ -0,0 +1,12 @@ +<RCC> + <qresource prefix="/images/Weather"> + <file>WeatherIcons_ALL-01.png</file> + <file>WeatherIcons_Cloudy-01.png</file> + <file>WeatherIcons_Moon-01.png</file> + <file>WeatherIcons_PartiallyCloudy-01.png</file> + <file>WeatherIcons_Rain-01.png</file> + <file>WeatherIcons_Snow-01.png</file> + <file>WeatherIcons_Sun-01.png</file> + <file>WeatherIcons_Thunderstorm-01.png</file> + </qresource> +</RCC> diff --git a/homescreen/qml/images/images.qrc b/homescreen/qml/images/images.qrc new file mode 100644 index 0000000..2d8e902 --- /dev/null +++ b/homescreen/qml/images/images.qrc @@ -0,0 +1,10 @@ +<RCC> + <qresource prefix="/images"> + <file>TopSection_NoText_NoIcons-01.png</file> + <file>Utility_Logo_Background-01.png</file> + <file>Utility_Logo_Colour-01.png</file> + <file>Utility_Music_Background-01.png</file> + <file>Utility_Radio_Background-01.png</file> + <file>AGL_HMI_Background_NoCar-01.png</file> + </qresource> +</RCC> diff --git a/homescreen/qml/main.qml b/homescreen/qml/main.qml new file mode 100644 index 0000000..11bd9d5 --- /dev/null +++ b/homescreen/qml/main.qml @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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.2 +import QtQuick.Window 2.1 +import QtQuick.Layouts 1.1 +import HomeScreen 1.0 + +Window { + visible: true + flags: Qt.FramelessWindowHint + width: container.width * container.scale + height: container.height * container.scale + title: 'HomeScreen' + + ApplicationLauncher { + id: launcher + } + + Image { + id: container + anchors.centerIn: parent + width: 1080 + height: 1920 + scale: 1.0 + source: './images/AGL_HMI_Background_NoCar-01.png' + + ColumnLayout { + anchors.fill: parent + spacing: 0 + TopArea { + id: topArea + Layout.fillWidth: true + Layout.preferredHeight: 218 + } + + Item { + id: applicationArea + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredHeight: 1920 - 218 - 215 + + visible: false + } + + Home { + id: appLauncherAreaLauncher + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredHeight: 1920 - 218 - 215 + visible: true + } + + MediaArea { + id: mediaArea + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredHeight: 215 + } + } + } +} diff --git a/homescreen/qml/qml.qrc b/homescreen/qml/qml.qrc new file mode 100644 index 0000000..c25e266 --- /dev/null +++ b/homescreen/qml/qml.qrc @@ -0,0 +1,15 @@ +<RCC> + <qresource prefix="/"> + <file>Home.qml</file> + <file>main.qml</file> + <file>MediaArea.qml</file> + <file>MediaAreaBlank.qml</file> + <file>MediaAreaMusic.qml</file> + <file>MediaAreaRadio.qml</file> + <file>ShortcutArea.qml</file> + <file>ShortcutIcon.qml</file> + <file>StatusArea.qml</file> + <file>TopArea.qml</file> + <file>IconItem.qml</file> + </qresource> +</RCC> diff --git a/homescreen/src/appinfo.cpp b/homescreen/src/appinfo.cpp new file mode 100644 index 0000000..fd9a585 --- /dev/null +++ b/homescreen/src/appinfo.cpp @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * 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. + */ + +#include "appinfo.h" + +#include <QtCore/QJsonObject> + +class AppInfo::Private : public QSharedData +{ +public: + Private(); + Private(const Private &other); + + QString id; + QString version; + int width; + int height; + QString name; + QString description; + QString shortname; + QString author; + QString iconPath; +}; + +AppInfo::Private::Private() + : width(-1) + , height(-1) +{ +} + +AppInfo::Private::Private(const Private &other) + : QSharedData(other) + , id(other.id) + , version(other.version) + , width(other.width) + , height(other.height) + , name(other.name) + , description(other.description) + , shortname(other.shortname) + , author(other.author) + , iconPath(other.iconPath) +{ +} + +AppInfo::AppInfo() + : d(new Private) +{ +} + +AppInfo::AppInfo(const QString &icon, const QString &name, const QString &id) + : d(new Private) +{ + d->iconPath = icon; + d->name = name; + d->id = id; +} + +AppInfo::AppInfo(const AppInfo &other) + : d(other.d) +{ +} + +AppInfo::~AppInfo() +{ +} + +AppInfo &AppInfo::operator =(const AppInfo &other) +{ + d = other.d; + return *this; +} + +QString AppInfo::id() const +{ + return d->id; +} + +QString AppInfo::version() const +{ + return d->version; +} + +int AppInfo::width() const +{ + return d->width; +} + +int AppInfo::height() const +{ + return d->height; +} + +QString AppInfo::name() const +{ + return d->name; +} + +QString AppInfo::description() const +{ + return d->description; +} + +QString AppInfo::shortname() const +{ + return d->shortname; +} + +QString AppInfo::author() const +{ + return d->author; +} + +QString AppInfo::iconPath() const +{ + return d->iconPath; +} + +void AppInfo::read(const QJsonObject &json) +{ + d->id = json["id"].toString(); + d->version = json["version"].toString(); + d->width = json["width"].toInt(); + d->height = json["height"].toInt(); + d->name = json["name"].toString(); + d->description = json["description"].toString(); + d->shortname = json["shortname"].toString(); + d->author = json["author"].toString(); + d->iconPath = json["iconPath"].toString(); +} + +QDBusArgument &operator <<(QDBusArgument &argument, const AppInfo &appInfo) +{ + argument.beginStructure(); + argument << appInfo.d->id; + argument << appInfo.d->version; + argument << appInfo.d->width; + argument << appInfo.d->height; + argument << appInfo.d->name; + argument << appInfo.d->description; + argument << appInfo.d->shortname; + argument << appInfo.d->author; + argument << appInfo.d->iconPath; + argument.endStructure(); + + return argument; +} + +const QDBusArgument &operator >>(const QDBusArgument &argument, AppInfo &appInfo) +{ + argument.beginStructure(); + argument >> appInfo.d->id; + argument >> appInfo.d->version; + argument >> appInfo.d->width; + argument >> appInfo.d->height; + argument >> appInfo.d->name; + argument >> appInfo.d->description; + argument >> appInfo.d->shortname; + argument >> appInfo.d->author; + argument >> appInfo.d->iconPath; + argument.endStructure(); + return argument; +} diff --git a/homescreen/src/appinfo.h b/homescreen/src/appinfo.h new file mode 100644 index 0000000..0d98b10 --- /dev/null +++ b/homescreen/src/appinfo.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * 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. + */ + +#ifndef APPINFO_H +#define APPINFO_H + +#include <QtCore/QSharedDataPointer> +#include <QtDBus/QDBusArgument> + +class AppInfo +{ + Q_GADGET + Q_PROPERTY(QString id READ id) + Q_PROPERTY(QString version READ version) + Q_PROPERTY(int width READ width) + Q_PROPERTY(int height READ height) + Q_PROPERTY(QString name READ name) + Q_PROPERTY(QString description READ description) + Q_PROPERTY(QString shortname READ shortname) + Q_PROPERTY(QString author READ author) + Q_PROPERTY(QString iconPath READ iconPath) +public: + AppInfo(); + AppInfo(const QString &icon, const QString &name, const QString &id); + AppInfo(const AppInfo &other); + virtual ~AppInfo(); + AppInfo &operator =(const AppInfo &other); + void swap(AppInfo &other) { qSwap(d, other.d); } + + QString id() const; + QString version() const; + int width() const; + int height() const; + QString name() const; + QString description() const; + QString shortname() const; + QString author() const; + QString iconPath() const; + + void read(const QJsonObject &json); + + friend QDBusArgument &operator <<(QDBusArgument &argument, const AppInfo &appInfo); + friend const QDBusArgument &operator >>(const QDBusArgument &argument, AppInfo &appInfo); + +private: + class Private; + QSharedDataPointer<Private> d; +}; + +Q_DECLARE_SHARED(AppInfo) +Q_DECLARE_METATYPE(AppInfo) +Q_DECLARE_METATYPE(QList<AppInfo>) + +#endif // APPINFO_H diff --git a/homescreen/src/applicationlauncher.cpp b/homescreen/src/applicationlauncher.cpp new file mode 100644 index 0000000..8358107 --- /dev/null +++ b/homescreen/src/applicationlauncher.cpp @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#include "applicationlauncher.h" + +#include "afm_user_daemon_proxy.h" + +#include <QtCore/QDebug> + +extern org::AGL::afm::user *afm_user_daemon_proxy; + +ApplicationLauncher::ApplicationLauncher(QObject *parent) + : QObject(parent) +{ +} + +int ApplicationLauncher::launch(const QString &application) +{ + int result = -1; + qDebug() << "ApplicationLauncher launch" << application; + + result = afm_user_daemon_proxy->start(application).value().toInt(); + qDebug() << "ApplicationLauncher pid:" << result; + + if (result > 1) { + setCurrent(application); + } + + return result; +} + +QString ApplicationLauncher::current() const +{ + return m_current; +} + +void ApplicationLauncher::setCurrent(const QString ¤t) +{ + if (m_current == current) return; + m_current = current; + emit currentChanged(current); +} diff --git a/homescreen/src/applicationlauncher.h b/homescreen/src/applicationlauncher.h new file mode 100644 index 0000000..a31e663 --- /dev/null +++ b/homescreen/src/applicationlauncher.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#ifndef APPLICATIONLAUNCHER_H +#define APPLICATIONLAUNCHER_H + +#include <QtCore/QObject> + +class ApplicationLauncher : public QObject +{ + Q_OBJECT + Q_PROPERTY(QString current READ current WRITE setCurrent NOTIFY currentChanged) +public: + explicit ApplicationLauncher(QObject *parent = NULL); + + QString current() const; + +signals: + void newAppRequestsToBeVisible(int pid); + void currentChanged(const QString ¤t); + +public slots: + int launch(const QString &application); + void setCurrent(const QString ¤t); + +private: + QString m_current; +}; + +#endif // APPLICATIONLAUNCHER_H diff --git a/homescreen/src/applicationmodel.cpp b/homescreen/src/applicationmodel.cpp new file mode 100644 index 0000000..2c51b98 --- /dev/null +++ b/homescreen/src/applicationmodel.cpp @@ -0,0 +1,155 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#include "applicationmodel.h" +#include "appinfo.h" + +#include <QtCore/QDebug> + +#include <QtDBus/QDBusInterface> +#include <QtDBus/QDBusReply> + +#include "afm_user_daemon_proxy.h" + +extern org::AGL::afm::user *afm_user_daemon_proxy; + +class ApplicationModel::Private +{ +public: + Private(); + + QList<AppInfo> data; +}; + +namespace { + QString get_icon_name(QJsonObject const &i) + { + QString icon = i["id"].toString().split("@").front(); + if (icon == "hvac" || icon == "poi") { + icon = icon.toUpper(); + } else if (icon == "mediaplayer") { +// icon = "Multimedia"; + icon = "MediaPlayer"; + } else { + icon[0] = icon[0].toUpper(); + } + return icon; + } +} + +ApplicationModel::Private::Private() +{ + QString apps = afm_user_daemon_proxy->runnables(QStringLiteral("")); + QJsonDocument japps = QJsonDocument::fromJson(apps.toUtf8()); + for (auto const &app : japps.array()) { + QJsonObject const &jso = app.toObject(); + auto const name = jso["name"].toString(); + auto const id = jso["id"].toString(); + auto const icon = get_icon_name(jso); + + // HomeScreenは除外する + if (name != "homescreen-2017") { + this->data.append(AppInfo(icon, name, id)); + } + + qDebug() << "name:" << name << "icon:" << icon << "id:" << id; + } +} + +ApplicationModel::ApplicationModel(QObject *parent) + : QAbstractListModel(parent) + , d(new Private()) +{ +} + +ApplicationModel::~ApplicationModel() +{ + delete this->d; +} + +int ApplicationModel::rowCount(const QModelIndex &parent) const +{ + if (parent.isValid()) + return 0; + + return this->d->data.count(); +} + +QVariant ApplicationModel::data(const QModelIndex &index, int role) const +{ + QVariant ret; + if (!index.isValid()) + return ret; + + switch (role) { + case Qt::DecorationRole: + ret = this->d->data[index.row()].iconPath(); + break; + case Qt::DisplayRole: + ret = this->d->data[index.row()].name(); + break; + case Qt::UserRole: + ret = this->d->data[index.row()].id(); + break; + default: + break; + } + + return ret; +} + +QHash<int, QByteArray> ApplicationModel::roleNames() const +{ + QHash<int, QByteArray> roles; + roles[Qt::DecorationRole] = "icon"; + roles[Qt::DisplayRole] = "name"; + roles[Qt::UserRole] = "id"; + return roles; +} + +QString ApplicationModel::id(int i) const +{ + return data(index(i), Qt::UserRole).toString(); +} + +QString ApplicationModel::name(int i) const +{ + return data(index(i), Qt::DisplayRole).toString(); +} + +void ApplicationModel::move(int from, int to) +{ + QModelIndex parent; + if (to < 0 || to > rowCount()) return; + if (from < to) { + if (!beginMoveRows(parent, from, from, parent, to + 1)) { + qDebug() << from << to << false; + return; + } + d->data.move(from, to); + endMoveRows(); + } else if (from > to) { + if (!beginMoveRows(parent, from, from, parent, to)) { + qDebug() << from << to << false; + return; + } + d->data.move(from, to); + endMoveRows(); + } else { + qDebug() << from << to << false; + } +} diff --git a/homescreen/src/applicationmodel.h b/homescreen/src/applicationmodel.h new file mode 100644 index 0000000..64f9c53 --- /dev/null +++ b/homescreen/src/applicationmodel.h @@ -0,0 +1,42 @@ +/* + * 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. + */ + +#ifndef APPLICATIONMODEL_H +#define APPLICATIONMODEL_H + +#include <QtCore/QAbstractListModel> + +class ApplicationModel : public QAbstractListModel +{ + Q_OBJECT +public: + explicit ApplicationModel(QObject *parent = nullptr); + ~ApplicationModel(); + + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QHash<int, QByteArray> roleNames() const override; + Q_INVOKABLE QString id(int index) const; + Q_INVOKABLE QString name(int index) const; + Q_INVOKABLE void move(int from, int to); + +private: + class Private; + Private *d; +}; + +#endif // APPLICATIONMODEL_H diff --git a/homescreen/src/homescreencontrolinterface.cpp b/homescreen/src/homescreencontrolinterface.cpp new file mode 100644 index 0000000..ecbe8e4 --- /dev/null +++ b/homescreen/src/homescreencontrolinterface.cpp @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#include "afm_user_daemon_proxy.h" +#include "homescreencontrolinterface.h" + +extern org::AGL::afm::user *afm_user_daemon_proxy; + +HomeScreenControlInterface::HomeScreenControlInterface(QObject *parent) : + QObject(parent), + mp_homeScreenAdaptor(0) +{ + // publish dbus homescreen interface + mp_homeScreenAdaptor = new HomescreenAdaptor((QObject*)this); + + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/HomeScreen", this); + dbus.registerService("org.agl.homescreen"); +} + +QList<int> HomeScreenControlInterface::getAllSurfacesOfProcess(int pid) +{ + qDebug("getAllSurfacesOfProcess %d", pid); + return newRequestGetAllSurfacesOfProcess(pid); +} + +int HomeScreenControlInterface::getSurfaceStatus(int surfaceId) +{ + qDebug("getSurfaceStatus %d", surfaceId); + return newRequestGetSurfaceStatus(surfaceId); +} + +void HomeScreenControlInterface::hardKeyPressed(int key) +{ + int pid = -1; + + switch (key) + { + case InputEvent::HARDKEY_NAV: + qDebug("hardKeyPressed NAV key pressed!"); + pid = afm_user_daemon_proxy->start("navigation@0.1").value().toInt(); + qDebug("pid: %d", pid); + emit newRequestsToBeVisibleApp(pid); + break; + case InputEvent::HARDKEY_MEDIA: + qDebug("hardKeyPressed MEDIA key pressed!"); + pid = afm_user_daemon_proxy->start("media@0.1").value().toInt(); + qDebug("pid: %d", pid); + emit newRequestsToBeVisibleApp(pid); + break; + default: + qDebug("hardKeyPressed %d", key); + break; + } +} + +void HomeScreenControlInterface::renderSurfaceToArea(int surfaceId, int layoutArea) +{ + qDebug("renderSurfaceToArea %d %d", surfaceId, layoutArea); + emit newRequestRenderSurfaceToArea(surfaceId, layoutArea); +} + +bool HomeScreenControlInterface::renderAppToAreaAllowed(int appCategory, int layoutArea) +{ + qDebug("renderAppToAreaAllowed %d %d", appCategory, layoutArea); + return true; //TODO: ask policy manager +} + +void HomeScreenControlInterface::requestSurfaceIdToFullScreen(int surfaceId) +{ + qDebug("requestSurfaceIdToFullScreen %d", surfaceId); + emit newRequestSurfaceIdToFullScreen(surfaceId); +} diff --git a/homescreen/src/homescreencontrolinterface.h b/homescreen/src/homescreencontrolinterface.h new file mode 100644 index 0000000..b68a2b2 --- /dev/null +++ b/homescreen/src/homescreencontrolinterface.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#ifndef HOMESCREENCONTROLINTERFACE_H +#define HOMESCREENCONTROLINTERFACE_H + +#include <QObject> +#include "include/homescreen.hpp" +#include "homescreen_adaptor.h" + +class HomeScreenControlInterface : public QObject +{ + Q_OBJECT +public: + explicit HomeScreenControlInterface(QObject *parent = 0); + +signals: + void newRequestsToBeVisibleApp(int pid); + + QList<int> newRequestGetAllSurfacesOfProcess(int pid); + int newRequestGetSurfaceStatus(int surfaceId); + void newRequestRenderSurfaceToArea(int surfaceId, int layoutArea); + bool newRequestRenderSurfaceToAreaAllowed(int surfaceId, int layoutArea); + void newRequestSurfaceIdToFullScreen(int surfaceId); + +//from homescreen_adaptor.h +public Q_SLOTS: // METHODS + QList<int> getAllSurfacesOfProcess(int pid); + int getSurfaceStatus(int surfaceId); + void hardKeyPressed(int key); + void renderSurfaceToArea(int surfaceId, int layoutArea); + bool renderAppToAreaAllowed(int appCategory, int layoutArea); + void requestSurfaceIdToFullScreen(int surfaceId); + +private: + HomescreenAdaptor *mp_homeScreenAdaptor; +}; + +#endif // HOMESCREENCONTROLINTERFACE_H diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp new file mode 100644 index 0000000..2a69034 --- /dev/null +++ b/homescreen/src/homescreenhandler.cpp @@ -0,0 +1,79 @@ +#include "homescreenhandler.h" +#include <functional> + +void* HomescreenHandler::myThis = 0; + +HomescreenHandler::HomescreenHandler(QObject *parent) : + QObject(parent), + mp_hs(NULL) +{ + +} + +HomescreenHandler::~HomescreenHandler() +{ + if (mp_hs != NULL) { + delete mp_hs; + } +} + +void HomescreenHandler::init(int port, const char *token) +{ + mp_hs = new LibHomeScreen(); + mp_hs->init(port, token); + + myThis = this; + +// mp_hs->registerCallback(HomescreenHandler::onEv_static, HomescreenHandler::onRep_static); +// mp_hs->subscribe(LibHomeScreen::event_list[0]); +// mp_hs->subscribe(LibHomeScreen::event_list[1]); + + mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static); + + mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](const char* display_message){ + qDebug("set_event_handler Event_OnScreenMessage display_message = %s", display_message); + }); + + mp_hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [this](const char* application_name){ + if(strcmp(application_name, "Home") == 0){ + emit this->homeButton(); + } + }); + +} + +void HomescreenHandler::tapShortcut(QString application_name) +{ + qDebug("tapShortcut %s", qPrintable(application_name)); + mp_hs->tapShortcut(application_name.toStdString().c_str()); +} + +void HomescreenHandler::onRep_static(struct json_object* reply_contents) +{ + static_cast<HomescreenHandler*>(HomescreenHandler::myThis)->onRep(reply_contents); +} + +void HomescreenHandler::onEv_static(const string& event, struct json_object* event_contents) +{ + static_cast<HomescreenHandler*>(HomescreenHandler::myThis)->onEv(event, event_contents); +} + +void HomescreenHandler::onRep(struct json_object* reply_contents) +{ + const char* str = json_object_to_json_string(reply_contents); + qDebug("HomeScreen onReply %s", str); +} + +void HomescreenHandler::onEv(const string& event, struct json_object* event_contents) +{ + const char* str = json_object_to_json_string(event_contents); + qDebug("HomeScreen onEv %s, contents: %s", event.c_str(), str); + + if (event.compare("homescreen/on_screen_message") == 0) { + struct json_object *json_data = json_object_object_get(event_contents, "data"); + struct json_object *json_display_message = json_object_object_get(json_data, "display_message"); + const char* display_message = json_object_get_string(json_display_message); + + qDebug("display_message = %s", display_message); + } +} diff --git a/homescreen/src/homescreenhandler.h b/homescreen/src/homescreenhandler.h new file mode 100644 index 0000000..55d14fd --- /dev/null +++ b/homescreen/src/homescreenhandler.h @@ -0,0 +1,34 @@ +#ifndef HOMESCREENHANDLER_H +#define HOMESCREENHANDLER_H + +#include <QObject> +#include <libhomescreen.hpp> +#include <string> + +using namespace std; + +class HomescreenHandler : public QObject +{ + Q_OBJECT +public: + explicit HomescreenHandler(QObject *parent = 0); + ~HomescreenHandler(); + + void init(int port, const char* token); + + Q_INVOKABLE void tapShortcut(QString application_name); + + void onRep(struct json_object* reply_contents); + void onEv(const string& event, struct json_object* event_contents); + + static void* myThis; + static void onRep_static(struct json_object* reply_contents); + static void onEv_static(const string& event, struct json_object* event_contents); +signals: + void homeButton(); + +private: + LibHomeScreen *mp_hs; +}; + +#endif // HOMESCREENHANDLER_H diff --git a/homescreen/src/layouthandler.cpp b/homescreen/src/layouthandler.cpp new file mode 100644 index 0000000..d16b5e7 --- /dev/null +++ b/homescreen/src/layouthandler.cpp @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#include <QDebug> +#include "layouthandler.h" + +#define HOMESCREEN "HomeScreen" + +LayoutHandler::LayoutHandler(QObject *parent) : + QObject(parent), + mp_wm(NULL) +{ + isActived = false; +} + +LayoutHandler::~LayoutHandler() +{ +} + +void LayoutHandler::init(int port, const char* token) +{ + if (mp_wm != NULL) exit(EXIT_FAILURE); + + mp_wm = new LibWindowmanager(); + + if (mp_wm->init(port, token) != 0) { + exit(EXIT_FAILURE); + } + + mp_wm->requestSurface(HOMESCREEN); + + mp_wm->set_event_handler(LibWindowmanager::Event_Active, [this](const char* label) { + this->isActived = true; + qDebug("Surface %s got activated!", label); + }); + + mp_wm->set_event_handler(LibWindowmanager::Event_Inactive, [this](const char* label) { + this->isActived = false; + qDebug("Surface %s got deactivated!", label); + }); + + mp_wm->set_event_handler(LibWindowmanager::Event_Visible, [](char const *label) { + qDebug("Surface %s got visibled!", label); + }); + + mp_wm->set_event_handler(LibWindowmanager::Event_Invisible, [](char const *label) { + qDebug("Surface %s got invisibled!", label); + }); + + mp_wm->set_event_handler(LibWindowmanager::Event_SyncDraw, [this](const char* label) { + qDebug("Surface %s got syncDraw!", label); + qDebug("Try to endDraw Surface %s Start!", label); + this->mp_wm->endDraw(HOMESCREEN); + qDebug("Try to endDraw Surface %s End!", label); + }); + + mp_wm->set_event_handler(LibWindowmanager::Event_FlushDraw, [](char const *label) { + qDebug("Surface %s got flushDraw!", label); + }); +} + +void LayoutHandler::activateSurface() +{ + mp_wm->activateSurface(HOMESCREEN); +} + +void LayoutHandler::slotActivateSurface() +{ + if(isActived) + return; + qDebug(__FUNCTION__); + this->activateSurface(); +} + +void LayoutHandler::slotHomeButton() +{ + qDebug(__FUNCTION__); + this->activateSurface(); +} diff --git a/homescreen/src/layouthandler.h b/homescreen/src/layouthandler.h new file mode 100644 index 0000000..4b9e510 --- /dev/null +++ b/homescreen/src/layouthandler.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#ifndef LAYOUTHANDLER_H +#define LAYOUTHANDLER_H + +#include <QObject> +#include <libwindowmanager.h> + +class LayoutHandler : public QObject +{ + Q_OBJECT +public: + explicit LayoutHandler(QObject *parent = 0); + ~LayoutHandler(); + + void init(int port, const char* token); + void activateSurface(); + +signals: + +public slots: + void slotActivateSurface(); + void slotHomeButton(); + +private: + LibWindowmanager* mp_wm; + bool isActived; +}; + +#endif // LAYOUTHANDLER_H diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp new file mode 100644 index 0000000..7c78166 --- /dev/null +++ b/homescreen/src/main.cpp @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#include <QGuiApplication> +#include <QCommandLineParser> +#include <QtGui/QGuiApplication> +#include <QtQml/QQmlApplicationEngine> +#include <QtQml/QQmlContext> +#include <QtQml/qqml.h> +#include <QQuickWindow> + +#include "layouthandler.h" +#include "homescreencontrolinterface.h" +#include "applicationlauncher.h" +#include "statusbarmodel.h" +#include "applicationmodel.h" +#include "appinfo.h" +#include "afm_user_daemon_proxy.h" +#include "mastervolume.h" +#include "homescreenhandler.h" + +// XXX: We want this DBus connection to be shared across the different +// QML objects, is there another way to do this, a nice way, perhaps? +org::AGL::afm::user *afm_user_daemon_proxy; + +namespace { + +struct Cleanup { + static inline void cleanup(org::AGL::afm::user *p) { + delete p; + afm_user_daemon_proxy = Q_NULLPTR; + } +}; + +void noOutput(QtMsgType, const QMessageLogContext &, const QString &) +{ +} + +} + +int main(int argc, char *argv[]) +{ + QGuiApplication a(argc, argv); + + // use launch process + QScopedPointer<org::AGL::afm::user, Cleanup> afm_user_daemon_proxy(new org::AGL::afm::user("org.AGL.afm.user", + "/org/AGL/afm/user", + QDBusConnection::sessionBus(), + 0)); + ::afm_user_daemon_proxy = afm_user_daemon_proxy.data(); + + QCoreApplication::setOrganizationDomain("LinuxFoundation"); + QCoreApplication::setOrganizationName("AutomotiveGradeLinux"); + QCoreApplication::setApplicationName("HomeScreen"); + QCoreApplication::setApplicationVersion("0.7.0"); + + QCommandLineParser parser; + parser.addPositionalArgument("port", a.translate("main", "port for binding")); + parser.addPositionalArgument("secret", a.translate("main", "secret for binding")); + parser.addHelpOption(); + parser.addVersionOption(); + parser.process(a); + QStringList positionalArguments = parser.positionalArguments(); + + int port = 1700; + QString token = "wm"; + + if (positionalArguments.length() == 2) { + port = positionalArguments.takeFirst().toInt(); + token = positionalArguments.takeFirst(); + } + + qDebug("HomeScreen port = %d, token = %s", port, token.toStdString().c_str()); + + // import C++ class to QML + qmlRegisterType<ApplicationLauncher>("HomeScreen", 1, 0, "ApplicationLauncher"); + qmlRegisterType<ApplicationModel>("Home", 1, 0, "ApplicationModel"); + qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel"); + qmlRegisterType<MasterVolume>("MasterVolume", 1, 0, "MasterVolume"); + + // DBus + qDBusRegisterMetaType<AppInfo>(); + qDBusRegisterMetaType<QList<AppInfo> >(); + + LayoutHandler* layoutHandler = new LayoutHandler(); + layoutHandler->init(port, token.toStdString().c_str()); + + HomescreenHandler* homescreenHandler = new HomescreenHandler(); + homescreenHandler->init(port, token.toStdString().c_str()); + +// HomeScreenControlInterface* hsci = new HomeScreenControlInterface(); + +// QObject::connect(hsci, SIGNAL(newRequestGetSurfaceStatus(int)), layoutHandler, SLOT(requestGetSurfaceStatus(int))); +// QObject::connect(hsci, SIGNAL(newRequestsToBeVisibleApp(int)), layoutHandler, SLOT(makeMeVisible(int))); +// QObject::connect(hsci, SIGNAL(newRequestRenderSurfaceToArea(int, int)), layoutHandler, SLOT(requestRenderSurfaceToArea(int,int))); +// QObject::connect(hsci, SIGNAL(newRequestRenderSurfaceToAreaAllowed(int, int)), layoutHandler, SLOT(requestRenderSurfaceToAreaAllowed(int,int))); +// QObject::connect(hsci, SIGNAL(newRequestSurfaceIdToFullScreen(int)), layoutHandler, SLOT(requestSurfaceIdToFullScreen(int))); + + // mail.qml loading + QQmlApplicationEngine engine; + engine.rootContext()->setContextProperty("layoutHandler", layoutHandler); + engine.rootContext()->setContextProperty("homescreenHandler", homescreenHandler); + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + + QObject *root = engine.rootObjects().first(); + QQuickWindow *window = qobject_cast<QQuickWindow *>(root); + QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface())); + QObject::connect(homescreenHandler, SIGNAL(homeButton()), layoutHandler, SLOT(slotHomeButton())); + +// layoutHandler->activateSurface(); + + // Connect C++ / QML +// QList<QObject *> mobjs = engine.rootObjects(); +// MasterVolume *mv = mobjs.first()->findChild<MasterVolume *>("mv"); +// engine.rootContext()->setContextProperty("MasterVolume", mv); +// QObject::connect(mv, SIGNAL(sliderVolumeChanged(int)), client, SLOT(incDecVolume(int))); +// QObject::connect(client, SIGNAL(volumeExternallyChanged(int)), mv, SLOT(changeExternalVolume(int))); + + return a.exec(); +} diff --git a/homescreen/src/mastervolume.cpp b/homescreen/src/mastervolume.cpp new file mode 100644 index 0000000..46985ee --- /dev/null +++ b/homescreen/src/mastervolume.cpp @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2017 Konsulko Group + * + * 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. + */ + +#include "mastervolume.h" + +#include <QtCore/QDebug> + +void MasterVolume::setVolume(pa_volume_t volume) +{ + int volume_delta = volume - m_volume; + m_volume = volume; + emit sliderVolumeChanged(volume_delta); + +} + +void MasterVolume::changeExternalVolume(int volume) +{ + m_volume = volume; + emit volumeChanged(); +} diff --git a/homescreen/src/mastervolume.h b/homescreen/src/mastervolume.h new file mode 100644 index 0000000..edcdd8c --- /dev/null +++ b/homescreen/src/mastervolume.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2017 Konsulko Group + * + * 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. + */ + +#include <QtCore/QObject> +#include <QQmlEngine> +#include <QDebug> + +#include <pulse/pulseaudio.h> + +class MasterVolume : public QObject +{ + Q_OBJECT + Q_PROPERTY (uint32_t volume READ getVolume WRITE setVolume NOTIFY volumeChanged) + + public: + MasterVolume(QObject *parent = 0) + : QObject(parent), m_volume(32768) + { + } + + ~MasterVolume() {} + + uint32_t getVolume() const { return m_volume; } + void setVolume(pa_volume_t volume); + + public slots: + void changeExternalVolume(int volume); + + signals: + void volumeChanged(void); + void sliderVolumeChanged(int volume_delta); + void externalVolumeChanged(uint32_t volume); + + private: + uint32_t m_volume; +}; diff --git a/homescreen/src/popupwidget.cpp b/homescreen/src/popupwidget.cpp new file mode 100644 index 0000000..1f062f1 --- /dev/null +++ b/homescreen/src/popupwidget.cpp @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#include "popupwidget.h" +#include "ui_popupwidget.h" +#include <include/daynightmode.hpp> + +PopupWidget::PopupWidget(QWidget *parent) : + QWidget(parent), + mp_ui(new Ui::PopupWidget), + mp_popupAdaptor(0), + m_sendComboBoxChoice(false) +{ + // publish dbus popup interface + mp_popupAdaptor = new PopupAdaptor((QObject*)this); + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/Popup", this); + dbus.registerService("org.agl.homescreen"); + + // no window decoration + setWindowFlags(Qt::FramelessWindowHint); + + mp_ui->setupUi(this); + + this->close(); +} + +PopupWidget::~PopupWidget() +{ + delete mp_popupAdaptor; + delete mp_ui; +} + +void PopupWidget::updateColorScheme() +{ + QSettings settings; + QSettings settings_cs(QApplication::applicationDirPath() + + "/colorschemes/" + + settings.value("systemsettings/colorscheme", "default").toString() + + "/" + + QString::number(settings.value("systemsettings/proximityobjectdetected", false).toBool()) + + "/" + + QString::number(settings.value("systemsettings/daynightmode", SystemDayNight::DAYNIGHTMODE_DAY).toInt()) + + ".ini", + QSettings::IniFormat); + + mp_ui->widget_popup->setStyleSheet(settings_cs.value(QString("PopupWidget/widget_popup_css")).toString()); + mp_ui->label_text->setStyleSheet(settings_cs.value(QString("PopupWidget/label_text_css")).toString()); +} + +void PopupWidget::showPopup(int /*type*/, const QString &text) +{ + m_sendComboBoxChoice = false; + mp_ui->comboBox_choice->hide(); + this->show(); + this->raise(); + mp_ui->label_text->setText(text); +} + +void PopupWidget::showPopupComboBox(const QString &text, const QStringList &choices) +{ + mp_ui->comboBox_choice->clear(); + m_sendComboBoxChoice = true; + mp_ui->comboBox_choice->addItems(choices); + mp_ui->comboBox_choice->show(); + this->show(); + this->raise(); + mp_ui->label_text->setText(text); +} + +void PopupWidget::on_pushButton_OK_clicked() +{ + if (m_sendComboBoxChoice) + { + emit comboBoxResult(mp_ui->comboBox_choice->currentText()); + m_sendComboBoxChoice = false; + } + this->close(); +} diff --git a/homescreen/src/popupwidget.h b/homescreen/src/popupwidget.h new file mode 100644 index 0000000..7f3aaa8 --- /dev/null +++ b/homescreen/src/popupwidget.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#ifndef POPUPWIDGET_H +#define POPUPWIDGET_H + +#include <QWidget> +#include <include/popup.hpp> +#include "popup_adaptor.h" + +namespace Ui { +class PopupWidget; +} + +class PopupWidget : public QWidget +{ + Q_OBJECT + +public: + explicit PopupWidget(QWidget *parent = 0); + ~PopupWidget(); +public slots: + void updateColorScheme(); + + // from popup_adaptor.h +public Q_SLOTS: // METHODS + void showPopup(int /*type*/, const QString &text); + void showPopupComboBox(const QString &text, const QStringList &choices); + +private slots: + void on_pushButton_OK_clicked(); + +signals: + void comboBoxResult(QString choice); + +private: + Ui::PopupWidget *mp_ui; + + PopupAdaptor *mp_popupAdaptor; + bool m_sendComboBoxChoice; + // for showPupupFor LayoutSelection + //QList<QPushButton> m_pushButtons; +}; + +#endif // POPUPWIDGET_H diff --git a/homescreen/src/settingswidget.cpp b/homescreen/src/settingswidget.cpp new file mode 100644 index 0000000..1629bf0 --- /dev/null +++ b/homescreen/src/settingswidget.cpp @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#include "settingswidget.h" +#include "ui_settingswidget.h" +#include <QSettings> +#include <include/daynightmode.hpp> + +SettingsWidget::SettingsWidget(QWidget *parent) : + QWidget(parent), + mp_ui(new Ui::SettingsWidget), + mp_translator(0) +{ + // no window decoration + setWindowFlags(Qt::FramelessWindowHint); + + // multi-language support + mp_translator = new QTranslator(); + mp_translator->load("homescreen_en_US.qm", ":/translations"); // TODO: read from system + QApplication::instance()->installTranslator(mp_translator); + + mp_ui->setupUi(this); + + mp_ui->comboBox_language->addItem(QString("English"), QVariant("homescreen_en_US.qm")); // TODO: make this configurable + mp_ui->comboBox_language->addItem(QString("Deutsch"), QVariant("homescreen_de_DE.qm")); + mp_ui->comboBox_language->addItem(QString("日本語"), QVariant("homescreen_ja_JP.qm")); + + mp_ui->comboBox_colorScheme->addItem(QString("Default"), QVariant("default")); // TODO: make this configurable + mp_ui->comboBox_colorScheme->addItem(QString("Demo 1"), QVariant("demo1")); + mp_ui->comboBox_colorScheme->addItem(QString("Demo 2"), QVariant("demo2")); + + QSettings settings; + mp_ui->comboBox_language->setCurrentIndex(settings.value("systemsettings/language", 0).toInt()); + mp_ui->comboBox_colorScheme->setCurrentIndex(settings.value("systemsettings/colorschemeindex", 0).toInt()); +} + +SettingsWidget::~SettingsWidget() +{ + delete mp_translator; + delete mp_ui; +} + +void SettingsWidget::updateColorScheme() +{ + QSettings settings; + QSettings settings_cs(QApplication::applicationDirPath() + + "/colorschemes/" + + settings.value("systemsettings/colorscheme", "default").toString() + + "/" + + QString::number(settings.value("systemsettings/proximityobjectdetected", false).toBool()) + + "/" + + QString::number(settings.value("systemsettings/daynightmode", SystemDayNight::DAYNIGHTMODE_DAY).toInt()) + + ".ini", + QSettings::IniFormat); + + mp_ui->widget_background->setStyleSheet(settings_cs.value("SettingsWidget/widget_background_css").toString()); + mp_ui->comboBox_language->setStyleSheet(settings_cs.value("SettingsWidget/comboBox_language_css").toString()); + mp_ui->comboBox_colorScheme->setStyleSheet(settings_cs.value("SettingsWidget/comboBox_colorScheme_css").toString()); + mp_ui->widget_settingsIcon->setStyleSheet(settings_cs.value("SettingsWidget/widget_settingsIcon_css").toString()); +} + +void SettingsWidget::changeEvent(QEvent* event) +{ + if (QEvent::LanguageChange == event->type()) + { + mp_ui->retranslateUi(this); + } + + QWidget::changeEvent(event); +} + +void SettingsWidget::on_comboBox_language_currentIndexChanged(const QString &) +{ + if (0 != mp_translator) + mp_translator->load(mp_ui->comboBox_language->currentData().toString(), ":/translations"); + + QSettings settings; + settings.setValue("systemsettings/language", mp_ui->comboBox_language->currentIndex()); +} + +void SettingsWidget::on_comboBox_colorScheme_currentIndexChanged(const QString &) +{ + QSettings settings; + settings.setValue("systemsettings/colorscheme", mp_ui->comboBox_colorScheme->currentData().toString()); + settings.setValue("systemsettings/colorschemeindex", mp_ui->comboBox_colorScheme->currentIndex()); + // make sure that everything is written to the settings file before continuing + settings.sync(); + + emit colorSchemeChanged(); +} diff --git a/homescreen/src/settingswidget.h b/homescreen/src/settingswidget.h new file mode 100644 index 0000000..75bb383 --- /dev/null +++ b/homescreen/src/settingswidget.h @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#ifndef SETTINGSWIDGET_H +#define SETTINGSWIDGET_H + +#include <QWidget> +#include <QTranslator> + +namespace Ui { +class SettingsWidget; +} + +class SettingsWidget : public QWidget +{ + Q_OBJECT + +public: + explicit SettingsWidget(QWidget *parent = 0); + ~SettingsWidget(); +public slots: + void updateColorScheme(); + +protected: + // called when the translator loaded a new language set + void changeEvent(QEvent* event); + +private slots: + void on_comboBox_language_currentIndexChanged(const QString &); + void on_comboBox_colorScheme_currentIndexChanged(const QString &); + +signals: + void colorSchemeChanged(void); + +private: + Ui::SettingsWidget *mp_ui; + QTranslator *mp_translator; +}; + +#endif // SETTINGSWIDGET_H diff --git a/homescreen/src/statusbarmodel.cpp b/homescreen/src/statusbarmodel.cpp new file mode 100644 index 0000000..5438e89 --- /dev/null +++ b/homescreen/src/statusbarmodel.cpp @@ -0,0 +1,92 @@ +/* + * 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. + */ + +#include "statusbarmodel.h" +#include "statusbarserver.h" + +#include <QtDBus/QDBusConnection> + +class StatusBarModel::Private +{ +public: + Private(StatusBarModel *parent); + +private: + StatusBarModel *q; +public: + StatusBarServer server; + QString iconList[StatusBarServer::SupportedCount]; +}; + +StatusBarModel::Private::Private(StatusBarModel *parent) + : q(parent) +{ + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/StatusBar", &server); + dbus.registerService("org.agl.homescreen"); + connect(&server, &StatusBarServer::statusIconChanged, [&](int placeholderIndex, const QString &icon) { + if (placeholderIndex < 0 || StatusBarServer::SupportedCount <= placeholderIndex) return; + if (iconList[placeholderIndex] == icon) return; + iconList[placeholderIndex] = icon; + emit q->dataChanged(q->index(placeholderIndex), q->index(placeholderIndex)); + }); + for (int i = 0; i < StatusBarServer::SupportedCount; i++) { + iconList[i] = server.getStatusIcon(i); + } +} + +StatusBarModel::StatusBarModel(QObject *parent) + : QAbstractListModel(parent) + , d(new Private(this)) +{ +} + +StatusBarModel::~StatusBarModel() +{ + delete d; +} + +int StatusBarModel::rowCount(const QModelIndex &parent) const +{ + if (parent.isValid()) + return 0; + + return StatusBarServer::SupportedCount; +} + +QVariant StatusBarModel::data(const QModelIndex &index, int role) const +{ + QVariant ret; + if (!index.isValid()) + return ret; + + switch (role) { + case Qt::DisplayRole: + ret = d->iconList[index.row()]; + break; + default: + break; + } + + return ret; +} + +QHash<int, QByteArray> StatusBarModel::roleNames() const +{ + QHash<int, QByteArray> roles; + roles[Qt::DisplayRole] = "icon"; + return roles; +} diff --git a/homescreen/src/statusbarmodel.h b/homescreen/src/statusbarmodel.h new file mode 100644 index 0000000..8d6a70b --- /dev/null +++ b/homescreen/src/statusbarmodel.h @@ -0,0 +1,39 @@ +/* + * 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. + */ + +#ifndef STATUSBARMODEL_H +#define STATUSBARMODEL_H + +#include <QtCore/QAbstractListModel> + +class StatusBarModel : public QAbstractListModel +{ + Q_OBJECT +public: + explicit StatusBarModel(QObject *parent = NULL); + ~StatusBarModel(); + + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QHash<int, QByteArray> roleNames() const override; + +private: + class Private; + Private *d; +}; + +#endif // STATUSBARMODEL_H diff --git a/homescreen/src/statusbarserver.cpp b/homescreen/src/statusbarserver.cpp new file mode 100644 index 0000000..805c582 --- /dev/null +++ b/homescreen/src/statusbarserver.cpp @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * + * 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. + */ + +#include "statusbarserver.h" +#include "statusbar_adaptor.h" + +class StatusBarServer::Private +{ +public: + Private(StatusBarServer *parent); + QString texts[SupportedCount]; + QString icons[SupportedCount]; + StatusbarAdaptor adaptor; +}; + +StatusBarServer::Private::Private(StatusBarServer *parent) + : adaptor(parent) +{ + icons[0] = QStringLiteral("qrc:/images/Status/HMI_Status_Wifi_NoBars-01.png"); + icons[1] = QStringLiteral("qrc:/images/Status/HMI_Status_Bluetooth_Inactive-01.png"); + icons[2] = QStringLiteral("qrc:/images/Status/HMI_Status_Signal_NoBars-01.png"); +} + +StatusBarServer::StatusBarServer(QObject *parent) + : QObject(parent) + , d(new Private(this)) +{ +} + +StatusBarServer::~StatusBarServer() +{ + delete d; +} + +QList<int> StatusBarServer::getAvailablePlaceholders() const +{ + QList<int> ret; + for (int i = 0; i < SupportedCount; ++i) { + ret.append(i); + } + return ret; +} + +QString StatusBarServer::getStatusIcon(int placeholderIndex) const +{ + QString ret; + if (-1 < placeholderIndex && placeholderIndex < SupportedCount) + ret = d->icons[placeholderIndex]; + return ret; +} + +void StatusBarServer::setStatusIcon(int placeholderIndex, const QString &icon) +{ + if (-1 < placeholderIndex && placeholderIndex < SupportedCount) { + if (d->icons[placeholderIndex] == icon) return; + d->icons[placeholderIndex] = icon; + emit statusIconChanged(placeholderIndex, icon); + } +} + +QString StatusBarServer::getStatusText(int placeholderIndex) const +{ + QString ret; + if (-1 < placeholderIndex && placeholderIndex < SupportedCount) { + ret = d->texts[placeholderIndex]; + } + return ret; +} + +void StatusBarServer::setStatusText(int placeholderIndex, const QString &text) +{ + if (-1 < placeholderIndex && placeholderIndex < SupportedCount) { + if (d->texts[placeholderIndex] == text) return; + d->texts[placeholderIndex] = text; + emit statusTextChanged(placeholderIndex, text); + } +} diff --git a/homescreen/src/statusbarserver.h b/homescreen/src/statusbarserver.h new file mode 100644 index 0000000..a5b89e5 --- /dev/null +++ b/homescreen/src/statusbarserver.h @@ -0,0 +1,49 @@ +/* + * 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. + */ + +#ifndef STATUSBARSERVER_H +#define STATUSBARSERVER_H + +#include <QtCore/QObject> + +class StatusBarServer : public QObject +{ + Q_OBJECT +public: + enum { + SupportedCount = 3, + }; + explicit StatusBarServer(QObject *parent = NULL); + ~StatusBarServer(); + + Q_INVOKABLE QList<int> getAvailablePlaceholders() const; + Q_INVOKABLE QString getStatusIcon(int placeholderIndex) const; + Q_INVOKABLE QString getStatusText(int placeholderIndex) const; + +public slots: + void setStatusIcon(int placeholderIndex, const QString &icon); + void setStatusText(int placeholderIndex, const QString &text); + +signals: + void statusIconChanged(int placeholderIndex, const QString &icon); + void statusTextChanged(int placeholderIndex, const QString &text); + +private: + class Private; + Private *d; +}; + +#endif // STATUSBARSERVER_H |