From fb6dba51315bd42ddd0999674aa92838884624a0 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 24 Mar 2011 15:51:42 +0100 Subject: separated debug console creation and layout setup --- src/fbgui.cpp | 39 ++++++++++++++++++++++----------------- src/fbgui.h | 4 +++- 2 files changed, 25 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/fbgui.cpp b/src/fbgui.cpp index ce42bab..bc92515 100644 --- a/src/fbgui.cpp +++ b/src/fbgui.cpp @@ -68,26 +68,11 @@ void fbgui::setupLayout() // setup layout of the gui: debug split or browser _webView = new QWebView(this); if (debugMode == 1){ - _debugConsole = new QTextEdit(this); - _debugConsole->setWindowFlags(Qt::FramelessWindowHint); - // fanciness - QPalette pal; - pal.setColor(QPalette::Base, Qt::black); - _debugConsole->setPalette(pal); - _debugConsole->setTextColor(Qt::white); - // enable custom logger engine - qxtLog->addLoggerEngine("fb_logger", new LoggerEngine_fb(_debugConsole)); - //qxtLog->initLoggerEngine("fb_logger"); - qxtLog->setMinimumLevel("fb_logger", QxtLogger::DebugLevel); - // display browser and debug in a splitter + // split main window in browser & debug console + createDebugConsole(); _splitter = new QSplitter(Qt::Vertical, this); _splitter->addWidget(_webView); _splitter->addWidget(_debugConsole); - // CTRL + D toggles debug window - _toggleDebugConsole = new QAction(tr("&toggleDebug"), this); - _toggleDebugConsole->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D)); - addAction(_toggleDebugConsole); - connect(_toggleDebugConsole, SIGNAL(triggered()), this, SLOT(toggleDebugConsole())); setCentralWidget(_splitter); } else @@ -232,6 +217,26 @@ void fbgui::setupBasicDebug() } } //------------------------------------------------------------------------------------------- +void fbgui::createDebugConsole(){ + // create the debug console widget + _debugConsole = new QTextEdit(this); + _debugConsole->setWindowFlags(Qt::FramelessWindowHint); + // fanciness + QPalette pal; + pal.setColor(QPalette::Base, Qt::black); + _debugConsole->setPalette(pal); + _debugConsole->setTextColor(Qt::white); + // enable custom logger engine + qxtLog->addLoggerEngine("fb_logger", new LoggerEngine_fb(_debugConsole)); + //qxtLog->initLoggerEngine("fb_logger"); + qxtLog->setMinimumLevel("fb_logger", QxtLogger::DebugLevel); + // CTRL + D toggles debug window + _toggleDebugConsole = new QAction(tr("&toggleDebug"), this); + _toggleDebugConsole->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D)); + addAction(_toggleDebugConsole); + connect(_toggleDebugConsole, SIGNAL(triggered()), this, SLOT(toggleDebugConsole())); +} +//------------------------------------------------------------------------------------------- void fbgui::toggleDebugConsole() { if (_debugConsole->isVisible()) diff --git a/src/fbgui.h b/src/fbgui.h index b4c2f99..5a1f39d 100644 --- a/src/fbgui.h +++ b/src/fbgui.h @@ -51,8 +51,10 @@ public: fbgui(); private: - // setup procedures + // debug setup void setupBasicDebug(); + void createDebugConsole(); + // layout setup void setupLayout(); void createActions(); -- cgit v1.2.3-55-g7522