[fondue-commits] [SCM] Fondue Font Editor branch, master, updated. b5056198e5469181556c59ce0c6911699b8fddcc

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit 7cbcebea52175357b3d4eef513214c245e9b1e33
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Sat Jan 5 03:15:30 2008 +0100

    make ScriptConsole a QDockWidget, hidden by default

diff --git a/gui/mainwindow.cxx b/gui/mainwindow.cxx
index 4fb355f..40ad2a0 100644
--- a/gui/mainwindow.cxx
+++ b/gui/mainwindow.cxx
@@ -43,11 +43,13 @@
 #include "config.h"
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
-	model(0), unicodeProxy(0), m_scriptConsole(0)
+	m_doc(0), model(0), unicodeProxy(0)
 {
 	setAttribute(Qt::WA_DeleteOnClose);
 
-	m_doc = 0;
+	m_scriptConsole = new ScriptConsole(this);
+	addDockWidget(Qt::BottomDockWidgetArea, m_scriptConsole);
+	m_scriptConsole->hide(); // TODO make it adjustable
 
 	createActions();
 	createMenus();
@@ -99,11 +101,6 @@ void MainWindow::createActions()
 	}
 	connect(cellSizeGroup, SIGNAL(triggered(QAction *)), this, SLOT(changeCellSize(QAction *)));
 
-	scriptConsoleAction = new QAction("&Script Console", this);
-	scriptConsoleAction->setCheckable(true);
-	scriptConsoleAction->setChecked(false);
-	connect(scriptConsoleAction, SIGNAL(toggled(bool)), this, SLOT(showScriptConsole(bool)));
-
 	editPrepAction = new QAction("Edit prep Table...", this);
 	connect(editPrepAction, SIGNAL(triggered()), this, SLOT(editPrep()));
 
@@ -155,7 +152,7 @@ void MainWindow::createMenus()
 	for (int i = 0; i < 5; i++)
 		viewMenu->addAction(cellSizeActions[i]);
 	viewMenu->addSeparator();
-	viewMenu->addAction(scriptConsoleAction);
+	viewMenu->addAction(m_scriptConsole->toggleViewAction());
 
 	instructionsMenu = menuBar()->addMenu("&Instructions");
 	instructionsMenu->addAction(editPrepAction);
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 0e1c514..0591c2a 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -102,7 +102,6 @@ private:
 
 	QActionGroup *cellSizeGroup;
 	QAction *cellSizeActions[5];
-	QAction *scriptConsoleAction;
 
 	QAction *editPrepAction;
 	QAction *editFpgmAction;
diff --git a/qscript/scriptconsole.cxx b/qscript/scriptconsole.cxx
index ecffd07..c7bf0ac 100644
--- a/qscript/scriptconsole.cxx
+++ b/qscript/scriptconsole.cxx
@@ -29,8 +29,12 @@ static QScriptValue printFunction(QScriptContext *context, QScriptEngine *engine
 static QScriptValue documentPropertyGetter(QScriptContext *context, QScriptEngine *engine);
 
 ScriptConsole::ScriptConsole(QWidget *parent) :
-	QWidget(parent, Qt::Window)
+	QDockWidget("Script Console", parent)
 {
+	// TODO do something about default widget size
+	setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
+	QWidget *contentWidget = new QWidget;
+
 	QVBoxLayout *vbox = new QVBoxLayout;
 
 	QSplitter *splitter = new QSplitter(Qt::Vertical);
@@ -49,7 +53,8 @@ ScriptConsole::ScriptConsole(QWidget *parent) :
 	hbox->addStretch();
 	hbox->addWidget(execButton);
 	vbox->addLayout(hbox);
-	setLayout(vbox);
+	contentWidget->setLayout(vbox);
+	setWidget(contentWidget);
 
 	connect(execButton, SIGNAL(clicked(bool)), this, SLOT(tryExecute()));
 
diff --git a/qscript/scriptconsole.h b/qscript/scriptconsole.h
index 069daf2..5f58613 100644
--- a/qscript/scriptconsole.h
+++ b/qscript/scriptconsole.h
@@ -16,14 +16,14 @@
  */
 #ifndef SCRIPTCONSOLE_H
 #define SCRIPTCONSOLE_H
-#include <QWidget>
+#include <QDockWidget>
 #include <QTextCharFormat>
 #include "fontdocument.h"
 
 class QTextEdit;
 class QScriptEngine;
 
-class ScriptConsole : public QWidget {
+class ScriptConsole : public QDockWidget {
 	Q_OBJECT
 public:
 	ScriptConsole(QWidget *parent = 0);

-- 
Fondue Font Editor