[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] pimsettingexporter: USe nextStep function
From: Montel Laurent <montel () kde ! org>
Date: 2013-11-15 20:03:03
Message-ID: E1VhPbb-0002Ib-Vc () scm ! kde ! org
[Download RAW message or body]
Git commit 8f43ae6069bcd125bbf0fe60718d2fa500f42990 by Montel Laurent.
Committed on 15/11/2013 at 20:02.
Pushed by mlaurent into branch 'master'.
USe nextStep function
M +23 -7 pimsettingexporter/addressbook/importaddressbookjob.cpp
M +3 -0 pimsettingexporter/addressbook/importaddressbookjob.h
M +22 -8 pimsettingexporter/alarm/importalarmjob.cpp
M +3 -0 pimsettingexporter/alarm/importalarmjob.h
M +23 -7 pimsettingexporter/calendar/importcalendarjob.cpp
M +3 -0 pimsettingexporter/calendar/importcalendarjob.h
M +10 -9 pimsettingexporter/jot/importjotjob.cpp
http://commits.kde.org/kdepim/8f43ae6069bcd125bbf0fe60718d2fa500f42990
diff --git a/pimsettingexporter/addressbook/importaddressbookjob.cpp \
b/pimsettingexporter/addressbook/importaddressbookjob.cpp index 4bad6ae..2c75f58 \
100644
--- a/pimsettingexporter/addressbook/importaddressbookjob.cpp
+++ b/pimsettingexporter/addressbook/importaddressbookjob.cpp
@@ -47,18 +47,30 @@ void ImportAddressbookJob::start()
{
Q_EMIT title(i18n("Start import kaddressbook settings..."));
mArchiveDirectory = archive()->directory();
- searchAllFiles(mArchiveDirectory, QString());
- if (mTypeSelected & Utils::Resources)
- restoreResources();
- if (mTypeSelected & Utils::Config)
- restoreConfig();
- Q_EMIT jobFinished();
+ searchAllFiles(mArchiveDirectory ,QString());
+ initializeListStep();
+ nextStep();
+}
+
+void ImportAddressbookJob::nextStep()
+{
+ ++mIndex;
+ if (mIndex < mListStep.count()) {
+ Utils::StoredType type = mListStep.at(mIndex);
+ if (type == Utils::Resources)
+ restoreResources();
+ if (type == Utils::Config)
+ restoreConfig();
+ } else {
+ Q_EMIT jobFinished();
+ }
}
void ImportAddressbookJob::restoreResources()
{
Q_EMIT info(i18n("Restore resources..."));
- restoreResourceFile(QString::fromLatin1("akonadi_vcard_resource"), \
Utils::addressbookPath(), QDir::homePath() + \
QLatin1String("/.kde/share/apps/kabc/")); + QStringList listResource;
+ listResource << \
restoreResourceFile(QString::fromLatin1("akonadi_vcard_resource"), \
Utils::addressbookPath(), QDir::homePath() + \
QLatin1String("/.kde/share/apps/kabc/"));
if (!mListResourceFile.isEmpty()) {
QDir dir(mTempDirName);
@@ -113,12 +125,15 @@ void ImportAddressbookJob::restoreResources()
const QString newResource = mCreateResource->createResource( \
instanceType, filename, settings, true ); infoAboutNewResource(newResource);
qDebug()<<" newResource"<<newResource;
+ listResource<<newResource;
}
}
}
}
Q_EMIT info(i18n("Resources restored."));
+ //It's maildir support. Need to add support
+ startSynchronizeResources(listResource);
}
void ImportAddressbookJob::addSpecificResourceSettings(KSharedConfig::Ptr \
resourceConfig, const QString &resourceName, QMap<QString, QVariant> &settings) @@ \
-199,6 +214,7 @@ void ImportAddressbookJob::restoreConfig() }
}
Q_EMIT info(i18n("Config restored."));
+ nextStep();
}
void ImportAddressbookJob::importkaddressBookConfig(const KArchiveFile* file, const \
QString &config, const QString &filename,const QString &prefix)
diff --git a/pimsettingexporter/addressbook/importaddressbookjob.h \
b/pimsettingexporter/addressbook/importaddressbookjob.h index b0ed268..4c4e460 100644
--- a/pimsettingexporter/addressbook/importaddressbookjob.h
+++ b/pimsettingexporter/addressbook/importaddressbookjob.h
@@ -33,6 +33,9 @@ public:
void start();
+protected:
+ void nextStep();
+
private:
void searchAllFiles(const KArchiveDirectory *dir,const QString &prefix);
void storeAddressBookArchiveResource(const KArchiveDirectory *dir, const QString \
&prefix);
diff --git a/pimsettingexporter/alarm/importalarmjob.cpp \
b/pimsettingexporter/alarm/importalarmjob.cpp index f7e1d75..fb85e0e 100644
--- a/pimsettingexporter/alarm/importalarmjob.cpp
+++ b/pimsettingexporter/alarm/importalarmjob.cpp
@@ -43,24 +43,34 @@ ImportAlarmJob::~ImportAlarmJob()
}
-
void ImportAlarmJob::start()
{
Q_EMIT title(i18n("Start import kalarm settings..."));
mArchiveDirectory = archive()->directory();
searchAllFiles(mArchiveDirectory ,QString());
- if (mTypeSelected & Utils::Resources)
- restoreResources();
- if (mTypeSelected & Utils::Config)
- restoreConfig();
- Q_EMIT jobFinished();
+ initializeListStep();
+ nextStep();
+}
+
+void ImportAlarmJob::nextStep()
+{
+ ++mIndex;
+ if (mIndex < mListStep.count()) {
+ Utils::StoredType type = mListStep.at(mIndex);
+ if (type == Utils::Resources)
+ restoreResources();
+ if (type == Utils::Config)
+ restoreConfig();
+ } else {
+ Q_EMIT jobFinished();
+ }
}
void ImportAlarmJob::restoreResources()
{
Q_EMIT info(i18n("Restore resources..."));
- restoreResourceFile(QString::fromLatin1("akonadi_kalarm_resource"), \
Utils::alarmPath(), storeAlarm, false);
-
+ QStringList listResource;
+ listResource << \
restoreResourceFile(QString::fromLatin1("akonadi_kalarm_resource"), \
Utils::alarmPath(), storeAlarm, false); if (!mListResourceFile.isEmpty()) {
QDir dir(mTempDirName);
dir.mkdir(Utils::alarmPath());
@@ -107,11 +117,14 @@ void ImportAlarmJob::restoreResources()
const QString newResource = mCreateResource->createResource( \
QString::fromLatin1("akonadi_kalarm_dir_resource"), filename, settings, true ); \
infoAboutNewResource(newResource); + listResource << newResource;
qDebug()<<" newResource"<<newResource;
}
}
}
}
+ //It's maildir support. Need to add support
+ startSynchronizeResources(listResource);
}
void ImportAlarmJob::addSpecificResourceSettings(KSharedConfig::Ptr resourceConfig, \
const QString &resourceName, QMap<QString, QVariant> &settings) @@ -181,6 +194,7 @@ \
void ImportAlarmJob::restoreConfig() }
}
Q_EMIT info(i18n("Config restored."));
+ nextStep();
}
void ImportAlarmJob::importkalarmConfig(const KArchiveFile* kalarmFile, const \
QString &kalarmrc, const QString &filename,const QString &prefix)
diff --git a/pimsettingexporter/alarm/importalarmjob.h \
b/pimsettingexporter/alarm/importalarmjob.h index 84fa46b..9276664 100644
--- a/pimsettingexporter/alarm/importalarmjob.h
+++ b/pimsettingexporter/alarm/importalarmjob.h
@@ -32,6 +32,9 @@ public:
void start();
+protected:
+ void nextStep();
+
private:
void storeAlarmArchiveResource(const KArchiveDirectory *dir, const QString \
&prefix);
void searchAllFiles(const KArchiveDirectory *dir,const QString &prefix);
diff --git a/pimsettingexporter/calendar/importcalendarjob.cpp \
b/pimsettingexporter/calendar/importcalendarjob.cpp index a159ec1..ae34b95 100644
--- a/pimsettingexporter/calendar/importcalendarjob.cpp
+++ b/pimsettingexporter/calendar/importcalendarjob.cpp
@@ -45,18 +45,30 @@ void ImportCalendarJob::start()
{
Q_EMIT title(i18n("Start import korganizer settings..."));
mArchiveDirectory = archive()->directory();
- searchAllFiles(mArchiveDirectory, QString());
- if (mTypeSelected & Utils::Resources)
- restoreResources();
- if (mTypeSelected & Utils::Config)
- restoreConfig();
- Q_EMIT jobFinished();
+ searchAllFiles(mArchiveDirectory ,QString());
+ initializeListStep();
+ nextStep();
+}
+
+void ImportCalendarJob::nextStep()
+{
+ ++mIndex;
+ if (mIndex < mListStep.count()) {
+ Utils::StoredType type = mListStep.at(mIndex);
+ if (type == Utils::Resources)
+ restoreResources();
+ if (type == Utils::Config)
+ restoreConfig();
+ } else {
+ Q_EMIT jobFinished();
+ }
}
void ImportCalendarJob::restoreResources()
{
Q_EMIT info(i18n("Restore resources..."));
- restoreResourceFile(QString::fromLatin1("akonadi_ical_resource"), \
Utils::calendarPath(), storeCalendar); + QStringList listResource;
+ listResource << \
restoreResourceFile(QString::fromLatin1("akonadi_ical_resource"), \
Utils::calendarPath(), storeCalendar);
if (!mListResourceFile.isEmpty()) {
QDir dir(mTempDirName);
@@ -104,11 +116,14 @@ void ImportCalendarJob::restoreResources()
const QString newResource = mCreateResource->createResource( \
QString::fromLatin1("akonadi_icaldir_resource"), filename, settings, true ); \
infoAboutNewResource(newResource); + listResource << newResource;
qDebug()<<" newResource"<<newResource;
}
}
}
}
+ //It's maildir support. Need to add support
+ startSynchronizeResources(listResource);
}
void ImportCalendarJob::addSpecificResourceSettings(KSharedConfig::Ptr \
resourceConfig, const QString &resourceName, QMap<QString, QVariant> &settings) @@ \
-258,6 +273,7 @@ void ImportCalendarJob::restoreConfig()
Q_EMIT info(i18n("Config restored."));
+ nextStep();
}
void ImportCalendarJob::importkorganizerConfig(const KArchiveFile* file, const \
QString &config, const QString &filename,const QString &prefix)
diff --git a/pimsettingexporter/calendar/importcalendarjob.h \
b/pimsettingexporter/calendar/importcalendarjob.h index d1d2ac9..4124e52 100644
--- a/pimsettingexporter/calendar/importcalendarjob.h
+++ b/pimsettingexporter/calendar/importcalendarjob.h
@@ -32,6 +32,9 @@ public:
void start();
+protected:
+ void nextStep();
+
private:
void searchAllFiles(const KArchiveDirectory *dir,const QString &prefix);
void storeCalendarArchiveResource(const KArchiveDirectory *dir, const QString \
&prefix);
diff --git a/pimsettingexporter/jot/importjotjob.cpp \
b/pimsettingexporter/jot/importjotjob.cpp index 17b3130..f0ea3d2 100644
--- a/pimsettingexporter/jot/importjotjob.cpp
+++ b/pimsettingexporter/jot/importjotjob.cpp
@@ -42,6 +42,16 @@ ImportJotJob::~ImportJotJob()
{
}
+
+void ImportJotJob::start()
+{
+ Q_EMIT title(i18n("Start import kjots settings..."));
+ mArchiveDirectory = archive()->directory();
+ searchAllFiles(mArchiveDirectory ,QString());
+ initializeListStep();
+ nextStep();
+}
+
void ImportJotJob::nextStep()
{
++mIndex;
@@ -56,15 +66,6 @@ void ImportJotJob::nextStep()
}
}
-void ImportJotJob::start()
-{
- Q_EMIT title(i18n("Start import kjots settings..."));
- mArchiveDirectory = archive()->directory();
- searchAllFiles(mArchiveDirectory ,QString());
- initializeListStep();
- nextStep();
-}
-
void ImportJotJob::restoreResources()
{
Q_EMIT info(i18n("Restore resources..."));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic