Cync

[mardrone] / mardrone / ConfigDialogSymbian.qml

diff --git a/mardrone/ConfigDialogSymbian.qml b/mardrone/ConfigDialogSymbian.qml
index e96d848..6b72c4d 100644 (file)
--- a/mardrone/ConfigDialogSymbian.qml
+++ b/mardrone/ConfigDialogSymbian.qml
@@ -14,35 +14,28 @@ Page {
                 MenuItem { text:"Desktop";  onClicked: { drone.confActiveUI="ardrone_desktop.qml"}}
            }
         }
-
         Component.onCompleted: {
-            for(var j = 0; j < uiList.length;++j ) {
-                var data = {'name':uiList[j].name,'modelData':uiList[j].name,'file':uiList[j].file };
-                console.debug("appending ",uiList.get(j).name,uiList.get(j).file)
+            console.debug("Appending items to choices",uiList.count())
+            for(var j = 0; j < uiList.count();++j ) {
+                var data = {'name':uiList.get(j).name,'modelData':uiList.get(j).name,'file':uiList.get(j).file };
+                console.debug("appending ",uiList.get(j).name,uiList.get(j).file);
                 choices.append(data);
-                if(uIList[j].file==drone.confActiveUI) activeUIDialog.selectedIndex=j;
+                if(uiList.get(j).file==drone.confActiveUI) { activeUIDialog.selectedIndex=j; uiDialogButton.text=uiList.get(j).name }
             }
         }
 
         ListModel {
              id: choices
-             ListElement {
-                 name:"none";
-                 modelData:"none"
-                 file:"none"
-             }
         }
         SelectionDialog {
             id: activeUIDialog;
-            model:uiList
+            model:choices
 
             onSelectedIndexChanged: {
-                console.debug("onSelectedIndexChanged " +selectedIndex);
-            console.debug("onSelectedIndexChanged " +uiList.get(selectedIndex).name);
-                          console.debug("onSelectedIndexChanged " + model.get(selectedIndex).name + ", " + model.get(selectedIndex).file);
-                          drone.confActiveUI=choices.get(selectedIndex).file
-                      }
-
+                  console.debug("onSelectedIndexChanged " + model.get(selectedIndex).name + ", " + model.get(selectedIndex).file);
+                  drone.confActiveUI=choices.get(selectedIndex).file;
+                  uiDialogButton.text=uiList.get(selectedIndex).name
+               }
             }
         Flickable {
           id: dialogscrolarea
@@ -64,7 +57,8 @@ Page {
               }
               Button {
                   width:200
-                  text:drone.confActiveUI
+                  id:uiDialogButton
+                  text:""
                   anchors.right:parent.right
                   onClicked:activeUIDialog.open()
                 //  onClicked:uiMenu.open()