summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/application.cpp18
-rw-r--r--src/application.h3
-rw-r--r--src/mainwindow.cpp93
-rw-r--r--src/mainwindow.h5
-rw-r--r--src/settings/settings_webkit.ui2
-rw-r--r--src/useragent/useragentinfo.cpp19
-rw-r--r--src/useragent/useragentinfo.h6
-rw-r--r--src/useragent/useragentmanager.cpp171
-rw-r--r--src/useragent/useragentmanager.h60
-rw-r--r--src/websnap.cpp3
11 files changed, 278 insertions, 103 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ced397c7..ea33df82 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -90,6 +90,7 @@ SET( rekonq_KDEINIT_SRCS
opensearch/suggestionparser.cpp
#----------------------------------------
useragent/useragentinfo.cpp
+ useragent/useragentmanager.cpp
useragent/useragentwidget.cpp
)
diff --git a/src/application.cpp b/src/application.cpp
index f37720ff..14e34686 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -50,6 +50,7 @@
#include "stackedurlbar.h"
#include "tabbar.h"
#include "urlbar.h"
+#include "useragentmanager.h"
#include "webtab.h"
// KDE Includes
@@ -142,6 +143,13 @@ Application::~Application()
m_adblockManager.clear();
}
+ if (!m_userAgentManager.isNull())
+ {
+ kDebug() << "deleting user agent manager";
+ delete m_userAgentManager.data();
+ m_userAgentManager.clear();
+ }
+
// TODO:
// add a check to NOT close rekonq
// until last download is finished
@@ -385,6 +393,16 @@ DownloadManager *Application::downloadManager()
}
+UserAgentManager *Application::userAgentManager()
+{
+ if (m_userAgentManager.isNull())
+ {
+ m_userAgentManager = new UserAgentManager(instance());
+ }
+ return m_userAgentManager.data();
+}
+
+
void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
{
if (url.isEmpty())
diff --git a/src/application.h b/src/application.h
index acc0335f..02b3009b 100644
--- a/src/application.h
+++ b/src/application.h
@@ -52,6 +52,7 @@ class IconManager;
class MainWindow;
class OpenSearchManager;
class SessionManager;
+class UserAgentManager;
class KAction;
@@ -94,6 +95,7 @@ public:
OpenSearchManager *opensearchManager();
IconManager *iconManager();
DownloadManager *downloadManager();
+ UserAgentManager *userAgentManager();
KAction *privateBrowsingAction()
{
@@ -139,6 +141,7 @@ private:
QWeakPointer<OpenSearchManager> m_opensearchManager;
QWeakPointer<IconManager> m_iconManager;
QWeakPointer<DownloadManager> m_downloadManager;
+ QWeakPointer<UserAgentManager> m_userAgentManager;
MainWindowList m_mainWindows;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c53fcb6c..ff500b4a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -55,8 +55,7 @@
#include "webpage.h"
#include "webtab.h"
#include "zoombar.h"
-#include "useragentinfo.h"
-#include "useragentwidget.h"
+#include "useragentmanager.h"
// Ui Includes
#include "ui_cleardata.h"
@@ -113,7 +112,6 @@ MainWindow::MainWindow()
, m_analyzerPanel(0)
, m_historyBackMenu(0)
, m_historyForwardMenu(0)
- , m_userAgentMenu(new KMenu(this))
, m_bookmarksBar(0)
, m_popup(new QLabel(this))
, m_hidePopupTimer(new QTimer(this))
@@ -504,12 +502,9 @@ void MainWindow::setupActions()
// User Agent
a = new KAction(KIcon("preferences-web-browser-identification"), i18n("Browser Identification"), this);
actionCollection()->addAction(QL1S("useragent"), a);
- a->setMenu(m_userAgentMenu);
- connect(m_userAgentMenu, SIGNAL(aboutToShow()), this, SLOT(populateUserAgentMenu()));
-
- a = new KAction(KIcon("preferences-web-browser-identification"), i18n("Browser Identification"), this);
- actionCollection()->addAction(QL1S("UserAgentSettings"), a);
- connect(a, SIGNAL(triggered(bool)), this, SLOT(showUserAgentSettings()));
+ KMenu *uaMenu = new KMenu(this);
+ a->setMenu(uaMenu);
+ connect(uaMenu, SIGNAL(aboutToShow()), this, SLOT(populateUserAgentMenu()));
// Editable Page
a = new KAction(KIcon("document-edit"), i18n("Set Editable"), this);
@@ -1438,65 +1433,6 @@ void MainWindow::openActionTab(QAction* action)
}
-void MainWindow::setUserAgent()
-{
- QAction *sender = static_cast<QAction *>(QObject::sender());
-
- QString info;
- QString desc = sender->text();
- int uaIndex = sender->data().toInt();
-
- KUrl url = currentTab()->url();
- UserAgentInfo uaInfo;
- uaInfo.setUserAgentForHost(uaIndex, url.host());
- currentTab()->page()->triggerAction(QWebPage::Reload);
-}
-
-
-void MainWindow::populateUserAgentMenu()
-{
- bool defaultUA = true;
- KUrl url = currentTab()->url();
-
- QAction *a, *defaultAction;
-
- m_userAgentMenu->clear();
-
- defaultAction = new QAction(i18nc("Default rekonq user agent", "Default"), this);
- defaultAction->setData(-1);
- defaultAction->setCheckable(true);
- connect(defaultAction, SIGNAL(triggered(bool)), this, SLOT(setUserAgent()));
-
- m_userAgentMenu->addAction(defaultAction);
- m_userAgentMenu->addSeparator();
-
- UserAgentInfo uaInfo;
- QStringList UAlist = uaInfo.availableUserAgents();
- int uaIndex = uaInfo.uaIndexForHost(currentTab()->url().host());
-
- for (int i = 0; i < UAlist.count(); ++i)
- {
- QString uaDesc = UAlist.at(i);
-
- a = new QAction(uaDesc, this);
- a->setData(i);
- a->setCheckable(true);
- connect(a, SIGNAL(triggered(bool)), this, SLOT(setUserAgent()));
-
- if (i == uaIndex)
- {
- a->setChecked(true);
- defaultUA = false;
- }
- m_userAgentMenu->addAction(a);
- }
- defaultAction->setChecked(defaultUA);
-
- m_userAgentMenu->addSeparator();
- m_userAgentMenu->addAction(actionByName("UserAgentSettings"));
-}
-
-
void MainWindow::enableNetworkAnalysis(bool b)
{
currentTab()->page()->enableNetworkAnalyzer(b);
@@ -1529,20 +1465,6 @@ void MainWindow::setupBookmarksAndToolsShortcuts()
}
-void MainWindow::showUserAgentSettings()
-{
- QPointer<KDialog> dialog = new KDialog(this);
- dialog->setCaption(i18nc("@title:window", "User Agent Settings"));
- dialog->setButtons(KDialog::Ok);
-
- UserAgentWidget widget;
- dialog->setMainWidget(&widget);
- dialog->exec();
-
- dialog->deleteLater();
-}
-
-
void MainWindow::moveEvent(QMoveEvent *event)
{
if (m_hidePopupTimer)
@@ -1577,3 +1499,10 @@ void MainWindow::closeEvent(QCloseEvent *event)
kDebug() << "CLOSING WINDOW...";
KXmlGuiWindow::closeEvent(event);
}
+
+
+void MainWindow::populateUserAgentMenu()
+{
+ KMenu *uaMenu = static_cast<KMenu *>(QObject::sender());
+ rApp->userAgentManager()->populateUAMenuForTabUrl(uaMenu, currentTab());
+}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 9dfe4a1e..581b4fd1 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -176,10 +176,7 @@ private Q_SLOTS:
void openActionUrl(QAction *action);
void openActionTab(QAction *action);
- // user agent
- void setUserAgent();
void populateUserAgentMenu();
- void showUserAgentSettings();
void enableNetworkAnalysis(bool);
void setEditable(bool);
@@ -204,8 +201,6 @@ private:
KMenu *m_tabListMenu;
- KMenu *m_userAgentMenu;
-
BookmarkToolBar *m_bookmarksBar;
QString m_lastSearch;
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index 46913f63..5235eab2 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -33,7 +33,7 @@
<item>
<widget class="QCheckBox" name="kcfg_javascriptCanOpenWindows">
<property name="text">
- <string>Let Javascipt open new windows</string>
+ <string>Let Javascript open new windows</string>
</property>
</widget>
</item>
diff --git a/src/useragent/useragentinfo.cpp b/src/useragent/useragentinfo.cpp
index 0829a7e1..6ac411ba 100644
--- a/src/useragent/useragentinfo.cpp
+++ b/src/useragent/useragentinfo.cpp
@@ -46,18 +46,13 @@
UserAgentInfo::UserAgentInfo()
{
- /* KService::List m_providers = KServiceTypeTrader::self()->query("UserAgentStrings");*/
-
- // NOTE: limiting User Agent Numbers
- m_providers << KService::serviceByDesktopName("firefox36oncurrent");
- m_providers << KService::serviceByDesktopName("ie70onwinnt51");
- m_providers << KService::serviceByDesktopName("ie60oncurrent");
- m_providers << KService::serviceByDesktopName("chrome50oncurrent");
- m_providers << KService::serviceByDesktopName("safari40");
- m_providers << KService::serviceByDesktopName("op962oncurrent");
- m_providers << KService::serviceByDesktopName("ns71oncurrent");
- m_providers << KService::serviceByDesktopName("android10");
- m_providers << KService::serviceByDesktopName("googlebot");
+ m_providers = KServiceTypeTrader::self()->query("UserAgentStrings");
+}
+
+
+KService::List UserAgentInfo::availableProviders() const
+{
+ return m_providers;
}
diff --git a/src/useragent/useragentinfo.h b/src/useragent/useragentinfo.h
index 417aeea1..86319d9e 100644
--- a/src/useragent/useragentinfo.h
+++ b/src/useragent/useragentinfo.h
@@ -46,6 +46,12 @@ public:
UserAgentInfo();
/**
+ * Lists all available providers
+ *
+ */
+ KService::List availableProviders() const;
+
+ /**
* Lists all available User Agents
*
* @returns the list of the UA descriptions
diff --git a/src/useragent/useragentmanager.cpp b/src/useragent/useragentmanager.cpp
new file mode 100644
index 00000000..20043549
--- /dev/null
+++ b/src/useragent/useragentmanager.cpp
@@ -0,0 +1,171 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2011 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 "useragentmanager.h"
+#include "useragentmanager.moc"
+
+// Local Includes
+#include "useragentinfo.h"
+#include "useragentwidget.h"
+#include "webtab.h"
+#include "webview.h"
+
+// KDE Includes
+#include <KAction>
+#include <KDialog>
+#include <KMenu>
+
+
+UserAgentManager::UserAgentManager(QObject *parent)
+ : QObject(parent)
+ , m_uaSettingsAction(0)
+ , m_uaTab(0)
+{
+ m_uaSettingsAction = new KAction(KIcon("preferences-web-browser-identification"), i18n("Browser Identification"), this);
+ connect(m_uaSettingsAction, SIGNAL(triggered(bool)), this, SLOT(showSettings()));
+}
+
+
+void UserAgentManager::showSettings()
+{
+ QPointer<KDialog> dialog = new KDialog(m_uaTab);
+ dialog->setCaption(i18nc("@title:window", "User Agent Settings"));
+ dialog->setButtons(KDialog::Ok);
+
+ UserAgentWidget widget;
+ dialog->setMainWidget(&widget);
+ dialog->exec();
+
+ dialog->deleteLater();
+}
+
+
+void UserAgentManager::populateUAMenuForTabUrl(KMenu *uaMenu, WebTab *uaTab)
+{
+ if (m_uaTab)
+ disconnect(this, SIGNAL(reloadTab()), m_uaTab->view(), SLOT(reload()));
+
+ m_uaTab = uaTab;
+ connect(this, SIGNAL(reloadTab()), m_uaTab->view(), SLOT(reload()));
+
+ bool defaultUA = true;
+
+ QAction *a, *defaultAction;
+
+ // just to be sure...
+ uaMenu->clear();
+
+ 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();
+
+ // Main Browsers Menus
+ KMenu *ffMenu = new KMenu(i18n("Firefox"), uaMenu);
+ uaMenu->addMenu(ffMenu);
+
+ KMenu *ieMenu = new KMenu(i18n("Internet Explorer"), uaMenu);
+ uaMenu->addMenu(ieMenu);
+
+ KMenu *nsMenu = new KMenu(i18n("Netscape"), uaMenu);
+ uaMenu->addMenu(nsMenu);
+
+ KMenu *opMenu = new KMenu(i18n("Opera"), uaMenu);
+ uaMenu->addMenu(opMenu);
+
+ KMenu *sfMenu = new KMenu(i18n("Safari"), uaMenu);
+ uaMenu->addMenu(sfMenu);
+
+ KMenu *otMenu = new KMenu(i18n("Other"), uaMenu);
+ uaMenu->addMenu(otMenu);
+
+ UserAgentInfo uaInfo;
+ QStringList UAlist = uaInfo.availableUserAgents();
+ const KService::List providers = uaInfo.availableProviders();
+ int uaIndex = uaInfo.uaIndexForHost(m_uaTab->url().host());
+
+ for (int i = 0; i < UAlist.count(); ++i)
+ {
+ QString uaDesc = UAlist.at(i);
+
+ a = new QAction(uaDesc, uaMenu);
+ a->setData(i);
+ a->setCheckable(true);
+ connect(a, SIGNAL(triggered(bool)), this, SLOT(setUserAgent()));
+
+ if (i == uaIndex)
+ {
+ a->setChecked(true);
+ defaultUA = false;
+ }
+
+ QString tag = providers.at(i)->property("X-KDE-UA-TAG").toString();
+ if (tag == QL1S("FF"))
+ {
+ ffMenu->addAction(a);
+ }
+ else if (tag == QL1S("IE"))
+ {
+ ieMenu->addAction(a);
+ }
+ else if (tag == QL1S("NN"))
+ {
+ nsMenu->addAction(a);
+ }
+ else if (tag == QL1S("OPR"))
+ {
+ opMenu->addAction(a);
+ }
+ else if (tag == QL1S("SAF"))
+ {
+ sfMenu->addAction(a);
+ }
+ else // OTHERs
+ {
+ otMenu->addAction(a);
+ }
+ }
+ defaultAction->setChecked(defaultUA);
+
+ uaMenu->addSeparator();
+ uaMenu->addAction(m_uaSettingsAction);
+}
+
+
+void UserAgentManager::setUserAgent()
+{
+ QAction *sender = static_cast<QAction *>(QObject::sender());
+
+ int uaIndex = sender->data().toInt();
+
+ UserAgentInfo uaInfo;
+ uaInfo.setUserAgentForHost(uaIndex, m_uaTab->url().host());
+ emit reloadTab();
+}
diff --git a/src/useragent/useragentmanager.h b/src/useragent/useragentmanager.h
new file mode 100644
index 00000000..0592e55c
--- /dev/null
+++ b/src/useragent/useragentmanager.h
@@ -0,0 +1,60 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2011 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 USER_AGENT_MANAGER_H
+#define USER_AGENT_MANAGER_H
+
+
+#include <QObject>
+
+class WebTab;
+
+class KAction;
+class KMenu;
+
+
+class UserAgentManager : public QObject
+{
+ Q_OBJECT
+
+public:
+ UserAgentManager(QObject *parent = 0);
+
+ void populateUAMenuForTabUrl(KMenu *, WebTab *);
+
+private Q_SLOTS:
+ void showSettings();
+ void setUserAgent();
+
+Q_SIGNALS:
+ void reloadTab();
+
+private:
+ KAction *m_uaSettingsAction;
+ WebTab *m_uaTab;
+};
+
+#endif // USER_AGENT_MANAGER_H
diff --git a/src/websnap.cpp b/src/websnap.cpp
index f8b57d70..3344ded8 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -30,9 +30,6 @@
#include "websnap.h"
#include "websnap.moc"
-// Local Includes
-#include "newtabpage.h"
-
// KDE Includes
#include <KStandardDirs>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-11 07:58:29 +0000