summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/history/historymanager.cpp1
-rw-r--r--src/mainwindow.cpp4
-rw-r--r--src/settings/advancedwidget.cpp2
-rw-r--r--src/settings/generalwidget.cpp3
-rw-r--r--src/settings/privacywidget.cpp31
-rw-r--r--src/settings/privacywidget.h3
-rw-r--r--src/settings/settingsdialog.cpp13
-rw-r--r--src/settings/settingsdialog.h1
8 files changed, 28 insertions, 30 deletions
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index 11b55e84..afc2ecf0 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -167,6 +167,7 @@ void HistoryManager::setHistory(const QList<HistoryItem> &history, bool loadedAn
m_lastSavedUrl.clear();
m_saveTimer->changeOccurred();
}
+
emit historyReset();
}
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7f9c98d9..5465afa6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1304,8 +1304,8 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status)
const QPoint mousePos = mapFromGlobal(QCursor::pos());
const QPoint bottomPoint = m_view->mapTo(this, m_view->geometry().bottomLeft());
- // +1 because bottom() returns top() + height() - 1 , see QRect doku
- int y = bottomPoint.y() + 1 - m_popup->height() - hScrollbarSize;
+
+ int y = bottomPoint.y() + 1 - m_popup->height() - hScrollbarSize; // +1 because bottom() returns top() + height() - 1, see QRect doku
int x = QRect(QPoint(0, y), labelSize).contains(mousePos) || actionBarsVisible
? width() - labelSize.width() - vScrollbarSize
: 0;
diff --git a/src/settings/advancedwidget.cpp b/src/settings/advancedwidget.cpp
index 7a607954..73c889dc 100644
--- a/src/settings/advancedwidget.cpp
+++ b/src/settings/advancedwidget.cpp
@@ -55,6 +55,8 @@ bool AdvancedWidget::changed()
void AdvancedWidget::hasChanged()
{
+ _changed = true;
+ emit changed(true);
}
diff --git a/src/settings/generalwidget.cpp b/src/settings/generalwidget.cpp
index 9e19f801..439aa5f3 100644
--- a/src/settings/generalwidget.cpp
+++ b/src/settings/generalwidget.cpp
@@ -113,8 +113,7 @@ void GeneralWidget::checkKGetPresence()
{
kcfg_kgetDownload->setDisabled(true);
kcfg_kgetList->setDisabled(true);
- kcfg_kgetDownload->setToolTip(i18n("Install KGet to enable rekonq to use KGet as download manager"));
-
+ kcfg_kgetDownload->setToolTip(i18n("Install KGet to enable rekonq to use it as download manager"));
}
else
{
diff --git a/src/settings/privacywidget.cpp b/src/settings/privacywidget.cpp
index 5fcd6b83..08677068 100644
--- a/src/settings/privacywidget.cpp
+++ b/src/settings/privacywidget.cpp
@@ -48,8 +48,7 @@ PrivacyWidget::PrivacyWidget(QWidget *parent)
{
setupUi(this);
- // JAVASCRIPT
- updateJavascriptSettings(ReKonfig::javascriptEnabled());
+ reload();
// DO NOT TRACK
KConfigGroup cg = KConfigGroup(KSharedConfig::openConfig("kioslaverc", KConfig::NoGlobals), QString());
@@ -70,22 +69,15 @@ void PrivacyWidget::save()
KConfigGroup cg = KConfigGroup(KSharedConfig::openConfig("kioslaverc", KConfig::NoGlobals), QString());
cg.writeEntry("DoNotTrack", doNotTrackCheckBox->isChecked());
cg.sync();
-}
-
-bool PrivacyWidget::changed()
-{
- return _changed;
+ reload();
}
-void PrivacyWidget::hasChanged()
-{
-}
-
-
-void PrivacyWidget::updateJavascriptSettings(bool b)
+void PrivacyWidget::reload()
{
+ bool b = ReKonfig::javascriptEnabled();
+
kcfg_javascriptCanAccessClipboard->setEnabled(b);
kcfg_javascriptCanOpenWindows->setEnabled(b);
@@ -103,6 +95,19 @@ void PrivacyWidget::updateJavascriptSettings(bool b)
}
+bool PrivacyWidget::changed()
+{
+ return _changed;
+}
+
+
+void PrivacyWidget::hasChanged()
+{
+ _changed = true;
+ emit changed(true);
+}
+
+
void PrivacyWidget::launchCacheSettings()
{
QString program = QL1S("kcmshell4");
diff --git a/src/settings/privacywidget.h b/src/settings/privacywidget.h
index 2525c0d9..8d90260e 100644
--- a/src/settings/privacywidget.h
+++ b/src/settings/privacywidget.h
@@ -46,6 +46,8 @@ public:
PrivacyWidget(QWidget *parent = 0);
void save();
+ void reload();
+
bool changed();
Q_SIGNALS:
@@ -53,7 +55,6 @@ Q_SIGNALS:
private Q_SLOTS:
void hasChanged();
- void updateJavascriptSettings(bool);
void launchCacheSettings();
void launchCookieSettings();
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 3e25640d..0d5c2542 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -155,8 +155,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
showButtonSeparator(false);
setWindowTitle(i18nc("Window title of the settings dialog", "Configure – rekonq"));
- readConfig();
-
// update buttons
connect(d->generalWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
connect(d->tabsWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
@@ -181,18 +179,9 @@ SettingsDialog::~SettingsDialog()
}
-// we need this function to UPDATE the config widget data..
-void SettingsDialog::readConfig()
-{
-}
-
-
// we need this function to SAVE settings in rc file..
void SettingsDialog::saveSettings()
{
- if (!hasChanged())
- return;
-
ReKonfig::self()->writeConfig();
d->generalWidg->save();
@@ -204,6 +193,8 @@ void SettingsDialog::saveSettings()
d->shortcutsEditor->save();
d->ebrowsingModule->save();
+ d->privacyWidg->reload();
+
SearchEngine::reload();
rApp->opensearchManager()->removeDeletedEngines();
diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h
index 40a2aeff..ad03602b 100644
--- a/src/settings/settingsdialog.h
+++ b/src/settings/settingsdialog.h
@@ -57,7 +57,6 @@ private:
Private* const d;
private Q_SLOTS:
- void readConfig();
void saveSettings();
};