summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/generalwidget.cpp11
-rw-r--r--src/settings/generalwidget.h1
-rw-r--r--src/settings/settings_general.ui79
3 files changed, 34 insertions, 57 deletions
diff --git a/src/settings/generalwidget.cpp b/src/settings/generalwidget.cpp
index d64fd8d3..0f582d66 100644
--- a/src/settings/generalwidget.cpp
+++ b/src/settings/generalwidget.cpp
@@ -49,10 +49,6 @@ GeneralWidget::GeneralWidget(QWidget *parent)
connect(setHomeToCurrentPageButton, SIGNAL(clicked()), this, SLOT(setHomeToCurrentPage()));
- disableHomeSettings(ReKonfig::useNewTabPage());
-
- connect(kcfg_useNewTabPage, SIGNAL(toggled(bool)), this, SLOT(disableHomeSettings(bool)));
-
checkKGetPresence();
connect(kcfg_homePage, SIGNAL(editingFinished()), this, SLOT(fixHomePageURL()));
@@ -99,13 +95,6 @@ void GeneralWidget::setHomeToCurrentPage()
}
-void GeneralWidget::disableHomeSettings(bool b)
-{
- kcfg_homePage->setEnabled(!b);
- setHomeToCurrentPageButton->setEnabled(!b);
-}
-
-
void GeneralWidget::checkKGetPresence()
{
if (KStandardDirs::findExe("kget").isNull())
diff --git a/src/settings/generalwidget.h b/src/settings/generalwidget.h
index ad865955..b0caa46c 100644
--- a/src/settings/generalwidget.h
+++ b/src/settings/generalwidget.h
@@ -52,7 +52,6 @@ Q_SIGNALS:
private Q_SLOTS:
void hasChanged();
void setHomeToCurrentPage();
- void disableHomeSettings(bool);
void fixHomePageURL();
private:
diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui
index 3764df8b..66424fa6 100644
--- a/src/settings/settings_general.ui
+++ b/src/settings/settings_general.ui
@@ -15,12 +15,12 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QGroupBox" name="groupBox_2">
+ <widget class="QGroupBox" name="groupBox">
<property name="title">
- <string>Startup</string>
+ <string>First settings</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="1" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -45,41 +45,7 @@
</property>
</widget>
</item>
- <item>
- <widget class="KComboBox" name="kcfg_startupBehaviour">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <item>
- <property name="text">
- <string>Open the Home Page</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Open the New Tab Page</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Restore the Last Opened Tabs</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Home Page</string>
- </property>
- <layout class="QFormLayout" name="formLayout_2">
- <item row="1" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -101,7 +67,7 @@
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="2" column="1">
<widget class="KLineEdit" name="kcfg_homePage">
<property name="enabled">
<bool>true</bool>
@@ -114,7 +80,7 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QPushButton" name="setHomeToCurrentPageButton">
@@ -138,11 +104,34 @@
</item>
</layout>
</item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="kcfg_useNewTabPage">
- <property name="text">
- <string>Use the New Tab Page as home page</string>
+ <item row="1" column="1">
+ <widget class="KComboBox" name="kcfg_startupBehaviour">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
+ <item>
+ <property name="text">
+ <string>Open the Home Page</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Open the New Tab Page</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Restore the Last Opened Tabs</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Show session dialog</string>
+ </property>
+ </item>
</widget>
</item>
</layout>