diff options
Diffstat (limited to 'HomeScreenSimulator')
| -rw-r--r-- | HomeScreenSimulator/README.md | 6 | ||||
| -rw-r--r-- | HomeScreenSimulator/resources/mainwindow.ui | 13 | ||||
| -rw-r--r-- | HomeScreenSimulator/src/main.cpp | 3 | ||||
| -rw-r--r-- | HomeScreenSimulator/src/mainwindow.cpp | 10 | ||||
| -rw-r--r-- | HomeScreenSimulator/src/mainwindow.h | 2 |
5 files changed, 32 insertions, 2 deletions
diff --git a/HomeScreenSimulator/README.md b/HomeScreenSimulator/README.md index 0a10780..2f4bd17 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.3.0 +09/30/2016 + +#changes +- added popup choice example + v0.2.0 08/05/2016 diff --git a/HomeScreenSimulator/resources/mainwindow.ui b/HomeScreenSimulator/resources/mainwindow.ui index 289c237..1915a24 100644 --- a/HomeScreenSimulator/resources/mainwindow.ui +++ b/HomeScreenSimulator/resources/mainwindow.ui @@ -113,6 +113,19 @@ <string>"Hello World" Example</string> </property> </widget> + <widget class="QPushButton" name="pushButton_comboBoxExample"> + <property name="geometry"> + <rect> + <x>230</x> + <y>380</y> + <width>191</width> + <height>27</height> + </rect> + </property> + <property name="text"> + <string>ComboBox 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 5a165f8..00c7ac2 100644 --- a/HomeScreenSimulator/src/main.cpp +++ b/HomeScreenSimulator/src/main.cpp @@ -36,12 +36,11 @@ int main(int argc, char *argv[]) QCoreApplication::setOrganizationDomain("LinuxFoundation"); QCoreApplication::setOrganizationName("AutomotiveGradeLinux"); QCoreApplication::setApplicationName("HomeScreenSimulator"); - QCoreApplication::setApplicationVersion("0.2.0"); + QCoreApplication::setApplicationVersion("0.3.0"); MainWindow w; w.show(); - // start input and system settings simulator on developer PCs #ifdef __arm__ qDebug("Running on ARM architecture"); #endif diff --git a/HomeScreenSimulator/src/mainwindow.cpp b/HomeScreenSimulator/src/mainwindow.cpp index 74c02d7..d670154 100644 --- a/HomeScreenSimulator/src/mainwindow.cpp +++ b/HomeScreenSimulator/src/mainwindow.cpp @@ -149,3 +149,13 @@ void MainWindow::on_pushButton_PopupExample_clicked() { mp_dBusPopupProxy->showPopup(0, "Hello Popup!\nNice to see you!"); } + +void MainWindow::on_pushButton_comboBoxExample_clicked() +{ + QStringList choices; + choices.append("Item1"); + choices.append("Item2"); + choices.append("Item3"); + choices.append("Item4"); + mp_dBusPopupProxy->showPopupComboBox("Make your choice!", choices); +} diff --git a/HomeScreenSimulator/src/mainwindow.h b/HomeScreenSimulator/src/mainwindow.h index 7c2f19b..dd412a3 100644 --- a/HomeScreenSimulator/src/mainwindow.h +++ b/HomeScreenSimulator/src/mainwindow.h @@ -57,6 +57,8 @@ private slots: void on_pushButton_PopupExample_clicked(); + void on_pushButton_comboBoxExample_clicked(); + private: Ui::MainWindow *mp_ui; DaynightmodeAdaptor *mp_dBusDayNightModeAdapter; |