From ced5fde6f1dc088e5786a5c3bb34ab3bf8dc2455 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 15 Nov 2013 07:15:38 +0100 Subject: [PATCH] Kiosk++ --- configuredialog/configurecomposerpage.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/configuredialog/configurecomposerpage.cpp b/configuredialog/configurecomposerpage.cpp index 7ccf17486..251fba43e 100644 --- a/configuredialog/configurecomposerpage.cpp +++ b/configuredialog/configurecomposerpage.cpp @@ -826,16 +826,16 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( QWidget * parent ) void ComposerPage::SubjectTab::doLoadFromGlobalSettings() { - mReplyListEditor->setStringList( MessageComposer::MessageComposerSettings::self()->replyPrefixes() ); - mForwardListEditor->setStringList( MessageComposer::MessageComposerSettings::self()->forwardPrefixes() ); + loadWidget(mReplyListEditor, MessageComposer::MessageComposerSettings::self()->replyPrefixesItem() ); + loadWidget(mForwardListEditor, MessageComposer::MessageComposerSettings::self()->forwardPrefixesItem() ); loadWidget(mReplaceForwardPrefixCheck, MessageComposer::MessageComposerSettings::self()->replaceForwardPrefixItem()); loadWidget(mReplaceReplyPrefixCheck, MessageComposer::MessageComposerSettings::self()->replaceReplyPrefixItem()); } void ComposerPage::SubjectTab::save() { - MessageComposer::MessageComposerSettings::self()->setReplyPrefixes( mReplyListEditor->stringList() ); - MessageComposer::MessageComposerSettings::self()->setForwardPrefixes( mForwardListEditor->stringList() ); + saveSimpleStringListEditor(mReplyListEditor, MessageComposer::MessageComposerSettings::self()->replyPrefixesItem() ); + saveSimpleStringListEditor(mForwardListEditor, MessageComposer::MessageComposerSettings::self()->forwardPrefixesItem() ); saveCheckBox(mReplaceForwardPrefixCheck, MessageComposer::MessageComposerSettings::self()->replaceForwardPrefixItem()); saveCheckBox(mReplaceReplyPrefixCheck, MessageComposer::MessageComposerSettings::self()->replaceReplyPrefixItem()); } @@ -843,15 +843,11 @@ void ComposerPage::SubjectTab::save() void ComposerPage::SubjectTab::doResetToDefaultsOther() { const bool bUseDefaults = MessageComposer::MessageComposerSettings::self()->useDefaults( true ); - const QStringList messageReplyPrefixes = MessageComposer::MessageComposerSettings::replyPrefixes(); - - const QStringList messageForwardPrefixes = MessageComposer::MessageComposerSettings::forwardPrefixes(); - + loadWidget(mReplyListEditor, MessageComposer::MessageComposerSettings::self()->replyPrefixesItem() ); + loadWidget(mForwardListEditor, MessageComposer::MessageComposerSettings::self()->forwardPrefixesItem() ); + loadWidget(mReplaceForwardPrefixCheck, MessageComposer::MessageComposerSettings::self()->replaceForwardPrefixItem()); + loadWidget(mReplaceReplyPrefixCheck, MessageComposer::MessageComposerSettings::self()->replaceReplyPrefixItem()); MessageComposer::MessageComposerSettings::self()->useDefaults( bUseDefaults ); - mReplyListEditor->setStringList( messageReplyPrefixes ); - mReplaceReplyPrefixCheck->setChecked( MessageComposer::MessageComposerSettings::replaceReplyPrefix() ); - mForwardListEditor->setStringList( messageForwardPrefixes ); - mReplaceForwardPrefixCheck->setChecked( MessageComposer::MessageComposerSettings::replaceForwardPrefix() ); }