diff options
author | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2018-08-01 11:09:38 +0900 |
---|---|---|
committer | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2018-08-01 11:09:38 +0900 |
commit | 4d66f9362b74500b1ceb1850c156cd7aeaf60fc6 (patch) | |
tree | 574d84cb4d3477eb7623b1259c04b8b8d506a193 /homescreen/src/statusbarmodel.cpp | |
parent | 7a78d97346aad35b1ad023fe8d3a369e45b61ee8 (diff) |
Change bluetooth status using agl-service-bluetooth
Use libqtappfw's bluetooth to connection with agl-service-bluetooth.
Instead of using dbus.
Change-Id: Ib0de7cf81ee9e582995a1e4102f8c3b297694328
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Diffstat (limited to 'homescreen/src/statusbarmodel.cpp')
-rw-r--r-- | homescreen/src/statusbarmodel.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/homescreen/src/statusbarmodel.cpp b/homescreen/src/statusbarmodel.cpp index 5438e89..bb44171 100644 --- a/homescreen/src/statusbarmodel.cpp +++ b/homescreen/src/statusbarmodel.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2017, 2018 TOYOTA MOTOR CORPORATION * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,7 +65,8 @@ int StatusBarModel::rowCount(const QModelIndex &parent) const if (parent.isValid()) return 0; - return StatusBarServer::SupportedCount; + // Delete bluetooth because use agl-service-bluetooth. + return StatusBarServer::SupportedCount - 1; } QVariant StatusBarModel::data(const QModelIndex &index, int role) const @@ -75,7 +77,11 @@ QVariant StatusBarModel::data(const QModelIndex &index, int role) const switch (role) { case Qt::DisplayRole: - ret = d->iconList[index.row()]; + if (index.row() == 0){ + ret = d->iconList[StatusBarServer::StatusWifi]; + }else if (index.row() == 1){ + ret = d->iconList[StatusBarServer::StatusCellular]; + } break; default: break; |