Commit 21afbe60 authored by Nate Graham's avatar Nate Graham
Browse files

Merge branch 'release/20.12'

parents 05976910 afaf25d8
Pipeline #47818 passed with stage
in 9 minutes and 50 seconds
......@@ -88,6 +88,13 @@ ecm_qt_declare_logging_category(elisaLib_SOURCES
DEFAULT_SEVERITY Info
)
ecm_qt_declare_logging_category(elisaLib_SOURCES
HEADER "powerManagementLogging.h"
IDENTIFIER "orgKdeElisaPowerManagement"
CATEGORY_NAME "org.kde.elisa.powermanagement"
DEFAULT_SEVERITY Info
)
if (LIBVLC_FOUND)
ecm_qt_declare_logging_category(elisaLib_SOURCES
HEADER "vlcLogging.h"
......
......@@ -8,6 +8,8 @@
#include "config-upnp-qt.h"
#include "powerManagementLogging.h"
#include <KLocalizedString>
#if defined Qt5DBus_FOUND && Qt5DBus_FOUND
......@@ -28,7 +30,7 @@
#include <QCoreApplication>
#include <QDebug>
#include <QLoggingCategory>
class PowerManagementInterfacePrivate
{
......@@ -119,7 +121,7 @@ void PowerManagementInterface::uninhibitDBusCallFinishedPlasmaWorkspace(QDBusPen
#if defined Qt5DBus_FOUND && Qt5DBus_FOUND
QDBusPendingReply<> reply = *aWatcher;
if (reply.isError()) {
qDebug() << "PowerManagementInterface::uninhibitDBusCallFinished" << reply.error();
qCDebug(orgKdeElisaPowerManagement()) << "PowerManagementInterface::uninhibitDBusCallFinished" << reply.error();
} else {
d->mInhibitedSleep = false;
......@@ -134,7 +136,7 @@ void PowerManagementInterface::inhibitDBusCallFinishedGnomeWorkspace(QDBusPendin
#if defined Qt5DBus_FOUND && Qt5DBus_FOUND
QDBusPendingReply<uint> reply = *aWatcher;
if (reply.isError()) {
qDebug() << "PowerManagementInterface::inhibitDBusCallFinishedGnomeWorkspace" << reply.error();
qCDebug(orgKdeElisaPowerManagement()) << "PowerManagementInterface::inhibitDBusCallFinishedGnomeWorkspace" << reply.error();
} else {
d->mInhibitSleepCookie = reply.argumentAt<0>();
d->mInhibitedSleep = true;
......@@ -150,7 +152,7 @@ void PowerManagementInterface::uninhibitDBusCallFinishedGnomeWorkspace(QDBusPend
#if defined Qt5DBus_FOUND && Qt5DBus_FOUND
QDBusPendingReply<> reply = *aWatcher;
if (reply.isError()) {
qDebug() << "PowerManagementInterface::uninhibitDBusCallFinished" << reply.error();
qCDebug(orgKdeElisaPowerManagement()) << "PowerManagementInterface::uninhibitDBusCallFinished" << reply.error();
} else {
d->mInhibitedSleep = false;
......
......@@ -140,9 +140,9 @@ FocusScope {
icon.name: 'media-track-show-active'
enabled: ElisaApplication.mediaPlayListProxyModel ? ElisaApplication.mediaPlayListProxyModel.tracksCount > 0 : false
onClicked: {
playListView.positionViewAtIndex(ElisaApplication.mediaPlayListProxyModel.currentTrackRow, ListView.Contain)
playListView.currentIndex = ElisaApplication.mediaPlayListProxyModel.currentTrackRow
playListView.currentItem.forceActiveFocus()
playListView.listView.positionViewAtIndex(ElisaApplication.mediaPlayListProxyModel.currentTrackRow, ListView.Contain)
playListView.listView.currentIndex = ElisaApplication.mediaPlayListProxyModel.currentTrackRow
playListView.listView.currentItem.forceActiveFocus()
}
},
FlatButtonWithToolTip {
......
......@@ -14,6 +14,7 @@ ScrollView {
id: scrollView
property alias playListModel: playListModelDelegate.model
property alias listView: playListView
property string title
signal startPlayback()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment