From 089c71b047931690a1fa79105c585f08f0837095 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Wed, 23 Jan 2019 08:49:42 -0800
Subject: [PATCH] Read device button enabled after setting working folder.

---
 tools/nitpick/src/Nitpick.cpp          |  6 +++++-
 tools/nitpick/src/Nitpick.h            |  5 +++--
 tools/nitpick/src/TestRunnerMobile.cpp | 12 +++++++++---
 tools/nitpick/src/TestRunnerMobile.h   |  5 ++++-
 tools/nitpick/ui/Nitpick.ui            |  9 ++++++---
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/tools/nitpick/src/Nitpick.cpp b/tools/nitpick/src/Nitpick.cpp
index a21d2a1790..d495d19e93 100644
--- a/tools/nitpick/src/Nitpick.cpp
+++ b/tools/nitpick/src/Nitpick.cpp
@@ -93,7 +93,7 @@ void Nitpick::setup() {
     if (_testRunnerMobile) {
         delete _testRunnerMobile;
     }
-    _testRunnerMobile = new TestRunnerMobile(_ui.workingFolderRunOnMobileLabel);
+    _testRunnerMobile = new TestRunnerMobile(_ui.workingFolderRunOnMobileLabel, _ui.readDeviceButton);
 }
 
 void Nitpick::startTestsEvaluation(const bool isRunningFromCommandLine,
@@ -326,3 +326,7 @@ void Nitpick::appendLogWindow(const QString& message) {
 void Nitpick::on_setWorkingFolderRunOnMobileButton_clicked() {
     _testRunnerMobile->setWorkingFolder();
 }
+
+void Nitpick::on_readDeviceButton_clicked() {
+    _testRunnerMobile->readDevice();
+}
diff --git a/tools/nitpick/src/Nitpick.h b/tools/nitpick/src/Nitpick.h
index 64a8e5c480..e64cb2f015 100644
--- a/tools/nitpick/src/Nitpick.h
+++ b/tools/nitpick/src/Nitpick.h
@@ -76,8 +76,6 @@ private slots:
     void on_setWorkingFolderRunOnDesktopButton_clicked();
     void on_runNowButton_clicked();
 
-    void on_setWorkingFolderRunOnMobileButton_clicked();
-
     void on_checkBoxRunLatest_clicked();
 
     void on_updateTestRailRunResultsButton_clicked();
@@ -97,6 +95,9 @@ private slots:
     void about();
     void content();
 
+    void on_setWorkingFolderRunOnMobileButton_clicked();
+    void on_readDeviceButton_clicked();
+
 private:
     Ui::NitpickClass _ui;
     Test* _test{ nullptr };
diff --git a/tools/nitpick/src/TestRunnerMobile.cpp b/tools/nitpick/src/TestRunnerMobile.cpp
index 0d02634484..3dc55e3a08 100644
--- a/tools/nitpick/src/TestRunnerMobile.cpp
+++ b/tools/nitpick/src/TestRunnerMobile.cpp
@@ -16,8 +16,9 @@
 #include "Nitpick.h"
 extern Nitpick* nitpick;
 
-TestRunnerMobile::TestRunnerMobile(QLabel* workingFolderLabel, QObject* parent) : QObject(parent) {
+TestRunnerMobile::TestRunnerMobile(QLabel* workingFolderLabel, QPushButton *readDeviceButton, QObject* parent) : QObject(parent) {
     _workingFolderLabel = workingFolderLabel;
+    _readDeviceButton = readDeviceButton;
 }
 
 TestRunnerMobile::~TestRunnerMobile() {
@@ -31,7 +32,7 @@ void TestRunnerMobile::setWorkingFolder() {
         parent += "/";
     }
 
-    _workingFolder = QFileDialog::getExistingDirectory(nullptr, "Please select a temporary folder for installation", parent,
+    _workingFolder = QFileDialog::getExistingDirectory(nullptr, "Please select a working folder for temporary files", parent,
         QFileDialog::ShowDirsOnly);
 
     // If user canceled then restore previous selection and return
@@ -41,4 +42,9 @@ void TestRunnerMobile::setWorkingFolder() {
     }
 
     _workingFolderLabel->setText(QDir::toNativeSeparators(_workingFolder));
-}
\ No newline at end of file
+
+    _readDeviceButton->setEnabled(true);
+}
+
+void TestRunnerMobile::readDevice() {
+}
diff --git a/tools/nitpick/src/TestRunnerMobile.h b/tools/nitpick/src/TestRunnerMobile.h
index 368d6188c5..3380542461 100644
--- a/tools/nitpick/src/TestRunnerMobile.h
+++ b/tools/nitpick/src/TestRunnerMobile.h
@@ -12,17 +12,20 @@
 #define hifi_testRunnerMobile_h
 #include <QLabel>
 #include <QObject>
+#include <QPushButton>
 
 class TestRunnerMobile : public QObject {
     Q_OBJECT
 public:
-    explicit TestRunnerMobile(QLabel* workingFolderLabel, QObject* parent = 0);
+    explicit TestRunnerMobile(QLabel* workingFolderLabel, QPushButton *readDeviceButton, QObject* parent = 0);
     ~TestRunnerMobile();
 
     void setWorkingFolder();
+    void readDevice();
 
 private:
     QLabel* _workingFolderLabel;
     QString _workingFolder;
+    QPushButton* _readDeviceButton;
 };
 #endif
diff --git a/tools/nitpick/ui/Nitpick.ui b/tools/nitpick/ui/Nitpick.ui
index e935c28e00..fbf3a587c7 100644
--- a/tools/nitpick/ui/Nitpick.ui
+++ b/tools/nitpick/ui/Nitpick.ui
@@ -43,7 +43,7 @@
      </rect>
     </property>
     <property name="currentIndex">
-     <number>2</number>
+     <number>3</number>
     </property>
     <widget class="QWidget" name="tab_1">
      <attribute name="title">
@@ -551,7 +551,10 @@
      <attribute name="title">
       <string>Run on Device</string>
      </attribute>
-     <widget class="QPushButton" name="getDeviceButton">
+     <widget class="QPushButton" name="readDeviceButton">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
       <property name="geometry">
        <rect>
         <x>10</x>
@@ -561,7 +564,7 @@
        </rect>
       </property>
       <property name="text">
-       <string>Get Device</string>
+       <string>Read Device</string>
       </property>
      </widget>
      <widget class="QLabel" name="label">