Large amount of whitespace cleanup, and almost get the LuminaRandR class finished (one last calculation to do)

2 files changed, 4 insertions, 3 deletions

diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp
index 4cc6d68b..cdcf2434 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp
@@ -10,13 +10,13 @@
 #include <unistd.h>
 
 #define NUMTRIES 3
-#define WAITMINS 1
+//#define WAITMINS 1
 #define DEBUG 1
 
 LLockScreen::LLockScreen(QWidget *parent) : QWidget(parent), ui(new Ui::LLockScreen()){
   ui->setupUi(this);
   waittime = new QTimer(this);
-    waittime->setInterval(WAITMINS*60000); //(too many attempts in short time)
+    //waittime->setInterval(WAITMINS*60000); //(too many attempts in short time)
     waittime->setSingleShot(true);
   refreshtime = new QTimer(this); //timer to update the wait time display
     refreshtime->setInterval(6000); //6 seconds (1/10 second)
@@ -92,6 +92,7 @@ void LLockScreen::TryUnlock(){
     if(triesleft>0){ 
       this->setEnabled(true);
     }else{ 
+      waittime->setInterval( (attempts/NUMTRIES)*60000);
       waittime->start(); 
       refreshtime->start();
     }
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Fireflies.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Fireflies.h
index 4e5acc3c..f1ef5fa3 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Fireflies.h
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Fireflies.h
@@ -83,7 +83,7 @@ public:
 	  this->stop(); 
 	  //while(fireflies.length()>0){ fireflies.takeAt(0)->deleteLater(); }
 	}
-		
+
 	void LoadAnimations(){
 	  while(fireflies.length()>0){ fireflies.takeAt(0)->deleteLater(); }
 	  canvas->setStyleSheet("background: black;");