Add objectName property to remaining objects for testing

Change-Id: I20660e0190f0cedb0d2ea07fe3d3c0969ce5917d
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

25 files changed, 90 insertions, 3 deletions

diff --git a/apps/com.kdab.keyboarddemo/KeyboardDemo.qml b/apps/com.kdab.keyboarddemo/KeyboardDemo.qml
index 478bc7a..a5917d7 100644
--- a/apps/com.kdab.keyboarddemo/KeyboardDemo.qml
+++ b/apps/com.kdab.keyboarddemo/KeyboardDemo.qml
@@ -36,6 +36,7 @@ import utils 1.0
 
 AppUIScreen {
     id: root
+    objectName: "Virtual_Keyboard_Demo"
     title: "KDAB Virtual Keyboard Demo"
 
     UIScreen {
diff --git a/apps/com.pelagicore.browser/Browser.qml b/apps/com.pelagicore.browser/Browser.qml
index 258621a..f4bb7e2 100644
--- a/apps/com.pelagicore.browser/Browser.qml
+++ b/apps/com.pelagicore.browser/Browser.qml
@@ -37,6 +37,7 @@ import utils 1.0
 
 AppUIScreen {
     id: root
+    objectName: "Neptune_Browser"
     title: "Neptune Browser"
 
     UIScreen {
diff --git a/apps/com.pelagicore.movies/MovieCoverDelegate.qml b/apps/com.pelagicore.movies/MovieCoverDelegate.qml
index 77249dc..cb44ba0 100644
--- a/apps/com.pelagicore.movies/MovieCoverDelegate.qml
+++ b/apps/com.pelagicore.movies/MovieCoverDelegate.qml
@@ -39,6 +39,7 @@ import controls 1.0
 
 Control {
     id: root
+    objectName: "MovieCover::" + title.text
     width: Style.hspan(4)
     height: Style.vspan(7)
     signal clicked()
@@ -68,6 +69,7 @@ Control {
             }
             Image {
                 id: image
+                objectName: "MovieCover::" + title.text + "Image"
                 anchors.fill: parent
                 anchors.margins: Style.paddingS
                 fillMode: Image.PreserveAspectCrop
diff --git a/apps/com.pelagicore.movies/MoviePlayer.qml b/apps/com.pelagicore.movies/MoviePlayer.qml
index 6976bbd..49518c1 100644
--- a/apps/com.pelagicore.movies/MoviePlayer.qml
+++ b/apps/com.pelagicore.movies/MoviePlayer.qml
@@ -42,6 +42,7 @@ import "."
 
 UIScreen {
     id: root
+    objectName: "MoviesScreen"
     width: Style.hspan(24)
     height: Style.vspan(24)
 
@@ -55,6 +56,7 @@ UIScreen {
 
     Video {
         id: video
+        objectName: "MoviePlayer::" + root.track.name + "Movie"
         anchors.fill: parent
         source: MovieModel.sourcePath(root.track.source)
         autoPlay: true
@@ -92,18 +94,21 @@ UIScreen {
             anchors.horizontalCenter: parent.horizontalCenter
             spacing: Style.hspan(2)
             Tool {
+                objectName: "MoviePlayer::PrevMovieButton"
                 Layout.preferredHeight: Style.vspan(1.5)
                 Layout.preferredWidth: Style.hspan(2)
                 symbol: 'prev'
                 onClicked: MovieModel.previous()
             }
             Tool {
+                objectName: "MoviePlayer::PausePlayMovieButton"
                 Layout.preferredHeight: Style.vspan(1.5)
                 Layout.preferredWidth: Style.hspan(2)
                 symbol: video.running?'pause':'play'
                 onClicked: video.togglePlay()
             }
             Tool {
+                objectName: "MoviePlayer::NextMovieButton"
                 Layout.preferredHeight: Style.vspan(1.5)
                 Layout.preferredWidth: Style.hspan(2)
                 symbol: 'next'
diff --git a/apps/com.pelagicore.movies/MovieTracks.qml b/apps/com.pelagicore.movies/MovieTracks.qml
index 4f32121..59f65b8 100644
--- a/apps/com.pelagicore.movies/MovieTracks.qml
+++ b/apps/com.pelagicore.movies/MovieTracks.qml
@@ -42,6 +42,7 @@ import "."
 
 UIScreen {
     id: root
+    objectName: "MovieTracksScreen"
     width: Style.hspan(24)
     height: Style.vspan(24)
 
@@ -75,6 +76,7 @@ UIScreen {
                     }
                     Image {
                         id: image
+                        objectName: "MovieTracks::" + root.track.title
                         anchors.fill: parent
                         source: MovieModel.coverPath(root.track.cover)
                         fillMode: Image.PreserveAspectCrop
@@ -107,6 +109,7 @@ UIScreen {
                         verticalAlignment: Text.AlignTop
                     }
                     Button {
+                        objectName: "MovieTracks::PlayNow"
                         text: 'PLAY NOW'
                         Layout.preferredWidth: Style.hspan(4)
                         Layout.alignment: Qt.AlignLeft
@@ -122,6 +125,7 @@ UIScreen {
 
         ListView {
             id: view
+            objectName: "MovieTracks::MovieList"
             anchors.horizontalCenter: parent.horizontalCenter
             orientation: Qt.Horizontal
             width: Style.hspan(22)
diff --git a/apps/com.pelagicore.movies/Movies.qml b/apps/com.pelagicore.movies/Movies.qml
index 9bf3427..4f03821 100644
--- a/apps/com.pelagicore.movies/Movies.qml
+++ b/apps/com.pelagicore.movies/Movies.qml
@@ -36,6 +36,7 @@ import controls 1.0
 
 AppUIScreen {
     id: root
+    objectName: "Neptune_Movie_Player"
     title: "Neptune Movie Player"
 
     StackView {
diff --git a/apps/com.pelagicore.music/AlbumScreen.qml b/apps/com.pelagicore.music/AlbumScreen.qml
index 46ec5d4..8530625 100644
--- a/apps/com.pelagicore.music/AlbumScreen.qml
+++ b/apps/com.pelagicore.music/AlbumScreen.qml
@@ -76,12 +76,14 @@ UIScreen {
     }
 
     Image {
+        objectName: "AlbumScreen::ShadowLeft"
         anchors.left: parent.left
         anchors.verticalCenter: parent.verticalCenter
         source: Style.gfx('shadow_left')
     }
 
     Image {
+        objectName: "AlbumScreen::ShadowRight"
         anchors.right: parent.right
         anchors.verticalCenter: parent.verticalCenter
         source: Style.gfx('shadow_right')
diff --git a/apps/com.pelagicore.music/CoverItem.qml b/apps/com.pelagicore.music/CoverItem.qml
index d52d4b2..f807b44 100644
--- a/apps/com.pelagicore.music/CoverItem.qml
+++ b/apps/com.pelagicore.music/CoverItem.qml
@@ -49,16 +49,19 @@ Control {
         anchors.horizontalCenter: parent.horizontalCenter
         spacing: 0
         Item {
+            objectName: "CoverItem::" + root.title.split(" ").join("")
             anchors.horizontalCenter: parent.horizontalCenter
             width: Style.hspan(5)
             height: width
             Rectangle {
+                objectName: "CoverItem::" + root.title.split(" ").join("") + "ContentArea"
                 anchors.fill: parent
                 color: Style.colorWhite
                 border.color: Qt.darker(color, 1.2)
             }
             Image {
                 id: image
+                objectName: "CoverItem::" + root.title.split(" ").join("") + "Image"
                 anchors.fill: parent
                 anchors.margins: Style.paddingXS
                 fillMode: Image.PreserveAspectCrop
@@ -67,6 +70,7 @@ Control {
         }
         Label {
             id: title
+            objectName: "CoverItem::" + root.title.split(" ").join("") + "Title"
             Layout.fillWidth: true
             horizontalAlignment: Text.AlignHCenter
             font.weight: Font.Light
@@ -74,6 +78,7 @@ Control {
         }
         Label {
             id: subTitle
+            objectName: "CoverItem::" + root.subTitle.split(" ").join("") + "SubTitle"
             Layout.fillWidth: true
             horizontalAlignment: Text.AlignHCenter
             font.pixelSize: Style.fontSizeS
diff --git a/apps/com.pelagicore.music/CurrentTrackScreen.qml b/apps/com.pelagicore.music/CurrentTrackScreen.qml
index 01dbb8d..82f50db 100644
--- a/apps/com.pelagicore.music/CurrentTrackScreen.qml
+++ b/apps/com.pelagicore.music/CurrentTrackScreen.qml
@@ -51,6 +51,7 @@ UIScreen {
 
     ColumnLayout {
         id: musicControl
+        objectName: "CurrentTrackScreen::MusicControl"
         width: Style.hspan(12)
         height: Style.vspan(17)
         anchors.horizontalCenter: parent.horizontalCenter
@@ -63,12 +64,14 @@ UIScreen {
             spacing: 0
             Tool {
                 Layout.preferredHeight: Style.vspan(1.5)
+                objectName: "CurrentTrackScreen::MusicControl_PrevTrackButton"
                 Layout.preferredWidth: Style.hspan(2)
                 symbol: 'prev'
                 onClicked: { MusicModel.previous() }
             }
 
             TrackSwipeView {
+                objectName: "CurrentTrackScreen::TrackSwipeView"
                 contentWidth: Style.hspan(6)
 
                 Layout.preferredWidth: Style.hspan(6)
@@ -78,6 +81,7 @@ UIScreen {
                 currentIndex: MusicModel.currentIndex
 
                 delegate: CoverItem {
+                    objectName: "CurrentTrackScreen::TrackSwipeViewCurrentCoverItem"
                     z: PathView.z
                     scale: PathView.scale
                     source: model.item.coverArtUrl
@@ -90,8 +94,9 @@ UIScreen {
             }
 
             Tool {
-                Layout.preferredHeight: Style.vspan(1.5)
+                objectName: "CurrentTrackScreen::MusicControl_NextTrackButton"
                 Layout.preferredWidth: Style.hspan(2)
+                Layout.preferredHeight: Style.vspan(1.5)
                 symbol: 'next'
                 onClicked: { MusicModel.next() }
             }
@@ -102,12 +107,14 @@ UIScreen {
             spacing: Style.hspan(0.5)
 
             Label {
+                objectName: "CurrentTrackScreen::CurrentTime"
                 Layout.preferredWidth: Style.hspan(1)
                 text: MusicModel.currentTime
             }
 
             Slider {
                 id: slider
+                objectName: "CurrentTrackScreen::Slider"
                 Layout.preferredWidth: Style.hspan(9)
                 Layout.preferredHeight: Style.vspan(1)
                 value: MusicModel.position
@@ -123,6 +130,7 @@ UIScreen {
             }
 
             Label {
+                objectName: "CurrentTrackScreen::DurationTime"
                 Layout.preferredWidth: Style.hspan(1)
                 text: MusicModel.durationTime
                 font.pixelSize: Style.fontSizeS
@@ -133,6 +141,7 @@ UIScreen {
             anchors.horizontalCenter: parent.horizontalCenter
             spacing: 0
             Tool {
+                objectName: "CurrentTrackScreen::ShuffleButton"
                 Layout.preferredWidth: Style.hspan(1.5)
                 symbol: 'shuffle'
                 checked: MusicModel.shuffleOn
@@ -141,6 +150,7 @@ UIScreen {
             }
             Spacer { Layout.preferredWidth: Style.hspan(2) }
             Tool {
+                objectName: "CurrentTrackScreen::PausePlayButton"
                 Layout.preferredWidth: Style.hspan(2)
                 Layout.preferredHeight: Style.vspan(1.8)
                 symbol: MusicModel.playing?'pause':'play'
@@ -148,6 +158,7 @@ UIScreen {
             }
             Spacer { Layout.preferredWidth: Style.hspan(2) }
             Tool {
+                objectName: "CurrentTrackScreen::LoopButton"
                 Layout.preferredWidth: Style.hspan(1.5)
                 symbol: 'loop'
                 checked: MusicModel.repeatOn
@@ -159,12 +170,14 @@ UIScreen {
             anchors.horizontalCenter: parent.horizontalCenter
             spacing: 0
             Symbol {
+                objectName: "CurrentTrackScreen::SpeakerButton"
                 Layout.preferredWidth: Style.hspan(1)
                 size: Style.symbolSizeXS
                 name: 'speaker'
             }
             VolumeSlider {
                 id: volumeSlider
+                objectName: "CurrentTrackScreen::VolumeSlider"
                 Layout.preferredWidth: Style.hspan(8)
                 Layout.preferredHeight: Style.vspan(2)
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -192,6 +205,7 @@ UIScreen {
 
     Library {
         id: library
+        objectName: "CurrentTrackScreen::Library"
         x: parent.width
         anchors.top: parent.top
         anchors.bottom: parent.bottom
@@ -212,12 +226,14 @@ UIScreen {
         ColumnLayout {
             anchors.fill: parent
             ToolButton {
+                objectName: "CurrentTrackScreen::Bluetooth"
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 text: "BLUETOOTH"
                 font.pixelSize: Style.fontSizeL
             }
             ToolButton {
+                objectName: "CurrentTrackScreen::USB"
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 text: "USB"
@@ -225,6 +241,7 @@ UIScreen {
                 font.pixelSize: Style.fontSizeL
             }
             ToolButton {
+                objectName: "CurrentTrackScreen::Spotify"
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 text: "SPOTIFY"
@@ -236,6 +253,7 @@ UIScreen {
 
     Tool {
         id: libraryButton
+        objectName: "CurrentTrackScreen::LibraryButton"
         width: Style.hspan(3)
         height: Style.vspan(5)
         anchors.left: musicControl.right
diff --git a/apps/com.pelagicore.music/IndexerStatus.qml b/apps/com.pelagicore.music/IndexerStatus.qml
index 33765fc..a939d4f 100644
--- a/apps/com.pelagicore.music/IndexerStatus.qml
+++ b/apps/com.pelagicore.music/IndexerStatus.qml
@@ -39,6 +39,7 @@ import "."
 import QtIvi.Media 1.0
 
 Rectangle {
+    objectName: "IndexerStatus::ContentArea"
     width: Style.vspan(10)
     height: Style.hspan(1)
 
@@ -49,6 +50,7 @@ Rectangle {
     }
 
     MediaIndexerControl {
+        objectName: "IndexerStatus::MediaIndexerControl"
         id: indexerControl
     }
 
@@ -57,6 +59,7 @@ Rectangle {
         spacing: 2
 
         Label {
+            objectName: "IndexerStatus::IndexingLabel"
             anchors.horizontalCenter: parent.horizontalCenter
             text: "Indexing..."
         }
diff --git a/apps/com.pelagicore.music/Library.qml b/apps/com.pelagicore.music/Library.qml
index 98ab958..0f5d11f 100644
--- a/apps/com.pelagicore.music/Library.qml
+++ b/apps/com.pelagicore.music/Library.qml
@@ -45,6 +45,7 @@ Control {
     signal close()
 
     Rectangle {
+        objectName: "Library::ContentArea"
         anchors.fill: parent
         color: "black"
     }
@@ -68,6 +69,7 @@ Control {
 
     LetterPicker {
         id: letterPicker
+        objectName: "Library::LetterPicker"
         height: root.height - tabView.tabHeight
         anchors.left: parent.left
         anchors.leftMargin: 5
@@ -77,12 +79,14 @@ Control {
 
     LibraryList {
         id: nowPlaying
+        objectName: "Library::NowPlaying"
         visible: false
         nowPlaying: true
     }
 
     // Close Button: used to close music library popup
     Tool {
+        objectName: "Library::CloseButton"
         height: Style.vspan(1.5)
         width: Style.hspan(1)
         anchors.right: parent.right
@@ -96,6 +100,7 @@ Control {
     Component {
         id: library
         LibraryList {
+            objectName: "Library::LibraryList"
             visible: false
         }
     }
diff --git a/apps/com.pelagicore.music/LibraryList.qml b/apps/com.pelagicore.music/LibraryList.qml
index ebecee9..942921d 100644
--- a/apps/com.pelagicore.music/LibraryList.qml
+++ b/apps/com.pelagicore.music/LibraryList.qml
@@ -68,6 +68,7 @@ Control {
 
     ListView {
         id: listView
+        objectName: root.parent.objectName + "TrackList"
         anchors.fill: parent
         model: root.nowPlaying ? MusicModel.nowPlaying : root.model
         clip: true
@@ -77,6 +78,7 @@ Control {
         currentIndex: nowPlaying ? MusicModel.currentIndex : -1
 
         header: UIElement {
+            objectName: root.parent.objectName + "UIElement"
             width: root.width
             height: Style.vspan(root.model.canGoBack ? 3 : 0)
             visible: root.model.canGoBack
@@ -89,6 +91,7 @@ Control {
             }
 
             Tool {
+                objectName: root.parent.objectName + "BackButton"
                 anchors.fill: parent
                 symbol: 'back'
                 onClicked: root.model.goBack()
@@ -100,6 +103,7 @@ Control {
             height: Style.vspan(3)
 
             Rectangle {
+                objectName: root.parent.objectName + model.name.split(" ").join("") + "_ControlArea"
                 anchors.fill: parent
                 opacity: 0.2
                 visible: listView.currentIndex === index
@@ -134,6 +138,7 @@ Control {
                 padding: Style.padding
                 spacing: 0
                 Icon {
+                    objectName: root.parent.objectName +  model.name.split(" ").join("")
                     anchors.verticalCenter: parent.verticalCenter
                     width: height
                     height: Style.vspan(2.8)
@@ -145,6 +150,8 @@ Control {
                     spacing: 0
                     padding: Style.padding
                     Label {
+                        objectName: model.type === "audiotrack" ? root.parent.objectName + model.name.split(" ").join("")  + "_Track" :
+                                                                  root.parent.objectName + model.name.split(" ").join("")
                         width: Style.hspan(7)
                         height: Style.vspan(2)
                         text: model.name.toUpperCase()
@@ -152,6 +159,7 @@ Control {
                     }
 
                     Label {
+                        objectName: model.item.data.artist ? root.parent.objectName + model.item.data.artist.split(" ").join("") : ""
                         width: Style.hspan(7)
                         height: Style.vspan(1)
                         text: model.type === "audiotrack" ? model.item.artist.toUpperCase() : (model.type === "album" ? model.item.data.artist.toUpperCase() : "")
@@ -161,6 +169,7 @@ Control {
                 }
 
                 Tool {
+                    objectName: root.parent.objectName + model.name.split(" ").join("") + "_CloseSymbol"
                     width: Style.hspan(1)
                     height: Style.vspan(3)
                     anchors.verticalCenter: parent.verticalCenter
diff --git a/apps/com.pelagicore.music/Music.qml b/apps/com.pelagicore.music/Music.qml
index 2bee11c..f3f092b 100644
--- a/apps/com.pelagicore.music/Music.qml
+++ b/apps/com.pelagicore.music/Music.qml
@@ -38,6 +38,7 @@ import "."
 
 AppUIScreen {
     id: root
+    objectName: "Neptune_Music_Player"
     title: "Neptune Music Player"
 
     onClusterKeyPressed: {
diff --git a/apps/com.pelagicore.music/PlaylistContainer.qml b/apps/com.pelagicore.music/PlaylistContainer.qml
index e27c1b0..f66a322 100644
--- a/apps/com.pelagicore.music/PlaylistContainer.qml
+++ b/apps/com.pelagicore.music/PlaylistContainer.qml
@@ -61,6 +61,7 @@ RowLayout {
     }
 
     Tool {
+        objectName: "PlaylistContainer::MusicSymbol"
         symbol: 'music'
         Layout.alignment: Qt.AlignTop
         onClicked: {
@@ -69,12 +70,14 @@ RowLayout {
     }
     Timer {
         id: closer
+        objectName: "PlaylistContainer::Closer"
         interval: 3000
         onTriggered: {
             playListContainer.expanded = false
         }
     }
     Rectangle {
+        objectName: "PlaylistContainer::ContentArea"
         Layout.fillWidth: true
         Layout.fillHeight: true
         color: '#000'
@@ -103,6 +106,7 @@ RowLayout {
                             anchors.fill: parent
                             anchors.margins: Style.padding
                             Rectangle {
+                                objectName: "PlaylistContainer::ItemContentArea"
                                 anchors.fill: parent
                                 anchors.leftMargin: -6
                                 anchors.rightMargin: -6
@@ -112,6 +116,7 @@ RowLayout {
                             }
 
                             Image {
+                                objectName: "PlaylistContainer::Cover"
                                 anchors.centerIn: parent
                                 height: parent.height
                                 width: parent.height
@@ -124,6 +129,7 @@ RowLayout {
                     ColumnLayout {
                         spacing: 0
                         Label {
+                            objectName: "PlaylistContainer::" + model.title + "_TitleName"
                             text: model.title
                             font.pixelSize: Style.fontSizeXS
                             opacity: 0.5
@@ -131,6 +137,7 @@ RowLayout {
                             Layout.fillWidth: true
                         }
                         Label {
+                            objectName: "PlaylistContainer::" + model.title + "_ArtistName"
                             text: model.artist
                             font.pixelSize: Style.fontSizeS
                             Layout.fillWidth: true
diff --git a/apps/com.pelagicore.nestedwayland/main.qml b/apps/com.pelagicore.nestedwayland/main.qml
index 1cc9be1..78c0427 100644
--- a/apps/com.pelagicore.nestedwayland/main.qml
+++ b/apps/com.pelagicore.nestedwayland/main.qml
@@ -39,12 +39,14 @@ import utils 1.0
 
 AppUIScreen {
     id: mainWindow
+    objectName: "Nested_Compositor"
 
     UIScreen {
         id: ui
 
         Label {
             id: compositorLabel
+            objectName: "NestedCompositor::InfoText"
             anchors.fill: parent
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
diff --git a/apps/com.pelagicore.phone/ContactsList.qml b/apps/com.pelagicore.phone/ContactsList.qml
index 517b9d0..a6c7c85 100644
--- a/apps/com.pelagicore.phone/ContactsList.qml
+++ b/apps/com.pelagicore.phone/ContactsList.qml
@@ -42,14 +42,17 @@ UIScreen {
     signal dial(string name, string number)
 
     Frame {
+        objectName: "ContactList:ContentArea"
         anchors.fill: parent
 
         ListView {
             id: contactList
+            objectName: "ContactList::AvailableContacts"
             anchors.fill: parent
             model: PhoneModel.contactsModel
 
             delegate: ItemDelegate {
+                objectName: "ContactList::" + model.name + " " + model.number
                 width: ListView.view.width
                 height: Style.vspan(2)
                 text: model.name + " " + model.number
diff --git a/apps/com.pelagicore.phone/DeviceList.qml b/apps/com.pelagicore.phone/DeviceList.qml
index eb85fc7..d37f26e 100644
--- a/apps/com.pelagicore.phone/DeviceList.qml
+++ b/apps/com.pelagicore.phone/DeviceList.qml
@@ -40,12 +40,14 @@ UIScreen {
     id: root
 
     Frame {
+        objectName: "DeviceList::ContentArea"
         width: Style.hspan(10)
         height: Style.vspan(17)
         anchors.centerIn: parent
 
         ListView {
             id: deviceListView
+            objectName: "DeviceList::AvailableDevices"
             anchors.fill: parent
             model: PhoneModel.availableDevices
             delegate: SwitchDelegate {
diff --git a/apps/com.pelagicore.phone/Dialer.qml b/apps/com.pelagicore.phone/Dialer.qml
index 5cb18e6..dfea202 100644
--- a/apps/com.pelagicore.phone/Dialer.qml
+++ b/apps/com.pelagicore.phone/Dialer.qml
@@ -62,6 +62,7 @@ UIScreen {
 
         GridLayout {
             id: dialGrid
+            objectName: "Dialer::DialGrid"
             columns: 3
             width: Style.hspan(8.5)
             height: Style.vspan(10)
@@ -74,6 +75,7 @@ UIScreen {
                 model: ['1','2','3','4','5','6','7','8','9','*','0','#']
                 Button {
                     id: button1
+                    objectName: "Dialer::" + modelData.toString()
                     text: modelData
                     //15, 20 spacings divided by columns & rows accordingly
                     Layout.preferredWidth: (parent.width - 15) / 3
@@ -87,6 +89,7 @@ UIScreen {
 
         GridLayout {
             id: dialButtons
+            objectName: "Dialer::DialButtons"
             width: Style.hspan(8.5)
             //20 the spacing and 4 rows
             height: (Style.vspan(10) - 20) / 4
@@ -97,6 +100,7 @@ UIScreen {
             columnSpacing: 5
             Button {
                 id: dialButton
+                objectName: "Dialer::Dial"
                 text: "Dial"
                 Layout.preferredWidth: (parent.width / 2) - 4
                 Layout.preferredHeight: parent.height
@@ -105,6 +109,7 @@ UIScreen {
                 }
             }
             Button {
+                objectName: "Dialer::DeleteButton"
                 Layout.preferredWidth: dialButton.width
                 Layout.preferredHeight: dialButton.height
                 text: "\u232b " + "Delete"
diff --git a/apps/com.pelagicore.phone/Phone.qml b/apps/com.pelagicore.phone/Phone.qml
index 9c08570..a72c6b3 100644
--- a/apps/com.pelagicore.phone/Phone.qml
+++ b/apps/com.pelagicore.phone/Phone.qml
@@ -56,6 +56,7 @@ import "models"
 
 AppUIScreen {
     id: root
+    objectName: "Neptune_Phone_App"
     title: "Neptune Phone App"
 
     /*! Internal */
@@ -85,17 +86,21 @@ AppUIScreen {
 
 
     Page {
+        objectName: "Phone::ContentArea"
         width: parent.width
         header: TabBar {
             id: bar
             TabButton {
+                objectName: "Phone::DialerTab"
                 enabled: PhoneModel.isAnyDevicePaired
                 text: qsTr("Dialer")
             }
             TabButton {
+                objectName: "Phone::DevicesTab"
                 text: qsTr("Devices")
             }
             TabButton {
+                objectName: "Phone::ContactListTab"
                 enabled: PhoneModel.isAnyDevicePaired
                 text: qsTr("Contacts List")
             }
diff --git a/apps/com.pelagicore.radio/Radio.qml b/apps/com.pelagicore.radio/Radio.qml
index cf84e1c..1ed2751 100644
--- a/apps/com.pelagicore.radio/Radio.qml
+++ b/apps/com.pelagicore.radio/Radio.qml
@@ -37,6 +37,7 @@ import "."
 
 AppUIScreen {
     id: root
+    objectName: "Neptune_Radio_Player"
     title: "Neptune Radio Player"
 
     onClusterKeyPressed: {
diff --git a/apps/com.theqtcompany.i18ndemo/I18NDemo.qml b/apps/com.theqtcompany.i18ndemo/I18NDemo.qml
index e4b9532..fc2ec3a 100644
--- a/apps/com.theqtcompany.i18ndemo/I18NDemo.qml
+++ b/apps/com.theqtcompany.i18ndemo/I18NDemo.qml
@@ -38,6 +38,7 @@ import com.theqtcompany.comtqci18ndemo 1.0
 
 AppUIScreen {
     id: root
+    objectName : "i18NDemo"
 
     UIScreen {
 
diff --git a/imports/shared/controls/TabView.qml b/imports/shared/controls/TabView.qml
index c4cd476..fb05be6 100644
--- a/imports/shared/controls/TabView.qml
+++ b/imports/shared/controls/TabView.qml
@@ -54,6 +54,7 @@ Control {
         Repeater {
             id: repeater
             TabButton {
+                objectName: root.parent.objectName + "_" + modelData.title
                 property real maxTabWidth: repeater.count ? root.width / repeater.count : root.width
                 width: Math.min(maxTabWidth, root.tabWidth)
                 height: root.tabHeight
diff --git a/imports/shared/controls/Tool.qml b/imports/shared/controls/Tool.qml
index b9764a3..a482b71 100644
--- a/imports/shared/controls/Tool.qml
+++ b/imports/shared/controls/Tool.qml
@@ -44,6 +44,7 @@ ToolButton {
     Behavior on scale { NumberAnimation { duration: 25 } }
 
     indicator: Image {
+        objectName: root.objectName ? root.objectName + "Image" : root.parent.objectName + "ToolButtonImage"
         anchors.centerIn: parent
         source: root.symbol ? Style.symbol(root.symbol, root.size, root.checked) : ""
     }
diff --git a/sysui/popup/PopupHeader.qml b/sysui/popup/PopupHeader.qml
index 469d269..c0a2741 100644
--- a/sysui/popup/PopupHeader.qml
+++ b/sysui/popup/PopupHeader.qml
@@ -36,6 +36,7 @@ import utils 1.0
 
 Item {
     id: root
+    objectName: "PopupHeader::" + title.text
 
     property alias title: title.text
     property alias subtitle: subtitle.text
diff --git a/sysui/windowoverview/WindowOverview.qml b/sysui/windowoverview/WindowOverview.qml
index 35a5f35..40bfdc8 100644
--- a/sysui/windowoverview/WindowOverview.qml
+++ b/sysui/windowoverview/WindowOverview.qml
@@ -101,7 +101,7 @@ Item {
 
         delegate: Item {
             id: delegate
-            objectName: "WindowOverview::" + model.item
+            objectName: "WindowOverview::" + ApplicationManagerModel.appIdFromWindow(model.item)
             width: gridView.cellWidth
             height: gridView.cellHeight
             property int padding: gridView.padding
@@ -113,6 +113,7 @@ Item {
             }
 
             MouseArea {
+                objectName: delegate.objectName + "Content"
                 anchors.fill: parent
                 onClicked: {
                     ApplicationManager.startApplication(ApplicationManagerModel.appIdFromWindow(model.item))
@@ -127,7 +128,7 @@ Item {
             }
 
             Tool {
-                objectName: "WindowOverview::AppManClose"
+                objectName: delegate.objectName + "CloseButton"
                 anchors.top: parent.top
                 anchors.right: parent.right