Code Review
/
apps
/
homescreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
change 1920*720 to 1920*1080
[apps/homescreen.git]
/
homescreen
/
src
/
statusbarmodel.cpp
diff --git
a/homescreen/src/statusbarmodel.cpp
b/homescreen/src/statusbarmodel.cpp
index
5e63b7d
..
c093ceb
100644
(file)
--- a/
homescreen/src/statusbarmodel.cpp
+++ b/
homescreen/src/statusbarmodel.cpp
@@
-1,6
+1,5
@@
/*
* Copyright (C) 2016 The Qt Company Ltd.
/*
* 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,11
+16,14
@@
#include "statusbarmodel.h"
#include "statusbarserver.h"
#include "statusbarmodel.h"
#include "statusbarserver.h"
+#include <QDebug>
+#include "hmi-debug.h"
#include <QtDBus/QDBusConnection>
#include "network.h"
#include <QtDBus/QDBusConnection>
#include "network.h"
+
class StatusBarModel::Private
{
public:
class StatusBarModel::Private
{
public:
@@
-65,6
+67,7
@@
StatusBarModel::~StatusBarModel()
void StatusBarModel::init(QUrl &url, QQmlContext *context)
{
void StatusBarModel::init(QUrl &url, QQmlContext *context)
{
+ HMI_DEBUG("HomeScreen", "StatusBarModel::init");
d->network = new Network(url, context);
context->setContextProperty("network", d->network);
d->network = new Network(url, context);
context->setContextProperty("network", d->network);
@@
-77,6
+80,7
@@
void StatusBarModel::init(QUrl &url, QQmlContext *context)
void StatusBarModel::setWifiStatus(bool connected, bool enabled, int strength)
{
void StatusBarModel::setWifiStatus(bool connected, bool enabled, int strength)
{
+ HMI_DEBUG("HomeScreen", "StatusBarModel::setWifiStatus");
if (enabled && connected)
if (strength < 30)
d->server.setStatusIcon(0, QStringLiteral("qrc:/images/Status/HMI_Status_Wifi_1Bar-01.png"));
if (enabled && connected)
if (strength < 30)
d->server.setStatusIcon(0, QStringLiteral("qrc:/images/Status/HMI_Status_Wifi_1Bar-01.png"));
@@
-111,7
+115,6
@@
int StatusBarModel::rowCount(const QModelIndex &parent) const
if (parent.isValid())
return 0;
if (parent.isValid())
return 0;
- // Delete bluetooth because use agl-service-bluetooth.
return StatusBarServer::SupportedCount - 1;
}
return StatusBarServer::SupportedCount - 1;
}
@@
-123,9
+126,9
@@
QVariant StatusBarModel::data(const QModelIndex &index, int role) const
switch (role) {
case Qt::DisplayRole:
switch (role) {
case Qt::DisplayRole:
- if (index.row() == 0){
+ if (index.row() == 0)
{
ret = d->iconList[StatusBarServer::StatusWifi];
ret = d->iconList[StatusBarServer::StatusWifi];
- }
else if (index.row() == 1)
{
+ }
else if (index.row() == 1)
{
ret = d->iconList[StatusBarServer::StatusCellular];
}
break;
ret = d->iconList[StatusBarServer::StatusCellular];
}
break;