From c428e6896241752a423c06b9740b394fe573883a Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 21 May 2014 17:03:07 -0700
Subject: [PATCH] Update script window to load script when pressing enter

---
 interface/src/ui/RunningScriptsWidget.cpp | 68 ++++++++++++++++++-----
 interface/src/ui/RunningScriptsWidget.h   |  7 ++-
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/interface/src/ui/RunningScriptsWidget.cpp b/interface/src/ui/RunningScriptsWidget.cpp
index b897c96c36..46989200cc 100644
--- a/interface/src/ui/RunningScriptsWidget.cpp
+++ b/interface/src/ui/RunningScriptsWidget.cpp
@@ -13,7 +13,6 @@
 #include "ui_runningScriptsWidget.h"
 #include "RunningScriptsWidget.h"
 
-#include <QCompleter>
 #include <QAbstractProxyModel>
 #include <QFileInfo>
 #include <QKeyEvent>
@@ -43,13 +42,18 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) :
 
     ui->recentlyLoadedScriptsArea->hide();
 
+    ui->filterLineEdit->installEventFilter(this);
+
+    connect(&_proxyModel, &QSortFilterProxyModel::modelReset,
+            this, &RunningScriptsWidget::selectFirstInList);
+
     _proxyModel.setSourceModel(&_scriptsModel);
     _proxyModel.sort(0, Qt::AscendingOrder);
     _proxyModel.setDynamicSortFilter(true);
     ui->scriptListView->setModel(&_proxyModel);
-    ui->scriptListView->setAttribute(Qt::WA_MacShowFocusRect, false);
+
     connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &RunningScriptsWidget::updateFileFilter);
-    connect(ui->scriptListView, &QListView::doubleClicked, this, &RunningScriptsWidget::scriptFileSelected);
+    connect(ui->scriptListView, &QListView::doubleClicked, this, &RunningScriptsWidget::loadScriptFromList);
 
     _runningScriptsTable = new ScriptsTableWidget(ui->runningScriptsTableWidget);
     _runningScriptsTable->setColumnCount(2);
@@ -80,12 +84,19 @@ RunningScriptsWidget::~RunningScriptsWidget() {
 void RunningScriptsWidget::updateFileFilter(const QString& filter) {
     QRegExp regex("^.*" + QRegExp::escape(filter) + ".*$", Qt::CaseInsensitive);
     _proxyModel.setFilterRegExp(regex);
+    selectFirstInList();
 }
 
-void RunningScriptsWidget::scriptFileSelected(const QModelIndex& index) {
+void RunningScriptsWidget::loadScriptFromList(const QModelIndex& index) {
     QVariant scriptFile = _proxyModel.data(index, ScriptsModel::ScriptPath);
-    qDebug() << "Loading: " << scriptFile.toString();
-    Application::getInstance()->loadScript(scriptFile.toString());
+    Application::getInstance()->loadScript(scriptFile.toString(), false, false);
+}
+
+void RunningScriptsWidget::loadSelectedScript() {
+    QModelIndex selectedIndex = ui->scriptListView->currentIndex();
+    if (selectedIndex.isValid()) {
+        loadScriptFromList(selectedIndex);
+    }
 }
 
 void RunningScriptsWidget::setBoundary(const QRect& rect) {
@@ -134,14 +145,43 @@ void RunningScriptsWidget::setRunningScripts(const QStringList& list) {
     createRecentlyLoadedScriptsTable();
 }
 
-void RunningScriptsWidget::keyPressEvent(QKeyEvent* event)
-{
+void RunningScriptsWidget::showEvent(QShowEvent* event) {
+    if (!event->spontaneous()) {
+        ui->filterLineEdit->setFocus();
+    }
+
+    FramelessDialog::showEvent(event);
+}
+
+void RunningScriptsWidget::selectFirstInList() {
+    if (_proxyModel.rowCount() > 0) {
+        ui->scriptListView->setCurrentIndex(_proxyModel.index(0, 0));
+    }
+}
+
+bool RunningScriptsWidget::eventFilter(QObject* sender, QEvent* event) {
+    if (sender == ui->filterLineEdit) {
+        if (event->type() != QEvent::KeyPress) {
+            return false;
+        }
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+        if (keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter) {
+            QModelIndex selectedIndex = ui->scriptListView->currentIndex();
+            if (selectedIndex.isValid()) {
+                loadScriptFromList(selectedIndex);
+            }
+            event->accept();
+            return true;
+        }
+        return false;
+    }
+
+    return FramelessDialog::eventFilter(sender, event);
+}
+
+void RunningScriptsWidget::keyPressEvent(QKeyEvent* event) {
     int loadScriptNumber = -1;
     switch(event->key()) {
-    case Qt::Key_Escape:
-        Application::getInstance()->toggleRunningScriptsWidget();
-        break;
-
     case Qt::Key_1:
     case Qt::Key_2:
     case Qt::Key_3:
@@ -159,7 +199,7 @@ void RunningScriptsWidget::keyPressEvent(QKeyEvent* event)
     }
     if (loadScriptNumber >= 0) {
         if (_recentlyLoadedScripts.size() > loadScriptNumber) {
-            Application::getInstance()->loadScript(_recentlyLoadedScripts.at(loadScriptNumber));
+            Application::getInstance()->loadScript(_recentlyLoadedScripts.at(loadScriptNumber), false, false);
         }
     }
 
@@ -199,7 +239,7 @@ void RunningScriptsWidget::stopScript(int row, int column) {
 }
 
 void RunningScriptsWidget::loadScript(int row, int column) {
-    Application::getInstance()->loadScript(_recentlyLoadedScriptsTable->item(row, column)->toolTip());
+    Application::getInstance()->loadScript(_recentlyLoadedScriptsTable->item(row, column)->toolTip(), false, false);
 }
 
 void RunningScriptsWidget::allScriptsStopped() {
diff --git a/interface/src/ui/RunningScriptsWidget.h b/interface/src/ui/RunningScriptsWidget.h
index 8170cb65b8..7b03898ece 100644
--- a/interface/src/ui/RunningScriptsWidget.h
+++ b/interface/src/ui/RunningScriptsWidget.h
@@ -37,8 +37,11 @@ signals:
     void stopScriptName(const QString& name);
 
 protected:
+    virtual bool eventFilter(QObject* sender, QEvent* event);
+
     virtual void keyPressEvent(QKeyEvent* event);
     virtual void paintEvent(QPaintEvent* event);
+    virtual void showEvent(QShowEvent* event);
 
 public slots:
     void scriptStopped(const QString& scriptName);
@@ -49,7 +52,9 @@ private slots:
     void loadScript(int row, int column);
     void allScriptsStopped();
     void updateFileFilter(const QString& filter);
-    void scriptFileSelected(const QModelIndex& index);
+    void loadScriptFromList(const QModelIndex& index);
+    void loadSelectedScript();
+    void selectFirstInList();
 
 private:
     Ui::RunningScriptsWidget* ui;