diff options
author | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2017-10-22 11:29:15 +0900 |
---|---|---|
committer | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2017-10-22 11:29:15 +0900 |
commit | 3d836c185f92fb38fed31e373f371187322b2f3f (patch) | |
tree | 36d73cb1ebefe8d98db833b2d4e7c4499023cb7c /homescreen | |
parent | d11b03b77a8d5a40677c860eaa06bd8177fbf71d (diff) |
Add Copyright for TOYOTA and remove unnecessary file
Add Copyright for file with TOYOTA modified.
Remove the unnecessary for this homescreen-2017.
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Diffstat (limited to 'homescreen')
30 files changed, 52 insertions, 487 deletions
diff --git a/homescreen/conf/HomeScreen.service b/homescreen/conf/HomeScreen.service deleted file mode 100644 index 3a89242..0000000 --- a/homescreen/conf/HomeScreen.service +++ /dev/null @@ -1,17 +0,0 @@ -[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/homescreen.pro b/homescreen/homescreen.pro index 21f742e..5e58612 100644 --- a/homescreen/homescreen.pro +++ b/homescreen/homescreen.pro @@ -1,4 +1,5 @@ # 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. @@ -32,7 +33,6 @@ INSTALLS += target SOURCES += \ src/main.cpp \ - src/homescreencontrolinterface.cpp \ src/layouthandler.cpp \ src/applicationmodel.cpp \ src/appinfo.cpp \ @@ -43,7 +43,6 @@ SOURCES += \ src/homescreenhandler.cpp HEADERS += \ - src/homescreencontrolinterface.h \ src/layouthandler.h \ src/statusbarmodel.h \ src/statusbarserver.h \ diff --git a/homescreen/qml/Home.qml b/homescreen/qml/Home.qml index 729ef36..4096e0f 100644 --- a/homescreen/qml/Home.qml +++ b/homescreen/qml/Home.qml @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/qml/MediaArea.qml b/homescreen/qml/MediaArea.qml index d7159d2..edbc98f 100644 --- a/homescreen/qml/MediaArea.qml +++ b/homescreen/qml/MediaArea.qml @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/qml/MediaAreaBlank.qml b/homescreen/qml/MediaAreaBlank.qml index 51fa657..c1f19dd 100644 --- a/homescreen/qml/MediaAreaBlank.qml +++ b/homescreen/qml/MediaAreaBlank.qml @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/qml/MediaAreaMusic.qml b/homescreen/qml/MediaAreaMusic.qml index 927e82c..bff4907 100644 --- a/homescreen/qml/MediaAreaMusic.qml +++ b/homescreen/qml/MediaAreaMusic.qml @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/qml/MediaAreaRadio.qml b/homescreen/qml/MediaAreaRadio.qml index a49f06d..3b58537 100644 --- a/homescreen/qml/MediaAreaRadio.qml +++ b/homescreen/qml/MediaAreaRadio.qml @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml index 94bad5d..bbe6565 100644 --- a/homescreen/qml/ShortcutArea.qml +++ b/homescreen/qml/ShortcutArea.qml @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/qml/ShortcutIcon.qml b/homescreen/qml/ShortcutIcon.qml index 6f8e05e..aa39020 100644 --- a/homescreen/qml/ShortcutIcon.qml +++ b/homescreen/qml/ShortcutIcon.qml @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml index 3fc3079..9ef8e62 100644 --- a/homescreen/qml/StatusArea.qml +++ b/homescreen/qml/StatusArea.qml @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/qml/TopArea.qml b/homescreen/qml/TopArea.qml index 922742d..2ddb25e 100644 --- a/homescreen/qml/TopArea.qml +++ b/homescreen/qml/TopArea.qml @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/qml/main.qml b/homescreen/qml/main.qml index 11bd9d5..9e5c7c7 100644 --- a/homescreen/qml/main.qml +++ b/homescreen/qml/main.qml @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/src/appinfo.cpp b/homescreen/src/appinfo.cpp index fd9a585..7159a0b 100644 --- a/homescreen/src/appinfo.cpp +++ b/homescreen/src/appinfo.cpp @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/src/appinfo.h b/homescreen/src/appinfo.h index 0d98b10..a5ecf90 100644 --- a/homescreen/src/appinfo.h +++ b/homescreen/src/appinfo.h @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/src/applicationlauncher.cpp b/homescreen/src/applicationlauncher.cpp index 8358107..411fb03 100644 --- a/homescreen/src/applicationlauncher.cpp +++ b/homescreen/src/applicationlauncher.cpp @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/src/applicationlauncher.h b/homescreen/src/applicationlauncher.h index a31e663..697dad0 100644 --- a/homescreen/src/applicationlauncher.h +++ b/homescreen/src/applicationlauncher.h @@ -1,6 +1,7 @@ /* * 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. diff --git a/homescreen/src/applicationmodel.cpp b/homescreen/src/applicationmodel.cpp index 2c51b98..08b1a55 100644 --- a/homescreen/src/applicationmodel.cpp +++ b/homescreen/src/applicationmodel.cpp @@ -1,6 +1,7 @@ /* * 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. @@ -61,7 +62,7 @@ ApplicationModel::Private::Private() auto const id = jso["id"].toString(); auto const icon = get_icon_name(jso); - // HomeScreenは除外する + // Hide HomeScreen icon itself if (name != "homescreen-2017") { this->data.append(AppInfo(icon, name, id)); } diff --git a/homescreen/src/homescreencontrolinterface.cpp b/homescreen/src/homescreencontrolinterface.cpp deleted file mode 100644 index ecbe8e4..0000000 --- a/homescreen/src/homescreencontrolinterface.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * 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 deleted file mode 100644 index b68a2b2..0000000 --- a/homescreen/src/homescreencontrolinterface.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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 index 2a69034..5d888ae 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -1,3 +1,19 @@ +/* + * 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 "homescreenhandler.h" #include <functional> diff --git a/homescreen/src/homescreenhandler.h b/homescreen/src/homescreenhandler.h index 55d14fd..6209631 100644 --- a/homescreen/src/homescreenhandler.h +++ b/homescreen/src/homescreenhandler.h @@ -1,3 +1,19 @@ +/* + * 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 HOMESCREENHANDLER_H #define HOMESCREENHANDLER_H diff --git a/homescreen/src/layouthandler.cpp b/homescreen/src/layouthandler.cpp index d16b5e7..37c1d09 100644 --- a/homescreen/src/layouthandler.cpp +++ b/homescreen/src/layouthandler.cpp @@ -1,5 +1,5 @@ /* - * 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. diff --git a/homescreen/src/layouthandler.h b/homescreen/src/layouthandler.h index 4b9e510..45cfd9c 100644 --- a/homescreen/src/layouthandler.h +++ b/homescreen/src/layouthandler.h @@ -1,5 +1,5 @@ /* - * 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. diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 7c78166..1b42832 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -1,5 +1,6 @@ /* * 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. @@ -23,7 +24,6 @@ #include <QQuickWindow> #include "layouthandler.h" -#include "homescreencontrolinterface.h" #include "applicationlauncher.h" #include "statusbarmodel.h" #include "applicationmodel.h" @@ -101,14 +101,6 @@ int main(int argc, char *argv[]) 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); @@ -120,14 +112,5 @@ int main(int argc, char *argv[]) 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 index 46985ee..5e1e450 100644 --- a/homescreen/src/mastervolume.cpp +++ b/homescreen/src/mastervolume.cpp @@ -16,8 +16,6 @@ #include "mastervolume.h" -#include <QtCore/QDebug> - void MasterVolume::setVolume(pa_volume_t volume) { int volume_delta = volume - m_volume; diff --git a/homescreen/src/mastervolume.h b/homescreen/src/mastervolume.h index edcdd8c..645968a 100644 --- a/homescreen/src/mastervolume.h +++ b/homescreen/src/mastervolume.h @@ -16,7 +16,6 @@ #include <QtCore/QObject> #include <QQmlEngine> -#include <QDebug> #include <pulse/pulseaudio.h> diff --git a/homescreen/src/popupwidget.cpp b/homescreen/src/popupwidget.cpp deleted file mode 100644 index 1f062f1..0000000 --- a/homescreen/src/popupwidget.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - * 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 deleted file mode 100644 index 7f3aaa8..0000000 --- a/homescreen/src/popupwidget.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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 deleted file mode 100644 index 1629bf0..0000000 --- a/homescreen/src/settingswidget.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* - * 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 deleted file mode 100644 index 75bb383..0000000 --- a/homescreen/src/settingswidget.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 |