summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/settings_general.ui2
-rw-r--r--src/settings/settings_tabs.ui28
-rw-r--r--src/settings/settingsdialog.cpp14
3 files changed, 2 insertions, 42 deletions
diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui
index 7d4419b8..3764df8b 100644
--- a/src/settings/settings_general.ui
+++ b/src/settings/settings_general.ui
@@ -151,7 +151,7 @@
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
- <string>Download Manager</string>
+ <string>Downloads Management</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
diff --git a/src/settings/settings_tabs.ui b/src/settings/settings_tabs.ui
index 4e19545f..ab43097c 100644
--- a/src/settings/settings_tabs.ui
+++ b/src/settings/settings_tabs.ui
@@ -202,13 +202,6 @@
</spacer>
</item>
<item>
- <widget class="QCheckBox" name="kcfg_alwaysShowTabBar">
- <property name="text">
- <string>Always show tab bar</string>
- </property>
- </widget>
- </item>
- <item>
<widget class="QCheckBox" name="kcfg_openLinksInNewWindow">
<property name="text">
<string>Don't use tabs: open links in new windows</string>
@@ -230,20 +223,6 @@
</widget>
</item>
<item>
- <widget class="QCheckBox" name="kcfg_openNewTabsInBackground">
- <property name="text">
- <string>Open new tabs in the background</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="kcfg_openNewTabsNearCurrent">
- <property name="text">
- <string>Open new tabs after currently active one</string>
- </property>
- </widget>
- </item>
- <item>
<widget class="QCheckBox" name="kcfg_closeTabSelectPrevious">
<property name="text">
<string>Activate previously used tab when closing the current one</string>
@@ -253,13 +232,6 @@
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="kcfg_animatedTabHighlighting">
- <property name="text">
- <string>Animated tab highlighting</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 9f6b372a..99922e54 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -47,7 +47,6 @@
#include <KConfig>
#include <KStandardDirs>
#include <KPageWidgetItem>
-#include <KShortcutsEditor>
#include <KCModuleInfo>
#include <KCModuleProxy>
@@ -70,8 +69,6 @@ private:
KCModuleProxy *ebrowsingModule;
- KShortcutsEditor *shortcutsEditor;
-
friend class SettingsDialog;
};
@@ -118,12 +115,7 @@ Private::Private(SettingsDialog *parent)
pageItem = parent->addPage(advancedWidg, i18n("Advanced"));
pageItem->setIcon(KIcon("applications-system"));
-// // -- 7
-// shortcutsEditor = new KShortcutsEditor(rApp->mainWindow()->actionCollection(), parent);
-// pageItem = parent->addPage(shortcutsEditor , i18n("Shortcuts"));
-// pageItem->setIcon(KIcon("configure-shortcuts"));
-
- // -- 8
+ // -- 7
KCModuleInfo ebrowsingInfo("ebrowsing.desktop");
ebrowsingModule = new KCModuleProxy(ebrowsingInfo, parent);
pageItem = parent->addPage(ebrowsingModule, i18n("Search Engines"));
@@ -160,8 +152,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
connect(d->advancedWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
connect(d->privacyWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
- connect(d->shortcutsEditor, SIGNAL(keyChange()), this, SLOT(updateButtons()));
-
// save settings
connect(this, SIGNAL(applyClicked()), this, SLOT(saveSettings()));
connect(this, SIGNAL(okClicked()), this, SLOT(saveSettings()));
@@ -187,7 +177,6 @@ void SettingsDialog::saveSettings()
d->webkitWidg->save();
d->advancedWidg->save();
d->privacyWidg->save();
- d->shortcutsEditor->save();
d->ebrowsingModule->save();
d->privacyWidg->reload();
@@ -209,7 +198,6 @@ bool SettingsDialog::hasChanged()
|| d->advancedWidg->changed()
|| d->privacyWidg->changed()
|| d->ebrowsingModule->changed()
- || d->shortcutsEditor->isModified();
;
}