From c1d1c10af5a89da77a1005bcf28cde2d216bef74 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 24 Nov 2011 17:16:28 +0100
Subject: clean up UserAgentManager code

This way we got the following gains:
- UA Manager is NOT loaded until it is really used
- rekonq other code does know ANYTHING about UA Manager (but the app
instance)

To let this really shine, we should link this directly to the webtab.
Another point for moving tabs up :)
---
 src/useragent/useragentmanager.cpp | 53 +++++++++++++++-----------------------
 src/useragent/useragentmanager.h   | 12 ++++++---
 2 files changed, 29 insertions(+), 36 deletions(-)

(limited to 'src/useragent')

diff --git a/src/useragent/useragentmanager.cpp b/src/useragent/useragentmanager.cpp
index db6e0708..78b5b1c0 100644
--- a/src/useragent/useragentmanager.cpp
+++ b/src/useragent/useragentmanager.cpp
@@ -31,9 +31,8 @@
 // Local Includes
 #include "useragentinfo.h"
 #include "useragentwidget.h"
-#include "application.h"
-#include "mainwindow.h"
 #include "webtab.h"
+#include "webview.h"
 
 // KDE Includes
 #include <KAction>
@@ -44,30 +43,16 @@
 UserAgentManager::UserAgentManager(QObject *parent)
     : QObject(parent)
     , _uaSettingsAction(0)
-    , _uaMenu(new KMenu)
+    , _uaTab(0)
 {
     _uaSettingsAction = new KAction(KIcon("preferences-web-browser-identification"), i18n("Browser Identification"), this);
     connect(_uaSettingsAction, SIGNAL(triggered(bool)), this, SLOT(showSettings()));
-
-    connect(_uaMenu, SIGNAL(aboutToShow()), this, SLOT(populateUserAgentMenu()));
-}
-
-
-UserAgentManager::~UserAgentManager()
-{
-    delete _uaMenu;
-}
-
-
-KMenu *UserAgentManager::userAgentMenu()
-{
-    return _uaMenu;
 }
 
 
 void UserAgentManager::showSettings()
 {
-    QPointer<KDialog> dialog = new KDialog;
+    QPointer<KDialog> dialog = new KDialog(_uaTab);
     dialog->setCaption(i18nc("@title:window", "User Agent Settings"));
     dialog->setButtons(KDialog::Ok);
 
@@ -79,33 +64,38 @@ void UserAgentManager::showSettings()
 }
 
 
-void UserAgentManager::populateUserAgentMenu()
+void UserAgentManager::populateUAMenuForTabUrl(KMenu *uaMenu, WebTab *uaTab)
 {
+    if (_uaTab)
+        disconnect(this, SIGNAL(reloadTab()), _uaTab->view(), SLOT(reload()));
+
+    _uaTab = uaTab;
+    connect(this, SIGNAL(reloadTab()), _uaTab->view(), SLOT(reload()));
+
     bool defaultUA = true;
-    KUrl url = rApp->mainWindow()->currentTab()->url();
 
     QAction *a, *defaultAction;
 
     // just to be sure...
-    _uaMenu->clear();
+    uaMenu->clear();
 
-    defaultAction = new QAction(i18nc("Default rekonq user agent", "Default"), this);
+    defaultAction = new QAction(i18nc("Default rekonq user agent", "Default"), uaMenu);
     defaultAction->setData(-1);
     defaultAction->setCheckable(true);
     connect(defaultAction, SIGNAL(triggered(bool)), this, SLOT(setUserAgent()));
 
-    _uaMenu->addAction(defaultAction);
-    _uaMenu->addSeparator();
+    uaMenu->addAction(defaultAction);
+    uaMenu->addSeparator();
 
     UserAgentInfo uaInfo;
     QStringList UAlist = uaInfo.availableUserAgents();
-    int uaIndex = uaInfo.uaIndexForHost(url.host());
+    int uaIndex = uaInfo.uaIndexForHost(_uaTab->url().host());
 
     for (int i = 0; i < UAlist.count(); ++i)
     {
         QString uaDesc = UAlist.at(i);
 
-        a = new QAction(uaDesc, this);
+        a = new QAction(uaDesc, uaMenu);
         a->setData(i);
         a->setCheckable(true);
         connect(a, SIGNAL(triggered(bool)), this, SLOT(setUserAgent()));
@@ -115,12 +105,12 @@ void UserAgentManager::populateUserAgentMenu()
             a->setChecked(true);
             defaultUA = false;
         }
-        _uaMenu->addAction(a);
+        uaMenu->addAction(a);
     }
     defaultAction->setChecked(defaultUA);
 
-    _uaMenu->addSeparator();
-    _uaMenu->addAction(_uaSettingsAction);
+    uaMenu->addSeparator();
+    uaMenu->addAction(_uaSettingsAction);
 }
 
 
@@ -131,8 +121,7 @@ void UserAgentManager::setUserAgent()
     QString desc = sender->text();
     int uaIndex = sender->data().toInt();
 
-    KUrl url = rApp->mainWindow()->currentTab()->url();
     UserAgentInfo uaInfo;
-    uaInfo.setUserAgentForHost(uaIndex, url.host());
-    rApp->mainWindow()->currentTab()->page()->triggerAction(QWebPage::Reload);
+    uaInfo.setUserAgentForHost(uaIndex, _uaTab->url().host());
+    emit reloadTab();
 }
diff --git a/src/useragent/useragentmanager.h b/src/useragent/useragentmanager.h
index ae38ac6d..62bf4890 100644
--- a/src/useragent/useragentmanager.h
+++ b/src/useragent/useragentmanager.h
@@ -30,27 +30,31 @@
 
 #include <QObject>
 
+class WebTab;
+
 class KAction;
 class KMenu;
 
+
 class UserAgentManager : public QObject
 {
     Q_OBJECT
 
 public:
     UserAgentManager(QObject *parent = 0);
-    ~UserAgentManager();
 
-    KMenu *userAgentMenu();
+    void populateUAMenuForTabUrl(KMenu *, WebTab *);
 
 private Q_SLOTS:
     void showSettings();
     void setUserAgent();
-    void populateUserAgentMenu();
+
+Q_SIGNALS:
+    void reloadTab();
 
 private:
     KAction *_uaSettingsAction;
-    KMenu *_uaMenu;
+    WebTab *_uaTab;
 };
 
 #endif  // USER_AGENT_MANAGER_H
-- 
cgit v1.2.1