diff --git a/debian/changelog b/debian/changelog index 788566b..1d1f309 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -liblxqt (0.9.0+20151024-1) experimental; urgency=medium +liblxqt (0.9.0+20151026-1) experimental; urgency=medium - * Cherry-picked upstream-version 0.9.0+20151024. + * Cherry-picked upstream-version 0.9.0+20151026. * Remove --list-missing from rules, it's included in --fail-missing * Fixed Symbols - -- Alf Gaida Sat, 24 Oct 2015 18:56:32 +0200 + -- Alf Gaida Thu, 29 Oct 2015 19:05:56 +0100 liblxqt (0.9.0+20150911-2) experimental; urgency=medium diff --git a/lxqtgridlayout.cpp b/lxqtgridlayout.cpp index 998d447..892cf6e 100644 --- a/lxqtgridlayout.cpp +++ b/lxqtgridlayout.cpp @@ -50,8 +50,7 @@ namespace ItemMoveAnimation(QLayoutItem *item) : mItem(item) { - setEasingCurve(QEasingCurve::OutBack); - setDuration(250); + setDuration(150); } void updateCurrentValue(const QVariant ¤t) diff --git a/lxqtpower/lxqtpower.cpp b/lxqtpower/lxqtpower.cpp index 3585227..742793b 100644 --- a/lxqtpower/lxqtpower.cpp +++ b/lxqtpower/lxqtpower.cpp @@ -34,10 +34,8 @@ using namespace LXQt; Power::Power(QObject *parent) : - QObject(parent), - mScreenSaver(this) + QObject(parent) { - connect(&mScreenSaver, SIGNAL(done()), &mLoop, SLOT(quit())); mProviders.append(new CustomProvider(this)); mProviders.append(new SystemdProvider(this)); mProviders.append(new UPowerProvider(this)); @@ -68,18 +66,11 @@ bool Power::doAction(Power::Action action) { foreach(PowerProvider* provider, mProviders) { - if (provider->canAction(action)) + if (provider->canAction(action) && + provider->doAction(action) + ) { - if (action == PowerSuspend || action == PowerHibernate) - { - mScreenSaver.lockScreen(); - mLoop.exec(); - } - if (provider->doAction(action)) - { - return true; - } - return false; + return true; } } return false; diff --git a/lxqtpower/lxqtpower.h b/lxqtpower/lxqtpower.h index c85e2e2..f738b46 100644 --- a/lxqtpower/lxqtpower.h +++ b/lxqtpower/lxqtpower.h @@ -31,8 +31,6 @@ #include #include -#include -#include "lxqtscreensaver.h" #include "lxqtglobals.h" namespace LXQt @@ -103,8 +101,6 @@ public slots: private: QList mProviders; - LXQt::ScreenSaver mScreenSaver; - QEventLoop mLoop; }; } // namespace LXQt