From 0efce7c8eef89e77349748ef56bc2aa54765f845 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 17 Sep 2014 13:50:57 -0700
Subject: [PATCH 1/3] Add hotkey to reload all scripts

---
 interface/src/Menu.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index d7679968ae..2417d156a6 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -148,7 +148,8 @@ Menu::Menu() :
     addActionToQMenuAndActionHash(fileMenu, MenuOption::LoadScriptURL,
                                     Qt::CTRL | Qt::SHIFT | Qt::Key_O, appInstance, SLOT(loadScriptURLDialog()));
     addActionToQMenuAndActionHash(fileMenu, MenuOption::StopAllScripts, 0, appInstance, SLOT(stopAllScripts()));
-    addActionToQMenuAndActionHash(fileMenu, MenuOption::ReloadAllScripts, 0, appInstance, SLOT(reloadAllScripts()));
+    addActionToQMenuAndActionHash(fileMenu, MenuOption::ReloadAllScripts, Qt::CTRL | Qt::SHIFT | Qt::Key_R,
+                                  appInstance, SLOT(reloadAllScripts()));
     addActionToQMenuAndActionHash(fileMenu, MenuOption::RunningScripts, Qt::CTRL | Qt::Key_J,
                                   appInstance, SLOT(toggleRunningScriptsWidget()));
 

From b55a5acdd3cf4553d73884e49290fca465bcaf55 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 17 Sep 2014 14:27:11 -0700
Subject: [PATCH 2/3] Update style of running scripts widget

---
 interface/ui/runningScriptsWidget.ui | 109 ++++++++++++---------------
 1 file changed, 47 insertions(+), 62 deletions(-)

diff --git a/interface/ui/runningScriptsWidget.ui b/interface/ui/runningScriptsWidget.ui
index ddc6ad6c27..b4d17b1561 100644
--- a/interface/ui/runningScriptsWidget.ui
+++ b/interface/ui/runningScriptsWidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>324</width>
-    <height>643</height>
+    <width>319</width>
+    <height>481</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -29,57 +29,12 @@
    <property name="bottomMargin">
     <number>20</number>
    </property>
-   <item>
-    <widget class="QWidget" name="header" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="leftMargin">
-       <number>6</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="widgetTitle">
-        <property name="styleSheet">
-         <string notr="true">color: #0e7077;
-font-size: 20px;</string>
-        </property>
-        <property name="text">
-         <string>Running Scripts</string>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <property name="indent">
-         <number>-1</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <widget class="QWidget" name="runningScriptsArea" native="true">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
-       <verstretch>1</verstretch>
+       <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
@@ -157,7 +112,7 @@ font: bold 16px;
         <property name="sizeHint" stdset="0">
          <size>
           <width>0</width>
-          <height>8</height>
+          <height>4</height>
          </size>
         </property>
        </spacer>
@@ -218,6 +173,12 @@ font: bold 16px;
       </item>
       <item>
        <widget class="QWidget" name="widget_4" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <layout class="QVBoxLayout" name="verticalLayout_8">
          <property name="spacing">
           <number>0</number>
@@ -236,6 +197,12 @@ font: bold 16px;
          </property>
          <item>
           <widget class="QScrollArea" name="runningScriptsList">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="font">
             <font>
              <family>Helvetica,Arial,sans-serif</family>
@@ -252,11 +219,14 @@ font: bold 16px;
             <number>0</number>
            </property>
            <property name="verticalScrollBarPolicy">
-            <enum>Qt::ScrollBarAsNeeded</enum>
+            <enum>Qt::ScrollBarAlwaysOn</enum>
            </property>
            <property name="horizontalScrollBarPolicy">
             <enum>Qt::ScrollBarAlwaysOff</enum>
            </property>
+           <property name="sizeAdjustPolicy">
+            <enum>QAbstractScrollArea::AdjustToContents</enum>
+           </property>
            <property name="widgetResizable">
             <bool>true</bool>
            </property>
@@ -268,7 +238,7 @@ font: bold 16px;
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>284</width>
+              <width>264</width>
               <height>16</height>
              </rect>
             </property>
@@ -278,6 +248,9 @@ font: bold 16px;
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="layoutDirection">
+             <enum>Qt::LeftToRight</enum>
+            </property>
             <property name="styleSheet">
              <string notr="true">font-size: 14px;</string>
             </property>
@@ -303,14 +276,20 @@ font: bold 16px;
          </item>
          <item>
           <widget class="QLabel" name="noRunningScriptsLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="styleSheet">
-            <string notr="true">font: 14px;</string>
+            <string notr="true">font: 14px; color: #5f5f5f;</string>
            </property>
            <property name="text">
-            <string>There are no scripts currently running.</string>
+            <string>There are no scripts running.</string>
            </property>
            <property name="alignment">
-            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
            </property>
           </widget>
          </item>
@@ -325,15 +304,9 @@ font: bold 16px;
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
-       <verstretch>2</verstretch>
+       <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>300</height>
-      </size>
-     </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <property name="spacing">
        <number>0</number>
@@ -352,6 +325,12 @@ font: bold 16px;
       </property>
       <item>
        <widget class="QWidget" name="widget" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <property name="spacing">
           <number>0</number>
@@ -432,6 +411,12 @@ font: bold 16px;</string>
          </item>
          <item>
           <widget class="QListView" name="scriptListView">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="verticalScrollBarPolicy">
             <enum>Qt::ScrollBarAlwaysOn</enum>
            </property>

From 145425276d74ac9d480bf70e671602918de445ff Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 19 Sep 2014 14:17:08 -0700
Subject: [PATCH 3/3] Fix script list not being hidden

---
 interface/src/ui/RunningScriptsWidget.cpp | 1 +
 interface/ui/runningScriptsWidget.ui      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/src/ui/RunningScriptsWidget.cpp b/interface/src/ui/RunningScriptsWidget.cpp
index 6efa2f8fe6..baf3995d0e 100644
--- a/interface/src/ui/RunningScriptsWidget.cpp
+++ b/interface/src/ui/RunningScriptsWidget.cpp
@@ -136,6 +136,7 @@ void RunningScriptsWidget::setRunningScripts(const QStringList& list) {
 
 
     ui->noRunningScriptsLabel->setVisible(list.isEmpty());
+    ui->runningScriptsList->setVisible(!list.isEmpty());
     ui->reloadAllButton->setVisible(!list.isEmpty());
     ui->stopAllButton->setVisible(!list.isEmpty());
 
diff --git a/interface/ui/runningScriptsWidget.ui b/interface/ui/runningScriptsWidget.ui
index b4d17b1561..a55e949d7a 100644
--- a/interface/ui/runningScriptsWidget.ui
+++ b/interface/ui/runningScriptsWidget.ui
@@ -222,7 +222,7 @@ font: bold 16px;
             <enum>Qt::ScrollBarAlwaysOn</enum>
            </property>
            <property name="horizontalScrollBarPolicy">
-            <enum>Qt::ScrollBarAlwaysOff</enum>
+            <enum>Qt::ScrollBarAsNeeded</enum>
            </property>
            <property name="sizeAdjustPolicy">
             <enum>QAbstractScrollArea::AdjustToContents</enum>