From b16181f6121a760cad408976a7e8f2540f5c54c5 Mon Sep 17 00:00:00 2001
From: "Tod E. Kurt" <tod@todbot.com>
Date: Tue, 26 Aug 2014 16:27:28 -0700
Subject: [PATCH] blink1control: more ifttt fixes, even more work on
 preferences window

---
 qt/blink1control/images/gear.png              | Bin 0 -> 5738 bytes
 qt/blink1control/mainwindow.cpp               |  36 +++++++++++++-----
 qt/blink1control/mainwindow.h                 |   1 +
 qt/blink1control/myresources.qrc              |   1 +
 .../qml/qml/PreferencesWindow.qml             |  28 ++++++++++----
 qt/blink1control/qml/qml/main.qml             |  34 +++++++++--------
 6 files changed, 67 insertions(+), 33 deletions(-)
 create mode 100644 qt/blink1control/images/gear.png

diff --git a/qt/blink1control/images/gear.png b/qt/blink1control/images/gear.png
new file mode 100644
index 0000000000000000000000000000000000000000..d134cc42d029c68d55e25da6a1dbe99345820b36
GIT binary patch
literal 5738
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
CD_Xk%

literal 0
HcmV?d00001

diff --git a/qt/blink1control/mainwindow.cpp b/qt/blink1control/mainwindow.cpp
index e65ba5ab..ccc4bda0 100644
--- a/qt/blink1control/mainwindow.cpp
+++ b/qt/blink1control/mainwindow.cpp
@@ -16,6 +16,7 @@
 
 #include <QClipboard>
 
+
 #include "patternsReadOnly.h"
 
 enum {
@@ -34,7 +35,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent)
 {
     fromPattern=false;
-    mk2=false;
+    mk2=true;
     blinkStatus="";
     iftttKey="";
     blink1Id="none";
@@ -697,6 +698,7 @@ void MainWindow::loadSettings()
     QJsonArray qarr = doc.array();
 
     qint64 nowSecs = QDateTime::currentDateTime().toMSecsSinceEpoch()/1000;
+    lastIftttDate = nowSecs;
 
     for( int i=0; i< qarr.size(); i++ ) {
         Blink1Pattern* bp = new Blink1Pattern();
@@ -728,19 +730,19 @@ void MainWindow::loadSettings()
             inputs.insert( bi->name(), bi );
             // find most recent ifttt time
             if( bi->type() == "ifttt" ) {
-                //qDebug() << "iftttTime: "<<bi->date();
-                if( bi->date() > nowSecs || bi->date() == 0 ) {  // if bad stored date, fix it
+                qDebug() << "input name:"<<bi->name() <<" iftttTime: "<<bi->date() << " nowSecs: "<<nowSecs;
+                if( bi->date() > nowSecs || bi->date() < 1 ) {  // if bad stored date, fix it
                     bi->setDate( nowSecs );
                 }
-                if( bi->date() > lastIftttDate )
-                    lastIftttDate = bi->date();
+                //if( bi->date() > lastIftttDate )
+                //    lastIftttDate = bi->date();
             }
         }
     }
-    if( lastIftttDate > nowSecs ) { 
-        qDebug() << "lastIftttDate: bad date in input";
-        lastIftttDate = nowSecs;
-    }
+    //if( lastIftttDate > nowSecs ) { 
+    //    qDebug() << "lastIftttDate: bad date in input: "<< lastIftttDate;
+    //    lastIftttDate = nowSecs;
+    //}
 
     QString sButtStr = settings.value("bigbuttons2","").toString();
     if( sButtStr.length() ) {
@@ -882,6 +884,7 @@ void MainWindow::createActions()
     #endif
     minimizeAction = new QAction(tr("Start minimized"), this);
     connect(minimizeAction,SIGNAL(triggered()),this,SLOT(changeMinimizeOption()));
+    //connect(minimizeAction,SIGNAL(triggered()),this,SLOT(updatePreferences()));
     minimizeAction->setCheckable(true);
     minimizeAction->setChecked(startmin);
     restoreAction = new QAction(tr("&Restore"), this);
@@ -893,10 +896,12 @@ void MainWindow::createActions()
     autorunAction->setCheckable(true);
     autorunAction->setChecked(autorun);
     connect(autorunAction,SIGNAL(triggered()),this,SLOT(setAutorun()));
+    //connect(autorunAction,SIGNAL(triggered()),this,SLOT(updatePreferences()));
     dockIconAction=new QAction("Show Dock Icon",this);
     dockIconAction->setCheckable(true);
     dockIconAction->setChecked(dockIcon);
     connect(dockIconAction,SIGNAL(triggered()),this,SLOT(showhideDockIcon()));
+    //connect(dockIconAction,SIGNAL(triggered()),this,SLOT(updatePreferences()));
     settingAction=new QAction("Open Settings",this);
     connect(settingAction,SIGNAL(triggered()),this,SLOT(showNormal()));
     alertsAction=new QAction("Reset Alerts",this);
@@ -905,6 +910,7 @@ void MainWindow::createActions()
     serverAction->setCheckable(true);
     serverAction->setChecked(enableServer);
     connect(serverAction,SIGNAL(triggered()),this,SLOT(startStopServer()));
+    //connect(serverAction,SIGNAL(triggered()),this,SLOT(updatePreferences()));
 
     // shortcuts don't work apparently in traymenus
     //alertsAction->setShortcut(Qt::Key_R | Qt::CTRL);
@@ -1071,7 +1077,7 @@ void MainWindow::showNormal(){
     //viewer.setWindowState( (windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
     viewer.requestActivate();
     //viewer.activateWindow(); // for Windows
- }
+}
 void MainWindow::playBigButton(int idx){
     blink1timer->stop();
     QString tmp=bigButtons2.at(idx)->getPatternName();
@@ -1154,6 +1160,16 @@ void MainWindow::startStopServer(){
     addToLog("SERVER IS "+QString::number(httpserver->status()));
 }
 
+void MainWindow::updatePreferences() { 
+    qDebug() << "updatePreferences";
+
+    serverAction->setChecked( enableServer );
+    dockIconAction->setChecked( dockIcon );
+
+    showhideDockIcon();
+    startStopServer();
+
+}
 
 QList<QObject*> MainWindow::getPatternsList(){
     QList<QObject*> patternsList;
diff --git a/qt/blink1control/mainwindow.h b/qt/blink1control/mainwindow.h
index 6b4c9cc6..f5a04559 100644
--- a/qt/blink1control/mainwindow.h
+++ b/qt/blink1control/mainwindow.h
@@ -188,6 +188,7 @@ public slots:
     void updatePatternsList();
     void changeInputName(QString oldName,QString newName);
 
+    void updatePreferences();
     void setAutorun();
     void showhideDockIcon();    
     void checkInput(QString key);
diff --git a/qt/blink1control/myresources.qrc b/qt/blink1control/myresources.qrc
index 5852b343..b1176442 100644
--- a/qt/blink1control/myresources.qrc
+++ b/qt/blink1control/myresources.qrc
@@ -172,5 +172,6 @@
         <file>images/layout/dropdown-bg.png</file>
         <file>images/layout/select-bg-right.png</file>
         <file>images/blink1-icon0-bw.png</file>
+        <file>images/gear.png</file>
     </qresource>
 </RCC>
diff --git a/qt/blink1control/qml/qml/PreferencesWindow.qml b/qt/blink1control/qml/qml/PreferencesWindow.qml
index ffa22208..9b0f7873 100644
--- a/qt/blink1control/qml/qml/PreferencesWindow.qml
+++ b/qt/blink1control/qml/qml/PreferencesWindow.qml
@@ -4,12 +4,13 @@ import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.1
 import QtQuick.Window 2.1
 
+//import "ToolTipTod2Creator.js" as ToolTipCreator
 
 Window {
     id: prefsWindow
 
-    width: mw.mac() ? 580 : 550 // Win version experimentally determined
-    height: mw.mac() ? 440 : 390
+    width: mw.mac() ? 575 : 560 // Win version experimentally determined
+    height: mw.mac() ? 465 : 410
     // FIXME: surely there's a shorter way of saying "no resize"?
     maximumWidth: width
     maximumHeight: height
@@ -28,21 +29,26 @@ Window {
 
         ColumnLayout {
             id: mainLayout
-            spacing: 10
+            spacing: 15
         RowLayout {
+            id: mainbox
+            spacing: 20
         ColumnLayout {
             id: leftcolumn
             Layout.alignment: Qt.AlignTop
-            Layout.minimumWidth: 280
-
+            Layout.minimumWidth: 260
+            spacing: 15
+            
         GroupBox {
             id: groupGeneral
             title: "General"
+            Layout.fillWidth: true
             ColumnLayout {
                 CheckBox {
                     id: minimizedCheckbox
                     text: "Start minimized"
                     checked: mw.startmin
+                    //onHoveredChanged: { console.log("hello "+hovered); }//ToolTipCreator.create("text on the tooltip, yo", parentItem).show() }
                 }
                 CheckBox {
                     id: loginCheckbox
@@ -60,6 +66,7 @@ Window {
         GroupBox {
             id: groupAPIServer
             title: "API server configuration"
+            Layout.fillWidth: true
             GridLayout {
                 anchors.fill: parent
                 columns: 2
@@ -80,6 +87,7 @@ Window {
         GroupBox {
             id: groupProxyConfig
             title: "Proxy configuration"
+            Layout.fillWidth: true
             ColumnLayout { 
                 spacing: 10
                 RowLayout {
@@ -123,11 +131,13 @@ Window {
         ColumnLayout {
             id: rightcolumn
             Layout.alignment: Qt.AlignTop
-            Layout.minimumWidth: 280
+            Layout.minimumWidth: 260
+            spacing: 15
 
         GroupBox {
             id: groupBlink1ToUse
             title: "blink(1) device to use"
+            Layout.fillWidth: true
             ColumnLayout {
                 ExclusiveGroup { id: blink1touseGroup }
                 RadioButton {  exclusiveGroup: blink1touseGroup
@@ -142,8 +152,8 @@ Window {
                     ComboBox {
                         id: blink1touseComboBox
                         model: mw.getBlink1Serials
-                        onCurrentIndexChanged: {
                         //onActivated: {
+                        onCurrentIndexChanged: {
                             console.log("blink1 serial: " + currentIndex + " , "+ currentText);
                             mw.blink1Blink( currentText, "#333333", 500);
                         }
@@ -155,7 +165,7 @@ Window {
         GroupBox {
             id: groupBlink1Startup
             title: "blink(1) device no-computer behavior"
-            Layout.alignment: Qt.AlignTop
+            Layout.fillWidth: true
             ColumnLayout {
                 ExclusiveGroup { id: blink1startupGroup }
                 RadioButton {  exclusiveGroup: blink1startupGroup
@@ -237,6 +247,8 @@ Window {
                       mw.setBlink1Index( 0 );
                     }
 
+                    mw.updatePreferences();
+
                     prefsWindow.visible = false
                 }
             }
diff --git a/qt/blink1control/qml/qml/main.qml b/qt/blink1control/qml/qml/main.qml
index d7faa7c6..962d3c7f 100644
--- a/qt/blink1control/qml/qml/main.qml
+++ b/qt/blink1control/qml/qml/main.qml
@@ -148,21 +148,6 @@ Image{
                 radius: width*0.5
                 anchors.centerIn: parent
             }
-            Button {
-                tooltip: "Show Preferences window"
-                iconSource: "qrc:images/layout/select-bg-right.png"
-                anchors.right: parent.right 
-                anchors.top: parent.top 
-                anchors.rightMargin:-15
-                anchors.topMargin:15
-                //width: 20
-                style: ButtonStyle { 
-                    background: Rectangle {
-                        implicitWidth: 15
-                    }
-                }
-                onClicked:  prefsWindow.visible = !prefsWindow.visible
-            }
 /*
             MouseArea{
                 anchors.fill: parent
@@ -173,6 +158,25 @@ Image{
             }
 */
         }
+        Button {
+            tooltip: "Show Preferences window"
+            //iconSource: "qrc:images/layout/select-bg-right.png"
+            iconSource: "qrc:images/gear.png"
+            anchors.right: parent.right 
+            anchors.top: parent.top 
+            anchors.rightMargin:13 //-25
+            anchors.topMargin:50 //15
+            style: ButtonStyle { 
+                background: Rectangle {
+                    //implicitWidth: 15
+                    radius: 4
+                    border.color: control.hovered ? "#d2d2d2"  : "transparent"
+                    color: control.pressed ? "#f4f4f4" : "transparent"
+                }
+            }
+            onClicked:  prefsWindow.visible = !prefsWindow.visible
+        }
+
         //// KONIEC VIRTUAL BLINK
         Text{
             text: "Status:"