summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fbbrowser.cpp10
-rw-r--r--src/fbbrowser.h8
-rw-r--r--src/fbgui.cpp5
-rw-r--r--src/fbgui.h4
-rw-r--r--src/main.cpp2
5 files changed, 17 insertions, 12 deletions
diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index 160b9c5..6098afd 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -14,7 +14,8 @@ void fbbrowser::quit()
// -------------------------------------------------------------------------------------------
fbbrowser::fbbrowser(const QUrl & url)
{
- view = new QWebView(this);
+ mw = new QMainWindow(this);
+ view = new QWebView(mw);
baseUrl = url;
// Create QNetworkAccessManager which is needed to send/receive requests.
manager = new QNetworkAccessManager(this);
@@ -47,13 +48,14 @@ fbbrowser::fbbrowser(const QUrl & url)
QObject::connect(dm, SIGNAL(updateProgress(int)), jso, SLOT(updateProgress(int)));
// Remove the window decoration, form to fullscreen, central view?
- this->setWindowFlags(Qt::SplashScreen);
- this->showFullScreen();
- setCentralWidget(view);
+ mw->setWindowFlags(Qt::SplashScreen);
+ mw->showFullScreen();
+ mw->setCentralWidget(view);
}
// -------------------------------------------------------------------------------------------
fbbrowser::~fbbrowser()
{
+ delete mw;
delete view;
delete manager;
delete dm;
diff --git a/src/fbbrowser.h b/src/fbbrowser.h
index 926cd6c..ace2eb9 100644
--- a/src/fbbrowser.h
+++ b/src/fbbrowser.h
@@ -13,7 +13,7 @@ class QWebFrame;
class JSObject;
class DownloadManager;
-class fbbrowser : public QMainWindow
+class fbbrowser : public QWidget
{
Q_OBJECT
@@ -22,11 +22,13 @@ public:
~fbbrowser();
private:
+ QMainWindow *mw;
+ QWebView *view;
+ QWebFrame* qwf;
+
QUrl baseUrl;
QNetworkRequest request;
QNetworkReply *reply;
- QWebView *view;
- QWebFrame* qwf;
QNetworkAccessManager *manager;
//the jsObject. connection to the webpage for emiting signals
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 04a6f3b..03de3b5 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -11,16 +11,15 @@ void fbgui::setUrl(QUrl& url)
this->_url=url;
}
-void fbgui::start()
+void fbgui::startBrowser()
{
_fbb = new fbbrowser(_url);
QObject::connect(_fbb, SIGNAL(killApp()), this->parent(), SLOT(quit()));
- _fbb->show();
+ //_fbb->show();
}
fbgui::fbgui()
{
-
_fbb = NULL;
_url = "";
}
diff --git a/src/fbgui.h b/src/fbgui.h
index 852ef2a..f67eaa4 100644
--- a/src/fbgui.h
+++ b/src/fbgui.h
@@ -3,7 +3,9 @@
#include <QtCore>
#include <QApplication>
+#include <QtWebKit>
+class QWidget;
class fbbrowser;
class fbgui : public QObject
{
@@ -13,7 +15,7 @@ public:
fbgui();
~fbgui();
void setUrl(QUrl &url);
- void start();
+ void startBrowser();
private:
fbbrowser* _fbb;
diff --git a/src/main.cpp b/src/main.cpp
index 1f4a984..4cf5f7a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
// TODO: Read INI.
// Start fbgui.
- gui->start();
+ gui->startBrowser();
return app->exec();
}