Merge pull request #2939 from huffman/19648

Code Review for Job #19648

interface/resources/styles/console.qss

@@ -0,0 +1,20 @@
+* {
+    font-family: Inconsolata, Lucida Console, Andale Mono, Monaco;
+    font-size: 14px;
+}
+
+#promptTextEdit {
+    color: #425d72;
+}
+
+#promptTextEdit:!enabled {
+    color: #7f7f7f;
+}
+
+#promptGutterLabel {
+    color: #a9bbc3;
+}
+
+#promptGutterLabel:!enabled {
+    color: #7f7f7f;
+}

interface/src/Application.cpp

@@ -3254,16 +3254,21 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
         return _scriptEnginesHash[scriptName];
     }
 
-    // start the script on a new thread...
-    QUrl scriptUrl(scriptName);
-    ScriptEngine* scriptEngine = new ScriptEngine(scriptUrl, &_controllerScriptingInterface);
-    _scriptEnginesHash.insert(scriptUrl.toString(), scriptEngine);
+    ScriptEngine* scriptEngine;
+    if (scriptName.isNull()) {
+        scriptEngine = new ScriptEngine(NO_SCRIPT, "", &_controllerScriptingInterface);
+    } else {
+        // start the script on a new thread...
+        QUrl scriptUrl(scriptName);
+        scriptEngine = new ScriptEngine(scriptUrl, &_controllerScriptingInterface);
+        _scriptEnginesHash.insert(scriptName, scriptEngine);
 
-    if (!scriptEngine->hasScript()) {
-        qDebug() << "Application::loadScript(), script failed to load...";
-        return NULL;
+        if (!scriptEngine->hasScript()) {
+            qDebug() << "Application::loadScript(), script failed to load...";
+            return NULL;
+        }
+        _runningScriptsWidget->setRunningScripts(getRunningScripts());
     }
-    _runningScriptsWidget->setRunningScripts(getRunningScripts());
 
     // setup the packet senders and jurisdiction listeners of the script engine's scripting interfaces so
     // we can use the same ones from the application.

interface/src/Application.h

@@ -323,7 +323,7 @@ public slots:
     void loadScriptURLDialog();
     void toggleLogDialog();
     void initAvatarAndViewFrustum();
-    ScriptEngine* loadScript(const QString& fileNameString, bool loadScriptFromEditor = false);
+    ScriptEngine* loadScript(const QString& fileNameString = QString(), bool loadScriptFromEditor = false);
     void scriptFinished(const QString& scriptName);
     void stopAllScripts(bool restart = false);
     void stopScript(const QString& scriptName);

interface/src/Menu.cpp

@@ -73,6 +73,11 @@ const int ONE_SECOND_OF_FRAMES = 60;
 const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES;
 const float MUTE_RADIUS = 50;
 
+const QString CONSOLE_TITLE = "Scripting Console";
+const float CONSOLE_WINDOW_OPACITY = 0.95f;
+const int CONSOLE_WIDTH = 800;
+const int CONSOLE_HEIGHT = 200;
+
 Menu::Menu() :
     _actionHash(),
     _audioJitterBufferSamples(0),
@@ -81,6 +86,7 @@ Menu::Menu() :
     _faceshiftEyeDeflection(DEFAULT_FACESHIFT_EYE_DEFLECTION),
     _frustumDrawMode(FRUSTUM_DRAW_MODE_ALL),
     _viewFrustumOffset(DEFAULT_FRUSTUM_OFFSET),
+    _jsConsole(NULL),
     _octreeStatsDialog(NULL),
     _lodToolsDialog(NULL),
     _maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM),
@@ -227,6 +233,12 @@ Menu::Menu() :
     _chatWindow = new ChatWindow(Application::getInstance()->getWindow());
 #endif
 
+    addActionToQMenuAndActionHash(toolsMenu,
+            MenuOption::Console,
+            Qt::CTRL | Qt::ALT | Qt::Key_J,
+            this,
+            SLOT(toggleConsole()));
+
     QMenu* viewMenu = addMenu("View");
 
     addCheckableActionToQMenuAndActionHash(viewMenu,
@@ -1258,6 +1270,25 @@ void Menu::toggleChat() {
 #endif
 }
 
+void Menu::toggleConsole() {
+    QMainWindow* mainWindow = Application::getInstance()->getWindow();
+    if (!_jsConsole) {
+        QDialog* dialog = new QDialog(mainWindow, Qt::WindowStaysOnTopHint);
+        QVBoxLayout* layout = new QVBoxLayout(dialog);
+        dialog->setLayout(new QVBoxLayout(dialog));
+
+        dialog->resize(QSize(CONSOLE_WIDTH, CONSOLE_HEIGHT));
+        layout->setMargin(0);
+        layout->setSpacing(0);
+        layout->addWidget(new JSConsole(dialog));
+        dialog->setWindowOpacity(CONSOLE_WINDOW_OPACITY);
+        dialog->setWindowTitle(CONSOLE_TITLE);
+
+        _jsConsole = dialog;
+    }
+    _jsConsole->setVisible(!_jsConsole->isVisible());
+}
+
 void Menu::audioMuteToggled() {
     QAction *muteAction = _actionHash.value(MenuOption::MuteAudio);
     muteAction->setChecked(Application::getInstance()->getAudio()->getMuted());

interface/src/Menu.h

@@ -26,6 +26,7 @@
 #include "location/LocationManager.h"
 #include "ui/PreferencesDialog.h"
 #include "ui/ChatWindow.h"
+#include "ui/JSConsole.h"
 #include "ui/ScriptEditorWindow.h"
 
 const float ADJUST_LOD_DOWN_FPS = 40.0;
@@ -189,6 +190,7 @@ private slots:
     void showMetavoxelEditor();
     void showScriptEditor();
     void showChat();
+    void toggleConsole();
     void toggleChat();
     void audioMuteToggled();
     void namedLocationCreated(LocationManager::NamedLocationCreateResponse response);
@@ -243,6 +245,7 @@ private:
     QPointer<MetavoxelEditor> _MetavoxelEditor;
     QPointer<ScriptEditorWindow> _ScriptEditor;
     QPointer<ChatWindow> _chatWindow;
+    QDialog* _jsConsole;
     OctreeStatsDialog* _octreeStatsDialog;
     LodToolsDialog* _lodToolsDialog;
     int _maxVoxels;
@@ -308,6 +311,7 @@ namespace MenuOption {
     const QString CollideWithParticles = "Collide With Particles";
     const QString CollideWithVoxels = "Collide With Voxels";
     const QString Collisions = "Collisions";
+    const QString Console = "Console...";
     const QString DecreaseAvatarSize = "Decrease Avatar Size";
     const QString DecreaseVoxelSize = "Decrease Voxel Size";
     const QString DisableAutoAdjustLOD = "Disable Automatically Adjusting LOD";

interface/src/ui/JSConsole.cpp

@@ -0,0 +1,229 @@
+//
+//  JSConsole.cpp
+//  interface/src/ui
+//
+//  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
+//
+
+#include <QKeyEvent>
+#include <QLabel>
+#include <QScrollBar>
+
+#include "Application.h"
+#include "ScriptHighlighting.h"
+
+#include "JSConsole.h"
+
+const int NO_CURRENT_HISTORY_COMMAND = -1;
+const int MAX_HISTORY_SIZE = 64;
+
+const QString COMMAND_STYLE = "color: #266a9b;";
+
+const QString RESULT_SUCCESS_STYLE = "color: #677373;";
+const QString RESULT_ERROR_STYLE = "color: #d13b22;";
+
+const QString GUTTER_PREVIOUS_COMMAND = "<span style=\"color: #57b8bb;\">&lt;</span>";
+const QString GUTTER_ERROR = "<span style=\"color: #d13b22;\">X</span>";
+
+JSConsole::JSConsole(QWidget* parent, ScriptEngine* scriptEngine) :
+    QWidget(parent),
+    _ui(new Ui::Console),
+    _currentCommandInHistory(NO_CURRENT_HISTORY_COMMAND),
+    _commandHistory(),
+    _scriptEngine(scriptEngine) {
+
+    _ui->setupUi(this);
+    _ui->promptTextEdit->setLineWrapMode(QTextEdit::NoWrap);
+    _ui->promptTextEdit->setWordWrapMode(QTextOption::NoWrap);
+    _ui->promptTextEdit->installEventFilter(this);
+
+    QFile styleSheet(Application::resourcesPath() + "styles/console.qss");
+    if (styleSheet.open(QIODevice::ReadOnly)) {
+        QDir::setCurrent(Application::resourcesPath());
+        setStyleSheet(styleSheet.readAll());
+    }
+
+    connect(_ui->scrollArea->verticalScrollBar(), SIGNAL(rangeChanged(int, int)), this, SLOT(scrollToBottom()));
+    connect(_ui->promptTextEdit, SIGNAL(textChanged()), this, SLOT(resizeTextInput()));
+
+
+    if (_scriptEngine == NULL) {
+        _scriptEngine = Application::getInstance()->loadScript();
+    }
+
+    connect(_scriptEngine, SIGNAL(evaluationFinished(QScriptValue, bool)),
+            this, SLOT(handleEvalutationFinished(QScriptValue, bool)));
+    connect(_scriptEngine, SIGNAL(printedMessage(const QString&)), this, SLOT(handlePrint(const QString&)));
+
+    resizeTextInput();
+}
+
+JSConsole::~JSConsole() {
+    delete _ui;
+}
+
+void JSConsole::executeCommand(const QString& command) {
+    _commandHistory.prepend(command);
+    if (_commandHistory.length() > MAX_HISTORY_SIZE) {
+        _commandHistory.removeLast();
+    }
+
+    _ui->promptTextEdit->setDisabled(true);
+
+    appendMessage(">", "<span style='" + COMMAND_STYLE + "'>" + command.toHtmlEscaped() + "</span>");
+
+    QMetaObject::invokeMethod(_scriptEngine, "evaluate", Q_ARG(const QString&, command));
+
+    resetCurrentCommandHistory();
+}
+
+void JSConsole::handleEvalutationFinished(QScriptValue result, bool isException) {
+    _ui->promptTextEdit->setDisabled(false);
+
+    // Make sure focus is still on this window - some commands are blocking and can take awhile to execute.
+    if (window()->isActiveWindow()) {
+        _ui->promptTextEdit->setFocus();
+    }
+    
+    QString gutter = (isException || result.isError()) ? GUTTER_ERROR : GUTTER_PREVIOUS_COMMAND;
+    QString resultColor = (isException || result.isError()) ? RESULT_ERROR_STYLE : RESULT_SUCCESS_STYLE;
+    QString resultStr = "<span style='" + resultColor + "'>" + result.toString().toHtmlEscaped()  + "</span>";
+    appendMessage(gutter, resultStr);
+}
+
+void JSConsole::handlePrint(const QString& message) {
+    appendMessage("", message);
+}
+
+void JSConsole::mouseReleaseEvent(QMouseEvent* event) {
+    _ui->promptTextEdit->setFocus();
+}
+
+void JSConsole::showEvent(QShowEvent* event) {
+    _ui->promptTextEdit->setFocus();
+}
+
+bool JSConsole::eventFilter(QObject* sender, QEvent* event) {
+    if (sender == _ui->promptTextEdit) {
+        if (event->type() == QEvent::KeyPress) {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            int key = keyEvent->key();
+
+            if ((key == Qt::Key_Return || key == Qt::Key_Enter)) {
+                if (keyEvent->modifiers() & Qt::ShiftModifier) {
+                    // If the shift key is being used then treat it as a regular return/enter.  If this isn't done,
+                    // a new QTextBlock isn't created.
+                    keyEvent->setModifiers(keyEvent->modifiers() & ~Qt::ShiftModifier);
+                } else {
+                    QString command = _ui->promptTextEdit->toPlainText().trimmed();
+
+                    if (!command.isEmpty()) {
+                        QTextCursor cursor = _ui->promptTextEdit->textCursor();
+                        _ui->promptTextEdit->clear();
+
+                        executeCommand(command);
+                    }
+
+                    return true;
+                }
+            } else if (key == Qt::Key_Down) {
+                // Go to the next command in history if the cursor is at the last line of the current command.
+                int blockNumber = _ui->promptTextEdit->textCursor().blockNumber();
+                int blockCount = _ui->promptTextEdit->document()->blockCount();
+                if (blockNumber == blockCount - 1) {
+                    setToNextCommandInHistory();
+                    return true;
+                }
+            } else if (key == Qt::Key_Up) {
+                // Go to the previous command in history if the cursor is at the first line of the current command.
+                int blockNumber = _ui->promptTextEdit->textCursor().blockNumber();
+                if (blockNumber == 0) {
+                    setToPreviousCommandInHistory();
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
+void JSConsole::setToNextCommandInHistory() {
+    if (_currentCommandInHistory >= 0) {
+        _currentCommandInHistory--;
+        if (_currentCommandInHistory == NO_CURRENT_HISTORY_COMMAND) {
+            setAndSelectCommand(_rootCommand);
+        } else {
+            setAndSelectCommand(_commandHistory[_currentCommandInHistory]);
+        }
+    }
+}
+
+void JSConsole::setToPreviousCommandInHistory() {
+    if (_currentCommandInHistory < (_commandHistory.length() - 1)) {
+        if (_currentCommandInHistory == NO_CURRENT_HISTORY_COMMAND) {
+            _rootCommand = _ui->promptTextEdit->toPlainText();
+        }
+        _currentCommandInHistory++;
+        setAndSelectCommand(_commandHistory[_currentCommandInHistory]);
+    }
+}
+
+void JSConsole::resetCurrentCommandHistory() {
+    _currentCommandInHistory = NO_CURRENT_HISTORY_COMMAND;
+}
+
+void JSConsole::resizeTextInput() {
+    _ui->promptTextEdit->setFixedHeight(_ui->promptTextEdit->document()->size().height());
+    _ui->promptTextEdit->updateGeometry();
+}
+
+void JSConsole::setAndSelectCommand(const QString& text) {
+    QTextCursor cursor = _ui->promptTextEdit->textCursor();
+    cursor.select(QTextCursor::Document);
+    cursor.deleteChar();
+    cursor.insertText(text);
+    cursor.movePosition(QTextCursor::End);
+}
+
+void JSConsole::scrollToBottom() {
+    QScrollBar* scrollBar = _ui->scrollArea->verticalScrollBar();
+    scrollBar->setValue(scrollBar->maximum());
+}
+
+void JSConsole::appendMessage(const QString& gutter, const QString& message) {
+    QWidget* logLine = new QWidget(_ui->logArea);
+    QHBoxLayout* layout = new QHBoxLayout(logLine);
+    layout->setMargin(0);
+    layout->setSpacing(4);
+
+    QLabel* gutterLabel = new QLabel(logLine);
+    QLabel* messageLabel = new QLabel(logLine);
+
+    gutterLabel->setFixedWidth(16);
+    gutterLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
+    messageLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
+
+    gutterLabel->setStyleSheet("font-size: 14px; font-family: Inconsolata, Lucida Console, Andale Mono, Monaco;");
+    messageLabel->setStyleSheet("font-size: 14px; font-family: Inconsolata, Lucida Console, Andale Mono, Monaco;");
+
+    gutterLabel->setText(gutter);
+    messageLabel->setText(message);
+
+    layout->addWidget(gutterLabel);
+    layout->addWidget(messageLabel);
+    logLine->setLayout(layout);
+
+    layout->setAlignment(gutterLabel, Qt::AlignTop);
+
+    layout->setStretch(0, 0);
+    layout->setStretch(1, 1);
+
+    _ui->logArea->layout()->addWidget(logLine);
+
+    _ui->logArea->updateGeometry();
+    scrollToBottom();
+}

interface/src/ui/JSConsole.h

@@ -0,0 +1,62 @@
+//
+//  JSConsole.h
+//  interface/src/ui
+//
+//  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_JSConsole_h
+#define hifi_JSConsole_h
+
+#include <QDialog>
+#include <QEvent>
+#include <QObject>
+#include <QWidget>
+
+#include "ui_console.h"
+#include "ScriptEngine.h"
+
+class JSConsole : public QWidget {
+    Q_OBJECT
+public:
+    JSConsole(QWidget* parent, ScriptEngine* scriptEngine = NULL);
+    ~JSConsole();
+
+public slots:
+    void executeCommand(const QString& command);
+
+signals:
+    void commandExecuting(const QString& command);
+    void commandFinished(const QString& result);
+
+protected:
+    void setAndSelectCommand(const QString& command);
+    virtual bool eventFilter(QObject* sender, QEvent* event);
+    virtual void mouseReleaseEvent(QMouseEvent* event);
+    virtual void showEvent(QShowEvent* event);
+
+protected slots:
+    void scrollToBottom();
+    void resizeTextInput();
+    void handleEvalutationFinished(QScriptValue result, bool isException);
+    void handlePrint(const QString& message);
+
+private:
+    void appendMessage(const QString& gutter, const QString& message);
+    void setToNextCommandInHistory();
+    void setToPreviousCommandInHistory();
+    void resetCurrentCommandHistory();
+
+    Ui::Console* _ui;
+    int _currentCommandInHistory;
+    QList<QString> _commandHistory;
+    QString _rootCommand;
+    ScriptEngine* _scriptEngine;
+};
+
+
+#endif // hifi_JSConsole_h

interface/src/ui/ScriptEditorWindow.cpp

@@ -27,6 +27,9 @@
 
 #include "Application.h"
 #include "FlowLayout.h"
+#include "JSConsole.h"
+
+const int CONSOLE_HEIGHT = 150;
 
 ScriptEditorWindow::ScriptEditorWindow() :
     _ScriptEditorWindowUI(new Ui::ScriptEditorWindow),
@@ -48,6 +51,10 @@ ScriptEditorWindow::ScriptEditorWindow() :
     connect(new QShortcut(QKeySequence("Ctrl+S"), this), &QShortcut::activated, this,&ScriptEditorWindow::saveScriptClicked);
     connect(new QShortcut(QKeySequence("Ctrl+O"), this), &QShortcut::activated, this, &ScriptEditorWindow::loadScriptClicked);
     connect(new QShortcut(QKeySequence("F5"), this), &QShortcut::activated, this, &ScriptEditorWindow::toggleRunScriptClicked);
+
+    QWidget* console = new JSConsole(this);
+    console->setFixedHeight(CONSOLE_HEIGHT);
+    this->layout()->addWidget(console);
 }
 
 ScriptEditorWindow::~ScriptEditorWindow() {

interface/ui/console.ui

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Console</class>
+ <widget class="QWidget" name="Console">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1055</width>
+    <height>205</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">QDialog { background: white }</string>
+  </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">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_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>0</number>
+      </property>
+      <item>
+       <widget class="QScrollArea" name="scrollArea">
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="verticalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOn</enum>
+        </property>
+        <property name="widgetResizable">
+         <bool>true</bool>
+        </property>
+        <widget class="QWidget" name="scrollAreaWidgetContents">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>1040</width>
+           <height>205</height>
+          </rect>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">background-color: white;</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <property name="spacing">
+           <number>4</number>
+          </property>
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
+          <item alignment="Qt::AlignTop">
+           <widget class="QWidget" name="widget_2" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_6">
+             <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="logArea" native="true">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="styleSheet">
+                <string notr="true">background-color: white;</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_5">
+                <property name="spacing">
+                 <number>4</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>
+             </item>
+             <item>
+              <widget class="QWidget" name="inputArea" native="true">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0">
+                <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 alignment="Qt::AlignTop">
+                 <widget class="QLabel" name="promptGutterLabel">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="minimumSize">
+                   <size>
+                    <width>16</width>
+                    <height>23</height>
+                   </size>
+                  </property>
+                  <property name="maximumSize">
+                   <size>
+                    <width>16</width>
+                    <height>23</height>
+                   </size>
+                  </property>
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                  <property name="styleSheet">
+                   <string notr="true">padding: 0px 0 0 0;</string>
+                  </property>
+                  <property name="text">
+                   <string>&gt;</string>
+                  </property>
+                  <property name="textFormat">
+                   <enum>Qt::PlainText</enum>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QTextEdit" name="promptTextEdit">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="font">
+                   <font>
+                    <family>Inconsolata,Lucida Console,Andale Mono,Monaco</family>
+                    <pointsize>-1</pointsize>
+                   </font>
+                  </property>
+                  <property name="frameShape">
+                   <enum>QFrame::NoFrame</enum>
+                  </property>
+                  <property name="verticalScrollBarPolicy">
+                   <enum>Qt::ScrollBarAlwaysOff</enum>
+                  </property>
+                  <property name="horizontalScrollBarPolicy">
+                   <enum>Qt::ScrollBarAlwaysOff</enum>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

libraries/script-engine/src/ScriptEngine.cpp

@@ -314,6 +314,18 @@ void ScriptEngine::evaluate() {
     }
 }
 
+QScriptValue ScriptEngine::evaluate(const QString& program, const QString& fileName, int lineNumber) {
+    QScriptValue result = _engine.evaluate(program, fileName, lineNumber);
+    bool hasUncaughtException = _engine.hasUncaughtException();
+    if (hasUncaughtException) {
+        int line = _engine.uncaughtExceptionLineNumber();
+        qDebug() << "Uncaught exception at line" << line << ": " << result.toString();
+    }
+    emit evaluationFinished(result, hasUncaughtException);
+    _engine.clearExceptions();
+    return result;
+}
+
 void ScriptEngine::sendAvatarIdentityPacket() {
     if (_isAvatar && _avatarData) {
         _avatarData->sendIdentityPacket();

libraries/script-engine/src/ScriptEngine.h

@@ -92,6 +92,7 @@ public:
 public slots:
     void stop();
 
+    QScriptValue evaluate(const QString& program, const QString& fileName = QString(), int lineNumber = 1);
     QObject* setInterval(const QScriptValue& function, int intervalMS);
     QObject* setTimeout(const QScriptValue& function, int timeoutMS);
     void clearInterval(QObject* timer) { stopTimer(reinterpret_cast<QTimer*>(timer)); }
@@ -107,6 +108,7 @@ signals:
     void printedMessage(const QString& message);
     void errorMessage(const QString& message);
     void runningStateChanged();
+    void evaluationFinished(QScriptValue result, bool isException);
 
 protected:
     QString _scriptContents;