diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 77b204839..e92e56f1a 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -327,6 +327,7 @@ if(ANDROID) "kt-restore-defaults-symbolic" "user-symbolic" "mark-location-symbolic" + "amarok_playcount" ${KIRIGAMI_ADDONS_ICONS} ) diff --git a/src/chatbar/ChatBar.qml b/src/chatbar/ChatBar.qml index 15957e3e9..b74e6d4e3 100644 --- a/src/chatbar/ChatBar.qml +++ b/src/chatbar/ChatBar.qml @@ -375,7 +375,9 @@ QQC2.Control { id: actionDelegate required property BusyAction modelData icon.name: modelData.isBusy ? "" : (modelData.icon.name.length > 0 ? modelData.icon.name : modelData.icon.source) - onClicked: modelData.trigger() + onClicked: if (!pieProgress.visible) { + modelData.trigger() + } padding: Kirigami.Units.smallSpacing @@ -383,7 +385,9 @@ QQC2.Control { QQC2.ToolTip.text: modelData.tooltip QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay - contentItem: PieProgressBar { + PieProgressBar { + id: pieProgress + anchors.fill: parent visible: actionDelegate.modelData.isBusy progress: root.currentRoom.fileUploadingProgress }