Cherry-picked upstream version 0.9.0+20150914.

Fixed debian/.gitignore
Switched to experimental because of LXQt namespace change
Added minimum version for liblxqt0-dev (>= 0.9.0+20150911)
ubuntu/cosmic
Alf Gaida 9 years ago
parent 67f723c0a4
commit 68207d1ebb

@ -1,9 +1,10 @@
/*
* File: Settings.h
* Author: christian
*
* Created on 15. februar 2014, 11:44
*/
* Copyright (c) 2014 Christian Surlykke
*
* This file is part of the LXQt project. <http://lxqt.org>
* It is distributed under the LGPL 2.1 or later license.
* Please refer to the LICENSE file for a copy of the license.
*/
#ifndef POWER_MANAGEMENT_SETTINGS_H
#define POWER_MANAGEMENT_SETTINGS_H

@ -6,6 +6,6 @@ Comment=Various settings regarding Power Management like battery or idleness wat
Exec=lxqt-config-powermanagement
Icon=preferences-system-power-management
Categories=Settings;DesktopSettings;Qt;LXQt;
OnlyShowIn=LXQt;LXDE;
OnlyShowIn=LXQt;
#TRANSLATIONS_DIR=translations

2
debian/.gitignore vendored

@ -5,5 +5,3 @@
/lxqt-powermanagement/
/lxqt-powermanagement-dbg/
/lxqt-powermanagement-qt5/
/lxqt-powermanagement-qt5-dbg/

8
debian/changelog vendored

@ -1,12 +1,14 @@
lxqt-powermanagement (0.9.0+20150831-1) unstable; urgency=medium
lxqt-powermanagement (0.9.0+20150914-1) experimental; urgency=medium
* Cherry-picking upstream version 0.9.0+20150831.
* Cherry-picking upstream version 0.9.0+20150914.
* Removed breaks/replaces
* Fixed control with cme fix
* Added upstream signing key and use it in watch file
* Added linker flags -Wl,--as-needed
* Switched to experimental because of LXQt namespace change
* Added minimum version for liblxqt0-dev (>= 0.9.0+20150911)
-- Alf Gaida <agaida@siduction.org> Thu, 03 Sep 2015 00:50:01 +0200
-- Alf Gaida <agaida@siduction.org> Fri, 25 Sep 2015 17:57:33 +0200
lxqt-powermanagement (0.9.0+20150807-1) unstable; urgency=medium

2
debian/control vendored

@ -9,7 +9,7 @@ Build-Depends: cmake (>= 3.0.2),
debhelper (>= 9),
libkf5solid-dev,
libkf5windowsystem-dev,
liblxqt0-dev,
liblxqt0-dev (>=0.9.0_20150911),
libx11-dev,
libx11-xcb-dev,
libxcb-dpms0-dev,

@ -1,3 +1,11 @@
/*
* Copyright (c) 2014 Christian Surlykke
*
* This file is part of the LXQt project. <http://lxqt.org>
* It is distributed under the LGPL 2.1 or later license.
* Please refer to the LICENSE file for a copy of the license.
*/
#include "batteryinfodialog.h"
#include "ui_batteryinfodialog.h"

@ -1,3 +1,11 @@
/*
* Copyright (c) 2014 Christian Surlykke
*
* This file is part of the LXQt project. <http://lxqt.org>
* It is distributed under the LGPL 2.1 or later license.
* Please refer to the LICENSE file for a copy of the license.
*/
#ifndef BATTERYINFODIALOG_H
#define BATTERYINFODIALOG_H

@ -1,3 +1,10 @@
/*
* Copyright (c) 2014, 2015 Christian Surlykke, Paulo Lieuthier
*
* This file is part of the LXQt project. <http://lxqt.org>
* It is distributed under the LGPL 2.1 or later license.
* Please refer to the LICENSE file for a copy of the license.
*/
#include "iconproducer.h"
#include <LXQt/Settings>
#include <XdgIcon>

@ -1,3 +1,11 @@
/*
* Copyright (c) 2014 Christian Surlykke
*
* This file is part of the LXQt project. <http://lxqt.org>
* It is distributed under the LGPL 2.1 or later license.
* Please refer to the LICENSE file for a copy of the license.
*/
#ifndef ICONPRODUCER_H
#define ICONPRODUCER_H
#include <QString>

@ -34,22 +34,25 @@
Lid::Lid()
{
mUPowerInterface = new QDBusInterface("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower",
QDBusConnection::systemBus(), this);
mUPowerPropertiesInterface = new QDBusInterface("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties",
mUPowerInterface = new QDBusInterface("org.freedesktop.UPower",
"/org/freedesktop/UPower",
"org.freedesktop.UPower",
QDBusConnection::systemBus(), this);
if (! connect(mUPowerInterface, SIGNAL(Changed()), this, SLOT(uPowerChange())))
{
qDebug() << "Could not connect to org.freedesktop.UPower.changed(), connecting to org.freedesktop.DBus.Properties.PropertiesChanged(..) instead";
QDBusConnection::systemBus().connect("org.freedesktop.UPower",
"/org/freedesktop/UPower",
"org.freedesktop.DBus.Properties",
"PropertiesChanged",
this,
SLOT(uPowerChange()));
}
mIsClosed = mUPowerPropertiesInterface->property("LidIsClosed").toBool();
mUPowerPropertiesInterface = new QDBusInterface("org.freedesktop.UPower",
"/org/freedesktop/UPower",
"org.freedesktop.DBus.Properties",
QDBusConnection::systemBus(), this);
if (!QDBusConnection::systemBus().connect("org.freedesktop.UPower",
"/org/freedesktop/UPower",
"org.freedesktop.DBus.Properties",
"PropertiesChanged",
this,
SLOT(uPowerChange())))
qDebug() << "Could not connect to org.freedesktop.DBus.Properties.PropertiesChanged()";
mIsClosed = mUPowerPropertiesInterface->property("LidIsClosed").toBool();
}
bool Lid::haveLid()
@ -62,7 +65,6 @@ bool Lid::onBattery()
return mUPowerInterface->property("OnBattery").toBool();
}
void Lid::uPowerChange()
{
bool newIsClosed = mUPowerInterface->property("LidIsClosed").toBool();

@ -1,9 +1,10 @@
/*
* File: powermanagementd.h
* Author: Christian Surlykke
*
* Created on 9. februar 2014, 16:15
*/
* Copyright (c) 2014 Christian Surlykke
*
* This file is part of the LXQt project. <http://lxqt.org>
* It is distributed under the LGPL 2.1 or later license.
* Please refer to the LICENSE file for a copy of the license.
*/
#ifndef POWERMANAGEMENTD_H
#define POWERMANAGEMENTD_H

@ -1,3 +1,11 @@
/*
* Copyright (c) 2014,2015 Christian Surlykke, Paulo Lieuthier
*
* This file is part of the LXQt project. <http://lxqt.org>
* It is distributed under the LGPL 2.1 or later license.
* Please refer to the LICENSE file for a copy of the license.
*/
#ifndef WATCHER_H
#define WATCHER_H

Loading…
Cancel
Save