mirrors/theshell
1
0
Fork 0
mirror of https://github.com/vicr123/theshell.git synced 2025-01-23 04:11:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'refs/heads/master' into blueprint

Browse source
This commit is contained in:
Victor Tran 2018-05-28 00:28:33 +10:00
commit 78c9670bcc
No known key found for this signature in database
GPG key ID: FBA10B22D602BAC1
3 changed files with 53 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
shell/infopanedropdown.cpp
View file

@ -161,6 +161,33 @@ InfoPaneDropdown::InfoPaneDropdown(WId MainWindowId, QWidget *parent) :
updateBatteryChart();
//Check Redshift
QProcess* redshiftQuery = new QProcess;
redshiftQuery->start("redshift -V");
connect(redshiftQuery, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), [=](int exitCode, QProcess::ExitStatus exitStatus) {
QString output = redshiftQuery->readAll().trimmed();
output.remove("redshift ");
QStringList parts = output.split(".");
for (int i = 0; i < parts.count(); i++) {
int version = parts.at(i).toInt();
if (i == 0) {
if (version > 1) {
break;
} else if (version < 1) {
isNewRedshift = false;
break;
}
} else if (i == 1) {
if (version < 11) {
isNewRedshift = false;
}
break;
}
}
redshiftQuery->deleteLater();
});
//Set up KDE Connect
if (!QFile("/usr/lib/kdeconnectd").exists()) {
//If KDE Connect is not installed, hide the KDE Connect option
@ -721,8 +748,8 @@ void InfoPaneDropdown::processTimer() {
int endMsecs = ui->endRedshift->time().msecsSinceStartOfDay();
int endIntensity = ui->redshiftIntensity->value();
const int oneHour = 3600000;
QProcess* redshiftAdjust = new QProcess;
connect(redshiftAdjust, SIGNAL(finished(int)), redshiftAdjust, SLOT(deleteLater()));
QString redshiftCommand;
if (ui->redshiftPause->isChecked()) {
//Calculate redshift value
//Transition to redshift is 1 hour from the start.
@ -777,7 +804,7 @@ void InfoPaneDropdown::processTimer() {
}
}
redshiftAdjust->start("redshift -O " + QString::number(intensity));
redshiftCommand = "redshift -O " + QString::number(intensity);
isRedshiftOn = true;
if (intensity == 6500 && effectiveRedshiftOn) {
@ -792,9 +819,9 @@ void InfoPaneDropdown::processTimer() {
} else {
//Check Redshift Override
if (overrideRedshift == 2) {
redshiftAdjust->start("redshift -O " + QString::number(endIntensity));
redshiftCommand = "redshift -O " + QString::number(endIntensity);
} else {
redshiftAdjust->start("redshift -O 6500");
redshiftCommand = "redshift -O 6500";
}
if (isRedshiftOn) {
@ -804,6 +831,14 @@ void InfoPaneDropdown::processTimer() {
emit redshiftEnabledChanged(false);
}
}
if (isNewRedshift) {
redshiftCommand += " -P";
}
QProcess* redshiftAdjust = new QProcess();
redshiftAdjust->start(redshiftCommand);
connect(redshiftAdjust, SIGNAL(finished(int)), redshiftAdjust, SLOT(deleteLater()));
}
/*{
@ -1336,15 +1371,23 @@ void InfoPaneDropdown::on_endRedshift_timeChanged(const QTime &time)
void InfoPaneDropdown::on_redshiftIntensity_sliderMoved(int position)
{
if (isNewRedshift) {
QProcess::startDetached("redshift -P -O " + QString::number(position));
} else {
QProcess::startDetached("redshift -O " + QString::number(position));
}
}
void InfoPaneDropdown::on_redshiftIntensity_sliderReleased()
{
if (!isRedshiftOn) {
if (isNewRedshift) {
QProcess::startDetached("redshift -P -O 6500");
} else {
QProcess::startDetached("redshift -O 6500");
}
}
}
void InfoPaneDropdown::on_redshiftIntensity_valueChanged(int value)
{

1
shell/infopanedropdown.h
View file

@ -504,6 +504,7 @@ class InfoPaneDropdown : public QDialog
Ui::InfoPaneDropdown *ui;
bool isRedshiftOn = false;
bool isNewRedshift = true;
dropdownType currentDropDown = Clock;
void changeDropDown(dropdownType changeTo, bool doAnimation = true);
int mouseClickPoint;

4
shell/notificationsWidget/notificationsdbusadaptor.cpp
View file

@ -44,7 +44,7 @@ void NotificationsDBusAdaptor::CloseNotification(uint id)
NotificationObject* notification = this->parentWidget()->getNotification(id);
notification->dismiss();
} else {
//ignore
}
}
@ -56,7 +56,7 @@ QStringList NotificationsDBusAdaptor::GetCapabilities()
QString NotificationsDBusAdaptor::GetServerInformation(QString &vendor, QString &version, QString &spec_version)
{
vendor = "theSuite";
version = QString(TS_VERSION);
version = TS_VERSION;
spec_version = "1.2";
return "theShell";
}