diff options
| author |   Angelo Mantellini (manangel) <angelo.mantellini@irt-systemx.fr> | 2017-06-06 14:56:41 +0200 |
|---|---|---|
| committer | Angelo Mantellini (manangel) <angelo.mantellini@irt-systemx.fr> | 2017-06-06 16:43:05 +0200 |
| commit | fe635f112bec38808dc36357ba601af6f8c26c46 (patch) | |
| tree | 10fe390dfc0581e458181a6feb718714918d3798 | |
| parent | 473e4b514ff411a1d4372f29eccea616d7ea4c60 (diff) | |
update libdash
Change-Id: Ia2c54574018d8d84c524c7b4da43cb2317d46f0e
Signed-off-by: Angelo Mantellini (manangel) <angelo.mantellini@irt-systemx.fr>
| -rw-r--r-- | libdash/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | qml/Viper/OpenMpd.qml | 44 |
2 files changed, 28 insertions, 18 deletions
diff --git a/libdash/CMakeLists.txt b/libdash/CMakeLists.txt index 4b9e73ce..d2c88cf5 100644 --- a/libdash/CMakeLists.txt +++ b/libdash/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.5) project(libdash) diff --git a/qml/Viper/OpenMpd.qml b/qml/Viper/OpenMpd.qml index d821f072..c32fb7d7 100755 --- a/qml/Viper/OpenMpd.qml +++ b/qml/Viper/OpenMpd.qml @@ -55,24 +55,34 @@ Rectangle { return rowMulti * item.Layout.rowSpan } - ComboBox { - z: parent.z + 1 - id: comboBoxList - Layout.rowSpan : 1 - Layout.columnSpan : 2 - Layout.preferredWidth : parent.colMulti * 2 + Utils.scaled(5) //grid.prefWidth(this) - Layout.preferredHeight : parent.rowMulti//grid.prefHeight(this) - - onCurrentIndexChanged: { - } + TextInput { - model: ListModel { - id: mpdItems - ListElement { text: "gastown"; } - ListElement { text: "sintel"; } - } - currentIndex: find(lastPlayed) + id: sourceTextInput + text: lastPlayed + Layout.rowSpan : 1 + Layout.columnSpan : 2 + Layout.preferredWidth : parent.colMulti * 2 + Utils.scaled(5) //grid.prefWidth(this) + Layout.preferredHeight : parent.rowMulti//grid.prefHeight(this) + color: "white" } + // ComboBox { + // z: parent.z + 1 + // id: comboBoxList + // Layout.rowSpan : 1 + // Layout.columnSpan : 2 + // Layout.preferredWidth : parent.colMulti * 2 + Utils.scaled(5) //grid.prefWidth(this) + // Layout.preferredHeight : parent.rowMulti//grid.prefHeight(this) + // + // onCurrentIndexChanged: { + // } + + // model: ListModel { + // id: mpdItems + // ListElement { text: "gastown"; } + // ListElement { text: "sintel"; } + // } + // currentIndex: find(lastPlayed) + //} Button { id: cancelBtn @@ -98,7 +108,7 @@ Rectangle { Layout.preferredHeight : grid.prefHeight(this) text: "Download" onClicked: { - saveAndPlayMpd(mpdItems.get(comboBoxList.currentIndex).text) + saveAndPlayMpd(sourceTextInput.text) closeOpenMpd(); } |