update libdash 24/7024/7
authorAngelo Mantellini (manangel) <[email protected]>
Tue, 6 Jun 2017 12:56:41 +0000 (14:56 +0200)
committerAngelo Mantellini (manangel) <[email protected]>
Tue, 6 Jun 2017 14:43:05 +0000 (16:43 +0200)
Change-Id: Ia2c54574018d8d84c524c7b4da43cb2317d46f0e
Signed-off-by: Angelo Mantellini (manangel) <[email protected]>
libdash/CMakeLists.txt
qml/Viper/OpenMpd.qml

index 4b9e73c..d2c88cf 100644 (file)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.5)
 project(libdash)
 
 
index d821f07..c32fb7d 100755 (executable)
@@ -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();
             }