From 121f5e012956ab9b105d174cb3bfd62d89f28e78 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Tue, 31 Jul 2018 17:58:11 -0700
Subject: [PATCH] Set window modality in UI files.

---
 tools/auto-tester/src/TestRailInterface.cpp           | 4 +---
 tools/auto-tester/src/TestRailInterface.h             | 6 +++++-
 tools/auto-tester/src/ui/BusyWindow.ui                | 3 +++
 tools/auto-tester/src/ui/MismatchWindow.ui            | 5 ++++-
 tools/auto-tester/src/ui/TestRailRunSelectorWindow.ui | 3 +++
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/tools/auto-tester/src/TestRailInterface.cpp b/tools/auto-tester/src/TestRailInterface.cpp
index e696f38d0c..d82add0db7 100644
--- a/tools/auto-tester/src/TestRailInterface.cpp
+++ b/tools/auto-tester/src/TestRailInterface.cpp
@@ -17,9 +17,6 @@
 #include <QTextStream>
 
 TestRailInterface::TestRailInterface() {
-    _busyWindow.setModal(true);
-    _testRailTestCasesSelectorWindow.setModal(true);
-
     _testRailTestCasesSelectorWindow.setURL("https://highfidelity.testrail.net");
     ////_testRailTestCasesSelectorWindow.setURL("https://nissimhadar.testrail.io");
     _testRailTestCasesSelectorWindow.setUser("@highfidelity.io");
@@ -689,4 +686,5 @@ void TestRailInterface::processTestPython(const QString& fullDirectory,
 }
 
 void TestRailInterface::createTestRailRun() {
+    
 }
\ No newline at end of file
diff --git a/tools/auto-tester/src/TestRailInterface.h b/tools/auto-tester/src/TestRailInterface.h
index b6fe53bc30..53d4bee618 100644
--- a/tools/auto-tester/src/TestRailInterface.h
+++ b/tools/auto-tester/src/TestRailInterface.h
@@ -12,7 +12,10 @@
 #define hifi_test_testrail_interface_h
 
 #include "ui/BusyWindow.h"
+
 #include "ui/TestRailTestCasesSelectorWindow.h"
+#include "ui/TestRailRunSelectorWindow.h"
+
 #include <QDirIterator>
 #include <QtXml/QDomDocument>
 #include <QProcess>
@@ -54,7 +57,7 @@ public:
     void createTestRailDotPyScript();
     void createStackDotPyScript();
     void requestTestRailDataFromUser();
-    void requestMilestoneFromUser();
+
     void createAddTestCasesPythonScript(const QString& testDirectory,
                                         const QString& userGitHub,
                                         const QString& branchGitHub);
@@ -82,6 +85,7 @@ private:
 
     BusyWindow _busyWindow;
     TestRailTestCasesSelectorWindow _testRailTestCasesSelectorWindow;
+    TestRailRunSelectorWindow _testRailRunSelectorWindow;
 
     QString _url;
     QString _user;
diff --git a/tools/auto-tester/src/ui/BusyWindow.ui b/tools/auto-tester/src/ui/BusyWindow.ui
index f04a39418b..c237566a5e 100644
--- a/tools/auto-tester/src/ui/BusyWindow.ui
+++ b/tools/auto-tester/src/ui/BusyWindow.ui
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>BusyWindow</class>
  <widget class="QDialog" name="BusyWindow">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/tools/auto-tester/src/ui/MismatchWindow.ui b/tools/auto-tester/src/ui/MismatchWindow.ui
index 72f86261ab..8a174989d4 100644
--- a/tools/auto-tester/src/ui/MismatchWindow.ui
+++ b/tools/auto-tester/src/ui/MismatchWindow.ui
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>MismatchWindow</class>
  <widget class="QDialog" name="MismatchWindow">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -193,4 +196,4 @@
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
-</ui>
\ No newline at end of file
+</ui>
diff --git a/tools/auto-tester/src/ui/TestRailRunSelectorWindow.ui b/tools/auto-tester/src/ui/TestRailRunSelectorWindow.ui
index c83b98c5cc..a15c1b6d0c 100644
--- a/tools/auto-tester/src/ui/TestRailRunSelectorWindow.ui
+++ b/tools/auto-tester/src/ui/TestRailRunSelectorWindow.ui
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>TestRailRunSelectorWindow</class>
  <widget class="QDialog" name="TestRailRunSelectorWindow">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>