summaryrefslogtreecommitdiff
path: root/src/webwindow/webwindow.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-08-08 15:05:40 +0200
committerAndrea Diamantini <adjam7@gmail.com>2012-12-10 02:48:05 +0100
commit3464290338fb7aaf8057d229221abf96ce349929 (patch)
tree1071bcb1ab89b7f97d80b2d852313665c0ef158c /src/webwindow/webwindow.cpp
parentTools actions restored (diff)
downloadrekonq-3464290338fb7aaf8057d229221abf96ce349929.tar.xz
Restore rekonq settings
Diffstat (limited to 'src/webwindow/webwindow.cpp')
-rw-r--r--src/webwindow/webwindow.cpp21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index 2dc476c1..4d350d71 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -41,6 +41,7 @@
#include "bookmarkstoolbar.h"
#include "rekonqfactory.h"
#include "rekonqmenu.h"
+#include "settingsdialog.h"
#include "urlbar.h"
#include "websnap.h"
@@ -304,7 +305,7 @@ void WebWindow::setupActions()
// <Action name="help_about_kde"/>
// </Menu>
//
-// <Action name="options_configure" />
+// <Action name="options_configure" /> +
// </Menu>
}
@@ -788,3 +789,21 @@ void WebWindow::setEditable(bool on)
{
page()->setContentEditable(on);
}
+
+
+void WebWindow::preferences()
+{
+ // an instance the dialog could be already created and could be cached,
+ // in which case you want to display the cached dialog
+ if (SettingsDialog::showDialog("rekonfig"))
+ return;
+
+ // we didn't find an instance of this dialog, so lets create it
+ QPointer<SettingsDialog> s = new SettingsDialog(this);
+
+ // keep us informed when the user changes settings
+ connect(s, SIGNAL(settingsChanged(QString)), rApp, SLOT(updateConfiguration()));
+ connect(s, SIGNAL(finished(int)), s, SLOT(deleteLater()));
+
+ s->show();
+}