Delete launcher icon area from HomeScreen

    Delete Home QML file from main.qml.
    Change Home shortcut icon to launcher.

Change-Id: Id1b3ffbbd24ee587a1d3bab1f86c90809bfc1209
Task-AGL: SPEC-1518
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>

5 files changed, 0 insertions, 449 deletions

diff --git a/homescreen/src/appinfo.cpp b/homescreen/src/appinfo.cpp
deleted file mode 100644
index 7159a0b..0000000
--- a/homescreen/src/appinfo.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (c) 2017 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.
- * 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
deleted file mode 100644
index a5ecf90..0000000
--- a/homescreen/src/appinfo.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (c) 2017 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.
- * 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/applicationmodel.cpp b/homescreen/src/applicationmodel.cpp
deleted file mode 100644
index 5b4bb01..0000000
--- a/homescreen/src/applicationmodel.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (c) 2017 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.
- * 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 "hmi-debug.h"
-
-#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["name"].toString().toLower();
-
-        if ( !QFile::exists(QString(":/images/%1_active.svg").arg(icon)) ||
-             !QFile::exists(QString(":/images/%1_inactive.svg").arg(icon)) )
-        {
-            icon = "blank";
-        }
-        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);
-
-        // Hide HomeScreen icon itself
-        if (name != "homescreen-2017" && name != "OnScreenApp") {
-            this->data.append(AppInfo(icon, name, id));
-        }
-
-        HMI_DEBUG("HomeScreen","name: %s icon: %s id: %s.", name.toStdString().c_str(), icon.toStdString().c_str(), id.toStdString().c_str());
-    }
-}
-
-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)) {
-            HMI_NOTICE("HomeScreen","from : %d, to : %d. false.", from, to);
-            return;
-        }
-        d->data.move(from, to);
-        endMoveRows();
-    } else if (from > to) {
-        if (!beginMoveRows(parent, from, from, parent, to)) {
-            HMI_NOTICE("HomeScreen","from : %d, to : %d. false.", from, to);
-            return;
-        }
-        d->data.move(from, to);
-        endMoveRows();
-    } else {
-        HMI_NOTICE("HomeScreen","from : %d, to : %d. false.", from, to);
-    }
-}
diff --git a/homescreen/src/applicationmodel.h b/homescreen/src/applicationmodel.h
deleted file mode 100644
index 64f9c53..0000000
--- a/homescreen/src/applicationmodel.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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/main.cpp b/homescreen/src/main.cpp
index 8845253..fbb430f 100644
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -27,8 +27,6 @@
 #include <weather.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"
@@ -89,14 +87,9 @@ int main(int argc, char *argv[])
 
     // 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> >();
-
     ApplicationLauncher *launcher = new ApplicationLauncher();
     QLibWindowmanager* layoutHandler = new QLibWindowmanager();
     if(layoutHandler->init(port,token) != 0){