From 564c3c80884c0e9064a19e31655fd80f92eb594a Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Wed, 1 Aug 2018 11:07:16 +0900 Subject: Change bluetooth status using agl-service-bluetooth Use libqtappfw's bluetooth to connection with agl-service-bluetooth. Instead of using dbus. Change-Id: I87610e0037b586fe08db86325b03f767dbe36537 Signed-off-by: zheng_wenlong --- homescreen/src/statusbarmodel.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'homescreen/src/statusbarmodel.cpp') 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; -- cgit 1.2.3-korg