summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2011-03-16 13:31:27 +0100
committerJonathan Bauer2011-03-16 13:31:27 +0100
commit17d8b5c38262b862c0b6741d973411fa6ef4ec0a (patch)
tree0b23b0d19216a9905073e3be94b8b2684a70eb50
parentnew fancy console for debugging, open/close with F4 (diff)
downloadfbgui-17d8b5c38262b862c0b6741d973411fa6ef4ec0a.tar.gz
fbgui-17d8b5c38262b862c0b6741d973411fa6ef4ec0a.tar.xz
fbgui-17d8b5c38262b862c0b6741d973411fa6ef4ec0a.zip
logViewer class
-rw-r--r--src/fbgui.cpp5
-rw-r--r--src/fbgui.h6
-rw-r--r--src/fbgui.pro6
3 files changed, 12 insertions, 5 deletions
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 985297a..d062529 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -20,6 +20,9 @@ fbgui::fbgui()
{
/* debug console test */
if (debug){
+ logView = new logViewer(this);
+ }
+ /*
logView = new QTextEdit(this);
logView->resize(QSize(640, 480));
QPalette qp;
@@ -28,7 +31,7 @@ fbgui::fbgui()
logView->setTextColor(Qt::green);
logView->setVisible(false);
logView->setPlainText("empty console.");
- }
+ */
/* initialize "browser" */
checkHost();
diff --git a/src/fbgui.h b/src/fbgui.h
index 35f5e69..0bbe8ba 100644
--- a/src/fbgui.h
+++ b/src/fbgui.h
@@ -22,6 +22,8 @@
#include <QPlainTextEdit>
#include <QtWebKit>
+#include "logViewer.h"
+
#define DEFAULT_URL "http://www.google.com"
#define DEFAULT_DOWNLOAD_DIR "/tmp/fbgui/downloads"
#define DEFAULT_UPDATE_INTERVAL 1;
@@ -40,8 +42,8 @@ public:
fbgui();
private:
- QWebView* webView;
- QTextEdit* logView;
+ QWebView *webView;
+ logViewer *logView;
void checkHost() const;
diff --git a/src/fbgui.pro b/src/fbgui.pro
index 2fdaf93..1b8d1f8 100644
--- a/src/fbgui.pro
+++ b/src/fbgui.pro
@@ -9,11 +9,13 @@ QT += core \
gui \
webkit \
network
-HEADERS += downloadManager.h \
+HEADERS += logViewer.h \
+ downloadManager.h \
fbgui.h \
javascriptInterface.h \
sysInfo.h
-SOURCES += downloadManager.cpp \
+SOURCES += logViewer.cpp \
+ downloadManager.cpp \
main.cpp \
fbgui.cpp \
javascriptInterface.cpp \