Merge lp:~nick-dedekind/unity8/remove.overview into lp:unity8

[Nick Dedekind]

Removed overview from indicators.

Removed overview from indicators.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/unity8-ci/301/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/656
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/300/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1209
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1209/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1030

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/301/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/unity8-ci/305/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/661
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/305/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1218
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1218/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1038

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/305/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Quite many changes are solely fixing coding style. It distracts from the relevant changes of this patch.

[Daniel d'Andrada (dandrader)]

All seems to work and changes look fine, even though you're piggybacking a coding style cleanup.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/unity8-ci/314/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1226/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/672/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/312/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/314/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1230/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/314/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/102/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1234
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/677
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/101
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1238
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1044

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

> All seems to work and changes look fine, even though you're piggybacking a
> coding style cleanup.

Didn't want Saviq coming at me with semi-colon changes ;)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Panel/IndicatorRow.qml'
--- Panel/IndicatorRow.qml	2013-06-17 09:02:14 +0000
+++ Panel/IndicatorRow.qml	2013-07-17 16:45:32 +0000
@@ -24,7 +24,6 @@
     readonly property int currentItemIndex: currentItem ? currentItem.ownIndex : -1
     property alias row: row
     property QtObject indicatorsModel: null
-    property bool overviewActive: false // "state of the menu"
 
     Behavior on y {NumberAnimation {duration: 300; easing.type: Easing.OutCubic} }
 
@@ -76,7 +75,7 @@
                height: indicatorRow.height
                y: {
                    //FIXME: all indicators will be initial for now.
-                   if (!highlighted && !overviewActive && (indicatorRow.state == "locked" || indicatorRow.state == "commit")) {
+                   if (!highlighted  && (indicatorRow.state == "locked" || indicatorRow.state == "commit")) {
                        return -indicatorRow.height
                    } else {
                        return 0
 
=== modified file 'Panel/Indicators.qml'
--- Panel/Indicators.qml	2013-07-03 16:33:58 +0000
+++ Panel/Indicators.qml	2013-07-17 16:45:32 +0000
@@ -56,36 +56,22 @@
 
     onHeightChanged: {
         // need to use handle.get_height(). As the handle height depends on indicators.height changes (but this is called first!)
-        var contentProgress = indicators.height - handle.get_height()
+        var contentProgress = indicators.height - handle.get_height();
         if (!showAnimation.running && !hideAnimation.running) {
             if (contentProgress <= hintValue && indicators.state == "reveal") {
-                indicators.state = "hint"
-                menuContent.hideAll()
+                indicators.state = "hint";
             } else if (contentProgress > hintValue && contentProgress < lockThreshold) {
-                menuContent.showMenu()
-                indicators.state = "reveal"
+                indicators.state = "reveal";
             } else if (contentProgress >= lockThreshold && lockThreshold > 0) {
-                // If we've shown the overview and are closing the view with progress changes (revealer handle),
-                // we dont want to switch to a indicator menu until we hit reveal state.
-                if (menuContent.overviewActive) {
-                    menuContent.showOverview()
-                } else {
-                    menuContent.showMenu()
-                }
-                indicators.state = "locked"
+                indicators.state = "locked";
             }
         }
 
         if (contentProgress == 0) {
-            menuContent.releaseContent()
+            menuContent.releaseContent();
         }
     }
 
-    function openOverview() {
-        indicatorRow.currentItem = null
-        menuContent.showOverview()
-    }
-
     function calculateCurrentItem(xValue, useBuffer) {
         var rowCoordinates
         var itemCoordinates
@@ -93,7 +79,7 @@
         var distanceFromRightEdge
         var bufferExceeded = false
 
-        if (indicators.state == "commit" || indicators.state == "locked" || showAnimation.running || hideAnimation.running) return
+        if (indicators.state == "commit" || indicators.state == "locked" || showAnimation.running || hideAnimation.running) return;
 
         /*
           If user drags the indicator handle bar down a distance hintValue or less, this is 0.
@@ -102,14 +88,14 @@
         */
         var verticalProgress =
             MathLocal.clamp((indicators.height - handle.height - hintValue) /
-                            (lockThreshold - hintValue), 0, 1)
+                            (lockThreshold - hintValue), 0, 1);
 
         /*
           Percentage of an indicator icon's width the user's press can stray horizontally from the
           focused icon before we change focus to another icon. E.g. a value of 0.5 means you must
           go right a distance of half an icon's width before focus moves to the icon on the right
         */
-        var maxBufferThreshold = 0.5
+        var maxBufferThreshold = 0.5;
 
         /*
           To help users find the indicator of their choice while opening the indicators, we add logic to add a
@@ -126,12 +112,12 @@
             itemCoordinates = indicatorRow.row.mapToItem(currentItem, rowCoordinates.x, 0);
             distanceFromRightEdge = (currentItem.width - itemCoordinates.x) / (currentItem.width)
             if (Math.abs(currentItem.ownIndex - indicatorRow.currentItemIndex) > 1) {
-                bufferExceeded = true
+                bufferExceeded = true;
             } else {
                 if (indicatorRow.currentItemIndex < currentItem.ownIndex && distanceFromRightEdge < (1 - effectiveBufferThreshold)) {
-                    bufferExceeded = true
+                    bufferExceeded = true;
                 } else if (indicatorRow.currentItemIndex > currentItem.ownIndex && distanceFromRightEdge > effectiveBufferThreshold) {
-                    bufferExceeded = true
+                    bufferExceeded = true;
                 }
             }
             if ((!useBuffer || (useBuffer && bufferExceeded)) || indicatorRow.currentItem < 0 || indicatorRow.currentItem == null)  {
@@ -172,8 +158,7 @@
             bottom: parent.bottom
         }
         indicatorsModel: indicatorsModel
-        animate: false
-        clip: indicators.partiallyOpened
+        clip: !indicators.fullyOpened
 
         onMenuSelected: {
             indicatorRow.setItem(index)
@@ -209,7 +194,7 @@
         clip: height < handleImage.height
 
         function get_height() {
-            return Math.max(Math.min(handleImage.height, indicators.height - handleImage.height), 0)
+            return Math.max(Math.min(handleImage.height, indicators.height - handleImage.height), 0);
         }
 
         BorderImage {
@@ -264,7 +249,6 @@
         height: indicators.panelHeight
         indicatorsModel: indicatorsModel
         state: indicators.state
-        overviewActive: menuContent.overviewActive
 
         onCurrentItemIndexChanged: menuContent.currentIndex = currentItemIndex
 
@@ -279,9 +263,10 @@
         onRunningChanged: {
             if (hideAnimation.running) {
                 indicators.state = "initial"
-                menuContent.hideAll()
             } else  {
-                if (state == "initial") indicatorRow.setDefaultItem()
+                if (state == "initial") {
+                    indicatorRow.setDefaultItem()
+                }
             }
         }
     }
@@ -289,13 +274,8 @@
         target: showAnimation
         onRunningChanged: {
             if (showAnimation.running) {
-                if (indicators.state == "initial") {
-                    openOverview()
-                } else {
-                    indicators.calculateCurrentItem(dragHandle.touchX, false)
-                    menuContent.showMenu()
-                }
-                indicators.state = "commit"
+                indicators.calculateCurrentItem(dragHandle.touchX, false);
+                indicators.state = "commit";
             }
         }
     }
@@ -303,8 +283,8 @@
     Connections {
         target: dragHandle
         onTouchXChanged: {
-            var buffer = dragHandle.dragging ? true : false
-            indicators.calculateCurrentItem(dragHandle.touchX, buffer)
+            var buffer = dragHandle.dragging ? true : false;
+            indicators.calculateCurrentItem(dragHandle.touchX, buffer);
         }
     }
 
@@ -339,8 +319,7 @@
 
         onStatusChanged: {
             if (status === DirectionalDragArea.Recognized) {
-                menuContent.hideAll()
-                menuContent.activateContent()
+                menuContent.activateContent();
             }
         }
     }
@@ -368,7 +347,6 @@
         State {
             name: "reveal"
             extend: "hint"
-            PropertyChanges { target: menuContent; animate: true }
             StateChangeScript { script: calculateCurrentItem(dragHandle.touchX, false); }
         },
         State {
@@ -390,7 +368,6 @@
         },
         State {
             name: "reveal"
-            PropertyChanges { target: menuContent; animate: true }
             StateChangeScript { script: calculateCurrentItem(dragHandle.touchX, false); }
         },
         State {
 
=== modified file 'Panel/MenuContent.qml'
--- Panel/MenuContent.qml	2013-07-17 11:03:15 +0000
+++ Panel/MenuContent.qml	2013-07-17 16:45:32 +0000
@@ -17,16 +17,12 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Unity.Indicators 0.1 as Indicators
-import "Menus"
 import "../Components"
 
 Rectangle {
     id: content
 
     property QtObject indicatorsModel: null
-    property bool animate: true // FIXME: Remove. This doesnt seem to be being used and it's referenced in Indicators.
-    property bool overviewActive: true // "state of the menu"
-    property bool __shown: false
     property bool __contentActive: false
     property alias currentIndex : menus.currentIndex
     property color backgroundColor: "#221e1c" // FIXME not in palette yet
@@ -35,32 +31,17 @@
     width: units.gu(40)
     height: units.gu(42)
     color: backgroundColor
-    enabled: __shown
 
     signal menuSelected(int index)
 
-    function showMenu() {
-        __shown = true
-        overviewActive = false
-    }
-
-    function showOverview() {
-        __shown = true
-        overviewActive = true
-    }
-
-    function hideAll() {
-        __shown = false
-    }
-
     function activateContent() {
-        contentReleaseTimer.stop()
-        __contentActive = true
+        contentReleaseTimer.stop();
+        __contentActive = true;
     }
 
     function releaseContent() {
         if (__contentActive)
-            contentReleaseTimer.restart()
+            contentReleaseTimer.restart();
     }
 
     ListView {
@@ -72,7 +53,6 @@
         width: parent.width
 
         spacing: units.gu(0.5)
-        opacity: !overviewActive && __shown ? 1 : 0
         enabled: opacity != 0
         orientation: ListView.Horizontal
         model: indicatorsModel
@@ -87,20 +67,19 @@
 
             onContentActiveChanged: {
                 if (contentActive && item) {
-                    item.start()
+                    item.start();
                 } else if (!contentActive && item) {
-                    item.stop()
+                    item.stop();
                 }
             }
 
             width: menus.width
             height: menus.height
             source: pageSource
-            visible: content.__shown
             onVisibleChanged: {
                 // Reset the indicator states
                 if (!visible && item && item["reset"]) {
-                    item.reset()
+                    item.reset();
                 }
             }
             asynchronous: true
@@ -108,11 +87,11 @@
             onLoaded: {
                 for(var pName in indicatorProperties) {
                     if (item.hasOwnProperty(pName)) {
-                        item[pName] = indicatorProperties[pName]
+                        item[pName] = indicatorProperties[pName];
                     }
                 }
                 if (contentActive && menus.visible) {
-                    item.start()
+                    item.start();
                 }
             }
 
@@ -124,40 +103,6 @@
                 value: handle.height
             }
         }
-
-        Behavior on opacity { NumberAnimation {duration: 200} }
-    }
-
-    Overview {
-        id: overview
-        objectName: "overview"
-
-        anchors.top: header.bottom
-        anchors.bottom: parent.bottom
-        // FIXME: Dont know why we're using handle height (introduces dep).. Check with design about bottom margin
-        anchors.bottomMargin: handle.height
-
-        width: content.width
-        indicatorsModel: content.indicatorsModel
-        enabled: content.overviewActive && content.__shown
-        opacity: content.overviewActive && content.__shown ? 1 : 0
-        Behavior on opacity {NumberAnimation{duration: 200}}
-        visible: opacity != 0
-
-        onMenuSelected: {
-            var storedDuration = menus.highlightMoveDuration
-            var storedVelocity = menus.highlightMoveVelocity
-            menus.highlightMoveDuration = 0
-            menus.highlightMoveVelocity = 100000
-
-            menus.currentIndex = modelIndex
-            content.overviewActive = false
-
-            menus.highlightMoveDuration = storedDuration
-            menus.highlightMoveVelocity = storedVelocity
-
-            content.menuSelected(modelIndex)
-        }
     }
 
     Rectangle {
@@ -181,14 +126,10 @@
                 right: parent.right
             }
             text: {
-                if (content.overviewActive)
-                    return i18n.tr("Device");
                 if (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count)
                     return indicatorsModel.data(menus.currentIndex, Indicators.IndicatorsModelRole.Title);
                 return "";
             }
-            opacity: __shown ? 1 : 0
-            Behavior on opacity {NumberAnimation{duration: 100}}
         }
     }
 
 
=== removed directory 'Panel/Menus'
=== removed file 'Panel/Menus/IndicatorMenuWindow.qml'
--- Panel/Menus/IndicatorMenuWindow.qml	2013-06-05 22:03:08 +0000
+++ Panel/Menus/IndicatorMenuWindow.qml	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-
-Item {
-    id: menuWindow
-
-    property bool shown: false
-    property int contentHeight: height
-    property string headingText: name
-    property string name
-
-    enabled: shown
-    opacity: shown ? 1.0 : 0.0
-    Behavior on opacity { NumberAnimation {duration: shown ? 300 : 150 } }
-
-    // don't pass any events under this screen
-    MouseArea {
-        anchors.fill: parent
-    }
-}
 
=== removed directory 'Panel/Menus/Overview'
=== removed file 'Panel/Menus/Overview.qml'
--- Panel/Menus/Overview.qml	2013-06-05 22:03:08 +0000
+++ Panel/Menus/Overview.qml	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import "../../Components/ListItems" as ListItems
-import "Overview"
-
-IndicatorMenuWindow {
-    id: overview
-
-    property QtObject indicatorsModel: null
-
-    signal menuSelected(int modelIndex)
-
-    VisualItemModel {
-        id: itemModel
-
-        FlightModeWidget {
-            anchors {
-                left: parent ? parent.left : undefined
-                right: parent ? parent.right : undefined
-            }
-            height: units.gu(8)
-
-            ListItems.ThinDivider {
-                anchors {
-                    bottom: parent.bottom
-                    bottomMargin: -units.dp(1)
-                }
-            }
-        }
-
-        VolumeWidget {
-            anchors {
-                left: parent ? parent.left : undefined
-                right: parent ? parent.right : undefined
-            }
-            height: units.gu(10)
-        }
-
-        OverviewGrid {
-            model: indicatorsModel
-            anchors {
-                left: parent ? parent.left : undefined
-                right: parent ? parent.right : undefined
-            }
-        }
-    }
-
-    ListView {
-        id: listView
-        anchors.fill: parent
-        model: itemModel
-        interactive: false
-    }
-}
 
=== removed file 'Panel/Menus/Overview/FlightModeWidget.qml'
--- Panel/Menus/Overview/FlightModeWidget.qml	2013-07-17 10:34:41 +0000
+++ Panel/Menus/Overview/FlightModeWidget.qml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-Item {
-    id: flightModeWidget
-
-    Image {
-        id: flightIcon
-        source: "graphics/plane_icon.png"
-        anchors {
-            left: parent.left
-            leftMargin: units.gu(2)
-            verticalCenter: parent.verticalCenter
-        }
-        width: units.gu(4)
-        height: units.gu(4)
-    }
-
-    Label {
-        anchors {
-            left: flightIcon.right
-            right: flightModeSwitch.left
-            margins: units.gu(2)
-            verticalCenter: parent.verticalCenter
-        }
-        text: i18n.tr("Flight mode")
-        color: Theme.palette.selected.backgroundText
-        style: Text.Raised
-        styleColor: "black"
-        opacity: 0.6;
-        fontSize: "medium"
-        elide: Text.ElideRight
-        horizontalAlignment: Text.AlignLeft
-    }
-
-    Switch {
-        id: flightModeSwitch
-        anchors {
-            right: parent.right
-            rightMargin: units.gu(2)
-            verticalCenter: parent.verticalCenter
-        }
-    }
-}
 
=== removed file 'Panel/Menus/Overview/OverviewGrid.qml'
--- Panel/Menus/Overview/OverviewGrid.qml	2013-07-17 11:03:15 +0000
+++ Panel/Menus/Overview/OverviewGrid.qml	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-import "../../../Components/ListItems" as ListItems
-
-Item {
-    id: overviewGrid
-
-    height: childrenRect.height
-
-    property var model
-
-    UbuntuShape {
-        id: gridBackground
-        anchors.fill: grid
-        color: "#282421" // FIXME missing palette
-        radius: "medium"
-    }
-
-    GridView {
-        id: grid
-        objectName: "overviewGrid"
-
-        property int columnCount: 3
-        property int rowCount: Math.ceil(model.count / columnCount)
-
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            topMargin: units.gu(3)
-            leftMargin: units.gu(2)
-            rightMargin: units.gu(2)
-        }
-        height: cellWidth * rowCount
-        cellWidth: Math.floor((width) / columnCount)
-        cellHeight: cellWidth
-        model: overviewGrid.model
-        visible: opacity != 0
-        interactive: false
-        delegate:
-            AbstractButton {
-                objectName: "overviewGridButton" + index
-                width: grid.cellWidth
-                height: grid.cellHeight
-
-                Loader {
-                    id: loader
-                    source: widgetSource
-
-                    width: units.gu(5)
-                    height: units.gu(5)
-                    anchors.centerIn: parent
-                    anchors.verticalCenterOffset: -units.gu(1)
-
-                    onLoaded: {
-                        for(var pName in indicatorProperties) {
-                            if (item.hasOwnProperty(pName)) {
-                                item[pName] = indicatorProperties[pName]
-                            }
-                        }
-                    }
-                }
-
-                Label {
-                    text: title
-                    color: Theme.palette.selected.backgroundText
-                    fontSize: "small"
-                    anchors {
-                        left: parent.left
-                        right: parent.right
-                        bottom: parent.bottom
-                        leftMargin: units.gu(0.5)
-                        rightMargin: units.gu(0.5)
-                        bottomMargin: units.gu(1.5)
-                    }
-                    elide: Text.ElideRight
-                    horizontalAlignment: Text.AlignHCenter
-
-                }
-                onClicked: overview.menuSelected(index)
-            }
-    }
-
-    Item {
-        id: gridOverlay
-        anchors.fill: grid
-
-        Column {
-            anchors {
-                left: parent.left
-                right: parent.right
-            }
-            spacing: grid.cellHeight
-            y: grid.cellHeight - units.dp(1)
-            Repeater {
-                model: grid.rowCount - 1
-                ListItems.ThinDivider {
-                    anchors.margins: units.dp(1)
-                }
-            }
-        }
-
-        Row {
-            anchors {
-                top: parent.top
-                bottom: parent.bottom
-            }
-            spacing: grid.cellWidth - units.dp(1)
-            x: grid.cellWidth - units.dp(1)
-            Repeater {
-                model: grid.columnCount - 1
-                ListItems.VerticalThinDivider {
-                    anchors.margins: units.dp(1)
-                }
-            }
-        }
-    }
-}
 
=== removed file 'Panel/Menus/Overview/VolumeWidget.qml'
--- Panel/Menus/Overview/VolumeWidget.qml	2013-06-05 22:03:08 +0000
+++ Panel/Menus/Overview/VolumeWidget.qml	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import "../../../Components/"
-
-Item {
-    id: volumeWidget
-
-    Image {
-        id: minVolumeIcon
-        objectName: "minVolumeIcon"
-        source: "graphics/sound_off_icon.png"
-        anchors {
-            left: parent.left
-            leftMargin: units.gu(2)
-            verticalCenter: parent.verticalCenter
-        }
-        width: units.gu(4)
-        height: units.gu(4)
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: volumeControl.volumeDown();
-        }
-    }
-
-    Slider {
-        id: slider
-        objectName: "volumeSlider"
-        anchors {
-            left: minVolumeIcon.right
-            right: maxVolumeIcon.left
-            margins: units.gu(1)
-            verticalCenter: parent.verticalCenter
-        }
-        live: false
-        minimumValue: 0
-        maximumValue: 100
-        value: 50
-
-        onValueChanged: {
-            volumeControl.volume = value;
-        }
-
-        Binding {
-            target: slider
-            property: "value"
-            value: volumeControl.volume
-        }
-
-        function formatValue(v) {
-            return ""
-        }
-    }
-
-    Image {
-        id: maxVolumeIcon
-        objectName: "maxVolumeIcon"
-        source: "graphics/sound_on_icon.png"
-        anchors {
-            right: parent.right
-            rightMargin: units.gu(2)
-            verticalCenter: parent.verticalCenter
-        }
-        width: units.gu(4)
-        height: units.gu(4)
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: volumeControl.volumeUp();
-        }
-    }
-}
 
=== removed directory 'Panel/Menus/Overview/graphics'
=== removed file 'Panel/Menus/Overview/graphics/[e-mail]'
 Binary files Panel/Menus/Overview/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Panel/Menus/Overview/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Panel/Menus/Overview/graphics/[e-mail]'
 Binary files Panel/Menus/Overview/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Panel/Menus/Overview/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Panel/Menus/Overview/graphics/[e-mail]'
 Binary files Panel/Menus/Overview/graphics/[e-mail]	2013-06-05 22:03:08 +0000 and Panel/Menus/Overview/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-07-11 09:09:20 +0000
+++ tests/qmltests/CMakeLists.txt	2013-07-17 16:45:32 +0000
@@ -61,10 +61,8 @@
 add_qml_test(Panel IndicatorRow)
 add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Panel MenuContent)
-add_qml_test(Panel Overview)
 add_qml_test(Panel Panel IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Panel SearchIndicator)
-add_qml_test(Panel/Menus IndicatorMenuWindow IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(SideStage SideStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
                                               ${CMAKE_BINARY_DIR}/tests/mocks
                                               ${CMAKE_BINARY_DIR}/plugins)
 
=== removed directory 'tests/qmltests/Panel/Menus'
=== removed file 'tests/qmltests/Panel/Menus/tst_IndicatorMenuWindow.qml'
--- tests/qmltests/Panel/Menus/tst_IndicatorMenuWindow.qml	2013-06-05 22:03:08 +0000
+++ tests/qmltests/Panel/Menus/tst_IndicatorMenuWindow.qml	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import QtTest 1.0
-import "../.."
-import "../../../../Panel/Menus"
-import Ubuntu.Components 0.1
-import Unity.Test 0.1 as UT
-
-Item {
-    id: testIndicatorMenuWindowItem
-    width: units.gu(9)
-    height: units.gu(3)
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-    }
-
-    IndicatorMenuWindow {
-        id: indicatorMenuWindow
-        name: "TestIndicatorMenuWindow"
-        anchors.fill: parent
-    }
-
-    UT.UnityTestCase {
-        name: "IndicatorMenuWindow"
-        when: windowShown
-
-        function test_mouseEvent_data() {
-            return [
-                {tag: "visible", shown: true, opacity: 1.0, mouseClicks: 0},
-                {tag: "invisible", shown: false, opacity: 0.0, mouseClicks: 1},
-            ]
-        }
-
-        function test_mouseEvent(data) {
-            indicatorMenuWindow.shown = data.shown
-            tryCompare(indicatorMenuWindow, "opacity", data.opacity)
-
-            clickedSpy.clear()
-            mouseClick(indicatorMenuWindow, indicatorMenuWindow.width / 2,
-                       indicatorMenuWindow.height / 2)
-            compare(clickedSpy.count, data.mouseClicks,
-                  "Check for Mouse event eating by indicatorMenuWindow failed")
-        }
-    }
-
-    SignalSpy {
-        id: clickedSpy
-        target: mouseArea
-        signalName: "clicked"
-    }
-}
 
=== modified file 'tests/qmltests/Panel/tst_IndicatorRow.qml'
--- tests/qmltests/Panel/tst_IndicatorRow.qml	2013-07-03 15:39:46 +0000
+++ tests/qmltests/Panel/tst_IndicatorRow.qml	2013-07-17 16:45:32 +0000
@@ -32,7 +32,6 @@
 
     function init_test()
     {
-        indicatorRow.overviewActive = false;
         indicatorRow.state = "initial";
         indicatorRow.currentItem = null;
     }
@@ -241,18 +240,5 @@
             compare(get_indicator_item_at(3).dimmed, true, "Other indicators should dim when in locked state");
             compare(get_indicator_item_at(4).dimmed, true, "Other indicators should dim when in locked state");
         }
-
-        function test_active_overview() {
-            init_test();
-
-            indicatorRow.overviewActive = true;
-            indicatorRow.state = "commit";
-
-            compare(get_indicator_item_at(0).dimmed, true, "Indicator should dim when in overview");
-            compare(get_indicator_item_at(1).dimmed, true, "Indicator should dim when in overview");
-            compare(get_indicator_item_at(2).dimmed, true, "Indicator should dim when in overview");
-            compare(get_indicator_item_at(3).dimmed, true, "Indicator should dim when in overview");
-            compare(get_indicator_item_at(4).dimmed, true, "Indicator should dim when in overview");
-        }
     }
 }
 
=== modified file 'tests/qmltests/Panel/tst_Indicators.qml'
--- tests/qmltests/Panel/tst_Indicators.qml	2013-07-03 16:33:58 +0000
+++ tests/qmltests/Panel/tst_Indicators.qml	2013-07-17 16:45:32 +0000
@@ -69,7 +69,6 @@
 
                 onClicked: {
                     if (!indicators.shown) {
-                        indicators.openOverview();
                         indicators.show();
                     } else {
                         indicators.hide();
@@ -89,47 +88,10 @@
             tryCompare(indicators, "state", "initial");
         }
 
-        // Showing the indicators should fully open the indicator panel with the overview menu visible.
+        // Showing the indicators should fully open the indicator panel.
         function test_show() {
             indicators.show()
             tryCompare(indicators, "fullyOpened", true);
-
-            // A show must open the indicators.
-            compare(findChild(indicators, "indicatorRow").overviewActive, true, "Overview indicator should be active when opened overview.")
-        }
-
-        // Opening the overview menu will activate the overview panel.
-        function test_open_overview() {
-            indicators.openOverview();
-            compare(findChild(indicators, "indicatorRow").overviewActive, true, "Overview should be active when opened overview.")
-        }
-
-        // Showing the indicators, then changing the progress (simulating drag) should keep the overview panel open until
-        // the reveal state is reached.
-        function test_slow_close_open_overview() {
-
-            var indicator_row = findChild(indicators, "indicatorRow");
-            verify(indicator_row != undefined);
-
-            indicators.show()
-            // wait for animation to end. (progress needs to be updated)
-            tryCompare(indicators.showAnimation, "running", false);
-            compare(indicator_row.overviewActive, true, "Overview should be active when opened overview.")
-
-            // iteratively decrease the progress and ensure that it keeps the correct behaviour
-            var current_progress = indicators.progress - shell.height/20;
-            while (current_progress > 0) {
-                indicators.progress = current_progress;
-
-                if (indicators.state == "commit" || indicators.state == "locked") {
-                    compare(indicator_row.overviewActive, true, "Overview should be active when in locked or commit state after show.")
-                }
-                else if (indicators.state == "reveal" || indicators.state == "hint") {
-                    compare(indicator_row.overviewActive, false, "Overview should be not active when not in commit or locked state.")
-                }
-
-                current_progress = current_progress - shell.height/20;
-            }
         }
 
         // Test the change in the revealer lateral position changes the current panel menu to fit the position
 
=== modified file 'tests/qmltests/Panel/tst_MenuContent.qml'
--- tests/qmltests/Panel/tst_MenuContent.qml	2013-06-17 08:14:24 +0000
+++ tests/qmltests/Panel/tst_MenuContent.qml	2013-07-17 16:45:32 +0000
@@ -52,8 +52,8 @@
         height: parent.height - 50
     }
 
-    Item {
-        id: click_me
+    Rectangle {
+        color: "#bbbbbb"
 
         height: 50
         anchors {
@@ -62,50 +62,16 @@
             right: parent.right
         }
 
-        Rectangle {
-            color: "#999999"
-
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.horizontalCenter
-                bottom: parent.bottom
-            }
-
-            Text {
-                text: "Devices"
-                anchors.fill: parent
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: menuContent.showOverview()
-            }
+        Text {
+            text: "Next Indicator"
+            anchors.fill: parent
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
         }
 
-        Rectangle {
-            color: "#bbbbbb"
-
-            anchors {
-                top: parent.top
-                left: parent.horizontalCenter
-                right: parent.right
-                bottom: parent.bottom
-            }
-
-            Text {
-                text: "Next Indicator"
-                anchors.fill: parent
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: activate_next_content()
-            }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: activate_next_content()
         }
     }
 
@@ -120,7 +86,6 @@
     function activate_content(index)
     {
         menuContent.currentIndex = index
-        menuContent.showMenu();
     }
 
     function get_test_menu_objecName(index) {
@@ -151,7 +116,6 @@
         when: windowShown
 
         function init() {
-            menuContent.hideAll();
             if (menuContent.__contentActive)
                 menuContent.releaseContent();
             tryCompare(menuContent, "__contentActive", false);
@@ -174,40 +138,6 @@
                 compare(menus.currentIndex, menu_index, "Current menu index does not match selected menu index");
                 tryCompareFunction(current_menu_equals_test_menu, true);
             }
-            // overview should not be visible.
-            tryCompare(findChild(menuContent, "overview"), "visible", false);
-        }
-
-        function test_show_overview() {
-            menuContent.showOverview();
-
-            var overview = findChild(menuContent, "overview");
-            tryCompare(overview, "visible", true);
-            tryCompare(overview, "enabled", true);
-            tryCompare(overview, "opacity", 1.0);
-
-            // menus should not be enabled.
-            tryCompare(findChild(menuContent, "menus"), "opacity", 0);
-            tryCompare(findChild(menuContent, "menus"), "enabled", false);
-        }
-
-        function test_overview_menuSelected_signal() {
-            menuContent.showOverview();
-
-            var overview = findChild(menuContent, "overview");
-            var menus = menu_content_test.findChild(menuContent, "menus")
-
-            var menu_count = indicatorsModel.count;
-            verify(menu_count > 0, "Menu count should be greater than zero");
-            for (var i = 0; i < menu_count; i++) {
-                // manually emit signal from overview.
-                // we dont want to go with mouse events here, otherwise we're testing the overview and not the signal.
-                overview.menuSelected(i);
-
-                test_menu_objectName = get_test_menu_objecName(i);
-                compare(menus.currentIndex, i, "Current menu index does not match selected menu index");
-                tryCompareFunction(current_menu_equals_test_menu, true);
-            }
         }
 
         // Calling activateContent should call start on all menus
 
=== removed file 'tests/qmltests/Panel/tst_Overview.qml'
--- tests/qmltests/Panel/tst_Overview.qml	2013-06-18 18:02:29 +0000
+++ tests/qmltests/Panel/tst_Overview.qml	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import QtTest 1.0
-import ".."
-import "../../../Panel/Menus"
-import "../../../Components"
-import Unity.Test 0.1 as UT
-import Unity.Indicators 0.1 as Indicators
-
-Rectangle {
-    id: shell
-    width: units.gu(40)
-    height: units.gu(80)
-    color: "black"
-
-    Overview {
-        id: overview
-        anchors.fill: parent
-        indicatorsModel: mockModel
-        shown: true
-    }
-
-    Item {
-        id: volumeControl
-        property int volume
-        function volumeUp() {
-            volume = Math.min(100, volume + 10);
-        }
-        function volumeDown() {
-            volume = Math.max(0, volume - 10);
-        }
-    }
-
-    ListModel {
-        id: mockModel
-        ListElement {title: "fake1"; widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget1.qml"; indicatorProperties: ""}
-        ListElement {title: "fake2"; widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget2.qml"; indicatorProperties: ""}
-        ListElement {title: "fake3"; widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget3.qml"; indicatorProperties: ""}
-    }
-
-    ListModel {
-        id: mockModel2
-    }
-
-    SignalSpy {
-        id: clickSpy
-        target: overview
-        signalName: "menuSelected"
-    }
-
-    UT.UnityTestCase {
-        name: "Overview"
-        when: windowShown
-
-        function initTestCase() {
-            // Spin the event loop once because the UI builds up delayed
-            wait(0);
-        }
-
-        function test_menuSelected() {
-            overview.indicatorsModel = mockModel;
-
-            for (var i = 0; i < mockModel.count; ++i) {
-                var button = findChild(overview, "overviewGridButton" + i);
-                clickSpy.clear();
-                mouseClick(button, button.width / 2, button.height / 2);
-                compare(clickSpy.count, 1, "Clicking on grid didn't work");
-                compare(clickSpy.signalArguments[0][0], i, "Clicking the grid returned a wrong index");
-            }
-        }
-
-        function test_dynamic_addition() {
-            var overviewGrid = findChild(overview, "overviewGrid");
-
-            for(var i = 0; i < mockModel.count; ++i) {
-                mockModel2.append(mockModel.get(i));
-            }
-            overview.indicatorsModel = mockModel2;
-            overviewGrid.forceLayout();
-            waitForRendering(overviewGrid);
-
-            var button = findChild(overview, "overviewGridButton2");
-            verify(button !== undefined, "button2 wasn't found");
-            button = findChild(overview, "overviewGridButton3");
-            compare(button, undefined, "There should only be 3 buttons... found at least 4...");
-
-            mockModel2.append({title: "humppa", widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget4.qml", indicatorProperties: ""})
-            overviewGrid.forceLayout();
-            waitForRendering(overviewGrid);
-
-            button = findChild(overview, "overviewGridButton3");
-            verify(button !== undefined, "button3 wasn't found");
-        }
-
-        function test_volume_slider_data() {
-            return [
-                {tag: "0%", sliderPos:0},
-                {tag: "100%", sliderPos: 100},
-                {tag: "50%", sliderPos: 50}
-            ];
-        }
-
-        function test_volume_slider(data) {
-            var volumeSlider = findChild(overview, "volumeSlider");
-            var startX = volumeSlider.width * volumeSlider.value / 100;
-            var startY = volumeSlider.y + volumeSlider.height / 2;
-            var stopX = (volumeSlider.width - units.gu(5)) * data.sliderPos / 100;
-            var stopY = volumeSlider.y + volumeSlider.height / 2;
-            mouseFlick(volumeSlider, startX, startY, stopX, stopY, true, true, 0.1);
-        }
-
-        function test_volume_buttons(data) {
-            var volumeDownButton = findChild(overview, "minVolumeIcon");
-            var volumeUpButton = findChild(overview, "maxVolumeIcon");
-
-            for (var i = 0; i < 10; ++i) {
-                mouseClick(volumeDownButton, volumeDownButton.width / 2, volumeDownButton.height / 2);
-                wait(0)
-            }
-            tryCompare(volumeControl, "volume", 0);
-            for (var i = 0; i < 10; ++i) {
-                mouseClick(volumeUpButton, 1, 1);
-                wait(0)
-            }
-        }
-    }
-}
 
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2013-07-03 16:33:58 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2013-07-17 16:45:32 +0000
@@ -62,14 +62,14 @@
 
         function get_indicator_item(index) {
             var row_repeater = findChild(panel.indicators, "rowRepeater");
-            verify(row_repeater != undefined)
+            verify(row_repeater != undefined);
             return row_repeater.itemAt(index);
         }
 
         function get_indicator_item_position(index) {
 
             var indicator_row = findChild(panel.indicators, "indicatorRow");
-            verify(indicator_row != undefined)
+            verify(indicator_row != undefined);
 
             var indicator_item = get_indicator_item(index);
             verify(indicator_item != undefined);
@@ -83,11 +83,11 @@
             panel.fullscreenMode = false;
             // Wait for the indicators to get into position.
             // (switches between normal and fullscreen modes are animated)
-            tryCompare(panel.indicators, "y", 0)
+            tryCompare(panel.indicators, "y", 0);
 
             var indicator_item_coord = get_indicator_item_position(0);
 
-            touchPress(panel, indicator_item_coord.x, panel.panelHeight / 2)
+            touchPress(panel, indicator_item_coord.x, panel.panelHeight / 2);
 
             // hint animation should be run, meaning that indicators will move downwards
             // by hintValue pixels without any drag taking place
@@ -96,7 +96,7 @@
             tryCompare(panel.indicators, "partiallyOpened", true);
             tryCompare(panel.indicators, "fullyOpened", false);
 
-            touchRelease(panel, indicator_item_coord.x, panel.panelHeight/2)
+            touchRelease(panel, indicator_item_coord.x, panel.panelHeight/2);
         }
 
         // Pressing on the top edge of the screen should have no effect if the panel
@@ -105,31 +105,31 @@
             panel.fullscreenMode = true;
             // Wait for the indicators to get into position.
             // (switches between normal and fullscreen modes are animated)
-            tryCompare(panel.indicators, "y", -panel.panelHeight)
+            tryCompare(panel.indicators, "y", -panel.panelHeight);
 
             var indicator_item_coord = get_indicator_item_position(0);
 
-            touchPress(panel, indicator_item_coord.x, panel.panelHeight / 2)
+            touchPress(panel, indicator_item_coord.x, panel.panelHeight / 2);
 
             // Give some time for a hint animation to change things, if any
-            wait(500)
+            wait(500);
 
             // no hint animation when fullscreen
-            compare(panel.indicators.y, -panel.panelHeight)
+            compare(panel.indicators.y, -panel.panelHeight);
             var indicatorRow = findChild(panel.indicators, "indicatorRow");
-            verify(indicatorRow != undefined)
-            compare(indicatorRow.y, 0)
-            compare(panel.indicators.height, panel.indicators.panelHeight)
+            verify(indicatorRow != undefined);
+            compare(indicatorRow.y, 0);
+            compare(panel.indicators.height, panel.indicators.panelHeight);
             compare(panel.indicators.partiallyOpened, false,
                     "Indicator should not be partially opened when panel is pressed in" +
-                    " fullscreenmode")
+                    " fullscreenmode");
             compare(panel.indicators.fullyOpened, false, "Indicator should not be partially" +
-                   " opened when panel is pressed in fullscreenmode")
+                   " opened when panel is pressed in fullscreenmode");
 
-            touchRelease(panel, indicator_item_coord.x, panel.panelHeight/2)
+            touchRelease(panel, indicator_item_coord.x, panel.panelHeight/2);
         }
 
-        function test_drag_show_data() { return get_window_data() }
+        function test_drag_show_data() { return get_window_data(); }
 
         // Dragging from a indicator item in the panel will gradually expose the
         // indicators, first by running the hint animation, then after dragging down will
@@ -138,50 +138,50 @@
             panel.fullscreenMode = data.fullscreenFlag;
 
             var indicator_row = findChild(panel.indicators, "indicatorRow");
-            verify(indicator_row != undefined)
+            verify(indicator_row != undefined);
 
             var row_repeater = findChild(panel.indicators, "rowRepeater");
-            verify(indicator_row != undefined)
+            verify(indicator_row != undefined);
 
             var menu_content = findChild(panel.indicators, "menuContent");
-            verify(indicator_row != undefined)
+            verify(indicator_row != undefined);
 
             // Wait for the indicators to get into position.
             // (switches between normal and fullscreen modes are animated)
             if (data.fullscreenFlag) {
-                tryCompare(panel.indicators, "y", -panel.panelHeight)
+                tryCompare(panel.indicators, "y", -panel.panelHeight);
             } else {
-                tryCompare(panel.indicators, "y", 0)
+                tryCompare(panel.indicators, "y", 0);
             }
 
             // do this for each indicator item
             for (var i = 0; i < row_repeater.count; i++) {
 
                 var indicator_item = get_indicator_item(i);
-                verify(indicator_item != undefined)
+                verify(indicator_item != undefined);
 
                 var indicator_item_coord = get_indicator_item_position(i);
 
                 touchPress(panel,
-                           indicator_item_coord.x, panel.panelHeight / 2)
+                           indicator_item_coord.x, panel.panelHeight / 2);
 
                 // 1) Drag the mouse down
                 touchFlick(panel,
                            indicator_item_coord.x, panel.panelHeight / 2,
                            indicator_item_coord.x, panel.height * 0.8,
-                           false /* beginTouch */, false /* endTouch */)
+                           false /* beginTouch */, false /* endTouch */);
 
                 // Indicators height should follow the drag, and therefore increase accordingly.
                 // They should be at least half-way through the screen
                 tryCompareFunction(
                     function() {return panel.indicators.height >= panel.height * 0.5},
-                    true)
+                    true);
 
-                touchRelease(panel, indicator_item_coord.x, panel.height * 0.8)
+                touchRelease(panel, indicator_item_coord.x, panel.height * 0.8);
 
                 compare(indicator_row.currentItem, indicator_item,
-                        "Incorrect item activated at position " + i)
-                compare(menu_content.__shown, true, "Menu conetent should be enabled for item at position " + i);
+                        "Incorrect item activated at position " + i);
+                compare(menu_content.currentIndex, i, "Menu conetent should be enabled for item at position " + i);
 
                 // init for next indicator_item
                 init();
@@ -195,23 +195,23 @@
             var search_indicator = findChild(panel, "search");
             verify(search_indicator != undefined);
 
-            tap(search_indicator, 1, 1)
+            tap(search_indicator, 1, 1);
 
             compare(search_clicked, true,
-                    "Tapping search indicator while it was enabled did not emit searchClicked signal")
+                    "Tapping search indicator while it was enabled did not emit searchClicked signal");
         }
 
         function test_search_click_when_not_visible() {
             panel.fullscreenMode = false;
-            panel.searchVisible = false
+            panel.searchVisible = false;
 
             var search_indicator = findChild(panel, "search");
             verify(search_indicator != undefined);
 
-            tap(search_indicator, 1, 1)
+            tap(search_indicator, 1, 1);
 
             compare(search_clicked, false,
-                    "Tapping search indicator while it was not visible emitted searchClicked signal")
+                    "Tapping search indicator while it was not visible emitted searchClicked signal");
         }
     }
 }