summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mainwindow.cpp1
-rw-r--r--src/settings_privacy.ui89
-rw-r--r--src/webview.cpp20
-rw-r--r--src/webview.h2
4 files changed, 56 insertions, 56 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5a591883..98ce7d99 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -151,7 +151,6 @@ MainWindow::MainWindow()
MainWindow::~MainWindow()
{
delete m_view;
- delete m_bookmarksProvider;
}
diff --git a/src/settings_privacy.ui b/src/settings_privacy.ui
index 19e7f088..7f3ff1a8 100644
--- a/src/settings_privacy.ui
+++ b/src/settings_privacy.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>privacy</class>
- <widget class="QWidget" name="privacy" >
- <property name="geometry" >
+ <widget class="QWidget" name="privacy">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,32 +10,32 @@
<height>313</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Privacy</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Web Content</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QCheckBox" name="kcfg_enablePlugins" >
- <property name="text" >
+ <widget class="QCheckBox" name="kcfg_enablePlugins">
+ <property name="text">
<string>Enable Plugins</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="kcfg_enableJavascript" >
- <property name="text" >
+ <widget class="QCheckBox" name="kcfg_enableJavascript">
+ <property name="text">
<string>Enable Javascript</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
@@ -43,79 +44,79 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="cookiesGroupBox" >
- <property name="title" >
+ <widget class="QGroupBox" name="cookiesGroupBox">
+ <property name="title">
<string>Cookies</string>
</property>
- <layout class="QGridLayout" name="_2" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
+ <layout class="QGridLayout" name="_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
<string>Accept Cookies:</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="kcfg_acceptCookies" >
+ <item row="0" column="1">
+ <widget class="QComboBox" name="kcfg_acceptCookies">
<item>
- <property name="text" >
+ <property name="text">
<string>Always</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Never</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Only from sites you navigate to</string>
</property>
</item>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QPushButton" name="exceptionsButton" >
- <property name="text" >
+ <item row="0" column="2">
+ <widget class="QPushButton" name="exceptionsButton">
+ <property name="text">
<string>Exceptions...</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Keep until:</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QComboBox" name="kcfg_keepCookiesUntil" >
+ <item row="1" column="1">
+ <widget class="QComboBox" name="kcfg_keepCookiesUntil">
<item>
- <property name="text" >
+ <property name="text">
<string>They expire</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>I exit the application</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>At most 90 days</string>
</property>
</item>
</widget>
</item>
- <item row="1" column="2" >
- <widget class="QPushButton" name="cookiesButton" >
- <property name="text" >
+ <item row="1" column="2">
+ <widget class="QPushButton" name="cookiesButton">
+ <property name="text">
<string>Cookies...</string>
</property>
</widget>
@@ -124,11 +125,11 @@
</widget>
</item>
<item>
- <spacer name="verticalSpacer" >
- <property name="orientation" >
+ <spacer name="verticalSpacer">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
diff --git a/src/webview.cpp b/src/webview.cpp
index e6748263..0c2e0b6e 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -111,19 +111,19 @@ QWebPage *WebPage::createWindow(QWebPage::WebWindowType type)
}
-// QObject *WebPage::createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
-// {
-// kWarning() << "creating PLUGIN for rekonq ";
-// kWarning() << "classId = " << classId;
-// kWarning() << "url = " << url;
-// kWarning() << "Param Names = " << paramNames;
-// kWarning() << "Param Values = " << paramValues;
+QObject *WebPage::createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
+{
+ kWarning() << "creating PLUGIN for rekonq ";
+ kWarning() << "classId = " << classId;
+ kWarning() << "url = " << url;
+ kWarning() << "Param Names = " << paramNames;
+ kWarning() << "Param Values = " << paramValues;
// Q_UNUSED(url);
// Q_UNUSED(paramNames);
// Q_UNUSED(paramValues);
-// QUiLoader loader;
-// return loader.createWidget(classId, view());
-// }
+ QUiLoader loader;
+ return loader.createWidget(classId, view());
+}
void WebPage::handleUnsupportedContent(QNetworkReply *reply)
diff --git a/src/webview.h b/src/webview.h
index b45edc17..6892fbd4 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -50,7 +50,7 @@ public:
protected:
bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
QWebPage *createWindow(QWebPage::WebWindowType type);
-// QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
+ QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
private slots:
void handleUnsupportedContent(QNetworkReply *reply);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 19:54:53 +0000