Skip to content

Commit

Permalink
more wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@rodlie
rodlie committed Oct 12, 2018
1 parent 9aa7ee5 commit 054afc5
Show file tree
Hide file tree
Showing 8 changed files with 608 additions and 224 deletions.
75 changes: 35 additions & 40 deletions app/dialog.cpp
View file
Expand Up @@ -7,8 +7,6 @@
*/

#include "dialog.h"
#include "login1.h"
#include "ckit.h"

Dialog::Dialog(QWidget *parent)
: QDialog(parent)
Expand Down Expand Up @@ -50,15 +48,15 @@ Dialog::Dialog(QWidget *parent)
// setup dialog
setAttribute(Qt::WA_QuitOnClose, true);
setWindowTitle(tr("Power Manager"));
setMinimumSize(QSize(387, 309));
setMinimumSize(QSize(390, 310));

// setup dbus
QDBusConnection session = QDBusConnection::sessionBus();
dbus = new QDBusInterface(PD_SERVICE, PD_PATH, PD_SERVICE,
session, this);

// setup man
man = new Power(this);
man = new PowerKit(this);

// setup theme
Common::setIconTheme();
Expand Down Expand Up @@ -566,11 +564,11 @@ Dialog::Dialog(QWidget *parent)
this, SLOT(handleBacklightSlider(int)));
connect(backlightWatcher, SIGNAL(fileChanged(QString)),
this, SLOT(updateBacklight(QString)));
connect(man, SIGNAL(updatedDevices()),
connect(man, SIGNAL(UpdatedDevices()),
this, SLOT(checkDevices()));
connect(man, SIGNAL(deviceWasRemoved(QString)),
connect(man, SIGNAL(DeviceWasRemoved(QString)),
this, SLOT(deviceRemove(QString)));
connect(man, SIGNAL(deviceWasAdded(QString)),
connect(man, SIGNAL(DeviceWasAdded(QString)),
this, SLOT(handleDeviceAdded(QString)));
connect(backlightBatteryCheck, SIGNAL(toggled(bool)),
this, SLOT(handleBacklightBatteryCheck(bool)));
Expand All @@ -584,6 +582,18 @@ Dialog::Dialog(QWidget *parent)
this, SLOT(handleBacklightBatteryCheckLower(bool)));
connect(backlightACHigherCheck, SIGNAL(toggled(bool)),
this, SLOT(handleBacklightACCheckHigher(bool)));


// test PKIT
qDebug() << "has battery?" <<man->HasBattery();
qDebug() << "has ckit?" << man->HasConsoleKit();
qDebug() << "has logind?" << man->HasLogind();
qDebug() << "has upower?" << man->HasUPower();
qDebug() << "can hibernate?" << man->CanHibernate();
qDebug() << "can hybridsleep?" << man->CanHybridSleep();
qDebug() << "can poweroff?" << man->CanPowerOff();
qDebug() << "can restart?" << man->CanRestart();
qDebug() << "can suspend?" << man->CanSuspend();
}

Dialog::~Dialog()
Expand Down Expand Up @@ -734,15 +744,10 @@ void Dialog::loadSettings()
}
disableLidAction->setChecked(defaultDisableLidAction);

if (Login1::hasService()) {
sleepButton->setEnabled(Login1::canSuspend());
hibernateButton->setEnabled(Login1::canHibernate());
poweroffButton->setEnabled(Login1::canPowerOff());
} else {
sleepButton->setEnabled(UPower::canSuspend());
hibernateButton->setEnabled(UPower::canHibernate());
poweroffButton->setEnabled(CKit::canPowerOff());
}
// power actions
sleepButton->setEnabled(man->CanSuspend());
hibernateButton->setEnabled(man->CanHibernate());
poweroffButton->setEnabled(man->CanPowerOff());

checkPerms();

Expand Down Expand Up @@ -920,17 +925,12 @@ void Dialog::handleAutoSleepACAction(int index)

void Dialog::handleLockscreenButton()
{
QProcess proc;
proc.start(XSCREENSAVER_LOCK);
proc.waitForFinished();
proc.close();
man->LockScreen();
}

void Dialog::handleSleepButton()
{
if (Login1::hasService()) {
if (Login1::canSuspend()) { Login1::suspend(); }
} else if (UPower::canSuspend()) { UPower::suspend(); }
if (man->CanSuspend()) { man->Suspend(); }
else {
QMessageBox::information(this,
tr("Power Action"),
Expand All @@ -942,9 +942,7 @@ void Dialog::handleSleepButton()

void Dialog::handleHibernateButton()
{
if (Login1::hasService()) {
if (Login1::canHibernate()) { Login1::hibernate(); }
} else if (UPower::canHibernate()) { UPower::hibernate(); }
if (man->CanHibernate()) { man->Hibernate(); }
else {
QMessageBox::information(this,
tr("Power Action"),
Expand All @@ -956,11 +954,8 @@ void Dialog::handleHibernateButton()

void Dialog::handlePoweroffButton()
{
if (Login1::hasService()) {
if (Login1::canPowerOff()) { Login1::poweroff(); }
} else if (CKit::hasService()) {
if (CKit::canPowerOff()) { CKit::poweroff(); }
} else {
if (man->CanPowerOff()) { man->PowerOff(); }
else {
QMessageBox::information(this,
tr("Power Action"),
tr("System denied power request."
Expand Down Expand Up @@ -1047,29 +1042,29 @@ void Dialog::checkDevices()
{
qDebug() << "check devices!";
QIcon icon = QIcon::fromTheme(DEFAULT_BATTERY_ICON);
double left = man->batteryLeft();
double left = man->BatteryLeft();
if (left<= 10) {
icon = QIcon::fromTheme(man->onBattery()?DEFAULT_BATTERY_ICON_CRIT:DEFAULT_BATTERY_ICON_CRIT_AC);
icon = QIcon::fromTheme(man->OnBattery()?DEFAULT_BATTERY_ICON_CRIT:DEFAULT_BATTERY_ICON_CRIT_AC);
} else if (left<=25) {
icon = QIcon::fromTheme(man->onBattery()?DEFAULT_BATTERY_ICON_LOW:DEFAULT_BATTERY_ICON_LOW_AC);
icon = QIcon::fromTheme(man->OnBattery()?DEFAULT_BATTERY_ICON_LOW:DEFAULT_BATTERY_ICON_LOW_AC);
} else if (left<=75) {
icon = QIcon::fromTheme(man->onBattery()?DEFAULT_BATTERY_ICON_GOOD:DEFAULT_BATTERY_ICON_GOOD_AC);
icon = QIcon::fromTheme(man->OnBattery()?DEFAULT_BATTERY_ICON_GOOD:DEFAULT_BATTERY_ICON_GOOD_AC);
} else if (left<=90) {
icon = QIcon::fromTheme(man->onBattery()?DEFAULT_BATTERY_ICON_FULL:DEFAULT_BATTERY_ICON_FULL_AC);
icon = QIcon::fromTheme(man->OnBattery()?DEFAULT_BATTERY_ICON_FULL:DEFAULT_BATTERY_ICON_FULL_AC);
} else {
icon = QIcon::fromTheme(man->onBattery()?DEFAULT_BATTERY_ICON_FULL:DEFAULT_BATTERY_ICON_CHARGED);
if (left>=100 && !man->onBattery()) {
icon = QIcon::fromTheme(man->OnBattery()?DEFAULT_BATTERY_ICON_FULL:DEFAULT_BATTERY_ICON_CHARGED);
if (left>=100 && !man->OnBattery()) {
icon = QIcon::fromTheme(DEFAULT_AC_ICON);
batteryLeftLCD->display("00:00");
}
}

batteryIcon->setPixmap(icon.pixmap(QSize(48, 48)));
batteryLabel->setText(QString("<h1 style=\"font-weight:normal;\">%1%</h1>").arg(left));
batteryLeftLCD->display(QDateTime::fromTime_t(man->onBattery()?man->timeToEmpty():man->timeToFull())
batteryLeftLCD->display(QDateTime::fromTime_t(man->OnBattery()?man->TimeToEmpty():man->TimeToFull())
.toUTC().toString("hh:mm"));

QMapIterator<QString, Device*> i(man->devices);
QMapIterator<QString, Device*> i(man->GetDevices());
while (i.hasNext()) {
i.next();
qDebug() << i.value()->name << i.value()->model << i.value()->type << i.value()->isPresent << i.value()->objectName() << i.value()->percentage;
Expand Down
5 changes: 2 additions & 3 deletions app/dialog.h
View file
Expand Up @@ -38,8 +38,7 @@

#include "def.h"
#include "common.h"
#include "upower.h"
#include "power.h"
#include "powerkit.h"

// fix X11 inc
#undef CursorShape
Expand Down Expand Up @@ -93,7 +92,7 @@ class Dialog : public QDialog
bool hasBacklight;
QSlider *backlightSlider;
QFileSystemWatcher *backlightWatcher;
Power *man;
PowerKit *man;
QLabel *batteryIcon;
QLabel *batteryLabel;
QTreeWidget *deviceTree;
Expand Down
17 changes: 9 additions & 8 deletions app/main.cpp
View file
Expand Up @@ -10,9 +10,10 @@
#include "systray.h"
#include "dialog.h"

#include "upower.h"
/*#include "upower.h"
#include "login1.h"
#include "ckit.h"
#include "ckit.h"*/
#include "powerkit.h"

int main(int argc, char *argv[])
{
Expand All @@ -30,9 +31,9 @@ int main(int argc, char *argv[])
if (a.arguments().size()>2) { userOpt = a.arguments().at(2); }

// trigger system services early
UPower::hasService();
/*UPower::hasService();
Login1::hasService();
CKit::hasService();
CKit::hasService();*/

// console actions
if (userArg == "--config") { // show config dialog
Expand All @@ -42,12 +43,12 @@ int main(int argc, char *argv[])
}

// check if a powerdwarf session is already running
QDBusInterface session(PD_SERVICE,
PD_PATH,
PD_SERVICE,
QDBusInterface session(POWERKIT_SERVICE,
POWERKIT_PATH,
POWERKIT_SERVICE,
QDBusConnection::sessionBus());
if (session.isValid()) {
qWarning() << QObject::tr("A powerdwarf session is already running");
qWarning() << QObject::tr("A powerkit session is already running");
return 1;
}

Expand Down

0 comments on commit 054afc5

Please sign in to comment.