diff options
| author | Niklas Goby | 2011-03-21 12:03:04 +0100 |
|---|---|---|
| committer | Niklas Goby | 2011-03-21 12:03:04 +0100 |
| commit | f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24 (patch) | |
| tree | 7234b2e8f2083fe23193bc1654c70ec395d20b12 /src/fbgui.h | |
| parent | some changes in the fbgui, ipWatcher (diff) | |
| parent | and the files ^^ (diff) | |
| download | fbgui-f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24.tar.gz fbgui-f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24.tar.xz fbgui-f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24.zip | |
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Conflicts:
src/fbgui.cpp
Diffstat (limited to 'src/fbgui.h')
| -rw-r--r-- | src/fbgui.h | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/src/fbgui.h b/src/fbgui.h index c0ef95e..2d06afe 100644 --- a/src/fbgui.h +++ b/src/fbgui.h @@ -19,21 +19,23 @@ #define FBGUI_H #include <QtGui> -#include <QPlainTextEdit> #include <QtWebKit> +#include <QxtCore> -#include "logViewer.h" +// Internal default settings #define DEFAULT_URL "http://www.google.com" #define DEFAULT_DOWNLOAD_DIR "/tmp/fbgui/downloads" +#define DEFAULT_CONFIG_PATH "/etc/fbgui.conf" #define DEFAULT_UPDATE_INTERVAL 1; + +// Global settings extern QString binPath; extern QString downloadPath; extern QUrl baseURL; -extern bool debug; +extern int debugMode; extern int updateInterval; -extern logViewer *logView; class fbgui : public QMainWindow { @@ -41,16 +43,26 @@ class fbgui : public QMainWindow public: fbgui(); - /* public log access */ - //void log(QString text); private: + // setup procedures + void setupDebugSplit(); + void createActions(); void checkHost() const; - QWebView *webView; + // widgets constituing the gui + QWebView* _webView; + QSplitter* _splitter; + QTextEdit* _debugConsole; + + // action list + QAction* _quit; + QAction* _toggleDebug; + +private slots: + // slots for processing actions + void toggleDebug(); -protected: - void keyPressEvent(QKeyEvent *event); }; #endif // FBGUI_H |