From 9bba12572b7d531ec47420bbbbc9414d408d3287 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 15 Nov 2012 22:57:12 +0100
Subject: Fix fullscreen action && shortcuts
---
src/webtab/webview.cpp | 10 +---------
src/webwindow/webwindow.cpp | 7 +------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/webtab/webview.cpp b/src/webtab/webview.cpp
index bb90a58a..31082a61 100644
--- a/src/webtab/webview.cpp
+++ b/src/webtab/webview.cpp
@@ -40,10 +40,10 @@
#include "bookmarkmanager.h"
#include "iconmanager.h"
-#include "webwindow.h"
#include "searchengine.h"
#include "webpage.h"
#include "webtab.h"
+#include "webwindow.h"
// KDE Includes
#include <KAction>
@@ -361,14 +361,6 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
menu.addAction(webwin->actionByName("page_source"));
menu.addAction(inspectAction);
}
-
- // we need to show everytime this because we cannot communicate with the tabwindow.
- // We are NOT sure it exists..
- if (webwin)
- {
- menu.addSeparator();
- menu.addAction(webwin->actionByName(KStandardAction::name(KStandardAction::FullScreen)));
- }
}
// LINK ACTIONS -------------------------------------------------------------------
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index df38c969..be2ba5da 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -246,12 +246,7 @@ void WebWindow::setupActions()
KStandardAction::findNext(m_findBar, SLOT(findNext()), actionCollection());
KStandardAction::findPrev(m_findBar, SLOT(findPrevious()), actionCollection());
-
- a = KStandardAction::fullScreen(this, SIGNAL(setFullScreen(bool)), this, actionCollection());
- KShortcut fullScreenShortcut = KStandardShortcut::fullScreen();
- fullScreenShortcut.setAlternate(Qt::Key_F11);
- a->setShortcut(fullScreenShortcut);
-
+
a = KStandardAction::redisplay(_tab->view(), SLOT(reload()), actionCollection());
a->setText(i18n("Reload"));
KShortcut reloadShortcut = KStandardShortcut::reload();
--
cgit v1.2.1