Rename example component file for clarity

Task-number: QTBUG-12633
(cherry picked from commit dc2f700a006d827db0eaf8d1e01e4d9c7c8c0baa)

4 files changed, 22 insertions, 8 deletions

diff --git a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
index 15e77de938..ba49d143b3 100644
--- a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
+++ b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
@@ -53,6 +53,13 @@ FocusScope {
             color: "#D1DBBD"
             focus: true
             Keys.onRightPressed: mainView.focus = true
+
+            Text { 
+                anchors { top: parent.top; horizontalCenter: parent.horizontalCenter; margins: 30 }
+                color: "black"
+                font.pixelSize: 14
+                text: "Context Menu"
+            }
         }
     }
 }
diff --git a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
index 19f723582f..88840cba86 100644
--- a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
+++ b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
@@ -43,7 +43,10 @@ import Qt 4.7
 FocusScope {
     property alias interactive: gridView.interactive
 
-    onActiveFocusChanged: if (activeFocus) mainView.state = ""
+    onActiveFocusChanged: {
+        if (activeFocus) 
+            mainView.state = ""
+    }
 
     Rectangle {
         anchors.fill: parent
@@ -60,7 +63,7 @@ FocusScope {
             focus: true
             model: 12
 
-            KeyNavigation.down: listViews
+            KeyNavigation.down: listMenu
             KeyNavigation.left: contextMenu
 
             delegate: Item {
diff --git a/examples/declarative/keyinteraction/focus/Core/ListViews.qml b/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
index 3d6ceabd9f..6100b32b70 100644
--- a/examples/declarative/keyinteraction/focus/Core/ListViews.qml
+++ b/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
@@ -43,7 +43,10 @@ import Qt 4.7
 FocusScope {
     clip: true
 
-    onActiveFocusChanged: if (activeFocus) mainView.state = "showListViews"
+    onActiveFocusChanged: {
+        if (activeFocus) 
+            mainView.state = "showListViews"
+    }
 
     ListView {
         id: list1
diff --git a/examples/declarative/keyinteraction/focus/focus.qml b/examples/declarative/keyinteraction/focus/focus.qml
index 56fdffc6d9..9463192d25 100644
--- a/examples/declarative/keyinteraction/focus/focus.qml
+++ b/examples/declarative/keyinteraction/focus/focus.qml
@@ -55,27 +55,28 @@ Rectangle {
 
         GridMenu {
             id: gridMenu
-
             width: parent.width; height: 320
+
             focus: true
             interactive: parent.activeFocus
         }
 
-        ListViews {
-            id: listViews
+        ListMenu {
+            id: listMenu
             y: 320; width: parent.width; height: 320
         }
 
         Rectangle { 
             id: shade
             anchors.fill: parent
-            color: "black"; opacity: 0 
+            color: "black"
+            opacity: 0 
         }
 
         states: State {
             name: "showListViews"
             PropertyChanges { target: gridMenu; y: -160 }
-            PropertyChanges { target: listViews; y: 160 }
+            PropertyChanges { target: listMenu; y: 160 }
         }
 
         transitions: Transition {