diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-22 16:43:56 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-22 16:43:56 +0200 |
commit | f02f8f72b459a30169d3016463147f662dca7491 (patch) | |
tree | 36adcfc14fdf2e69bd72be9440bd91f666182ebd /src/settings.cpp | |
parent | changed title. (diff) | |
download | rekonq-f02f8f72b459a30169d3016463147f662dca7491.tar.xz |
(LAST hopefully) BIG change (before 0.3)
A strange bug on new window loading, calling from .desktop file
(krunner & friends). So I had to change the homePage launch mechanism.
Working on that I started playing with startup settings and implemented this.
I hope Pano like this very much: 0.3 gift :D
Waiting for someone comments and reviews to merge..
Diffstat (limited to 'src/settings.cpp')
-rw-r--r-- | src/settings.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index 4a6c50b8..812c7f52 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -41,6 +41,7 @@ //Ui Includes #include "ui_settings_general.h" +#include "ui_settings_tabs.h" #include "ui_settings_fonts.h" #include "ui_settings_webkit.h" @@ -60,9 +61,12 @@ class Private { private: + Ui::general generalUi; + Ui::tabs tabsUi; Ui::fonts fontsUi; Ui::webkit webkitUi; + KCModuleProxy *proxyModule; KCModuleProxy *ebrowsingModule; KCModuleProxy *cookiesModule; @@ -86,6 +90,12 @@ Private::Private(SettingsDialog *parent) pageItem->setIcon(KIcon("rekonq")); widget = new QWidget; + tabsUi.setupUi(widget); + widget->layout()->setMargin(0); + pageItem = parent->addPage(widget , i18n("Tabs")); + pageItem->setIcon(KIcon("tab-duplicate")); + + widget = new QWidget; fontsUi.setupUi(widget); widget->layout()->setMargin(0); pageItem = parent->addPage(widget , i18n("Fonts")); @@ -118,7 +128,7 @@ Private::Private(SettingsDialog *parent) pageItem = parent->addPage(ebrowsingModule, i18n(ebrowsingInfo.moduleName().toLocal8Bit())); pageItem->setIcon(KIcon(ebrowsingInfo.icon())); - parent->setMinimumSize(800,500); + parent->setMinimumSize(600,400); } @@ -129,7 +139,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : KConfigDialog(parent, "rekonfig", ReKonfig::self()) , d(new Private(this)) { - setFaceType(KPageDialog::List); + setFaceType(KPageDialog::Tree); showButtonSeparator(true); setWindowTitle(i18n("rekonfig...")); @@ -178,12 +188,6 @@ void SettingsDialog::setWebSettingsToolTips() // we need this function to UPDATE the config widget data.. void SettingsDialog::readConfig() { - // ======= General Page - if( ReKonfig::newTabHomePage() ) - d->generalUi.rbUseNewTabPage->setChecked( true ); - else - d->generalUi.rbUseHomePage->setChecked( true ); - // ======= Fonts d->fontsUi.kcfg_fixedFont->setOnlyFixed(true); } @@ -192,8 +196,6 @@ void SettingsDialog::readConfig() // we need this function to SAVE settings in rc file.. void SettingsDialog::saveSettings() { - ReKonfig::setNewTabHomePage( d->generalUi.rbUseNewTabPage->isChecked() ); - ReKonfig::self()->writeConfig(); d->ebrowsingModule->save(); d->cookiesModule->save(); |