Implementing the webwindow as special widget

first step, main & bookmarks toolbar

7 files changed, 497 insertions, 17 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e4d48dd4..9a2c7b18 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -94,6 +94,7 @@ set(rekonq_KDEINIT_SRCS
     webtab/webview.cpp
     webtab/webtab.cpp
     #----------------------------------------
+    webwindow/rekonqmenu.cpp
     webwindow/webwindow.cpp
     #----------------------------------------
 )
diff --git a/src/bookmarks/bookmarkmanager.cpp b/src/bookmarks/bookmarkmanager.cpp
index 5075820d..42a6ae40 100644
--- a/src/bookmarks/bookmarkmanager.cpp
+++ b/src/bookmarks/bookmarkmanager.cpp
@@ -200,7 +200,6 @@ void BookmarkManager::fillBookmarkBar(BookmarkToolBar *toolBar)
         {
             KBookmarkAction *action = new KBookmarkAction(bookmark, m_owner, this);
             action->setIcon(IconManager::self()->iconForUrl(KUrl(bookmark.url())));
-            connect(action, SIGNAL(hovered()), toolBar, SLOT(actionHovered()));
             toolBar->toolBar()->addAction(action);
             toolBar->toolBar()->widgetForAction(action)->installEventFilter(toolBar);
         }
diff --git a/src/main.cpp b/src/main.cpp
index 74ec72eb..0fceffc0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -38,7 +38,6 @@
 
 #include <QDir>
 #include <QUrl>
-#include <QWebSettings>
 
 
 static const char description[] =
@@ -85,8 +84,6 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
     Application app;
 
-    QWebSettings::setIconDatabasePath("/tmp/iconcache");
-
     // set application data
     QCoreApplication::setApplicationName(QLatin1String("rekonq"));
     QCoreApplication::setApplicationVersion(REKONQ_VERSION);
diff --git a/src/webwindow/rekonqmenu.cpp b/src/webwindow/rekonqmenu.cpp
new file mode 100644
index 00000000..a5cea784
--- /dev/null
+++ b/src/webwindow/rekonqmenu.cpp
@@ -0,0 +1,99 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>
+* Copyright (C) 2012 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "rekonqmenu.h"
+#include "rekonqmenu.moc"
+
+// Qt Includes
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QWidget>
+
+
+RekonqMenu::RekonqMenu(QWidget *parent)
+    : KMenu(parent)
+{
+}
+
+
+void RekonqMenu::setButtonWidget(QWidget *w)
+{
+    m_button = w;
+}
+
+
+void RekonqMenu::showEvent(QShowEvent* event)
+{
+    KMenu::showEvent(event);
+
+    if (!m_button)
+        return;
+
+    // Adjust the position of the menu to be shown within the
+    // rekonq window to reduce the cases that sub-menus might overlap
+    // the right screen border.
+    QPoint pos;
+    if (layoutDirection() == Qt::RightToLeft)
+    {
+        pos = m_button->mapToGlobal(QPoint(0, m_button->height()));
+    }
+    else
+    {
+        pos = m_button->mapToGlobal(QPoint(m_button->width(), m_button->height()));
+        pos.rx() -= width();
+    }
+
+    // Assure that the menu is not shown outside the screen boundaries and
+    // that it does not overlap with the parent button.
+    const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos());
+    if (pos.x() < screen.x())
+    {
+        pos.rx() = screen.x();
+    }
+    else
+    {
+        if (pos.x() + width() > screen.x() + screen.width())
+        {
+            pos.rx() = screen.x() + screen.width() - width();
+        }
+    }
+
+    if (pos.y() < screen.y())
+    {
+        pos.ry() = screen.y();
+    }
+    else
+    {
+        if (pos.y() + height() > screen.y() + screen.height())
+        {
+            pos.ry() = m_button->mapToGlobal(QPoint(0, 0)).y() + height();
+        }
+    }
+
+    move(pos);
+}
diff --git a/src/webwindow/rekonqmenu.h b/src/webwindow/rekonqmenu.h
new file mode 100644
index 00000000..8bda008b
--- /dev/null
+++ b/src/webwindow/rekonqmenu.h
@@ -0,0 +1,64 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>
+* Copyright (C) 2012 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+
+#ifndef REKONQ_MENU_H
+#define REKONQ_MENU_H
+
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
+// KDE Includes
+#include <KMenu>
+
+// Forward Declarations
+class QWidget;
+
+
+/**
+ * Menu shown inside rekonq window.
+ * Inspired by Dolphin solution.
+ *
+ */
+class REKONQ_TESTS_EXPORT RekonqMenu : public KMenu
+{
+    Q_OBJECT
+
+public:
+    RekonqMenu(QWidget *parent);
+
+    void setButtonWidget(QWidget *);
+
+protected:
+    virtual void showEvent(QShowEvent* event);
+
+private:
+    QWidget *m_button;
+};
+
+#endif // REKONQ_MENU_H
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index 758807b7..8a87ca90 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -27,16 +27,23 @@
 #include "webwindow.h"
 #include "webwindow.moc"
 
+#include "bookmarkmanager.h"
+#include "iconmanager.h"
+
 #include "webpage.h"
 #include "webtab.h"
 
+#include "bookmarkstoolbar.h"
+#include "rekonqmenu.h"
 #include "urlbar.h"
 
 #include "websnap.h"
 
 #include <KUrl>
+#include <KToolBar>
 
 #include <QWebView>
+#include <QWebHistory>
 #include <QVBoxLayout>
 
 
@@ -45,6 +52,11 @@ WebWindow::WebWindow(QWidget *parent)
     , _progress(0)
     , _tab(new WebTab(this))
     , _bar(new UrlBar(_tab))
+    , _mainToolBar(new KToolBar(this, false, false))
+    , _bookmarksBar(0)
+    , m_loadStopReloadAction(0)
+    , m_rekonqMenu(0)
+    , _ac(new KActionCollection(this))
 {
     init();
 }
@@ -54,6 +66,11 @@ WebWindow::WebWindow(WebPage *page, QWidget *parent)
     : QWidget(parent)
     , _tab(new WebTab(this))
     , _bar(new UrlBar(_tab))
+    , _mainToolBar(new KToolBar(this, false, false))
+    , _bookmarksBar(0)
+    , m_loadStopReloadAction(0)
+    , m_rekonqMenu(0)
+    , _ac(new KActionCollection(this))
 {
     _tab->view()->setPage(page);
     page->setParent(_tab->view());
@@ -61,31 +78,107 @@ WebWindow::WebWindow(WebPage *page, QWidget *parent)
     init();
 }
 
+// ---------------------------------------------------------------------------------------------------
 
 void WebWindow::init()
 {
+    // then, setup our actions
+    setupActions();
+
+    // setting up rekonq tools
+    setupTools();
+
+    // main toolbar
+    _mainToolBar->addAction(actionByName(QL1S("go_back")));
+    _mainToolBar->addAction(actionByName(QL1S("go_forward")));
+    _mainToolBar->addAction(actionByName(QL1S("url_bar")));
+    _mainToolBar->addAction(actionByName(QL1S("load_stop_reload")));
+    _mainToolBar->addAction(actionByName(QL1S("rekonq_tools")));
+
+    // bookmarks toolbar
+    if (_bookmarksBar)
+    {
+        BookmarkManager::self()->removeBookmarkBar(_bookmarksBar);
+        delete _bookmarksBar;
+    }
+    KToolBar *XMLGUIBkBar = new KToolBar(this);
+    _bookmarksBar = new BookmarkToolBar(XMLGUIBkBar, this);
+    BookmarkManager::self()->registerBookmarkBar(_bookmarksBar);
+
     // layout
-    QVBoxLayout *l = new QVBoxLayout;
-    l->addWidget(_bar);
+    QVBoxLayout *l = new QVBoxLayout(this);
+    l->addWidget(_mainToolBar);
+    l->addWidget(XMLGUIBkBar);
     l->addWidget(_tab);
     l->setContentsMargins(0, 0, 0, 0);
-    setLayout(l);
 
     setContentsMargins(0, 0, 0, 0);
 
     // things changed signals
     connect(_tab->view(), SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));
 
-    // load signals
-    connect(_tab->view(), SIGNAL(loadStarted()), this, SIGNAL(loadStarted()));
-    connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SIGNAL(loadFinished(bool)));
-
-    connect(_tab->view(), SIGNAL(loadProgress(int)), this, SLOT(checkLoadProgress(int)));
+    // check view signals
+    connect(_tab->view(), SIGNAL(loadStarted()), this, SLOT(webLoadStarted()));
+    connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(webLoadFinished(bool)));
+    connect(_tab->view(), SIGNAL(loadProgress(int)), this, SLOT(webLoadProgress(int)));
 
     // page signals
     connect(page(), SIGNAL(pageCreated(WebPage *)), this, SIGNAL(pageCreated(WebPage *)));
 }
 
+void WebWindow::setupActions()
+{
+    KAction *a;
+    
+    // ========================= History related actions ==============================
+    a = _ac->addAction(KStandardAction::Back);
+    connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)),
+            this, SLOT(openPrevious(Qt::MouseButtons, Qt::KeyboardModifiers)));
+
+    m_historyBackMenu = new KMenu(this);
+    a->setMenu(m_historyBackMenu);
+    connect(m_historyBackMenu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowBackMenu()));
+    connect(m_historyBackMenu, SIGNAL(triggered(QAction*)), this, SLOT(openActionUrl(QAction*)));
+
+    a = _ac->addAction(KStandardAction::Forward);
+    connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)),
+            this, SLOT(openNext(Qt::MouseButtons, Qt::KeyboardModifiers)));
+
+    m_historyForwardMenu = new KMenu(this);
+    a->setMenu(m_historyForwardMenu);
+    connect(m_historyForwardMenu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowForwardMenu()));
+    connect(m_historyForwardMenu, SIGNAL(triggered(QAction*)), this, SLOT(openActionUrl(QAction*)));
+
+    // urlbar
+    a = new KAction(i18n("Location Bar"), this);
+    a->setDefaultWidget(_bar);
+    _ac->addAction(QL1S("url_bar"), a);
+
+    // load stop reload Action
+    m_loadStopReloadAction = new KAction(this);
+    _ac->addAction(QL1S("load_stop_reload") , m_loadStopReloadAction);
+    m_loadStopReloadAction->setShortcutConfigurable(false);
+
+    m_loadStopReloadAction->setIcon(KIcon("go-jump-locationbar"));
+    m_loadStopReloadAction->setToolTip(i18n("Go"));
+    m_loadStopReloadAction->setText(i18n("Go"));
+}
+
+
+void WebWindow::setupTools()
+{
+    KActionMenu *toolsAction = new KActionMenu(KIcon("configure"), i18n("&Tools"), this);
+    toolsAction->setDelayed(false);
+    toolsAction->setShortcutConfigurable(true);
+    toolsAction->setShortcut(KShortcut(Qt::ALT + Qt::Key_T));
+    m_rekonqMenu = new RekonqMenu(this);
+    toolsAction->setMenu(m_rekonqMenu); // dummy menu to have the dropdown arrow
+
+    // adding rekonq_tools to rekonq actionCollection
+    _ac->addAction(QL1S("rekonq_tools"), toolsAction);
+}
+
+// ---------------------------------------------------------------------------------------------------
 
 void WebWindow::load(const QUrl &url)
 {
@@ -99,13 +192,212 @@ WebPage *WebWindow::page()
 }
 
 
-void WebWindow::checkLoadProgress(int p)
+void WebWindow::webLoadProgress(int p)
 {
     _progress = p;
     emit loadProgress(p);
 }
 
 
+void WebWindow::webLoadStarted()
+{
+    emit loadStarted();
+
+    m_loadStopReloadAction->setIcon(KIcon("process-stop"));
+    m_loadStopReloadAction->setToolTip(i18n("Stop loading the current page"));
+    m_loadStopReloadAction->setText(i18n("Stop"));
+    connect(m_loadStopReloadAction, SIGNAL(triggered(bool)), _tab->view(), SLOT(stop()));
+
+    updateHistoryActions();
+}
+
+
+void WebWindow::webLoadFinished(bool b)
+{
+    emit loadFinished(b);
+
+    m_loadStopReloadAction->setIcon(KIcon("view-refresh"));
+    m_loadStopReloadAction->setToolTip(i18n("Reload the current page"));
+    m_loadStopReloadAction->setText(i18n("Reload"));
+    connect(m_loadStopReloadAction, SIGNAL(triggered(bool)), _tab->view(), SLOT(reload()));
+
+    updateHistoryActions();
+}
+
+
+void WebWindow::aboutToShowBackMenu()
+{
+    m_historyBackMenu->clear();
+
+    QWebHistory *history = _tab->view()->history();
+    int pivot = history->currentItemIndex();
+    int offset = 0;
+    const int maxItemNumber = 8;  // no more than 8 elements in the Back History Menu!
+    QList<QWebHistoryItem> historyList = history->backItems(maxItemNumber);
+    int listCount = historyList.count();
+    if (pivot >= maxItemNumber)
+        offset = pivot - maxItemNumber;
+
+    if (_tab->page()->isOnRekonqPage())
+    {
+        QWebHistoryItem item = history->currentItem();
+        KAction *action = new KAction(this);
+        action->setData(listCount + offset++);
+        KIcon icon = IconManager::self()->iconForUrl(item.url());
+        action->setIcon(icon);
+        action->setText(item.title());
+        m_historyBackMenu->addAction(action);
+    }
+
+    for (int i = listCount - 1; i >= 0; --i)
+    {
+        QWebHistoryItem item = historyList.at(i);
+        KAction *action = new KAction(this);
+        action->setData(i + offset);
+        KIcon icon = IconManager::self()->iconForUrl(item.url());
+        action->setIcon(icon);
+        action->setText(item.title());
+        m_historyBackMenu->addAction(action);
+    }
+}
+
+
+void WebWindow::aboutToShowForwardMenu()
+{
+    m_historyForwardMenu->clear();
+
+    QWebHistory *history = _tab->view()->history();
+    const int pivot = history->currentItemIndex();
+    int offset = 0;
+    const int maxItemNumber = 8;  // no more than 8 elements in the Forward History Menu!
+    QList<QWebHistoryItem> historyList = history->forwardItems(maxItemNumber);
+    int listCount = historyList.count();
+
+    if (pivot >= maxItemNumber)
+        offset = pivot - maxItemNumber;
+
+    if (_tab->page()->isOnRekonqPage())
+    {
+        QWebHistoryItem item = history->currentItem();
+        KAction *action = new KAction(this);
+        action->setData(listCount + offset++);
+        KIcon icon = IconManager::self()->iconForUrl(item.url());
+        action->setIcon(icon);
+        action->setText(item.title());
+        m_historyForwardMenu->addAction(action);
+    }
+
+    for (int i = 1; i <= listCount; i++)
+    {
+        QWebHistoryItem item = historyList.at(i - 1);
+        KAction *action = new KAction(this);
+        action->setData(pivot + i + offset);
+        KIcon icon = IconManager::self()->iconForUrl(item.url());
+        action->setIcon(icon);
+        action->setText(item.title());
+        m_historyForwardMenu->addAction(action);
+    }
+}
+
+
+void WebWindow::openActionUrl(QAction *action)
+{
+    int index = action->data().toInt();
+
+    QWebHistory *history = _tab->view()->history();
+    if (!history->itemAt(index).isValid())
+    {
+        kDebug() << "Invalid Index!: " << index;
+        return;
+    }
+
+    history->goToItem(history->itemAt(index));
+}
+
+
+void WebWindow::openPrevious(Qt::MouseButtons mouseButtons, Qt::KeyboardModifiers keyboardModifiers)
+{
+    QWebHistory *history = _tab->view()->history();
+    QWebHistoryItem *item = 0;
+
+    if (_tab->page()->isOnRekonqPage())
+    {
+        item = new QWebHistoryItem(history->currentItem());
+    }
+    else
+    {
+        if (history->canGoBack())
+        {
+            item = new QWebHistoryItem(history->backItem());
+        }
+    }
+
+    if (!item)
+        return;
+
+    if (mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
+    {
+// FIXME        rApp->loadUrl(item->url(), Rekonq::NewTab);
+    }
+    else
+    {
+        history->goToItem(*item);
+    }
+
+    updateHistoryActions();
+}
+
+
+void WebWindow::openNext(Qt::MouseButtons mouseButtons, Qt::KeyboardModifiers keyboardModifiers)
+{
+    QWebHistory *history = _tab->view()->history();
+    QWebHistoryItem *item = 0;
+
+    if (_tab->page()->isOnRekonqPage())
+    {
+        item = new QWebHistoryItem(history->currentItem());
+    }
+    else
+    {
+        if (history->canGoForward())
+        {
+            item = new QWebHistoryItem(history->forwardItem());
+        }
+    }
+
+    if (!item)
+        return;
+
+    if (mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
+    {
+// FIXME        rApp->loadUrl(item->url(), Rekonq::NewTab);
+    }
+    else
+    {
+        history->goToItem(*item);
+    }
+
+    updateHistoryActions();
+}
+
+
+void WebWindow::updateHistoryActions()
+{
+    QWebHistory *history = _tab->view()->history();
+    
+    bool rekonqPage = _tab->page()->isOnRekonqPage();
+
+    QAction *historyBackAction = actionByName(KStandardAction::name(KStandardAction::Back));
+    if (rekonqPage && history->count() > 0)
+        historyBackAction->setEnabled(true);
+    else
+        historyBackAction->setEnabled(history->canGoBack());
+
+    QAction *historyForwardAction = actionByName(KStandardAction::name(KStandardAction::Forward));
+    historyForwardAction->setEnabled(history->canGoForward());
+}
+
+
 KUrl WebWindow::url() const
 {
     return _tab->url();
diff --git a/src/webwindow/webwindow.h b/src/webwindow/webwindow.h
index a8bebbf4..c727ecf0 100644
--- a/src/webwindow/webwindow.h
+++ b/src/webwindow/webwindow.h
@@ -32,7 +32,7 @@
 #include "rekonq_defines.h"
 
 // KDE Includes
-// #include <KActionCollection>
+#include <KActionCollection>
 
 // Qt Includes
 #include <QWidget>
@@ -43,7 +43,12 @@ class WebPage;
 class WebTab;
 class WebView;
 
+class BookmarkToolBar;
 class UrlBar;
+class RekonqMenu;
+
+class KMenu;
+class KToolBar;
 
 class QPixmap;
 class QUrl;
@@ -74,15 +79,26 @@ public:
 
     inline QAction *actionByName(const QString &name)
     {
-        return new QAction(this);
-//         FIXME return actionCollection()->action(name);
+        return _ac->action(name);
     }
     
 private:
     void init();
+    void setupActions();
+    void setupTools();
     
 private Q_SLOTS:
-    void checkLoadProgress(int);
+    void webLoadProgress(int);
+    void webLoadStarted();
+    void webLoadFinished(bool);
+
+    // history related
+    void aboutToShowBackMenu();
+    void aboutToShowForwardMenu();
+    void openActionUrl(QAction *action);
+    void openPrevious(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier);
+    void openNext(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier);
+    void updateHistoryActions();
 
 Q_SIGNALS:
     void titleChanged(QString);
@@ -98,6 +114,18 @@ private:
 
     WebTab *_tab;
     UrlBar *_bar;
+
+    KToolBar *_mainToolBar;
+    BookmarkToolBar *_bookmarksBar;
+
+    KAction *m_loadStopReloadAction;
+
+    KMenu *m_historyBackMenu;
+    KMenu *m_historyForwardMenu;
+
+    RekonqMenu *m_rekonqMenu;
+
+    KActionCollection *_ac;
 };
 
 #endif // WEB_WINDOW