diff options
Diffstat (limited to 'HomeScreenSimulator')
| -rw-r--r-- | HomeScreenSimulator/HomeScreenSimulator.pro | 9 | ||||
| -rw-r--r-- | HomeScreenSimulator/README.md | 6 | ||||
| -rw-r--r-- | HomeScreenSimulator/resources/mainwindow.ui | 17 | ||||
| -rw-r--r-- | HomeScreenSimulator/src/main.cpp | 7 | ||||
| -rw-r--r-- | HomeScreenSimulator/src/mainwindow.cpp | 5 | ||||
| -rw-r--r-- | HomeScreenSimulator/src/mainwindow.h | 4 |
6 files changed, 32 insertions, 16 deletions
diff --git a/HomeScreenSimulator/HomeScreenSimulator.pro b/HomeScreenSimulator/HomeScreenSimulator.pro index 04aff3c..88eeb2e 100644 --- a/HomeScreenSimulator/HomeScreenSimulator.pro +++ b/HomeScreenSimulator/HomeScreenSimulator.pro @@ -27,15 +27,10 @@ SOURCES += \ HEADERS += \ ../interfaces/daynightmode.h \ ../interfaces/popup.h \ - src/mainwindow.h \ - $$OUT_PWD/../interfaces/daynightmode_adapter.h \ #generated dbus adapter - $$OUT_PWD/../interfaces/daynightmode_proxy.h \ #generated dbus proxy - $$OUT_PWD/../interfaces/popup_adapter.h \ #generated dbus adapter - $$OUT_PWD/../interfaces/popup_proxy.h \ #generated dbus proxy - $$OUT_PWD/../interfaces/statusbar_adapter.h \ #generated dbus adapter - $$OUT_PWD/../interfaces/statusbar_proxy.h #generated dbus proxy + src/mainwindow.h INCLUDEPATH += $$OUT_PWD/../interfaces +INCLUDEPATH += ../interfaces LIBS += -L$$OUT_PWD/../interfaces -linterfaces diff --git a/HomeScreenSimulator/README.md b/HomeScreenSimulator/README.md index 30dbfe8..0a10780 100644 --- a/HomeScreenSimulator/README.md +++ b/HomeScreenSimulator/README.md @@ -9,6 +9,12 @@ https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen AGL repo for bitbake recipe: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/AGL/meta-agl-demo/recipes-demo-hmi/HomeScreen/HomeScreen_?.bb +v0.2.0 +08/05/2016 + +#changes +- just new version number + v0.1.1 07/06/2015 diff --git a/HomeScreenSimulator/resources/mainwindow.ui b/HomeScreenSimulator/resources/mainwindow.ui index dc03c7a..289c237 100644 --- a/HomeScreenSimulator/resources/mainwindow.ui +++ b/HomeScreenSimulator/resources/mainwindow.ui @@ -41,7 +41,7 @@ <rect> <x>20</x> <y>380</y> - <width>221</width> + <width>211</width> <height>27</height> </rect> </property> @@ -52,7 +52,7 @@ <widget class="QTableWidget" name="tableWidget_Status"> <property name="geometry"> <rect> - <x>20</x> + <x>30</x> <y>20</y> <width>681</width> <height>341</height> @@ -100,6 +100,19 @@ </rect> </property> </widget> + <widget class="QPushButton" name="pushButton_PopupExample"> + <property name="geometry"> + <rect> + <x>428</x> + <y>380</y> + <width>171</width> + <height>27</height> + </rect> + </property> + <property name="text"> + <string>"Hello World" Example</string> + </property> + </widget> </widget> <widget class="QWidget" name="tab_DayNightMode"> <attribute name="title"> diff --git a/HomeScreenSimulator/src/main.cpp b/HomeScreenSimulator/src/main.cpp index 921c4eb..5a165f8 100644 --- a/HomeScreenSimulator/src/main.cpp +++ b/HomeScreenSimulator/src/main.cpp @@ -36,16 +36,11 @@ int main(int argc, char *argv[]) QCoreApplication::setOrganizationDomain("LinuxFoundation"); QCoreApplication::setOrganizationName("AutomotiveGradeLinux"); QCoreApplication::setApplicationName("HomeScreenSimulator"); - QCoreApplication::setApplicationVersion("0.1.1"); + QCoreApplication::setApplicationVersion("0.2.0"); MainWindow w; w.show(); - // TODO: input handling not defined right now... - /*InputEventDistributor *mp_inputEventDistributor; - mp_inputEventDistributor = new InputEventDistributor();*/ - - // start input and system settings simulator on developer PCs #ifdef __arm__ qDebug("Running on ARM architecture"); diff --git a/HomeScreenSimulator/src/mainwindow.cpp b/HomeScreenSimulator/src/mainwindow.cpp index ffc5170..74c02d7 100644 --- a/HomeScreenSimulator/src/mainwindow.cpp +++ b/HomeScreenSimulator/src/mainwindow.cpp @@ -144,3 +144,8 @@ void MainWindow::on_pushButton_IconExample_clicked() // Home Screen app resources... mp_ui->tableWidget_Status->setItem(0, 2, new QTableWidgetItem(":/icons/home_day.png")); } + +void MainWindow::on_pushButton_PopupExample_clicked() +{ + mp_dBusPopupProxy->showPopup(0, "Hello Popup!\nNice to see you!"); +} diff --git a/HomeScreenSimulator/src/mainwindow.h b/HomeScreenSimulator/src/mainwindow.h index 2eb6e11..7c2f19b 100644 --- a/HomeScreenSimulator/src/mainwindow.h +++ b/HomeScreenSimulator/src/mainwindow.h @@ -18,7 +18,7 @@ #define MAINWINDOW_H #include <QMainWindow> -#include "../interfaces/daynightmode.h" +#include <include/daynightmode.hpp> #include "daynightmode_adapter.h" #include "statusbar_proxy.h" @@ -55,6 +55,8 @@ private slots: void on_pushButton_IconExample_clicked(); + void on_pushButton_PopupExample_clicked(); + private: Ui::MainWindow *mp_ui; DaynightmodeAdaptor *mp_dBusDayNightModeAdapter; |