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

Fix Redshift in Redshift 1.12 and later

Browse source
This commit is contained in:
Victor Tran 2018-05-27 23:57:39 +10:00
parent 1f3b23d14d
commit 0b569dd87f
No known key found for this signature in database
GPG key ID: FBA10B22D602BAC1
3 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
shell/infopanedropdown.cpp
View file

@ -523,8 +523,11 @@ 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()));
QProcess* redshiftQuery = new QProcess;
redshiftQuery->start("redshift -V");
QString redshiftCommand;
if (ui->redshiftPause->isChecked()) {
//Calculate redshift value
//Transition to redshift is 1 hour from the start.
@ -579,7 +582,7 @@ void InfoPaneDropdown::processTimer() {
}
}
redshiftAdjust->start("redshift -O " + QString::number(intensity));
redshiftCommand = "redshift -O " + QString::number(intensity);
isRedshiftOn = true;
if (intensity == 6500 && effectiveRedshiftOn) {
@ -592,7 +595,7 @@ void InfoPaneDropdown::processTimer() {
emit redshiftEnabledChanged(true);
}
} else {
redshiftAdjust->start("redshift -O 6500");
redshiftCommand = "redshift -O 6500";
if (isRedshiftOn) {
isRedshiftOn = false;
@ -601,6 +604,36 @@ void InfoPaneDropdown::processTimer() {
emit redshiftEnabledChanged(false);
}
}
connect(redshiftQuery, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), [=](int exitCode, QProcess::ExitStatus exitStatus) {
QString runCommand = redshiftCommand;
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) {
runCommand += " -P";
break;
} else if (version < 1) {
break;
}
} else if (i == 1) {
if (version > 11) {
runCommand += " -P";
}
break;
}
}
redshiftQuery->deleteLater();
QProcess* redshiftAdjust = new QProcess();
redshiftAdjust->start(runCommand);
connect(redshiftAdjust, SIGNAL(finished(int)), redshiftAdjust, SLOT(deleteLater()));
});
}
/*{

2
shell/notificationsWidget/notificationsdbusadaptor.cpp
View file

@ -36,7 +36,7 @@ QStringList NotificationsDBusAdaptor::GetCapabilities()
QString NotificationsDBusAdaptor::GetServerInformation(QString &vendor, QString &version, QString &spec_version)
{
vendor = "theSuite";
version = QString::number(TS_VERSION);
version = TS_VERSION;
spec_version = "1.2";
return "theShell";
}

2
shell/shell.pro
View file

@ -12,7 +12,7 @@ INCLUDEPATH += /usr/include/glib-2.0/ /usr/lib/glib-2.0/include/
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
DEFINES += TS_VERSION="7.1"
DEFINES += TS_VERSION='\\"7.1.1\\"'
unix {
QT += thelib x11extras