Merge pull request #3075 from huffman/19644

Code Review for Job #19644
2025-04-20 01:03:57 +02:00 · 2014-06-26 09:39:20 -07:00 · 2014-06-26 09:39:20 -07:00 · dba9d33f86
commit dba9d33f86
parent 96e81d5596 3bec59fd33
13 changed files with 1175 additions and 345 deletions
--- a/interface/resources/styles/preferences.qss
+++ b/interface/resources/styles/preferences.qss
@ -12,7 +12,8 @@ QLabel#advancedTuningLabel {

 QPushButton#buttonBrowseHead,
 QPushButton#buttonBrowseBody,
-QPushButton#buttonBrowseLocation {
+QPushButton#buttonBrowseLocation,
+QPushButton#buttonBrowseScriptsLocation {
    background-image: url(styles/search.svg);
    background-repeat: no-repeat;
    background-position: center center;
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@ -167,7 +167,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
        _nodeBoundsDisplay(this),
        _previousScriptLocation(),
        _applicationOverlay(),
-        _runningScriptsWidget(new RunningScriptsWidget(_window)),
+        _runningScriptsWidget(NULL),
        _runningScriptsWidgetWasVisible(false),
        _trayIcon(new QSystemTrayIcon(_window)),
        _lastNackTime(usecTimestampNow())
@ -201,6 +201,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
    // call Menu getInstance static method to set up the menu
    _window->setMenuBar(Menu::getInstance());

+    _runningScriptsWidget = new RunningScriptsWidget(_window);
+
    unsigned int listenPort = 0; // bind to an ephemeral port by default
    const char** constArgv = const_cast<const char**>(argv);
    const char* portStr = getCmdOption(argc, constArgv, "--listenPort");
@ -3532,10 +3534,12 @@ void Application::saveScripts() {
    _settings->endArray();
 }

-ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScriptFromEditor) {
+ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScriptFromEditor, bool activateMainWindow) {
    QUrl scriptUrl(scriptName);
    const QString& scriptURLString = scriptUrl.toString();
-    if(loadScriptFromEditor && _scriptEnginesHash.contains(scriptURLString) && !_scriptEnginesHash[scriptURLString]->isFinished()){
+    if (_scriptEnginesHash.contains(scriptURLString) && loadScriptFromEditor
+        && !_scriptEnginesHash[scriptURLString]->isFinished()) {
+
        return _scriptEnginesHash[scriptURLString];
    }

@ -3548,10 +3552,11 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript

        if (!scriptEngine->hasScript()) {
            qDebug() << "Application::loadScript(), script failed to load...";
+            QMessageBox::warning(getWindow(), "Error Loading Script", scriptURLString + " failed to load.");
            return NULL;
        }

-        _scriptEnginesHash.insert(scriptURLString, scriptEngine);
+        _scriptEnginesHash.insertMulti(scriptURLString, scriptEngine);
        _runningScriptsWidget->setRunningScripts(getRunningScripts());
    }

@ -3614,7 +3619,7 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
    workerThread->start();

    // restore the main window's active state
-    if (!loadScriptFromEditor) {
+    if (activateMainWindow && !loadScriptFromEditor) {
        _window->activateWindow();
    }
    bumpSettings();
@ -3623,7 +3628,9 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
 }

 void Application::scriptFinished(const QString& scriptName) {
-    if (_scriptEnginesHash.remove(scriptName)) {
+    QHash<QString, ScriptEngine*>::iterator it = _scriptEnginesHash.find(scriptName);
+    if (it != _scriptEnginesHash.end()) {
+        _scriptEnginesHash.erase(it);
        _runningScriptsWidget->scriptStopped(scriptName);
        _runningScriptsWidget->setRunningScripts(getRunningScripts());
        bumpSettings();
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@ -324,7 +324,7 @@ public slots:
    void loadScriptURLDialog();
    void toggleLogDialog();
    void initAvatarAndViewFrustum();
-    ScriptEngine* loadScript(const QString& fileNameString = QString(), bool loadScriptFromEditor = false);
+    ScriptEngine* loadScript(const QString& fileNameString = QString(), bool loadScriptFromEditor = false, bool activateMainWindow = false);
    void scriptFinished(const QString& scriptName);
    void stopAllScripts(bool restart = false);
    void stopScript(const QString& scriptName);
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@ -108,6 +108,7 @@ Menu::Menu() :
    _fastFPSAverage(ONE_SECOND_OF_FRAMES),
    _loginAction(NULL),
    _preferencesDialog(NULL),
+    _scriptsLocation(),
    _loginDialog(NULL),
    _snapshotsLocation()
 {
@ -607,6 +608,7 @@ void Menu::loadSettings(QSettings* settings) {
    _boundaryLevelAdjust = loadSetting(settings, "boundaryLevelAdjust", 0);
    _snapshotsLocation = settings->value("snapshotsLocation",
                                         QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).toString();
+    setScriptsLocation(settings->value("scriptsLocation", QString()).toString());

    settings->beginGroup("View Frustum Offset Camera");
    // in case settings is corrupt or missing loadSetting() will check for NaN
@ -651,6 +653,7 @@ void Menu::saveSettings(QSettings* settings) {
    settings->setValue("avatarLODDistanceMultiplier", _avatarLODDistanceMultiplier);
    settings->setValue("boundaryLevelAdjust", _boundaryLevelAdjust);
    settings->setValue("snapshotsLocation", _snapshotsLocation);
+    settings->setValue("scriptsLocation", _scriptsLocation);
    settings->beginGroup("View Frustum Offset Camera");
    settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffset.yaw);
    settings->setValue("viewFrustumOffsetPitch", _viewFrustumOffset.pitch);
@ -1786,3 +1789,8 @@ QString Menu::getSnapshotsLocation() const {
    }
    return _snapshotsLocation;
 }
+
+void Menu::setScriptsLocation(const QString& scriptsLocation) {
+    _scriptsLocation = scriptsLocation;
+    emit scriptLocationChanged(scriptsLocation);
+}
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@ -102,6 +102,9 @@ public:
    QString getSnapshotsLocation() const;
    void setSnapshotsLocation(QString snapshotsLocation) { _snapshotsLocation = snapshotsLocation; }

+    const QString& getScriptsLocation() const { return _scriptsLocation; }
+    void setScriptsLocation(const QString& scriptsLocation);
+
    BandwidthDialog* getBandwidthDialog() const { return _bandwidthDialog; }
    FrustumDrawMode getFrustumDrawMode() const { return _frustumDrawMode; }
    ViewFrustumOffset getViewFrustumOffset() const { return _viewFrustumOffset; }
@ -156,6 +159,9 @@ public:
    void static goToDomain(const QString newDomain);
    void static goTo(QString destination);

+signals:
+    void scriptLocationChanged(const QString& newPath);
+
 public slots:

    void loginForCurrentDomain();
@ -283,6 +289,7 @@ private:
    QPointer<LoginDialog> _loginDialog;
    QAction* _chatAction;
    QString _snapshotsLocation;
+    QString _scriptsLocation;
 };

 namespace MenuOption {
--- a/interface/src/ScriptsModel.cpp
+++ b/interface/src/ScriptsModel.cpp
@ -0,0 +1,209 @@
+//
+//  ScriptsModel.cpp
+//  interface/src
+//
+//  Created by Ryan Huffman on 05/12/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  S3 request code written with ModelBrowser as a reference.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <QNetworkAccessManager>
+#include <QUrl>
+#include <QUrlQuery>
+#include <QXmlStreamReader>
+
+#include "ScriptsModel.h"
+#include "Menu.h"
+
+
+static const QString S3_URL = "http://highfidelity-public.s3-us-west-1.amazonaws.com";
+static const QString PUBLIC_URL = "http://public.highfidelity.io";
+static const QString MODELS_LOCATION = "scripts/";
+
+static const QString PREFIX_PARAMETER_NAME = "prefix";
+static const QString MARKER_PARAMETER_NAME = "marker";
+static const QString IS_TRUNCATED_NAME = "IsTruncated";
+static const QString CONTAINER_NAME = "Contents";
+static const QString KEY_NAME = "Key";
+
+static const int SCRIPT_PATH = Qt::UserRole;
+
+ScriptItem::ScriptItem(const QString& filename, const QString& fullPath) :
+    _filename(filename),
+    _fullPath(fullPath) {
+};
+
+ScriptsModel::ScriptsModel(QObject* parent) :
+    QAbstractListModel(parent),
+    _loadingScripts(false),
+    _localDirectory(),
+    _fsWatcher(),
+    _localFiles(),
+    _remoteFiles() {
+
+    QString scriptPath = Menu::getInstance()->getScriptsLocation();
+
+    _localDirectory.setPath(scriptPath);
+    _localDirectory.setFilter(QDir::Files | QDir::Readable);
+    _localDirectory.setNameFilters(QStringList("*.js"));
+
+    _fsWatcher.addPath(_localDirectory.absolutePath());
+    connect(&_fsWatcher, &QFileSystemWatcher::directoryChanged, this, &ScriptsModel::reloadLocalFiles);
+
+    connect(Menu::getInstance(), &Menu::scriptLocationChanged, this, &ScriptsModel::updateScriptsLocation);
+
+    reloadLocalFiles();
+    reloadRemoteFiles();
+}
+
+QVariant ScriptsModel::data(const QModelIndex& index, int role) const {
+    const QList<ScriptItem*>* files = NULL;
+    int row = 0;
+    bool isLocal = index.row() < _localFiles.size();
+     if (isLocal) {
+         files = &_localFiles;
+         row = index.row();
+     } else {
+         files = &_remoteFiles;
+         row = index.row() - _localFiles.size();
+     }
+
+    if (role == Qt::DisplayRole) {
+        return QVariant((*files)[row]->getFilename() + (isLocal ? " (local)" : ""));
+    } else if (role == ScriptPath) {
+        return QVariant((*files)[row]->getFullPath());
+    }
+    return QVariant();
+}
+
+int ScriptsModel::rowCount(const QModelIndex& parent) const {
+    if (parent.isValid()) {
+        return 0;
+    }
+    return _localFiles.length() + _remoteFiles.length();
+}
+
+void ScriptsModel::updateScriptsLocation(const QString& newPath) {
+    _fsWatcher.removePath(_localDirectory.absolutePath());
+    _localDirectory.setPath(newPath);
+    _fsWatcher.addPath(_localDirectory.absolutePath());
+    reloadLocalFiles();
+}
+
+void ScriptsModel::reloadRemoteFiles() {
+    if (!_loadingScripts) {
+        _loadingScripts = true;
+        while (!_remoteFiles.isEmpty()) {
+            delete _remoteFiles.takeFirst();
+        }
+        requestRemoteFiles();
+    }
+}
+
+void ScriptsModel::requestRemoteFiles(QString marker) {
+    QUrl url(S3_URL);
+    QUrlQuery query;
+    query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION);
+    if (!marker.isEmpty()) {
+        query.addQueryItem(MARKER_PARAMETER_NAME, marker);
+    }
+    url.setQuery(query);
+
+    QNetworkAccessManager* accessManager = new QNetworkAccessManager(this);
+    connect(accessManager, SIGNAL(finished(QNetworkReply*)), SLOT(downloadFinished(QNetworkReply*)));
+
+    QNetworkRequest request(url);
+    accessManager->get(request);
+}
+
+void ScriptsModel::downloadFinished(QNetworkReply* reply) {
+    bool finished = true;
+
+    if (reply->error() == QNetworkReply::NoError) {
+        QByteArray data = reply->readAll();
+
+        if (!data.isEmpty()) {
+            finished = parseXML(data);
+        } else {
+            qDebug() << "Error: Received no data when loading remote scripts";
+        }
+    }
+
+    reply->deleteLater();
+    sender()->deleteLater();
+
+    if (finished) {
+        _loadingScripts = false;
+    }
+}
+
+bool ScriptsModel::parseXML(QByteArray xmlFile) {
+    beginResetModel();
+
+    QXmlStreamReader xml(xmlFile);
+    QRegExp jsRegex(".*\\.js");
+    bool truncated = false;
+    QString lastKey;
+
+    while (!xml.atEnd() && !xml.hasError()) {
+        if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == IS_TRUNCATED_NAME) {
+            while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == IS_TRUNCATED_NAME)) {
+                xml.readNext();
+                if (xml.text().toString() == "true") {
+                    truncated = true;
+                }
+            }
+        }
+
+        if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == CONTAINER_NAME) {
+            while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == CONTAINER_NAME)) {
+                if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == KEY_NAME) {
+                    xml.readNext();
+                    lastKey = xml.text().toString();
+                    if (jsRegex.exactMatch(xml.text().toString())) {
+                        _remoteFiles.append(new ScriptItem(lastKey.mid(MODELS_LOCATION.length()), S3_URL + "/" + lastKey));
+                    }
+                }
+                xml.readNext();
+            }
+        }
+        xml.readNext();
+    }
+
+    endResetModel();
+
+    // Error handling
+    if (xml.hasError()) {
+        qDebug() << "Error loading remote scripts: " << xml.errorString();
+        return true;
+    }
+
+    if (truncated) {
+        requestRemoteFiles(lastKey);
+    }
+
+    // If this request was not truncated, we are done.
+    return !truncated;
+}
+
+void ScriptsModel::reloadLocalFiles() {
+    beginResetModel();
+
+    while (!_localFiles.isEmpty()) {
+        delete _localFiles.takeFirst();
+    }
+
+    _localDirectory.refresh();
+
+    const QFileInfoList localFiles = _localDirectory.entryInfoList();
+    for (int i = 0; i < localFiles.size(); i++) {
+        QFileInfo file = localFiles[i];
+        _localFiles.append(new ScriptItem(file.fileName(), file.absoluteFilePath()));
+    }
+
+    endResetModel();
+}
--- a/interface/src/ScriptsModel.h
+++ b/interface/src/ScriptsModel.h
@ -0,0 +1,62 @@
+//
+//  ScriptsModel.h
+//  interface/src
+//
+//  Created by Ryan Huffman on 05/12/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_ScriptsModel_h
+#define hifi_ScriptsModel_h
+
+#include <QAbstractListModel>
+#include <QDir>
+#include <QNetworkReply>
+#include <QFileSystemWatcher>
+
+class ScriptItem {
+public:
+    ScriptItem(const QString& filename, const QString& fullPath);
+
+    const QString& getFilename() { return _filename; };
+    const QString& getFullPath() { return _fullPath; };
+
+private:
+    QString _filename;
+    QString _fullPath;
+};
+
+class ScriptsModel : public QAbstractListModel {
+    Q_OBJECT
+public:
+    ScriptsModel(QObject* parent = NULL);
+
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
+
+    enum Role {
+        ScriptPath = Qt::UserRole,
+    };
+
+protected slots:
+    void updateScriptsLocation(const QString& newPath);
+    void downloadFinished(QNetworkReply* reply);
+    void reloadLocalFiles();
+    void reloadRemoteFiles();
+
+protected:
+    void requestRemoteFiles(QString marker = QString());
+    bool parseXML(QByteArray xmlFile);
+
+private:
+    bool _loadingScripts;
+    QDir _localDirectory;
+    QFileSystemWatcher _fsWatcher;
+    QList<ScriptItem*> _localFiles;
+    QList<ScriptItem*> _remoteFiles;
+};
+
+#endif // hifi_ScriptsModel_h
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@ -29,6 +29,7 @@ PreferencesDialog::PreferencesDialog(QWidget* parent, Qt::WindowFlags flags) : F
    connect(ui.buttonBrowseHead, &QPushButton::clicked, this, &PreferencesDialog::openHeadModelBrowser);
    connect(ui.buttonBrowseBody, &QPushButton::clicked, this, &PreferencesDialog::openBodyModelBrowser);
    connect(ui.buttonBrowseLocation, &QPushButton::clicked, this, &PreferencesDialog::openSnapshotLocationBrowser);
+    connect(ui.buttonBrowseScriptsLocation, &QPushButton::clicked, this, &PreferencesDialog::openScriptsLocationBrowser);
    connect(ui.buttonReloadDefaultScripts, &QPushButton::clicked,
            Application::getInstance(), &Application::loadDefaultScripts);
 }
@ -72,13 +73,32 @@ void PreferencesDialog::openBodyModelBrowser() {

 void PreferencesDialog::openSnapshotLocationBrowser() {
    setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+    show();
+
    QString dir = QFileDialog::getExistingDirectory(this, tr("Snapshots Location"),
                                                    QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
                                                    QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
    if (!dir.isNull() && !dir.isEmpty()) {
        ui.snapshotLocationEdit->setText(dir);
    }
+
    setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+    show();
+}
+
+void PreferencesDialog::openScriptsLocationBrowser() {
+    setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+    show();
+
+    QString dir = QFileDialog::getExistingDirectory(this, tr("Scripts Location"),
+                                                    ui.scriptsLocationEdit->text(),
+                                                    QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+    if (!dir.isNull() && !dir.isEmpty()) {
+        ui.scriptsLocationEdit->setText(dir);
+    }
+
+    setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+    show();
 }

 void PreferencesDialog::resizeEvent(QResizeEvent *resizeEvent) {
@ -118,6 +138,8 @@ void PreferencesDialog::loadPreferences() {

    ui.snapshotLocationEdit->setText(menuInstance->getSnapshotsLocation());

+    ui.scriptsLocationEdit->setText(menuInstance->getScriptsLocation());
+
    ui.pupilDilationSlider->setValue(myAvatar->getHead()->getPupilDilation() *
                                     ui.pupilDilationSlider->maximum());
    
@ -180,6 +202,10 @@ void PreferencesDialog::savePreferences() {
        Menu::getInstance()->setSnapshotsLocation(ui.snapshotLocationEdit->text());
    }

+    if (!ui.scriptsLocationEdit->text().isEmpty() && QDir(ui.scriptsLocationEdit->text()).exists()) {
+        Menu::getInstance()->setScriptsLocation(ui.scriptsLocationEdit->text());
+    }
+
    myAvatar->getHead()->setPupilDilation(ui.pupilDilationSlider->value() / (float)ui.pupilDilationSlider->maximum());
    myAvatar->setLeanScale(ui.leanScaleSpin->value());
    myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());
--- a/interface/src/ui/PreferencesDialog.h
+++ b/interface/src/ui/PreferencesDialog.h
@ -42,6 +42,7 @@ private slots:
    void setHeadUrl(QString modelUrl);
    void setSkeletonUrl(QString modelUrl);
    void openSnapshotLocationBrowser();
+    void openScriptsLocationBrowser();
    
 };

--- a/interface/src/ui/RunningScriptsWidget.cpp
+++ b/interface/src/ui/RunningScriptsWidget.cpp
@ -3,6 +3,7 @@
 //  interface/src/ui
 //
 //  Created by Mohammed Nafees on 03/28/2014.
+//  Updated by Ryan Huffman on 05/13/2014.
 //  Copyright 2014 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
@ -12,18 +13,27 @@
 #include "ui_runningScriptsWidget.h"
 #include "RunningScriptsWidget.h"

+#include <QAbstractProxyModel>
 #include <QFileInfo>
 #include <QKeyEvent>
 #include <QPainter>
 #include <QTableWidgetItem>

 #include "Application.h"
+#include "Menu.h"
+#include "ScriptsModel.h"
+

 RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) :
    FramelessDialog(parent, 0, POSITION_LEFT),
-    ui(new Ui::RunningScriptsWidget) {
+    ui(new Ui::RunningScriptsWidget),
+    _signalMapper(this),
+    _scriptsModel(this),
+    _proxyModel(this) {
    ui->setupUi(this);

+    setAttribute(Qt::WA_DeleteOnClose, false);
+
    setAllowResize(false);

    ui->hideWidgetButton->setIcon(QIcon(Application::resourcesPath() + "images/close.svg"));
@ -31,17 +41,24 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) :
    ui->stopAllButton->setIcon(QIcon(Application::resourcesPath() + "images/stop.svg"));
    ui->loadScriptButton->setIcon(QIcon(Application::resourcesPath() + "images/plus-white.svg"));

-    _runningScriptsTable = new ScriptsTableWidget(ui->runningScriptsTableWidget);
-    _runningScriptsTable->setColumnCount(2);
-    _runningScriptsTable->setColumnWidth(0, 245);
-    _runningScriptsTable->setColumnWidth(1, 22);
-    connect(_runningScriptsTable, &QTableWidget::cellClicked, this, &RunningScriptsWidget::stopScript);
+    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);
+
+    connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &RunningScriptsWidget::updateFileFilter);
+    connect(ui->scriptListView, &QListView::doubleClicked, this, &RunningScriptsWidget::loadScriptFromList);

    _recentlyLoadedScriptsTable = new ScriptsTableWidget(ui->recentlyLoadedScriptsTableWidget);
    _recentlyLoadedScriptsTable->setColumnCount(1);
    _recentlyLoadedScriptsTable->setColumnWidth(0, 265);
-    connect(_recentlyLoadedScriptsTable, &QTableWidget::cellClicked,
-            this, &RunningScriptsWidget::loadScript);

    connect(ui->hideWidgetButton, &QPushButton::clicked,
            Application::getInstance(), &Application::toggleRunningScriptsWidget);
@ -51,59 +68,121 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) :
            this, &RunningScriptsWidget::allScriptsStopped);
    connect(ui->loadScriptButton, &QPushButton::clicked,
            Application::getInstance(), &Application::loadDialog);
+    connect(&_signalMapper, SIGNAL(mapped(QString)), Application::getInstance(), SLOT(stopScript(const QString&)));
 }

 RunningScriptsWidget::~RunningScriptsWidget() {
    delete ui;
 }

+void RunningScriptsWidget::updateFileFilter(const QString& filter) {
+    QRegExp regex("^.*" + QRegExp::escape(filter) + ".*$", Qt::CaseInsensitive);
+    _proxyModel.setFilterRegExp(regex);
+    selectFirstInList();
+}
+
+void RunningScriptsWidget::loadScriptFromList(const QModelIndex& index) {
+    QVariant scriptFile = _proxyModel.data(index, ScriptsModel::ScriptPath);
+    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) {
    _boundary = rect;
 }

 void RunningScriptsWidget::setRunningScripts(const QStringList& list) {
-    _runningScriptsTable->setRowCount(list.size());
+    setUpdatesEnabled(false);
+    QLayoutItem* widget;
+    while ((widget = ui->scrollAreaWidgetContents->layout()->takeAt(0)) != NULL) {
+        delete widget->widget();
+        delete widget;
+    }
+    const int CLOSE_ICON_HEIGHT = 12;
+    for (int i = 0; i < list.size(); i++) {
+        QWidget* row = new QWidget(ui->scrollAreaWidgetContents);
+        row->setLayout(new QHBoxLayout(row));
+
+        QUrl url = QUrl(list.at(i));
+        QLabel* name = new QLabel(url.fileName(), row);
+        QPushButton* closeButton = new QPushButton(row);
+        closeButton->setFlat(true);
+        closeButton->setIcon(
+            QIcon(QPixmap(Application::resourcesPath() + "images/kill-script.svg").scaledToHeight(CLOSE_ICON_HEIGHT)));
+        closeButton->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred));
+        closeButton->setStyleSheet("border: 0;");
+        closeButton->setCursor(Qt::PointingHandCursor);
+
+        connect(closeButton, SIGNAL(clicked()), &_signalMapper, SLOT(map()));
+        _signalMapper.setMapping(closeButton, url.toString());
+
+        row->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
+
+        row->layout()->setContentsMargins(4, 4, 4, 4);
+        row->layout()->setSpacing(0);
+
+        row->layout()->addWidget(name);
+        row->layout()->addWidget(closeButton);
+
+        row->setToolTip(url.toString());
+
+        QFrame* line = new QFrame(row);
+        line->setFrameShape(QFrame::HLine);
+        line->setStyleSheet("color: #E1E1E1; margin-left: 6px; margin-right: 6px;");
+
+        ui->scrollAreaWidgetContents->layout()->addWidget(row);
+        ui->scrollAreaWidgetContents->layout()->addWidget(line);
+    }
+

    ui->noRunningScriptsLabel->setVisible(list.isEmpty());
-    ui->currentlyRunningLabel->setVisible(!list.isEmpty());
-    ui->runningScriptsTableWidget->setVisible(!list.isEmpty());
    ui->reloadAllButton->setVisible(!list.isEmpty());
    ui->stopAllButton->setVisible(!list.isEmpty());

-    const int CLOSE_ICON_HEIGHT = 12;
+    ui->scrollAreaWidgetContents->updateGeometry();
+    setUpdatesEnabled(true);
+    Application::processEvents();
+    repaint();
+}

-    for (int i = 0; i < list.size(); ++i) {
-        QTableWidgetItem *scriptName = new QTableWidgetItem;
-        scriptName->setText(QFileInfo(list.at(i)).fileName());
-        scriptName->setToolTip(list.at(i));
-        scriptName->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-        QTableWidgetItem *closeIcon = new QTableWidgetItem;
-        closeIcon->setIcon(QIcon(QPixmap(Application::resourcesPath() + "images/kill-script.svg").scaledToHeight(CLOSE_ICON_HEIGHT)));
-
-        _runningScriptsTable->setItem(i, 0, scriptName);
-        _runningScriptsTable->setItem(i, 1, closeIcon);
+void RunningScriptsWidget::showEvent(QShowEvent* event) {
+    if (!event->spontaneous()) {
+        ui->filterLineEdit->setFocus();
    }

-    const int RUNNING_SCRIPTS_TABLE_LEFT_MARGIN = 12;
-    const int RECENTLY_LOADED_TOP_MARGIN = 61;
-    const int RECENTLY_LOADED_LABEL_TOP_MARGIN = 19;
+    FramelessDialog::showEvent(event);
+}

-    int y = ui->runningScriptsTableWidget->y() + RUNNING_SCRIPTS_TABLE_LEFT_MARGIN;
-    for (int i = 0; i < _runningScriptsTable->rowCount(); ++i) {
-        y += _runningScriptsTable->rowHeight(i);
+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;
    }

-    ui->runningScriptsTableWidget->resize(ui->runningScriptsTableWidget->width(), y - RUNNING_SCRIPTS_TABLE_LEFT_MARGIN);
-    _runningScriptsTable->resize(_runningScriptsTable->width(), y - RUNNING_SCRIPTS_TABLE_LEFT_MARGIN);
-    ui->reloadAllButton->move(ui->reloadAllButton->x(), y);
-    ui->stopAllButton->move(ui->stopAllButton->x(), y);
-    ui->recentlyLoadedLabel->move(ui->recentlyLoadedLabel->x(),
-                                  ui->stopAllButton->y() + ui->stopAllButton->height() + RECENTLY_LOADED_TOP_MARGIN);
-    ui->recentlyLoadedScriptsTableWidget->move(ui->recentlyLoadedScriptsTableWidget->x(),
-                                               ui->recentlyLoadedLabel->y() + RECENTLY_LOADED_LABEL_TOP_MARGIN);
-
-
-    createRecentlyLoadedScriptsTable();
+    return FramelessDialog::eventFilter(sender, event);
 }

 void RunningScriptsWidget::keyPressEvent(QKeyEvent *keyEvent) {
@ -114,79 +193,10 @@ void RunningScriptsWidget::keyPressEvent(QKeyEvent *keyEvent) {
    }
 }

-void RunningScriptsWidget::paintEvent(QPaintEvent* event) {
-    QPainter painter(this);
-    painter.setPen(QColor::fromRgb(225, 225, 225)); // #e1e1e1
-
-    if (ui->currentlyRunningLabel->isVisible()) {
-        // line below the 'Currently Running' label
-        painter.drawLine(36, ui->currentlyRunningLabel->y() + ui->currentlyRunningLabel->height(),
-                         300, ui->currentlyRunningLabel->y() + ui->currentlyRunningLabel->height());
-    }
-
-    if (ui->recentlyLoadedLabel->isVisible()) {
-        // line below the 'Recently loaded' label
-        painter.drawLine(36, ui->recentlyLoadedLabel->y() + ui->recentlyLoadedLabel->height(),
-                         300, ui->recentlyLoadedLabel->y() + ui->recentlyLoadedLabel->height());
-    }
-
-    painter.end();
-}
-
 void RunningScriptsWidget::scriptStopped(const QString& scriptName) {
-    _recentlyLoadedScripts.prepend(scriptName);
-}
-
-void RunningScriptsWidget::stopScript(int row, int column) {
-    if (column == 1) { // make sure the user has clicked on the close icon
-        _lastStoppedScript = _runningScriptsTable->item(row, 0)->toolTip();
-        emit stopScriptName(_runningScriptsTable->item(row, 0)->toolTip());
-    }
-}
-
-void RunningScriptsWidget::loadScript(int row, int column) {
-    Application::getInstance()->loadScript(_recentlyLoadedScriptsTable->item(row, column)->toolTip());
+    // _recentlyLoadedScripts.prepend(scriptName);
 }

 void RunningScriptsWidget::allScriptsStopped() {
    Application::getInstance()->stopAllScripts();
 }
-
-void RunningScriptsWidget::createRecentlyLoadedScriptsTable() {
-    if (!_recentlyLoadedScripts.contains(_lastStoppedScript) && !_lastStoppedScript.isEmpty()) {
-        _recentlyLoadedScripts.prepend(_lastStoppedScript);
-        _lastStoppedScript = "";
-    }
-
-    for (int i = 0; i < _recentlyLoadedScripts.size(); ++i) {
-        if (Application::getInstance()->getRunningScripts().contains(_recentlyLoadedScripts.at(i))) {
-            _recentlyLoadedScripts.removeOne(_recentlyLoadedScripts.at(i));
-        }
-    }
-
-    ui->recentlyLoadedLabel->setVisible(!_recentlyLoadedScripts.isEmpty());
-    ui->recentlyLoadedScriptsTableWidget->setVisible(!_recentlyLoadedScripts.isEmpty());
-    ui->recentlyLoadedInstruction->setVisible(!_recentlyLoadedScripts.isEmpty());
-
-    int limit = _recentlyLoadedScripts.size() > 9 ? 9 : _recentlyLoadedScripts.size();
-    _recentlyLoadedScriptsTable->setRowCount(limit);
-    for (int i = 0; i < limit; i++) {
-        QTableWidgetItem *scriptName = new QTableWidgetItem;
-        scriptName->setText(QString::number(i + 1) + ". " + QFileInfo(_recentlyLoadedScripts.at(i)).fileName());
-        scriptName->setToolTip(_recentlyLoadedScripts.at(i));
-        scriptName->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-
-        _recentlyLoadedScriptsTable->setItem(i, 0, scriptName);
-    }
-
-    int y = ui->recentlyLoadedScriptsTableWidget->y() + 15;
-    for (int i = 0; i < _recentlyLoadedScriptsTable->rowCount(); ++i) {
-        y += _recentlyLoadedScriptsTable->rowHeight(i);
-    }
-
-    ui->recentlyLoadedInstruction->setGeometry(36, y,
-                                               ui->recentlyLoadedInstruction->width(),
-                                               ui->recentlyLoadedInstruction->height());
-
-    repaint();
-}
--- a/interface/src/ui/RunningScriptsWidget.h
+++ b/interface/src/ui/RunningScriptsWidget.h
@ -3,6 +3,7 @@
 //  interface/src/ui
 //
 //  Created by Mohammed Nafees on 03/28/2014.
+//  Updated by Ryan Huffman on 05/13/2014.
 //  Copyright 2014 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
@ -12,6 +13,11 @@
 #ifndef hifi_RunningScriptsWidget_h
 #define hifi_RunningScriptsWidget_h

+#include <QFileSystemModel>
+#include <QSignalMapper>
+#include <QSortFilterProxyModel>
+
+#include "ScriptsModel.h"
 #include "FramelessDialog.h"
 #include "ScriptsTableWidget.h"

@ -32,27 +38,31 @@ 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);
    void setBoundary(const QRect& rect);

 private slots:
-    void stopScript(int row, int column);
-    void loadScript(int row, int column);
    void allScriptsStopped();
+    void updateFileFilter(const QString& filter);
+    void loadScriptFromList(const QModelIndex& index);
+    void loadSelectedScript();
+    void selectFirstInList();

 private:
    Ui::RunningScriptsWidget* ui;
-    ScriptsTableWidget* _runningScriptsTable;
+    QSignalMapper _signalMapper;
+    QSortFilterProxyModel _proxyModel;
+    ScriptsModel _scriptsModel;
    ScriptsTableWidget* _recentlyLoadedScriptsTable;
    QStringList _recentlyLoadedScripts;
    QString _lastStoppedScript;
    QRect _boundary;
-
-    void createRecentlyLoadedScriptsTable();
 };

 #endif // hifi_RunningScriptsWidget_h
--- a/interface/ui/preferencesDialog.ui
+++ b/interface/ui/preferencesDialog.ui
@ -154,9 +154,9 @@ color: #0e7077</string>
    <property name="geometry">
     <rect>
      <x>0</x>
-      <y>-1002</y>
-      <width>477</width>
-      <height>1386</height>
+      <y>0</y>
+      <width>600</width>
+      <height>1091</height>
     </rect>
    </property>
    <layout class="QVBoxLayout" name="verticalLayout_2">
@ -645,6 +645,112 @@ color: #0e7077</string>
       </property>
      </widget>
     </item>
+     <item>
+      <widget class="QLabel" name="headLabel_4">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>16</pointsize>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color: #0e7077</string>
+       </property>
+       <property name="text">
+        <string>Load scripts from this directory:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <property name="buddy">
+        <cstring>snapshotLocationEdit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
+       <item>
+        <widget class="QLineEdit" name="scriptsLocationEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_11">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="buttonBrowseScriptsLocation">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>30</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>30</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>30</width>
+           <height>30</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
     <item>
      <widget class="QWidget" name="widget" native="true">
       <layout class="QHBoxLayout" name="horizontalLayout_12">
--- a/interface/ui/runningScriptsWidget.ui
+++ b/interface/ui/runningScriptsWidget.ui
@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>323</width>
-    <height>894</height>
+    <width>324</width>
+    <height>971</height>
   </rect>
  </property>
  <property name="windowTitle">
@ -21,240 +21,623 @@ QWidget {
 	background: #f7f7f7; 
 }</string>
  </property>
-  <widget class="QLabel" name="widgetTitle">
-   <property name="geometry">
-    <rect>
-     <x>37</x>
-     <y>20</y>
-     <width>251</width>
-     <height>31</height>
-    </rect>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="leftMargin">
+    <number>20</number>
   </property>
-   <property name="styleSheet">
-    <string notr="true">color: #0e7077;
+   <property name="topMargin">
+    <number>20</number>
+   </property>
+   <property name="rightMargin">
+    <number>20</number>
+   </property>
+   <property name="bottomMargin">
+    <number>20</number>
+   </property>
+   <item>
+    <widget class="QWidget" name="header" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="widgetTitle">
+        <property name="styleSheet">
+         <string notr="true">color: #0e7077;
 font-size: 20px;
 background: transparent;</string>
-   </property>
-   <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18px;&quot;&gt;Running Scripts&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-   </property>
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="indent">
-    <number>-1</number>
-   </property>
-  </widget>
-  <widget class="QLabel" name="currentlyRunningLabel">
-   <property name="geometry">
-    <rect>
-     <x>36</x>
-     <y>110</y>
-     <width>270</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">color: #0e7077;
-font: bold 14px;
+        </property>
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18px;&quot;&gt;Running Scripts&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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>
+      <item>
+       <widget class="QPushButton" name="hideWidgetButton">
+        <property name="cursor">
+         <cursorShape>PointingHandCursor</cursorShape>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">border: 0</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="flat">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="runningScriptsArea" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>1</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>141</height>
+      </size>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="currentlyRunningLabel">
+        <property name="font">
+         <font>
+          <family>Helvetica,Arial,sans-serif</family>
+          <pointsize>16</pointsize>
+          <weight>75</weight>
+          <italic>false</italic>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">color: #0e7077;
+font: bold 16px;
 background: transparent;</string>
-   </property>
-   <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Currently running&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="reloadAllButton">
-   <property name="geometry">
-    <rect>
-     <x>36</x>
-     <y>270</y>
-     <width>111</width>
-     <height>35</height>
-    </rect>
-   </property>
-   <property name="cursor">
-    <cursorShape>PointingHandCursor</cursorShape>
-   </property>
-   <property name="autoFillBackground">
-    <bool>false</bool>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">background: #0e7077;
+        </property>
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Currently running&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Minimum</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>8</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QWidget" name="reloadStopButtonArea" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <property name="spacing">
+          <number>24</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QPushButton" name="reloadAllButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>111</width>
+             <height>35</height>
+            </size>
+           </property>
+           <property name="cursor">
+            <cursorShape>PointingHandCursor</cursorShape>
+           </property>
+           <property name="autoFillBackground">
+            <bool>false</bool>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background: #0e7077;
 color: #fff;
 border-radius: 4px;
 font: bold 14px;
 padding-top: 3px;</string>
-   </property>
-   <property name="text">
-    <string>Reload all</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="stopAllButton">
-   <property name="geometry">
-    <rect>
-     <x>160</x>
-     <y>270</y>
-     <width>93</width>
-     <height>35</height>
-    </rect>
-   </property>
-   <property name="cursor">
-    <cursorShape>PointingHandCursor</cursorShape>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">background: #0e7077;
+           </property>
+           <property name="text">
+            <string>Reload all</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="stopAllButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>111</width>
+             <height>35</height>
+            </size>
+           </property>
+           <property name="cursor">
+            <cursorShape>PointingHandCursor</cursorShape>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background: #0e7077;
 color: #fff;
 border-radius: 4px;
 font: bold 14px;
 padding-top: 3px;</string>
-   </property>
-   <property name="text">
-    <string>Stop all</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="recentlyLoadedLabel">
-   <property name="geometry">
-    <rect>
-     <x>36</x>
-     <y>320</y>
-     <width>265</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">color: #0e7077;
-font: bold 14px;</string>
-   </property>
-   <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Recently loaded&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="recentlyLoadedInstruction">
-   <property name="geometry">
-    <rect>
-     <x>36</x>
-     <y>630</y>
-     <width>211</width>
-     <height>41</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">color: #95a5a6;
+           </property>
+           <property name="text">
+            <string>Stop all</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <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>
+       <spacer name="verticalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>8</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="noRunningScriptsLabel">
+        <property name="styleSheet">
+         <string notr="true">font: 14px;</string>
+        </property>
+        <property name="text">
+         <string>There are no scripts currently running.</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>10</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QScrollArea" name="runningScriptsList">
+        <property name="font">
+         <font>
+          <family>Helvetica,Arial,sans-serif</family>
+          <pointsize>14</pointsize>
+         </font>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">margin: 0;</string>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="lineWidth">
+         <number>0</number>
+        </property>
+        <property name="verticalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOn</enum>
+        </property>
+        <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOff</enum>
+        </property>
+        <property name="widgetResizable">
+         <bool>true</bool>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+        <widget class="QWidget" name="scrollAreaWidgetContents">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>269</width>
+           <height>16</height>
+          </rect>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">font-size: 14px;</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="recentlyLoadedScriptsArea" native="true">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>100</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="recentlyLoadedLabel">
+        <property name="styleSheet">
+         <string notr="true">color: #0e7077;
+font: bold 16px;</string>
+        </property>
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Recently loaded&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="noRecentlyLoadedLabel">
+        <property name="styleSheet">
+         <string notr="true">font: 14px;</string>
+        </property>
+        <property name="text">
+         <string>There are no recently loaded scripts.</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" name="recentlyLoadedScriptsTableWidget" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>1</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>284</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">background: transparent;
 font-size: 14px;</string>
-   </property>
-   <property name="text">
-    <string>(click a script to load and run it)</string>
-   </property>
-   <property name="wordWrap">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="hideWidgetButton">
-   <property name="geometry">
-    <rect>
-     <x>285</x>
-     <y>29</y>
-     <width>16</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="cursor">
-    <cursorShape>PointingHandCursor</cursorShape>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="iconSize">
-    <size>
-     <width>16</width>
-     <height>16</height>
-    </size>
-   </property>
-   <property name="flat">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QLabel" name="noRunningScriptsLabel">
-   <property name="geometry">
-    <rect>
-     <x>36</x>
-     <y>110</y>
-     <width>271</width>
-     <height>51</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">font: 14px;</string>
-   </property>
-   <property name="text">
-    <string>There are no scripts currently running.</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-   </property>
-  </widget>
-  <widget class="QWidget" name="recentlyLoadedScriptsTableWidget" native="true">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>340</y>
-     <width>272</width>
-     <height>280</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">background: transparent;
-font-size: 14px;</string>
-   </property>
-  </widget>
-  <widget class="QWidget" name="runningScriptsTableWidget" native="true">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>128</y>
-     <width>272</width>
-     <height>161</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">background: transparent;
-font-size: 14px;</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="loadScriptButton">
-   <property name="geometry">
-    <rect>
-     <x>36</x>
-     <y>70</y>
-     <width>111</width>
-     <height>35</height>
-    </rect>
-   </property>
-   <property name="cursor">
-    <cursorShape>PointingHandCursor</cursorShape>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">background: #0e7077;
+        </property>
+        <zorder>runningScriptsList</zorder>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="quickLoadArea" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>2</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>300</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QWidget" name="widget" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>15</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="styleSheet">
+            <string notr="true">color: #0e7077;
+font: bold 16px;</string>
+           </property>
+           <property name="text">
+            <string>Scripts</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="loadScriptButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>111</width>
+             <height>35</height>
+            </size>
+           </property>
+           <property name="cursor">
+            <cursorShape>PointingHandCursor</cursorShape>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background: #0e7077;
 color: #fff;
 border-radius: 4px;
 font: bold 14px;
 padding-top: 3px;</string>
-   </property>
-   <property name="text">
-    <string>Load script</string>
-   </property>
-  </widget>
-  <zorder>widgetTitle</zorder>
-  <zorder>currentlyRunningLabel</zorder>
-  <zorder>recentlyLoadedLabel</zorder>
-  <zorder>recentlyLoadedInstruction</zorder>
-  <zorder>hideWidgetButton</zorder>
-  <zorder>recentlyLoadedScriptsTableWidget</zorder>
-  <zorder>runningScriptsTableWidget</zorder>
-  <zorder>noRunningScriptsLabel</zorder>
-  <zorder>reloadAllButton</zorder>
-  <zorder>stopAllButton</zorder>
-  <zorder>loadScriptButton</zorder>
+           </property>
+           <property name="text">
+            <string>Load script</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="filterLineEdit">
+        <property name="styleSheet">
+         <string notr="true">border: 1px solid rgb(128, 128, 128);
+border-radius: 2px;
+padding: 4px;
+background-color: white;</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="placeholderText">
+         <string>filter</string>
+        </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>6</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QListView" name="scriptListView">
+        <property name="styleSheet">
+         <string notr="true">QListView {
+	border: 1px solid rgb(128, 128, 128);
+	border-radius: 2px;
+}
+QListView::item {
+	padding-top: 2px;
+	padding-bottom: 2px;
+}</string>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Plain</enum>
+        </property>
+        <property name="verticalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOff</enum>
+        </property>
+        <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAsNeeded</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
 </widget>
 <resources/>
 <connections/>