Commit df6ca052 authored by Laurent Montel's avatar Laurent Montel 😁

Convert more plugins

parent ac7c36f5
......@@ -62,13 +62,13 @@ set(libimportwizard_autodetect_SRCS
autodetect/claws-mail/clawsmailimportdata.cpp
autodetect/claws-mail/clawsmailsettings.cpp
autodetect/claws-mail/clawsmailaddressbook.cpp
autodetect/trojita/trojitasettings.cpp
autodetect/trojita/trojitaimportdata.cpp
autodetect/trojita/trojitaaddressbook.cpp
# autodetect/trojita/trojitasettings.cpp
# autodetect/trojita/trojitaimportdata.cpp
# autodetect/trojita/trojitaaddressbook.cpp
autodetect/icedove/icedoveimportdata.cpp
autodetect/geary/gearysettings.cpp
autodetect/geary/gearyimportdata.cpp
autodetect/geary/gearyaddressbook.cpp
# autodetect/geary/gearysettings.cpp
# autodetect/geary/gearyimportdata.cpp
# autodetect/geary/gearyaddressbook.cpp
)
......
add_subdirectory(geary)
add_subdirectory(trojita)
set(icedoveimporter_SRCS
icedoveaddressbook.cpp
icedoveimportdata.cpp
icedovesettings.cpp
)
kcoreaddons_add_plugin(icedoveimporterplugin JSON icedoveimporter.json SOURCES
${icedoveimporter_SRCS} INSTALL_NAMESPACE importwizard)
target_link_libraries(icedoveimporterplugin
libimportwizard
KF5::XmlGui
KF5::I18n
KF5::Contacts
KF5::MailImporterAkonadi
KF5::MailTransport
KF5::IdentityManagement
)
set(trojitaimporter_SRCS
trojitaaddressbook.cpp
trojitaimportdata.cpp
trojitasettings.cpp
)
kcoreaddons_add_plugin(trojitaimporterplugin JSON trojitaimporter.json SOURCES
${trojitaimporter_SRCS} INSTALL_NAMESPACE importwizard)
target_link_libraries(trojitaimporterplugin
libimportwizard
KF5::XmlGui
KF5::I18n
KF5::Contacts
KF5::MailImporterAkonadi
KF5::MailTransport
KF5::IdentityManagement
)
......@@ -28,6 +28,9 @@
#include <QDir>
K_PLUGIN_FACTORY_WITH_JSON(TrojitaImporterFactory, "trojitaimporter.json", registerPlugin<TrojitaImportData>();)
TrojitaImportData::TrojitaImportData(QObject *parent, const QList<QVariant> &)
: AbstractImporter(parent)
{
......@@ -81,3 +84,5 @@ AbstractImporter::TypeSupportedOptions TrojitaImportData::supportedOption()
options |= AbstractImporter::AddressBooks;
return options;
}
#include "trojitaimportdata.moc"
......@@ -25,7 +25,7 @@
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KIdentityManagement/kidentitymanagement/signature.h>
#include "importwizard_debug.h"
//#include "importwizard_debug.h"
#include <QSettings>
......@@ -142,7 +142,7 @@ void TrojitaSettings::readTransport()
}
mt->setType(MailTransport::Transport::EnumType::SMTP);
} else {
qCWarning(IMPORTWIZARD_LOG) << " smtpMethod unknown " << smtpMethod;
//FIXME qCWarning(IMPORTWIZARD_LOG) << " smtpMethod unknown " << smtpMethod;
}
storeTransport(mt, true); //only one smtp for the moment
}
......@@ -169,7 +169,7 @@ void TrojitaSettings::readIdentity()
signature.setText(signatureStr);
identity->setSignature(signature);
}
qCDebug(IMPORTWIZARD_LOG) << " realName :" << realName << " address : " << address << " organisation : " << organisation << " signature: " << signatureStr;
//qCDebug(IMPORTWIZARD_LOG) << " realName :" << realName << " address : " << address << " organisation : " << organisation << " signature: " << signatureStr;
storeIdentity(identity);
}
settings->endArray();
......
......@@ -40,7 +40,6 @@
#include "autodetect/thebat/thebatimportdata.h"
#include "autodetect/balsa/balsaimportdata.h"
#include "autodetect/claws-mail/clawsmailimportdata.h"
#include "autodetect/trojita/trojitaimportdata.h"
#include "manual/manualimportmailpage.h"
#include "manual/manualselectfilterpage.h"
......@@ -274,9 +273,9 @@ void ImportWizard::initializeImportModule()
importer->setImportWizard(this);
addImportModule(importer);
importer = new TrojitaImportData(this);
importer->setImportWizard(this);
addImportModule(importer);
// importer = new TrojitaImportData(this);
// importer->setImportWizard(this);
// addImportModule(importer);
}
void ImportWizard::slotProgramDoubleClicked()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment