wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KConfig -> KConfigGroup

Browse Source 
Fixes reading of folder settings.

KConfig -> KConfigGroup

svn path=/trunk/KDE/kdepim/; revision=656443
wilder-work
Ismail Onur Filiz 19 years ago
parent 0cfe0bd901
commit 0687891abb
9 changed files with 93 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      configuredialog.cpp
  2. 4
      folderstorage.cpp
  3. 88
      kmfolder.cpp
  4. 4
      kmfolder.h
  5. 13
      kmkernel.cpp
  6. 24
      kmstartup.cpp
  7. 38
      mailinglist-magic.cpp
  8. 6
      mailinglist-magic.h
  9. 2
      renamejob.cpp

2
configuredialog.cpp
Unescape View File

@ -4784,7 +4784,7 @@ void MiscPage::FolderTab::doLoadFromGlobalSettings() {
mDelayedMarkAsRead->setChecked( GlobalSettings::self()->delayedMarkAsRead() );
mDelayedMarkTime->setValue( GlobalSettings::self()->delayedMarkTime() );
mShowPopupAfterDnD->setChecked( GlobalSettings::self()->showPopupAfterDnD() );
mQuotaCmbBox->setCurrentItem( GlobalSettings::self()->quotaUnit() );
mQuotaCmbBox->setCurrentIndex( GlobalSettings::self()->quotaUnit() );
}
void MiscPage::FolderTab::doLoadOther() {

4
folderstorage.cpp
Unescape View File

@ -904,7 +904,7 @@ void FolderStorage::readConfig()
if ( type < 0 || type > KMail::ContentsTypeLast ) type = 0;
setContentsType( static_cast<KMail::FolderContentsType>( type ) );
if( folder() ) folder()->readConfig( config );
if( folder() ) folder()->readConfig( group );
}
//-----------------------------------------------------------------------------
@ -919,7 +919,7 @@ void FolderStorage::writeConfig()
group.writeEntry( "ContentsType", (int)mContentsType );
// Write the KMFolder parts
if( folder() ) folder()->writeConfig( config );
if( folder() ) folder()->writeConfig( group );
GlobalSettings::self()->requestSync();
}

88
kmfolder.cpp
Unescape View File

@ -150,74 +150,76 @@ KMFolder::~KMFolder()
delete mStorage;
}
void KMFolder::readConfig( KConfig* config )
{
if ( !config->readEntry( "SystemLabel" ).isEmpty() )
mSystemLabel = config->readEntry( "SystemLabel" );
mExpireMessages = config->readEntry( "ExpireMessages", false );
mReadExpireAge = config->readEntry( "ReadExpireAge", 3 );
mReadExpireUnits = (ExpireUnits)config->readEntry( "ReadExpireUnits", (int)expireMonths );
mUnreadExpireAge = config->readEntry( "UnreadExpireAge", 12 );
void KMFolder::readConfig( KConfigGroup & configGroup )
{
// KConfigGroup configGroup(config, "");
if ( !configGroup.readEntry( "SystemLabel" ).isEmpty() )
mSystemLabel = configGroup.readEntry( "SystemLabel" );
mExpireMessages = configGroup.readEntry( "ExpireMessages", false );
mReadExpireAge = configGroup.readEntry( "ReadExpireAge", 3 );
mReadExpireUnits = (ExpireUnits)configGroup.readEntry( "ReadExpireUnits", (int)expireMonths );
mUnreadExpireAge = configGroup.readEntry( "UnreadExpireAge", 12 );
mUnreadExpireUnits = (ExpireUnits)
config->readEntry( "UnreadExpireUnits", (int)expireNever );
mExpireAction = config->readEntry( "ExpireAction", "Delete") == "Move" ? ExpireMove : ExpireDelete;
mExpireToFolderId = config->readEntry( "ExpireToFolder" );
configGroup.readEntry( "UnreadExpireUnits", (int)expireNever );
mExpireAction = configGroup.readEntry( "ExpireAction", "Delete") == "Move" ? ExpireMove : ExpireDelete;
mExpireToFolderId = configGroup.readEntry( "ExpireToFolder" );
mUseCustomIcons = config->readEntry( "UseCustomIcons", false );
mNormalIconPath = config->readEntry( "NormalIconPath" );
mUnreadIconPath = config->readEntry( "UnreadIconPath" );
mUseCustomIcons = configGroup.readEntry( "UseCustomIcons", false );
mNormalIconPath = configGroup.readEntry( "NormalIconPath" );
mUnreadIconPath = configGroup.readEntry( "UnreadIconPath" );
mMailingListEnabled = config->readEntry( "MailingListEnabled", false );
mMailingList.readConfig( config );
mMailingListEnabled = configGroup.readEntry( "MailingListEnabled", false );
mMailingList.readConfig( configGroup );
mIdentity = config->readEntry("Identity", 0 );
mIdentity = configGroup.readEntry("Identity", 0 );
setUserWhoField( config->readEntry( "WhoField" ), false );
uint savedId = config->readEntry( "Id" , 0 );
setUserWhoField( configGroup.readEntry( "WhoField" ), false );
uint savedId = configGroup.readEntry( "Id" , 0 );
// make sure that we don't overwrite a valid id
if ( savedId != 0 && mId == 0 )
mId = savedId;
mPutRepliesInSameFolder = config->readEntry( "PutRepliesInSameFolder", false );
mIgnoreNewMail = config->readEntry( "IgnoreNewMail", false );
mPutRepliesInSameFolder = configGroup.readEntry( "PutRepliesInSameFolder", false );
mIgnoreNewMail = configGroup.readEntry( "IgnoreNewMail", false );
if ( mUseCustomIcons )
emit iconsChanged();
QString shortcut( config->readEntry( "Shortcut" ) );
QString shortcut( configGroup.readEntry( "Shortcut" ) );
if ( !shortcut.isEmpty() ) {
KShortcut sc( shortcut );
setShortcut( sc );
}
}
void KMFolder::writeConfig( KConfig* config ) const
void KMFolder::writeConfig( KConfigGroup & configGroup ) const
{
config->writeEntry("SystemLabel", mSystemLabel);
config->writeEntry("ExpireMessages", mExpireMessages);
config->writeEntry("ReadExpireAge", mReadExpireAge);
config->writeEntry("ReadExpireUnits", (int)mReadExpireUnits);
config->writeEntry("UnreadExpireAge", mUnreadExpireAge);
config->writeEntry("UnreadExpireUnits", (int)mUnreadExpireUnits);
config->writeEntry("ExpireAction", mExpireAction == ExpireDelete ? "Delete" : "Move");
config->writeEntry("ExpireToFolder", mExpireToFolderId);
// KConfigGroup configGroup(config, "");
configGroup.writeEntry("SystemLabel", mSystemLabel);
configGroup.writeEntry("ExpireMessages", mExpireMessages);
configGroup.writeEntry("ReadExpireAge", mReadExpireAge);
configGroup.writeEntry("ReadExpireUnits", (int)mReadExpireUnits);
configGroup.writeEntry("UnreadExpireAge", mUnreadExpireAge);
configGroup.writeEntry("UnreadExpireUnits", (int)mUnreadExpireUnits);
configGroup.writeEntry("ExpireAction", mExpireAction == ExpireDelete ? "Delete" : "Move");
configGroup.writeEntry("ExpireToFolder", mExpireToFolderId);
config->writeEntry("UseCustomIcons", mUseCustomIcons);
config->writeEntry("NormalIconPath", mNormalIconPath);
config->writeEntry("UnreadIconPath", mUnreadIconPath);
configGroup.writeEntry("UseCustomIcons", mUseCustomIcons);
configGroup.writeEntry("NormalIconPath", mNormalIconPath);
configGroup.writeEntry("UnreadIconPath", mUnreadIconPath);
config->writeEntry("MailingListEnabled", mMailingListEnabled);
mMailingList.writeConfig( config );
configGroup.writeEntry("MailingListEnabled", mMailingListEnabled);
mMailingList.writeConfig( configGroup );
config->writeEntry("Identity", mIdentity);
configGroup.writeEntry("Identity", mIdentity);
config->writeEntry("WhoField", mUserWhoField);
config->writeEntry("Id", mId);
config->writeEntry( "PutRepliesInSameFolder", mPutRepliesInSameFolder );
config->writeEntry( "IgnoreNewMail", mIgnoreNewMail );
configGroup.writeEntry("WhoField", mUserWhoField);
configGroup.writeEntry("Id", mId);
configGroup.writeEntry( "PutRepliesInSameFolder", mPutRepliesInSameFolder );
configGroup.writeEntry( "IgnoreNewMail", mIgnoreNewMail );
if ( !mShortcut.isEmpty() )
config->writeEntry( "Shortcut", mShortcut.toString() );
configGroup.writeEntry( "Shortcut", mShortcut.toString() );
else
config->deleteEntry( "Shortcut" );
configGroup.deleteEntry( "Shortcut" );
}
KMFolderType KMFolder::folderType() const

4
kmfolder.h
Unescape View File

@ -132,10 +132,10 @@ public:
bool hasAccounts() const { return (mAcctList != 0); }
/** This is used by the storage to read the folder specific configuration */
void readConfig( KConfig* config );
void readConfig( KConfigGroup & config );
/** This is used by the storage to save the folder specific configuration */
void writeConfig( KConfig* config ) const;
void writeConfig( KConfigGroup & config ) const;
FolderStorage* storage() { return mStorage; }
/** if the folder is const, the storage should be as well */

13
kmkernel.cpp
Unescape View File

@ -1209,8 +1209,9 @@ void KMKernel::recoverDeadLetters()
void KMKernel::initFolders(KConfig* cfg)
{
QString name;
KConfigGroup group(cfg,"General");
name = cfg->readEntry("inboxFolder");
name = group.readEntry("inboxFolder");
// Currently the folder manager cannot manage folders which are not
// in the base folder directory.
@ -1229,7 +1230,7 @@ void KMKernel::initFolders(KConfig* cfg)
the_inboxFolder->setUserWhoField( QString() );
// inboxFolder->open();
the_outboxFolder = the_folderMgr->findOrCreate(cfg->readEntry("outboxFolder", I18N_NOOP("outbox")));
the_outboxFolder = the_folderMgr->findOrCreate(group.readEntry("outboxFolder", I18N_NOOP("outbox")));
if (the_outboxFolder->canAccess() != 0) {
emergencyExit( i18n("You do not have read/write permission to your outbox folder.") );
}
@ -1248,7 +1249,7 @@ void KMKernel::initFolders(KConfig* cfg)
// unlink( QFile::encodeName( the_outboxFolder->indexLocation() ) );
the_outboxFolder->open( "kmkernel" );
the_sentFolder = the_folderMgr->findOrCreate(cfg->readEntry("sentFolder", I18N_NOOP("sent-mail")));
the_sentFolder = the_folderMgr->findOrCreate(group.readEntry("sentFolder", I18N_NOOP("sent-mail")));
if (the_sentFolder->canAccess() != 0) {
emergencyExit( i18n("You do not have read/write permission to your sent-mail folder.") );
}
@ -1257,7 +1258,7 @@ void KMKernel::initFolders(KConfig* cfg)
the_sentFolder->setUserWhoField( QString() );
// the_sentFolder->open();
the_trashFolder = the_folderMgr->findOrCreate(cfg->readEntry("trashFolder", I18N_NOOP("trash")));
the_trashFolder = the_folderMgr->findOrCreate(group.readEntry("trashFolder", I18N_NOOP("trash")));
if (the_trashFolder->canAccess() != 0) {
emergencyExit( i18n("You do not have read/write permission to your trash folder.") );
}
@ -1266,7 +1267,7 @@ void KMKernel::initFolders(KConfig* cfg)
the_trashFolder->setUserWhoField( QString() );
// the_trashFolder->open();
the_draftsFolder = the_folderMgr->findOrCreate(cfg->readEntry("draftsFolder", I18N_NOOP("drafts")));
the_draftsFolder = the_folderMgr->findOrCreate(group.readEntry("draftsFolder", I18N_NOOP("drafts")));
if (the_draftsFolder->canAccess() != 0) {
emergencyExit( i18n("You do not have read/write permission to your drafts folder.") );
}
@ -1275,7 +1276,7 @@ void KMKernel::initFolders(KConfig* cfg)
the_draftsFolder->setUserWhoField( QString() );
the_draftsFolder->open( "kmkernel" );
the_templatesFolder = the_folderMgr->findOrCreate(cfg->readEntry("templatesFolder", I18N_NOOP("templates")));
the_templatesFolder = the_folderMgr->findOrCreate(group.readEntry("templatesFolder", I18N_NOOP("templates")));
if (the_templatesFolder->canAccess() != 0) {
emergencyExit( i18n("You do not have read/write permission to your templates folder.") );
}

24
kmstartup.cpp
Unescape View File

@ -137,11 +137,12 @@ void lockOrDie() {
QString lockLocation = KStandardDirs::locateLocal("data", "kmail/lock");
KConfig config(lockLocation, KConfig::OnlyLocal);
int oldPid = config.readEntry("pid", -1 );
KConfigGroup group(&config, "");
int oldPid = group.readEntry("pid", -1 );
kDebug() << "oldPid=" << oldPid << endl;
const QString oldHostName = config.readEntry("hostname");
const QString oldAppName = config.readEntry( "appName", appName );
const QString oldProgramName = config.readEntry( "programName", programName );
const QString oldHostName = group.readEntry("hostname");
const QString oldAppName = group.readEntry( "appName", appName );
const QString oldProgramName = group.readEntry( "programName", programName );
const QString hostName = KNetwork::KResolver::localHostName();
bool first_instance = false;
if ( oldPid == -1 ) {
@ -226,11 +227,11 @@ void lockOrDie() {
}
}
config.writeEntry("pid", getpid());
config.writeEntry("hostname", hostName);
config.writeEntry( "appName", appName );
config.writeEntry( "programName", programName );
config.sync();
group.writeEntry("pid", getpid());
group.writeEntry("hostname", hostName);
group.writeEntry( "appName", appName );
group.writeEntry( "programName", programName );
group.sync();
}
void insertLibraryCataloguesAndIcons() {
@ -254,7 +255,8 @@ void cleanup()
{
const QString lockLocation = KStandardDirs::locateLocal("data", "kmail/lock");
KConfig config(lockLocation, KConfig::OnlyLocal);
config.writeEntry("pid", -1);
config.sync();
KConfigGroup group(&config, "");
group.writeEntry("pid", -1);
group.sync();
}
}

38
mailinglist-magic.cpp
Unescape View File

@ -388,29 +388,29 @@ MailingList::id() const
}
void
MailingList::writeConfig( KConfig* config ) const
MailingList::writeConfig( KConfigGroup & config ) const
{
config->writeEntry( "MailingListFeatures", mFeatures );
config->writeEntry( "MailingListHandler", (int)mHandler );
config->writeEntry( "MailingListId", mId );
config->writeEntry( "MailingListPostingAddress", mPostURLS.toStringList() );
config->writeEntry( "MailingListSubscribeAddress", mSubscribeURLS.toStringList() );
config->writeEntry( "MailingListUnsubscribeAddress", mUnsubscribeURLS.toStringList() );
config->writeEntry( "MailingListArchiveAddress", mArchiveURLS.toStringList() );
config->writeEntry( "MailingListHelpAddress", mHelpURLS.toStringList() );
config.writeEntry( "MailingListFeatures", mFeatures );
config.writeEntry( "MailingListHandler", (int)mHandler );
config.writeEntry( "MailingListId", mId );
config.writeEntry( "MailingListPostingAddress", mPostURLS.toStringList() );
config.writeEntry( "MailingListSubscribeAddress", mSubscribeURLS.toStringList() );
config.writeEntry( "MailingListUnsubscribeAddress", mUnsubscribeURLS.toStringList() );
config.writeEntry( "MailingListArchiveAddress", mArchiveURLS.toStringList() );
config.writeEntry( "MailingListHelpAddress", mHelpURLS.toStringList() );
}
void
MailingList::readConfig( KConfig* config )
MailingList::readConfig( KConfigGroup & config )
{
mFeatures = config->readEntry( "MailingListFeatures", 0 );
mFeatures = config.readEntry( "MailingListFeatures", 0 );
mHandler = static_cast<MailingList::Handler>(
config->readEntry( "MailingListHandler", (int)MailingList::KMail ) );
mId = config->readEntry("MailingListId");
mPostURLS = config->readEntry( "MailingListPostingAddress" , QStringList() );
mSubscribeURLS = config->readEntry( "MailingListSubscribeAddress" , QStringList() );
mUnsubscribeURLS = config->readEntry( "MailingListUnsubscribeAddress" , QStringList() );
mArchiveURLS = config->readEntry( "MailingListArchiveAddress" , QStringList() );
mHelpURLS = config->readEntry( "MailingListHelpAddress" , QStringList() );
config.readEntry( "MailingListHandler", (int)MailingList::KMail ) );
mId = config.readEntry("MailingListId");
mPostURLS = config.readEntry( "MailingListPostingAddress" , QStringList() );
mSubscribeURLS = config.readEntry( "MailingListSubscribeAddress" , QStringList() );
mUnsubscribeURLS = config.readEntry( "MailingListUnsubscribeAddress" , QStringList() );
mArchiveURLS = config.readEntry( "MailingListArchiveAddress" , QStringList() );
mHelpURLS = config.readEntry( "MailingListHelpAddress" , QStringList() );
}

6
mailinglist-magic.h
Unescape View File

@ -8,7 +8,7 @@
#include <QByteArray>
class KMMessage;
class KConfig;
class KConfigGroup;
namespace KMail
{
@ -69,8 +69,8 @@ public:
void setId( const QString& );
QString id() const;
void writeConfig( KConfig* config ) const;
void readConfig( KConfig* config );
void writeConfig( KConfigGroup & config ) const;
void readConfig( KConfigGroup & config );
private:
int mFeatures;
Handler mHandler;

2
renamejob.cpp
Unescape View File

@ -201,7 +201,7 @@ void RenameJob::folderCopyComplete(bool success)
continue;
saver.writeEntry( it.key(), it.data() );
}
mNewFolder->readConfig( config );
mNewFolder->readConfig( saver );
// make sure the children state is correct
if ( mNewFolder->child() &&
( mNewFolder->storage()->hasChildren() == FolderStorage::HasNoChildren ) )

Write Preview
Loading…
Cancel
Save