aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>2019-02-12 12:06:07 +0100
committerBramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>2019-02-12 15:27:47 +0000
commiteba517afc4091adc3a3a411be3e50c61f0fa7411 (patch)
treedf355ef1f66537279cb04a9248b0d5c89a3688f2
parent0162e139dd0a6b6099b082f5c76bdd88b0133787 (diff)
[music] hide busy indicator and show warning when no media is available
- busy indicator consumes quite a lot of CPU to render its animation Task-number: AUTOSUITE-770 Change-Id: Ie7ae053f8fc40cbcc76c137c611afe0ea0919963 Reviewed-by: Egor Nemtsev <enemtsev@luxoft.com>
-rw-r--r--apps/com.pelagicore.music/panels/AlbumArtPanel.qml43
-rw-r--r--apps/com.pelagicore.music/views/WidgetContentView.qml2
-rw-r--r--imports_shared/assets/translations/ar-MA.ts7
-rw-r--r--imports_shared/assets/translations/cs_CZ.ts7
-rw-r--r--imports_shared/assets/translations/de_DE.ts7
-rw-r--r--imports_shared/assets/translations/en_GB.ts7
-rw-r--r--imports_shared/assets/translations/en_US.ts7
-rw-r--r--imports_shared/assets/translations/ja_JP.ts7
-rw-r--r--imports_shared/assets/translations/ko_KR.ts7
-rw-r--r--imports_shared/assets/translations/zh_CN.ts7
10 files changed, 90 insertions, 11 deletions
diff --git a/apps/com.pelagicore.music/panels/AlbumArtPanel.qml b/apps/com.pelagicore.music/panels/AlbumArtPanel.qml
index 1dafb162..c5679f18 100644
--- a/apps/com.pelagicore.music/panels/AlbumArtPanel.qml
+++ b/apps/com.pelagicore.music/panels/AlbumArtPanel.qml
@@ -160,21 +160,44 @@ Item {
}
}
- Item {
+ Loader {
id: searchingMedia
width: Sizes.dp(180)
height: width
- opacity: root.mediaReady ? 0.0 : 1.0
- Behavior on opacity { DefaultNumberAnimation {} }
- visible: opacity > 0
anchors.centerIn: coverslide
+ active: !root.mediaReady
+ sourceComponent: Item {
+ BusyIndicator {
+ id: busyIndicator
+ anchors.centerIn: parent
+ Behavior on opacity { DefaultNumberAnimation {} }
+ visible: opacity > 0.0
+ running: visible
+ width: Sizes.dp(60)
+ height: Sizes.dp(60)
+ }
- BusyIndicator {
- anchors.centerIn: parent
- visible: parent.visible
- running: visible
- width: Sizes.dp(60)
- height: Sizes.dp(60)
+ Label {
+ id: warningLabel
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.left
+ anchors.leftMargin: root.parentStateMaximized === "Maximized"? Sizes.dp(300) : 0
+ Behavior on anchors.leftMargin { DefaultNumberAnimation {} }
+ opacity: 0.0
+ text: qsTr("There are no music available")
+ Behavior on opacity { DefaultNumberAnimation {} }
+ }
+
+ Timer {
+ running: busyIndicator.running
+ interval: 5000
+ onTriggered: {
+ if (!root.mediaReady) {
+ busyIndicator.opacity = 0.0;
+ warningLabel.opacity = 1.0;
+ }
+ }
+ }
}
}
diff --git a/apps/com.pelagicore.music/views/WidgetContentView.qml b/apps/com.pelagicore.music/views/WidgetContentView.qml
index f7f2f57b..4ddb2d7e 100644
--- a/apps/com.pelagicore.music/views/WidgetContentView.qml
+++ b/apps/com.pelagicore.music/views/WidgetContentView.qml
@@ -133,7 +133,7 @@ Item {
currentIndex: store.musicPlaylist.currentIndex
currentSongTitle: store.currentEntry ? root.store.currentEntry.title : ""
currentArtisName: store.currentEntry ? root.store.currentEntry.artist : ""
- parentStateMaximized: state === "Maximized"
+ parentStateMaximized: root.state === "Maximized"
mediaReady: store.searchAndBrowseModel.count > 0
musicPlaying: store.playing
onPlayClicked: store.playSong()
diff --git a/imports_shared/assets/translations/ar-MA.ts b/imports_shared/assets/translations/ar-MA.ts
index 6808a66d..1b94f65f 100644
--- a/imports_shared/assets/translations/ar-MA.ts
+++ b/imports_shared/assets/translations/ar-MA.ts
@@ -82,6 +82,13 @@
</message>
</context>
<context>
+ <name>AlbumArtPanel</name>
+ <message>
+ <source>There are no music available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CalendarToolsColumn</name>
<message>
<source>year</source>
diff --git a/imports_shared/assets/translations/cs_CZ.ts b/imports_shared/assets/translations/cs_CZ.ts
index a36d3401..7b2e3ab9 100644
--- a/imports_shared/assets/translations/cs_CZ.ts
+++ b/imports_shared/assets/translations/cs_CZ.ts
@@ -122,6 +122,13 @@ UX na cestu</translation>
</message>
</context>
<context>
+ <name>AlbumArtPanel</name>
+ <message>
+ <source>There are no music available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>AppStoreServer</name>
<message>
<source>%1 Successfully Installed</source>
diff --git a/imports_shared/assets/translations/de_DE.ts b/imports_shared/assets/translations/de_DE.ts
index 593c6907..a5fdd24e 100644
--- a/imports_shared/assets/translations/de_DE.ts
+++ b/imports_shared/assets/translations/de_DE.ts
@@ -101,6 +101,13 @@
</message>
</context>
<context>
+ <name>AlbumArtPanel</name>
+ <message>
+ <source>There are no music available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ApplicationStoreContent</name>
<message>
<source>No apps found!</source>
diff --git a/imports_shared/assets/translations/en_GB.ts b/imports_shared/assets/translations/en_GB.ts
index 45dd6615..2398ac10 100644
--- a/imports_shared/assets/translations/en_GB.ts
+++ b/imports_shared/assets/translations/en_GB.ts
@@ -82,6 +82,13 @@
</message>
</context>
<context>
+ <name>AlbumArtPanel</name>
+ <message>
+ <source>There are no music available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CalendarToolsColumn</name>
<message>
<source>year</source>
diff --git a/imports_shared/assets/translations/en_US.ts b/imports_shared/assets/translations/en_US.ts
index 80266381..2eba2cf4 100644
--- a/imports_shared/assets/translations/en_US.ts
+++ b/imports_shared/assets/translations/en_US.ts
@@ -82,6 +82,13 @@
</message>
</context>
<context>
+ <name>AlbumArtPanel</name>
+ <message>
+ <source>There are no music available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CalendarToolsColumn</name>
<message>
<source>year</source>
diff --git a/imports_shared/assets/translations/ja_JP.ts b/imports_shared/assets/translations/ja_JP.ts
index d29fed84..c3060da3 100644
--- a/imports_shared/assets/translations/ja_JP.ts
+++ b/imports_shared/assets/translations/ja_JP.ts
@@ -101,6 +101,13 @@
</message>
</context>
<context>
+ <name>AlbumArtPanel</name>
+ <message>
+ <source>There are no music available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ApplicationStoreContent</name>
<message>
<source>No apps found!</source>
diff --git a/imports_shared/assets/translations/ko_KR.ts b/imports_shared/assets/translations/ko_KR.ts
index c9a81206..8c72deec 100644
--- a/imports_shared/assets/translations/ko_KR.ts
+++ b/imports_shared/assets/translations/ko_KR.ts
@@ -108,6 +108,13 @@
</message>
</context>
<context>
+ <name>AlbumArtPanel</name>
+ <message>
+ <source>There are no music available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ApplicationStoreContent</name>
<message>
<source>No apps found!</source>
diff --git a/imports_shared/assets/translations/zh_CN.ts b/imports_shared/assets/translations/zh_CN.ts
index aa2d714a..68249220 100644
--- a/imports_shared/assets/translations/zh_CN.ts
+++ b/imports_shared/assets/translations/zh_CN.ts
@@ -108,6 +108,13 @@
</message>
</context>
<context>
+ <name>AlbumArtPanel</name>
+ <message>
+ <source>There are no music available</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ApplicationStoreContent</name>
<message>
<source>No apps found!</source>