X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreenSimulator%2Fsrc%2Fmainwindow.cpp;h=ffc44fe4eab0b4ea688745372e72ca2eb9aba1b9;hb=09f2f0036f122e49aa49e6c446d723850192a725;hp=743c8541b83fe3b805e1f339a2fe9323e4ba5dff;hpb=c32114eb2ccbe142d73c06a5992544d6eacb97d0;p=staging%2FHomeScreen.git diff --git a/HomeScreenSimulator/src/mainwindow.cpp b/HomeScreenSimulator/src/mainwindow.cpp index 743c854..ffc44fe 100644 --- a/HomeScreenSimulator/src/mainwindow.cpp +++ b/HomeScreenSimulator/src/mainwindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH + * 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. @@ -20,10 +20,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), mp_ui(new Ui::MainWindow), - mp_dBusDayNightModeAdapter(0), + mp_dBusDayNightModeAdaptor(0), mp_dBusStatusBarProxy(0), mp_dBusPopupProxy(0), - mp_dBusProximityProxy(0) + mp_dBusProximityProxy(0), + mp_dBusHomeScreenProxy(0) { mp_ui->setupUi(this); @@ -31,7 +32,7 @@ MainWindow::MainWindow(QWidget *parent) : QDBusConnection dbus = QDBusConnection::sessionBus(); // publish dbus day night mode interface - mp_dBusDayNightModeAdapter = new DaynightmodeAdaptor((QObject*)this); + mp_dBusDayNightModeAdaptor = new DaynightmodeAdaptor((QObject*)this); dbus.registerService("org.agl.homescreen.simulator"); dbus.registerObject("/", this); @@ -48,6 +49,11 @@ MainWindow::MainWindow(QWidget *parent) : "/Proximity", QDBusConnection::sessionBus(), 0); + mp_dBusHomeScreenProxy = new org::agl::homescreen("org.agl.homescreen", + "/HomeScreen", + QDBusConnection::sessionBus(), + 0); + QSettings settings; this->move(settings.value("homescreensimulator/pos").toPoint()); mp_ui->radioButton_DayMode->setChecked(settings.value("homescreensimulator/daymode", true).toBool()); // if nothing is stored, use "true" @@ -61,13 +67,14 @@ MainWindow::~MainWindow() settings.setValue("homescreensimulator/daymode", mp_ui->radioButton_DayMode->isChecked()); settings.setValue("homescreensimulator/nightmode", mp_ui->radioButton_NightMode->isChecked()); + delete mp_dBusHomeScreenProxy; delete mp_dBusProximityProxy; delete mp_dBusPopupProxy; delete mp_dBusStatusBarProxy; - if (0 == mp_dBusDayNightModeAdapter) + if (0 == mp_dBusDayNightModeAdaptor) { - delete mp_dBusDayNightModeAdapter; + delete mp_dBusDayNightModeAdaptor; } delete mp_ui; }