Cleaner fix

vicr123 · May 27, 2018 · 912b745 · 912b745
1 parent 0b569dd
commit 912b745
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 39 deletions.
diff --git a/shell/infopanedropdown.cpp b/shell/infopanedropdown.cpp
@@ -138,6 +138,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
@@ -523,9 +550,6 @@ void InfoPaneDropdown::processTimer() {
         int endMsecs = ui->endRedshift->time().msecsSinceStartOfDay();
         int endIntensity = ui->redshiftIntensity->value();
         const int oneHour = 3600000;
-        QProcess* redshiftQuery = new QProcess;
-        redshiftQuery->start("redshift -V");
-
         QString redshiftCommand;
 
         if (ui->redshiftPause->isChecked()) {
@@ -604,36 +628,14 @@ 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();
+        if (isNewRedshift) {
+            redshiftCommand += " -P";
+        }
 
-            QProcess* redshiftAdjust = new QProcess();
-            redshiftAdjust->start(runCommand);
-            connect(redshiftAdjust, SIGNAL(finished(int)), redshiftAdjust, SLOT(deleteLater()));
-        });
+        QProcess* redshiftAdjust = new QProcess();
+        redshiftAdjust->start(redshiftCommand);
+        connect(redshiftAdjust, SIGNAL(finished(int)), redshiftAdjust, SLOT(deleteLater()));
     }
 
     /*{

diff --git a/shell/infopanedropdown.h b/shell/infopanedropdown.h
@@ -447,6 +447,7 @@ private slots:
     Ui::InfoPaneDropdown *ui;
 
     bool isRedshiftOn = false;
+    bool isNewRedshift = true;
     dropdownType currentDropDown = Clock;
     void changeDropDown(dropdownType changeTo, bool doAnimation = true);
     int mouseClickPoint;

diff --git a/shell/infopanedropdown.ui b/shell/infopanedropdown.ui
@@ -376,8 +376,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>1151</width>
-            <height>1038</height>
+            <width>616</width>
+            <height>1062</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_26">
@@ -611,14 +611,14 @@
                  <second>0</second>
                  <year>1969</year>
                  <month>9</month>
-                 <day>5</day>
+                 <day>4</day>
                 </datetime>
                </property>
                <property name="date">
                 <date>
                  <year>1969</year>
                  <month>9</month>
-                 <day>5</day>
+                 <day>4</day>
                 </date>
                </property>
                <property name="displayFormat">
@@ -1504,7 +1504,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>1165</width>
+            <width>182</width>
             <height>114</height>
            </rect>
           </property>
@@ -1947,7 +1947,7 @@
          <item>
           <widget class="QStackedWidget" name="settingsTabs">
            <property name="currentIndex">
-            <number>13</number>
+            <number>14</number>
            </property>
            <widget class="QWidget" name="StartupSettings">
             <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -4896,7 +4896,8 @@ Items that will be kept if you choose to keep files:
                 <string>Reset Device</string>
                </property>
                <property name="icon">
-                <iconset theme="view-refresh"/>
+                <iconset theme="view-refresh">
+                 <normaloff>.</normaloff>.</iconset>
                </property>
               </widget>
              </item>
@@ -4920,7 +4921,7 @@ Items that will be kept if you choose to keep files:
              <item row="7" column="0">
               <widget class="QLabel" name="label_21">
                <property name="text">
-                <string>theShell is Copyright (c) Victor Tran 2017. Licensed under the terms of the GNU General Public License, version 3 or later.</string>
+                <string>theShell is Copyright (c) Victor Tran 2018. Licensed under the terms of the GNU General Public License, version 3 or later.</string>
                </property>
                <property name="wordWrap">
                 <bool>true</bool>