Lubuntu/liblxqt-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cherry-picking upstream version 0.9.0+20151026.

Browse Source
This commit is contained in:
Alf Gaida 2015-10-29 19:07:52 +01:00
parent d5e53f6f13
commit b2379e7bff
4 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -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 * Remove --list-missing from rules, it's included in --fail-missing
* Fixed Symbols * Fixed Symbols
-- Alf Gaida <agaida@siduction.org> Sat, 24 Oct 2015 18:56:32 +0200 -- Alf Gaida <agaida@siduction.org> Thu, 29 Oct 2015 19:05:56 +0100
liblxqt (0.9.0+20150911-2) experimental; urgency=medium liblxqt (0.9.0+20150911-2) experimental; urgency=medium

3
lxqtgridlayout.cpp
View File

@ -50,8 +50,7 @@ namespace
ItemMoveAnimation(QLayoutItem *item) ItemMoveAnimation(QLayoutItem *item)
: mItem(item) : mItem(item)
{ {
setEasingCurve(QEasingCurve::OutBack); setDuration(150);
setDuration(250);
} }
void updateCurrentValue(const QVariant &current) void updateCurrentValue(const QVariant &current)

19
lxqtpower/lxqtpower.cpp
View File

@ -34,10 +34,8 @@
using namespace LXQt; using namespace LXQt;
Power::Power(QObject *parent) : Power::Power(QObject *parent) :
QObject(parent), QObject(parent)
mScreenSaver(this)
{ {
connect(&mScreenSaver, SIGNAL(done()), &mLoop, SLOT(quit()));
mProviders.append(new CustomProvider(this)); mProviders.append(new CustomProvider(this));
mProviders.append(new SystemdProvider(this)); mProviders.append(new SystemdProvider(this));
mProviders.append(new UPowerProvider(this)); mProviders.append(new UPowerProvider(this));
@ -68,18 +66,11 @@ bool Power::doAction(Power::Action action)
{ {
foreach(PowerProvider* provider, mProviders) foreach(PowerProvider* provider, mProviders)
{ {
if (provider->canAction(action)) if (provider->canAction(action) &&
provider->doAction(action)
)
{ {
if (action == PowerSuspend || action == PowerHibernate) return true;
{
mScreenSaver.lockScreen();
mLoop.exec();
}
if (provider->doAction(action))
{
return true;
}
return false;
} }
} }
return false; return false;

4
lxqtpower/lxqtpower.h
View File

@ -31,8 +31,6 @@
#include <QObject> #include <QObject>
#include <QList> #include <QList>
#include <QEventLoop>
#include "lxqtscreensaver.h"
#include "lxqtglobals.h" #include "lxqtglobals.h"
namespace LXQt namespace LXQt
@ -103,8 +101,6 @@ public slots:
private: private:
QList<PowerProvider*> mProviders; QList<PowerProvider*> mProviders;
LXQt::ScreenSaver mScreenSaver;
QEventLoop mLoop;
}; };
} // namespace LXQt } // namespace LXQt