[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] /: Continue to implement support for immutable settings
From:       Montel Laurent <montel () kde ! org>
Date:       2014-01-17 19:21:26
Message-ID: E1W4Eys-0004yp-Gc () scm ! kde ! org
[Download RAW message or body]

Git commit 3f05fc06525b3cde938b6142313f0db8bf63077b by Montel Laurent.
Committed on 17/01/2014 at 19:20.
Pushed by mlaurent into branch 'master'.

Continue to implement support for immutable settings

M  +5    -6    kmail/configuredialog/configurecomposerpage.cpp
M  +2    -2    kmail/configuredialog/configuresecuritypage.cpp
M  +0    -2    kmail/configuredialog/configurestorageservicewidget.cpp
M  +13   -0    pimcommon/widgets/configureimmutablewidgetutils.cpp
M  +4    -0    pimcommon/widgets/configureimmutablewidgetutils.h

http://commits.kde.org/kdepim/3f05fc06525b3cde938b6142313f0db8bf63077b

diff --git a/kmail/configuredialog/configurecomposerpage.cpp \
b/kmail/configuredialog/configurecomposerpage.cpp index 8ecf835..59edd45 100644
--- a/kmail/configuredialog/configurecomposerpage.cpp
+++ b/kmail/configuredialog/configurecomposerpage.cpp
@@ -550,10 +550,10 @@ void ComposerPage::GeneralTab::doLoadFromGlobalSettings()
     loadWidget(mAutoRequestMDNCheck, GlobalSettings::self()->requestMDNItem() );
     loadWidget(mWordWrapCheck, MessageComposer::MessageComposerSettings::self()->wordWrapItem() );
 
-    mWrapColumnSpin->setValue( MessageComposer::MessageComposerSettings::self()->lineWrapWidth() );
-    mMaximumRecipients->setValue( MessageComposer::MessageComposerSettings::self()->maximumRecipients() \
); +    loadWidget(mWrapColumnSpin, MessageComposer::MessageComposerSettings::self()->lineWrapWidthItem() \
); +    loadWidget(mMaximumRecipients,  \
MessageComposer::MessageComposerSettings::self()->maximumRecipientsItem() );  mAutoSave->setValue( \
                GlobalSettings::self()->autosaveInterval() );
-    mShowRecentAddressesInComposer->setChecked( \
MessageComposer::MessageComposerSettings::self()->showRecentAddressesInComposer() ); +    \
loadWidget(mShowRecentAddressesInComposer, \
                MessageComposer::MessageComposerSettings::self()->showRecentAddressesInComposerItem() );
     mImprovePlainTextOfHtmlMessage->setChecked(MessageComposer::MessageComposerSettings::self()->improvePlainTextOfHtmlMessage());
  
 #ifdef KDEPIM_ENTERPRISE_BUILD
@@ -583,8 +583,8 @@ void ComposerPage::GeneralTab::save() {
 
     MessageComposer::MessageComposerSettings::self()->setAutoTextSignature(
                 mAutoAppSignFileCheck->isChecked() ? QLatin1String("auto") : QLatin1String("manual") );
-    MessageComposer::MessageComposerSettings::self()->setLineWrapWidth( mWrapColumnSpin->value() );
-    MessageComposer::MessageComposerSettings::self()->setMaximumRecipients( mMaximumRecipients->value() \
); +    saveKIntSpinBox(mWrapColumnSpin, \
MessageComposer::MessageComposerSettings::self()->lineWrapWidthItem() ); +    \
saveKIntSpinBox(mMaximumRecipients,  \
MessageComposer::MessageComposerSettings::self()->maximumRecipientsItem() );  \
                GlobalSettings::self()->setAutosaveInterval( mAutoSave->value() );
     MessageComposer::MessageComposerSettings::self()->setShowRecentAddressesInComposer( \
                mShowRecentAddressesInComposer->isChecked() );
     MessageComposer::MessageComposerSettings::self()->setImprovePlainTextOfHtmlMessage( \
mImprovePlainTextOfHtmlMessage->isChecked() ); @@ -1344,7 +1344,6 @@ \
ComposerPageAutoCorrectionTab::ComposerPageAutoCorrectionTab(QWidget *parent)  \
vlay->addWidget(autocorrectionWidget);  setLayout(vlay);
     connect( autocorrectionWidget, SIGNAL(changed()), this, SLOT(slotEmitChanged()) );
-
 }
 
 QString ComposerPageAutoCorrectionTab::helpAnchor() const
diff --git a/kmail/configuredialog/configuresecuritypage.cpp \
b/kmail/configuredialog/configuresecuritypage.cpp index 06ffc24..d84b33d 100644
--- a/kmail/configuredialog/configuresecuritypage.cpp
+++ b/kmail/configuredialog/configuresecuritypage.cpp
@@ -124,7 +124,7 @@ void SecurityPage::GeneralTab::doLoadOther()
     loadWidget(mSGTab.mAlwaysDecrypt, MessageViewer::GlobalSettings::self()->alwaysDecryptItem() );
 
     loadWidget(mSGTab.mScamDetection, \
                MessageViewer::GlobalSettings::self()->scamDetectionEnabledItem());
-    mSGTab.scamWhiteList->setStringList( MessageViewer::GlobalSettings::self()->scamDetectionWhiteList() \
); +    loadWidget(mSGTab.scamWhiteList, \
MessageViewer::GlobalSettings::self()->scamDetectionWhiteListItem());  }
 
 void SecurityPage::GeneralTab::save()
@@ -147,7 +147,7 @@ void SecurityPage::GeneralTab::save()
     saveCheckBox(mSGTab.mAutomaticallyImportAttachedKeysCheck, \
                MessageViewer::GlobalSettings::self()->autoImportKeysItem() );
     saveCheckBox(mSGTab.mAlwaysDecrypt, MessageViewer::GlobalSettings::self()->alwaysDecryptItem() );
     saveCheckBox(mSGTab.mScamDetection, \
                MessageViewer::GlobalSettings::self()->scamDetectionEnabledItem());
-    MessageViewer::GlobalSettings::self()->setScamDetectionWhiteList( mSGTab.scamWhiteList->stringList() \
); +    saveSimpleStringListEditor(mSGTab.scamWhiteList, \
MessageViewer::GlobalSettings::self()->scamDetectionWhiteListItem());  }
 
 //Adblock
diff --git a/kmail/configuredialog/configurestorageservicewidget.cpp \
b/kmail/configuredialog/configurestorageservicewidget.cpp index 7b181cf..ab7adb4 100644
--- a/kmail/configuredialog/configurestorageservicewidget.cpp
+++ b/kmail/configuredialog/configurestorageservicewidget.cpp
@@ -45,8 +45,6 @@ ConfigureStorageServiceWidget::ConfigureStorageServiceWidget(QWidget *parent)
     mStorageServiceWidget = new PimCommon::StorageServiceSettingsWidget;
     lay->addWidget(mStorageServiceWidget);
 
-
-
     setLayout(lay);
 }
 
diff --git a/pimcommon/widgets/configureimmutablewidgetutils.cpp \
b/pimcommon/widgets/configureimmutablewidgetutils.cpp index 8e1209e..f69e18f 100644
--- a/pimcommon/widgets/configureimmutablewidgetutils.cpp
+++ b/pimcommon/widgets/configureimmutablewidgetutils.cpp
@@ -21,6 +21,7 @@
 #include <KLocalizedString>
 #include <KDialog>
 #include <KUrlRequester>
+#include <KIntSpinBox>
 
 #include <QWidget>
 #include <QLineEdit>
@@ -107,6 +108,18 @@ void ConfigureImmutableWidgetUtils::saveSpinBox( QSpinBox * b, KCoreConfigSkelet
     e->setValue( b->value() );
 }
 
+void ConfigureImmutableWidgetUtils::loadWidget( KIntSpinBox * b, const KCoreConfigSkeleton::ItemInt *e )
+{
+    checkLockDown( b, e );
+    b->setValue( e->value() );
+}
+
+void ConfigureImmutableWidgetUtils::saveKIntSpinBox( KIntSpinBox * b, KCoreConfigSkeleton::ItemInt *e )
+{
+    e->setValue( b->value() );
+}
+
+
 void ConfigureImmutableWidgetUtils::saveCheckBox( QCheckBox * b, KCoreConfigSkeleton::ItemBool *e )
 {
     e->setValue( b->isChecked() );
diff --git a/pimcommon/widgets/configureimmutablewidgetutils.h \
b/pimcommon/widgets/configureimmutablewidgetutils.h index fd18cc5..1e84722 100644
--- a/pimcommon/widgets/configureimmutablewidgetutils.h
+++ b/pimcommon/widgets/configureimmutablewidgetutils.h
@@ -32,6 +32,8 @@ class QLineEdit;
 class KConfigSkeletonItem;
 class KUrlRequester;
 class QSpinBox;
+
+class KIntSpinBox;
 namespace PimCommon {
 class SimpleStringListEditor;
 namespace ConfigureImmutableWidgetUtils {
@@ -44,7 +46,9 @@ PIMCOMMON_EXPORT void loadWidget( QLineEdit * b, const KCoreConfigSkeleton::Item
 PIMCOMMON_EXPORT void loadWidget( KUrlRequester * b, const KCoreConfigSkeleton::ItemString *e );
 PIMCOMMON_EXPORT void loadWidget( QSpinBox * b, const KCoreConfigSkeleton::ItemInt *e );
 PIMCOMMON_EXPORT void loadWidget( PimCommon::SimpleStringListEditor * b, const \
KCoreConfigSkeleton::ItemStringList *e ); +PIMCOMMON_EXPORT void loadWidget( KIntSpinBox * b, const \
KCoreConfigSkeleton::ItemInt *e );  
+PIMCOMMON_EXPORT void saveKIntSpinBox( KIntSpinBox * b, KCoreConfigSkeleton::ItemInt *e );
 PIMCOMMON_EXPORT void saveSpinBox( QSpinBox * b, KCoreConfigSkeleton::ItemInt *e );
 PIMCOMMON_EXPORT void saveCheckBox( QCheckBox * b, KCoreConfigSkeleton::ItemBool *e );
 PIMCOMMON_EXPORT void saveLineEdit( QLineEdit * b, KCoreConfigSkeleton::ItemString *e );


[prev in list] [next in list] [prev in thread] [next in thread]