summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fbgui.cpp8
-rw-r--r--src/main.cpp3
2 files changed, 6 insertions, 5 deletions
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index beb0aac..0a6780d 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -19,12 +19,13 @@ fbgui::fbgui(QApplication *parent)
QWebView* webView = new QWebView(this);
webView->load(baseURL);
/* Connect fbb with app for killing the app from browser. */
- //QObject::connect(jso, SIGNAL(signalQuitAll()), this, SLOT(quit()));
+ QObject::connect(jso, SIGNAL(signalQuitAll()), this, SLOT(quit()));
/* Init JavaScript interface */
JSObject* jso = new JSObject(webView->page()->mainFrame());
- QObject::connect(webView->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), jso, SLOT(attachToDOM()));
+ QObject::connect(webView->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()),
+ jso, SLOT(attachToDOM()));
/* Init Download Manager */
DownloadManager* dm = new DownloadManager();
@@ -37,5 +38,4 @@ fbgui::fbgui(QApplication *parent)
}
void fbgui::quit(){
- //parent->quit();
-}
+ this->close();
diff --git a/src/main.cpp b/src/main.cpp
index cc2729c..bf16712 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,8 +26,9 @@ int main(int argc, char *argv[])
debug = false;
QApplication app(argc, argv, QApplication::GuiServer);
app.setOrganizationName("team_projekt_2011");
- app.setApplicationName("fbgui");
+ app.setApplicationName("prebootGUI");
app.setObjectName("test");
+ app.setQuitOnLastWindowClosed(true);
// Translator, for later (maybe).
QTranslator translator;