From b9248e0bbf7bfe9e57590ace44a7664d72207801 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 27 May 2014 08:03:46 -0700
Subject: [PATCH] Update JSConsole to QWidget

---
 interface/src/Menu.cpp         | 18 +++++++++++++++++-
 interface/src/Menu.h           |  2 +-
 interface/src/ui/JSConsole.cpp |  2 +-
 interface/src/ui/JSConsole.h   |  2 +-
 interface/ui/console.ui        | 24 +++++++++++++-----------
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index cce8399491..a924528c2b 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -72,6 +72,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.95;
+const int CONSOLE_WIDTH = 800;
+const int CONSOLE_HEIGHT = 200;
+
 Menu::Menu() :
     _actionHash(),
     _audioJitterBufferSamples(0),
@@ -1233,7 +1238,18 @@ void Menu::toggleChat() {
 void Menu::toggleConsole() {
     QMainWindow* mainWindow = Application::getInstance()->getWindow();
     if (!_jsConsole) {
-        _jsConsole = new JSConsole(mainWindow);
+        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());
 }
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index c9577e708e..6b37791b45 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -245,7 +245,7 @@ private:
     QPointer<MetavoxelEditor> _MetavoxelEditor;
     QPointer<ScriptEditorWindow> _ScriptEditor;
     QPointer<ChatWindow> _chatWindow;
-    JSConsole* _jsConsole;
+    QDialog* _jsConsole;
     OctreeStatsDialog* _octreeStatsDialog;
     LodToolsDialog* _lodToolsDialog;
     int _maxVoxels;
diff --git a/interface/src/ui/JSConsole.cpp b/interface/src/ui/JSConsole.cpp
index d0880cd50b..267be0bc6d 100644
--- a/interface/src/ui/JSConsole.cpp
+++ b/interface/src/ui/JSConsole.cpp
@@ -32,7 +32,7 @@ const QString GUTTER_ERROR = "<pre style=\"color: red;\">X</pre>";
 const QString GUTTER_PREVIOUS_COMMAND = "<pre style=\"color: lightblue;\">&lt;</pre>";
 
 JSConsole::JSConsole(QWidget* parent, ScriptEngine* scriptEngine) :
-    QDialog(parent, Qt::WindowStaysOnTopHint),
+    QWidget(parent),
     _ui(new Ui::Console),
     _currentCommandInHistory(NO_CURRENT_HISTORY_COMMAND),
     _commandHistory(),
diff --git a/interface/src/ui/JSConsole.h b/interface/src/ui/JSConsole.h
index ebc8aeb43b..f28132a1f5 100644
--- a/interface/src/ui/JSConsole.h
+++ b/interface/src/ui/JSConsole.h
@@ -20,7 +20,7 @@
 #include "ui_console.h"
 #include "ScriptEngine.h"
 
-class JSConsole : public QDialog {
+class JSConsole : public QWidget {
     Q_OBJECT
 public:
     JSConsole(QWidget* parent, ScriptEngine* scriptEngine = NULL);
diff --git a/interface/ui/console.ui b/interface/ui/console.ui
index 2f5e6d235e..7c86ab3d8f 100644
--- a/interface/ui/console.ui
+++ b/interface/ui/console.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Console</class>
- <widget class="QDialog" name="Console">
+ <widget class="QWidget" name="Console">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1018</width>
-    <height>263</height>
+    <width>1055</width>
+    <height>205</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -75,8 +75,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>1003</width>
-           <height>263</height>
+           <width>1040</width>
+           <height>205</height>
           </rect>
          </property>
          <property name="styleSheet">
@@ -203,14 +203,14 @@
                    </font>
                   </property>
                   <property name="styleSheet">
-                   <string notr="true">background-color: white; font-weight: bold; color: blue;</string>
+                   <string notr="true">background-color: white; font-weight: bold; color: rgb(169, 187, 195);</string>
                   </property>
                   <property name="text">
                    <string>&gt;</string>
                   </property>
                  </widget>
                 </item>
-                <item alignment="Qt::AlignTop">
+                <item>
                  <widget class="QTextEdit" name="promptTextEdit">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -220,9 +220,14 @@
                   </property>
                   <property name="font">
                    <font>
-                    <family>Courier New</family>
+                    <family>Inconsolata,Lucida Console,Andale Mono,Monaco</family>
+                    <pointsize>-1</pointsize>
                    </font>
                   </property>
+                  <property name="styleSheet">
+                   <string notr="true">    font-family: Inconsolata, Lucida Console, Andale Mono, Monaco;
+font-size:14px</string>
+                  </property>
                   <property name="frameShape">
                    <enum>QFrame::NoFrame</enum>
                   </property>
@@ -232,9 +237,6 @@
                   <property name="horizontalScrollBarPolicy">
                    <enum>Qt::ScrollBarAlwaysOff</enum>
                   </property>
-                  <property name="textInteractionFlags">
-                   <set>Qt::TextEditorInteraction</set>
-                  </property>
                  </widget>
                 </item>
                </layout>