From fc07debcf06be1648afb60653bead970c93258ac Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 14 May 2009 12:17:46 +0200 Subject: Fixed FullScreen Action & provided it in contextual menu, in fullscreen mode --- TODO | 9 +++++++++ src/mainwindow.cpp | 6 +++++- src/webview.cpp | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 4234bcea..5b1a08da 100644 --- a/TODO +++ b/TODO @@ -19,3 +19,12 @@ TO 0.2 release - bookmarks panel - MimeType Manager - BETTER KDE INTEGRATION (What else to be done??) + +TO 0.1 release + +- fix cookies system +- fix toggle actions + - history side panel + - status bar + - menu bar +- fullscreen action in webView \ No newline at end of file diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index adc6fc87..3311dfa8 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -224,7 +224,11 @@ void MainWindow::setupActions() KStandardAction::find(this, SLOT(slotViewFindBar()) , actionCollection()); KStandardAction::findNext(this, SLOT(slotFindNext()) , actionCollection()); KStandardAction::findPrev(this, SLOT(slotFindPrevious()) , actionCollection()); - KStandardAction::fullScreen(this, SLOT(slotViewFullScreen(bool)), this, actionCollection()); + + // we all like "short" shortcuts.. ;) + a = KStandardAction::fullScreen(this, SLOT(slotViewFullScreen(bool)), this, actionCollection()); + a->setShortcut(KShortcut(Qt::Key_F11)); + KStandardAction::home(this, SLOT(slotHome()), actionCollection()); KStandardAction::preferences(this, SLOT(slotPreferences()), actionCollection()); KStandardAction::showMenubar(this, SLOT(slotShowMenubar(bool)), actionCollection()); diff --git a/src/webview.cpp b/src/webview.cpp index dfb31279..01fd0d00 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -422,6 +422,11 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) menu.addAction(addBookmarkAction); } + if(mainwindow->isFullScreen()) + { + menu.addAction(mainwindow->actionByName("fullscreen")); + } + menu.exec(mapToGlobal(event->pos())); } -- cgit v1.2.1