diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2013-03-30 14:47:03 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2013-04-02 09:22:58 +0200 |
| commit | 80828dcd0a812149993c04d81c24a8d8bd2e971f (patch) | |
| tree | 0c63e592e4dbfde0cd4ab2908408d85f896093f5 /src/webwindow | |
| parent | Managing sessions, first bits (diff) | |
| download | rekonq-80828dcd0a812149993c04d81c24a8d8bd2e971f.tar.xz | |
Implement session saving, inspired from kate session management
(or at least, for what I see...)
Added session manager widget and ability to load/save/rename sessions
Diffstat (limited to 'src/webwindow')
| -rw-r--r-- | src/webwindow/rekonqui.rc | 8 | ||||
| -rw-r--r-- | src/webwindow/webwindow.cpp | 8 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/webwindow/rekonqui.rc b/src/webwindow/rekonqui.rc index 72ae6672..6e23416f 100644 --- a/src/webwindow/rekonqui.rc +++ b/src/webwindow/rekonqui.rc @@ -30,13 +30,7 @@ <text>&Tools</text> <Action name="clear_private_data" /> <Separator/> - - <Menu name="sessionMenu" noMerge="1"> - <text>&Sessions</text> - <Action name="session_save" /> - <Action name="session_manage" /> - </Menu> - + <Action name="session_manage" /> <Action name="webapp_shortcut" /> <Action name="web_inspector" /> <Action name="page_source" /> diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp index da7a1bc5..a6e5d876 100644 --- a/src/webwindow/webwindow.cpp +++ b/src/webwindow/webwindow.cpp @@ -281,13 +281,9 @@ void WebWindow::setupActions() connect(a, SIGNAL(triggered(bool)) , this, SLOT(openLocation())); // User sessions management - a = new KAction(KIcon("document-save"), i18n("&Save Session"), this); - actionCollection()->addAction(QL1S("session_save"), a); - connect(a, SIGNAL(triggered(bool)), SessionManager::self(), SLOT(saveYourSession())); - - a = new KAction(KIcon("view-choose"), i18n("&Manage Session"), this); + a = new KAction(KIcon("view-choose"), i18n("&Manage Sessions"), this); actionCollection()->addAction(QL1S("session_manage"), a); - connect(a, SIGNAL(triggered(bool)), SessionManager::self(), SLOT(restoreYourSession())); + connect(a, SIGNAL(triggered(bool)), SessionManager::self(), SLOT(manageSession())); // ===== Tools Actions ================================= a = new KAction(i18n("View Page S&ource"), this); |