summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS2
-rw-r--r--src/clicktoflash.cpp2
-rw-r--r--src/main.cpp2
-rw-r--r--src/settings/settings_webkit.ui78
-rw-r--r--src/walletwidget.cpp8
-rw-r--r--src/webview.cpp4
6 files changed, 74 insertions, 22 deletions
diff --git a/AUTHORS b/AUTHORS
index 825d7912..7815171e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,5 +3,5 @@ Alexandr Domrachev alexandr.domrachev_AT_gmail_DOT_com
Panagiotis Papadopoulos pano_90@gmx.net
Lionel Chauvin megabigbug@yahoo.fr
Johannes Zellner webmaster@nebulon.de
-Matthieu Gicquel matthieu@bureau.home
+Matthieu Gicquel matgic78@gmail.com
Ronny Scholz ronny_scholz@web.de
diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp
index 4ec1a9c1..b6ea1093 100644
--- a/src/clicktoflash.cpp
+++ b/src/clicktoflash.cpp
@@ -71,7 +71,7 @@ ClickToFlash::ClickToFlash(QUrl pluginUrl, QWidget *parent)
QToolButton *button = new QToolButton(this);
button->setPopupMode(QToolButton::InstantPopup);
button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- button->setText(i18n("Load animation"));
+ button->setText(i18n("Load Plugin"));
button->setAutoRaise(false);
layout()->addWidget(button);
connect(button, SIGNAL(clicked(bool)), this, SLOT(load()));
diff --git a/src/main.cpp b/src/main.cpp
index c0e4b70d..030b8476 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -82,7 +82,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
about.addAuthor(ki18n("Matthieu Gicquel"),
ki18n("Developer, Ideas, Tabloid improvements"),
- "matthieu@bureau.home",
+ "matgic78@gmail.com",
"");
about.addAuthor(ki18n("Ronny Scholz"),
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index c59dc9c3..5074522b 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>485</width>
- <height>360</height>
+ <width>437</width>
+ <height>346</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -24,13 +24,6 @@
</property>
</widget>
</item>
- <item row="0" column="2" rowspan="6">
- <widget class="Line" name="line">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
<item row="0" column="3">
<widget class="QCheckBox" name="kcfg_linksIncludedInFocusChain">
<property name="text">
@@ -40,6 +33,12 @@
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="kcfg_javascriptEnabled">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>JavaScript support</string>
</property>
@@ -101,21 +100,74 @@
</property>
</widget>
</item>
- <item row="5" column="0">
+ <item row="0" column="2" rowspan="6">
+ <widget class="Line" name="line">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Plugin Settings</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>When loading web pages:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QComboBox" name="kcfg_pluginsEnabled">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<item>
<property name="text">
- <string>Autoload plugins</string>
+ <string>Autoload Plugins</string>
</property>
</item>
<item>
<property name="text">
- <string>Manually load plugins</string>
+ <string>Manually Load Plugins</string>
</property>
</item>
<item>
<property name="text">
- <string>Never load plugins</string>
+ <string>Never Load Plugins</string>
</property>
</item>
</widget>
diff --git a/src/walletwidget.cpp b/src/walletwidget.cpp
index 8aff4b8e..b5b572f7 100644
--- a/src/walletwidget.cpp
+++ b/src/walletwidget.cpp
@@ -48,9 +48,9 @@ WalletWidget::WalletWidget(QWidget *parent)
closeButton->setAutoRaise(true);
closeButton->setIcon(KIcon("dialog-close"));
- QPushButton *rememberButton = new QPushButton(KIcon("document-save"), i18n("remember"), this);
- QPushButton *neverHereButton = new QPushButton(KIcon("process-stop"), i18n("never for this site"), this);
- QPushButton *notNowButton = new QPushButton(KIcon("dialog-cancel"), i18n("not now"), this);
+ QPushButton *rememberButton = new QPushButton(KIcon("document-save"), i18n("Remember"), this);
+ QPushButton *neverHereButton = new QPushButton(KIcon("process-stop"), i18n("Never for This Site"), this);
+ QPushButton *notNowButton = new QPushButton(KIcon("dialog-cancel"), i18n("Not Now"), this);
connect(closeButton, SIGNAL(clicked()), this, SLOT(notNowRememberData()));
connect(rememberButton, SIGNAL(clicked()), this, SLOT(rememberData()));
@@ -97,7 +97,7 @@ void WalletWidget::notNowRememberData()
void WalletWidget::onSaveFormData(const QString &key, const QUrl &url)
{
- m_label->setText( i18n("Do you want rekonq to remember the password for %1 on %2?")
+ m_label->setText( i18n("Do you want rekonq to remember the password for \"%1\" on \"%2\"?")
.arg(key)
.arg(url.host())
);
diff --git a/src/webview.cpp b/src/webview.cpp
index 574af35a..be46d601 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -57,6 +57,7 @@
#include <QAction>
#include <QLayout>
+
WebView::WebView(QWidget* parent, QWidget* messageWidget)
: KWebView(parent, false)
, m_page( new WebPage(this) )
@@ -78,8 +79,7 @@ WebView::WebView(QWidget* parent, QWidget* messageWidget)
if (messageWidget)
{
-
- WalletWidget *walletBar= new WalletWidget(messageWidget);
+ WalletWidget *walletBar = new WalletWidget(messageWidget);
messageWidget->layout()->addWidget(walletBar);
// kwallet
KWebWallet *w = m_page->wallet();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 13:48:07 +0000