History

Add console to script editor

Ryan Huffman committed 12 years ago

Commit 6ef80261 parent 44c5e561 file · +7 −0Browse files

Showing the changes to interface/src/ui/ScriptEditorWindow.cpp (1 of 1 file). Show all

Unified · Split

interface/src/ui/ScriptEditorWindow.cpp+7−0
@@ -27,6 +27,9 @@ · 26 unmodified lines
27 27
28#include "Application.h"28#include "Application.h"
29#include "FlowLayout.h"29#include "FlowLayout.h"
30#include "JSConsole.h"
31
32const int CONSOLE_HEIGHT = 150;
30 33
31ScriptEditorWindow::ScriptEditorWindow() :34ScriptEditorWindow::ScriptEditorWindow() :
32 _ScriptEditorWindowUI(new Ui::ScriptEditorWindow),35 _ScriptEditorWindowUI(new Ui::ScriptEditorWindow),
@@ -48,6 +51,10 @@ ScriptEditorWindow::ScriptEditorWindow() : · 15 unmodified lines
48 connect(new QShortcut(QKeySequence("Ctrl+S"), this), &QShortcut::activated, this,&ScriptEditorWindow::saveScriptClicked);51 connect(new QShortcut(QKeySequence("Ctrl+S"), this), &QShortcut::activated, this,&ScriptEditorWindow::saveScriptClicked);
49 connect(new QShortcut(QKeySequence("Ctrl+O"), this), &QShortcut::activated, this, &ScriptEditorWindow::loadScriptClicked);52 connect(new QShortcut(QKeySequence("Ctrl+O"), this), &QShortcut::activated, this, &ScriptEditorWindow::loadScriptClicked);
50 connect(new QShortcut(QKeySequence("F5"), this), &QShortcut::activated, this, &ScriptEditorWindow::toggleRunScriptClicked);53 connect(new QShortcut(QKeySequence("F5"), this), &QShortcut::activated, this, &ScriptEditorWindow::toggleRunScriptClicked);
54
55 QWidget* console = new JSConsole(this);
56 console->setFixedHeight(CONSOLE_HEIGHT);
57 this->layout()->addWidget(console);
51}58}
52 59
53ScriptEditorWindow::~ScriptEditorWindow() {60ScriptEditorWindow::~ScriptEditorWindow() {