diff --git a/kmymoney/kmymoney.kcfg b/kmymoney/kmymoney.kcfg
--- a/kmymoney/kmymoney.kcfg
+++ b/kmymoney/kmymoney.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
-
+
diff --git a/kmymoney/main.cpp b/kmymoney/main.cpp
--- a/kmymoney/main.cpp
+++ b/kmymoney/main.cpp
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#ifdef KMM_DBUS
#include
#include
@@ -38,6 +39,8 @@
#include
#include
#include
+#include
+#include
// ----------------------------------------------------------------------------
// Project Includes
@@ -60,23 +63,17 @@
KMyMoneyApp* kmymoney;
static int runKMyMoney(QApplication *a, std::unique_ptr splash, const QUrl & file, bool noFile);
+static void migrateConfigFiles();
int main(int argc, char *argv[])
{
- {
- // Copy KDE 4 config files to the KF5 location
- Kdelibs4ConfigMigrator migrator(QStringLiteral("kmymoney"));
- migrator.setConfigFiles(QStringList{"kmymoneyrc"});
- migrator.setUiFiles(QStringList{"kmymoneyui.rc"});
- migrator.migrate();
- }
-
/**
* Create application first
*/
QApplication app(argc, argv);
KLocalizedString::setApplicationDomain("kmymoney");
+ migrateConfigFiles();
/**
* construct and register about data
@@ -319,3 +316,53 @@
const int rc = a->exec();
return rc;
}
+
+static void migrateConfigFiles()
+{
+ const QString sMainConfigName(QStringLiteral("kmymoneyrc"));
+ const QString sMainConfigSubdirectory(QStringLiteral("kmymoney/")); // all KMM config files should be in ~/.config/kmymoney/
+ const QString sMainConfigPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) +
+ QLatin1Char('/') +
+ sMainConfigSubdirectory;
+
+ if (!QFile::exists(sMainConfigPath + sMainConfigName)) { // if main config file doesn't exist, then it's first run
+
+ // it could be migration from KDE4 to KF5 so prepare list of configuration files to migrate
+ QStringList sConfigNames
+ {
+ sMainConfigName,
+ QStringLiteral("csvimporterrc"),
+ QStringLiteral("printcheckpluginrc"),
+ QStringLiteral("icalendarexportpluginrc"),
+ QStringLiteral("kbankingrc"),
+ };
+
+ // Copy KDE 4 config files to the KF5 location
+ Kdelibs4ConfigMigrator migrator(QStringLiteral("kmymoney"));
+ migrator.setConfigFiles(sConfigNames);
+ migrator.setUiFiles(QStringList{QStringLiteral("kmymoneyui.rc")});
+ migrator.migrate();
+
+ QFileInfo fileInfo(sMainConfigPath + sMainConfigName);
+ QDir().mkpath(fileInfo.absolutePath());
+ const QString sOldMainConfigPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) +
+ QLatin1Char('/');
+
+ // some files have changed their names during switch to KF5, so prepare map for name replacements
+ QMap configNamesChange {
+ {QStringLiteral("printcheckpluginrc"), QStringLiteral("checkprintingrc")},
+ {QStringLiteral("icalendarexportpluginrc"), QStringLiteral("icalendarexporterrc")}
+ };
+
+ for (const auto& sConfigName : sConfigNames) {
+ const auto sOldConfigFilename = sOldMainConfigPath + sConfigName;
+ const auto sNewConfigFilename = sMainConfigPath + configNamesChange.value(sConfigName, sConfigName);
+ if (QFile::exists(sOldConfigFilename)) {
+ if (QFile::copy(sOldConfigFilename, sNewConfigFilename))
+ QFile::remove(sOldConfigFilename);
+ }
+ }
+ }
+ KConfig::setMainConfigName(sMainConfigSubdirectory + sMainConfigName); // otherwise it would be ~/.config/kmymoneyrc and not ~/.config/kmymoney/kmymoneyrc
+ KMyMoneySettings::instance(KSharedConfig::openConfig().data()->name()); // kcfg settings file should be kmymoneyrc, so define it here in one place instead in kmymoney.kcfg
+}
diff --git a/kmymoney/plugins/CMakeLists.txt b/kmymoney/plugins/CMakeLists.txt
--- a/kmymoney/plugins/CMakeLists.txt
+++ b/kmymoney/plugins/CMakeLists.txt
@@ -7,7 +7,7 @@
add_subdirectory( ofx )
add_subdirectory( icalendar )
add_subdirectory( reconciliationreport )
-add_subdirectory( printcheck )
+add_subdirectory( checkprinting )
if (KBANKING_FOUND)
add_subdirectory( kbanking )
diff --git a/kmymoney/plugins/checkprinting/CMakeLists.txt b/kmymoney/plugins/checkprinting/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/kmymoney/plugins/checkprinting/CMakeLists.txt
@@ -0,0 +1,72 @@
+# patch the version with the version defined in the build system
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/checkprinting.json.in ${CMAKE_CURRENT_BINARY_DIR}/checkprinting.json @ONLY)
+
+set(checkprinting_PART_SRCS
+ numbertowords.cpp
+ checkprinting.cpp
+ ../../widgets/selectedtransaction.cpp
+ )
+
+kconfig_add_kcfg_files(checkprinting_PART_SRCS pluginsettings.kcfgc)
+
+add_library(checkprinting MODULE ${checkprinting_PART_SRCS})
+
+target_link_libraries(checkprinting
+ Qt5::PrintSupport
+ KF5::I18n
+ kmm_mymoney
+ kmm_plugin
+)
+
+if(ENABLE_WEBENGINE)
+ target_link_libraries(checkprinting Qt5::WebEngineWidgets)
+else(ENABLE_WEBENGINE)
+ target_link_libraries(checkprinting KF5::WebKit)
+endif(ENABLE_WEBENGINE)
+
+install(TARGETS checkprinting
+ DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/")
+
+install(FILES checkprinting.rc
+ DESTINATION "${KXMLGUI_INSTALL_DIR}/checkprinting")
+
+install(FILES check_template.html
+ DESTINATION "${DATA_INSTALL_DIR}/checkprinting")
+
+install(FILES check_template_green_linen.html
+ DESTINATION "${DATA_INSTALL_DIR}/checkprinting")
+
+# the KCM module
+
+set(kcm_checkprinting_PART_SRCS
+ kcm_checkprinting.cpp
+ )
+
+kconfig_add_kcfg_files(kcm_checkprinting_PART_SRCS pluginsettings.kcfgc)
+
+ki18n_wrap_ui(kcm_checkprinting_PART_SRCS pluginsettingsdecl.ui)
+
+add_library(kcm_checkprinting MODULE ${kcm_checkprinting_PART_SRCS})
+
+kcoreaddons_desktop_to_json(kcm_checkprinting kcm_checkprinting.desktop)
+
+target_link_libraries(kcm_checkprinting
+ Qt5::PrintSupport
+ KF5::I18n
+ KF5::ConfigWidgets
+ KF5::Completion
+ KF5::KIOWidgets
+ KF5::CoreAddons
+ )
+
+if(ENABLE_WEBENGINE)
+ target_link_libraries(kcm_checkprinting Qt5::WebEngineWidgets)
+else(ENABLE_WEBENGINE)
+ target_link_libraries(kcm_checkprinting KF5::WebKit)
+endif(ENABLE_WEBENGINE)
+
+install(TARGETS kcm_checkprinting
+ DESTINATION "${KDE_INSTALL_PLUGINDIR}")
+
+install(FILES kcm_checkprinting.desktop
+ DESTINATION "${SERVICES_INSTALL_DIR}")
diff --git a/kmymoney/plugins/printcheck/check_template.html b/kmymoney/plugins/checkprinting/check_template.html
rename from kmymoney/plugins/printcheck/check_template.html
rename to kmymoney/plugins/checkprinting/check_template.html
diff --git a/kmymoney/plugins/printcheck/check_template_green_linen.html b/kmymoney/plugins/checkprinting/check_template_green_linen.html
rename from kmymoney/plugins/printcheck/check_template_green_linen.html
rename to kmymoney/plugins/checkprinting/check_template_green_linen.html
diff --git a/kmymoney/plugins/printcheck/printcheck.h b/kmymoney/plugins/checkprinting/checkprinting.h
rename from kmymoney/plugins/printcheck/printcheck.h
rename to kmymoney/plugins/checkprinting/checkprinting.h
--- a/kmymoney/plugins/printcheck/printcheck.h
+++ b/kmymoney/plugins/checkprinting/checkprinting.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see *
***************************************************************************/
-#ifndef PRINTCHECK_H
-#define PRINTCHECK_H
+#ifndef CHECKPRINTING_H
+#define CHECKPRINTING_H
#include
@@ -28,13 +28,13 @@
class KPluginInfo;
class QPrinter;
class QObject;
-class PrintCheck : public KMyMoneyPlugin::Plugin
+class CheckPrinting : public KMyMoneyPlugin::Plugin
{
Q_OBJECT
public:
- explicit PrintCheck(QObject *parent, const QVariantList &args);
- ~PrintCheck() override;
+ explicit CheckPrinting(QObject *parent, const QVariantList &args);
+ ~CheckPrinting() override;
public Q_SLOTS:
void plug() override;
@@ -57,5 +57,5 @@
QPrinter *m_currentPrinter;
};
-#endif // PRINTCHECK_H
+#endif
diff --git a/kmymoney/plugins/printcheck/printcheck.cpp b/kmymoney/plugins/checkprinting/checkprinting.cpp
rename from kmymoney/plugins/printcheck/printcheck.cpp
rename to kmymoney/plugins/checkprinting/checkprinting.cpp
--- a/kmymoney/plugins/printcheck/printcheck.cpp
+++ b/kmymoney/plugins/checkprinting/checkprinting.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see *
***************************************************************************/
-#include "printcheck.h"
+#include "checkprinting.h"
#include
@@ -57,30 +57,30 @@
#include "pluginsettings.h"
#include "mymoneyenums.h"
-struct PrintCheck::Private {
+struct CheckPrinting::Private {
QAction* m_action;
QString m_checkTemplateHTML;
QStringList m_printedTransactionIdList;
KMyMoneyRegister::SelectedTransactions m_transactions;
};
-PrintCheck::PrintCheck(QObject *parent, const QVariantList &args) :
- KMyMoneyPlugin::Plugin(parent, "printcheck"/*must be the same as X-KDE-PluginInfo-Name*/)
+CheckPrinting::CheckPrinting(QObject *parent, const QVariantList &args) :
+ KMyMoneyPlugin::Plugin(parent, "checkprinting"/*must be the same as X-KDE-PluginInfo-Name*/)
{
Q_UNUSED(args);
// Tell the host application to load my GUI component
- setComponentName("printcheck", i18n("Print check"));
- setXMLFile("printcheck.rc");
+ setComponentName("checkprinting", i18nc("It's about printing bank checks", "Check printing"));
+ setXMLFile("checkprinting.rc");
// For ease announce that we have been loaded.
- qDebug("Plugins: printcheck loaded");
+ qDebug("Plugins: checkprinting loaded");
d = std::unique_ptr(new Private);
// Create the actions of this plugin
QString actionName = i18n("Print check");
- d->m_action = actionCollection()->addAction("transaction_printcheck", this, SLOT(slotPrintCheck()));
+ d->m_action = actionCollection()->addAction("transaction_checkprinting", this, SLOT(slotPrintCheck()));
d->m_action->setText(actionName);
// wait until a transaction is selected before enableing the action
@@ -97,24 +97,24 @@
/**
* @internal Destructor is needed because destructor call of unique_ptr must be in this compile unit
*/
-PrintCheck::~PrintCheck()
+CheckPrinting::~CheckPrinting()
{
- qDebug("Plugins: printcheck unloaded");
+ qDebug("Plugins: checkprinting unloaded");
}
-void PrintCheck::plug()
+void CheckPrinting::plug()
{
- connect(viewInterface(), &KMyMoneyPlugin::ViewInterface::transactionsSelected, this, &PrintCheck::slotTransactionsSelected);
+ connect(viewInterface(), &KMyMoneyPlugin::ViewInterface::transactionsSelected, this, &CheckPrinting::slotTransactionsSelected);
}
-void PrintCheck::unplug()
+void CheckPrinting::unplug()
{
- disconnect(viewInterface(), &KMyMoneyPlugin::ViewInterface::transactionsSelected, this, &PrintCheck::slotTransactionsSelected);
+ disconnect(viewInterface(), &KMyMoneyPlugin::ViewInterface::transactionsSelected, this, &CheckPrinting::slotTransactionsSelected);
}
-void PrintCheck::readCheckTemplate()
+void CheckPrinting::readCheckTemplate()
{
- QString checkTemplateHTMLPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "printcheck/check_template.html");
+ QString checkTemplateHTMLPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "checkprinting/check_template.html");
if (PluginSettings::checkTemplateFile().isEmpty()) {
PluginSettings::setCheckTemplateFile(checkTemplateHTMLPath);
@@ -131,20 +131,20 @@
checkTemplateHTMLFile.close();
}
-bool PrintCheck::canBePrinted(const KMyMoneyRegister::SelectedTransaction & selectedTransaction) const
+bool CheckPrinting::canBePrinted(const KMyMoneyRegister::SelectedTransaction & selectedTransaction) const
{
MyMoneyFile* file = MyMoneyFile::instance();
bool isACheck = file->account(selectedTransaction.split().accountId()).accountType() == eMyMoney::Account::Type::Checkings && selectedTransaction.split().shares().isNegative();
return isACheck && d->m_printedTransactionIdList.contains(selectedTransaction.transaction().id()) == 0;
}
-void PrintCheck::markAsPrinted(const KMyMoneyRegister::SelectedTransaction & selectedTransaction)
+void CheckPrinting::markAsPrinted(const KMyMoneyRegister::SelectedTransaction & selectedTransaction)
{
d->m_printedTransactionIdList.append(selectedTransaction.transaction().id());
}
-void PrintCheck::slotPrintCheck()
+void CheckPrinting::slotPrintCheck()
{
MyMoneyFile* file = MyMoneyFile::instance();
MyMoneyMoneyToWordsConverter converter;
@@ -216,7 +216,7 @@
delete htmlPart;
}
-void PrintCheck::slotTransactionsSelected(const KMyMoneyRegister::SelectedTransactions& transactions)
+void CheckPrinting::slotTransactionsSelected(const KMyMoneyRegister::SelectedTransactions& transactions)
{
d->m_transactions = transactions;
bool actionEnabled = false;
@@ -233,14 +233,14 @@
}
// the plugin's configurations has changed
-void PrintCheck::configurationChanged()
+void CheckPrinting::configurationChanged()
{
PluginSettings::self()->load();
// re-read the data because the configuration has changed
readCheckTemplate();
d->m_printedTransactionIdList = PluginSettings::printedChecks();
}
-K_PLUGIN_FACTORY_WITH_JSON(PrintCheckFactory, "printcheck.json", registerPlugin();)
+K_PLUGIN_FACTORY_WITH_JSON(CheckPrintingFactory, "checkprinting.json", registerPlugin();)
-#include "printcheck.moc"
+#include "checkprinting.moc"
diff --git a/kmymoney/plugins/printcheck/printcheck.json.in b/kmymoney/plugins/checkprinting/checkprinting.json.in
rename from kmymoney/plugins/printcheck/printcheck.json.in
rename to kmymoney/plugins/checkprinting/checkprinting.json.in
--- a/kmymoney/plugins/printcheck/printcheck.json.in
+++ b/kmymoney/plugins/checkprinting/checkprinting.json.in
@@ -39,9 +39,9 @@
"Description[zh_TW]": "提供列印支票的功能",
"EnabledByDefault": true,
"Icon": "document-print",
- "Id": "printcheck",
+ "Id": "checkprinting",
"License": "GPL",
- "Name": "Print check",
+ "Name": "Check printing",
"Name[ar]": "اطبع شيكًا",
"Name[bs]": "Provjera štampe",
"Name[ca@valencia]": "Imprimeix el xec",
diff --git a/kmymoney/plugins/checkprinting/checkprinting.rc b/kmymoney/plugins/checkprinting/checkprinting.rc
new file mode 100644
--- /dev/null
+++ b/kmymoney/plugins/checkprinting/checkprinting.rc
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/kmymoney/plugins/printcheck/kcm_printcheck.h b/kmymoney/plugins/checkprinting/kcm_checkprinting.h
rename from kmymoney/plugins/printcheck/kcm_printcheck.h
rename to kmymoney/plugins/checkprinting/kcm_checkprinting.h
--- a/kmymoney/plugins/printcheck/kcm_printcheck.h
+++ b/kmymoney/plugins/checkprinting/kcm_checkprinting.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see *
***************************************************************************/
-#ifndef KCM_PRINTCHECK_H
-#define KCM_PRINTCHECK_H
+#ifndef KCM_CHECKPRINTING_H
+#define KCM_CHECKPRINTING_H
#include
@@ -51,12 +51,12 @@
#endif
};
-class KCMPrintCheck : public KCModule
+class KCMCheckPrinting : public KCModule
{
public:
- KCMPrintCheck(QWidget* parent, const QVariantList& args);
- ~KCMPrintCheck();
+ KCMCheckPrinting(QWidget* parent, const QVariantList& args);
+ ~KCMCheckPrinting();
};
-#endif // KCM_PRINTCHECK_H
+#endif
diff --git a/kmymoney/plugins/printcheck/kcm_printcheck.cpp b/kmymoney/plugins/checkprinting/kcm_checkprinting.cpp
rename from kmymoney/plugins/printcheck/kcm_printcheck.cpp
rename to kmymoney/plugins/checkprinting/kcm_checkprinting.cpp
--- a/kmymoney/plugins/printcheck/kcm_printcheck.cpp
+++ b/kmymoney/plugins/checkprinting/kcm_checkprinting.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see *
***************************************************************************/
-#include "kcm_printcheck.h"
+#include "kcm_checkprinting.h"
#include
// Qt includes
@@ -67,7 +67,7 @@
m_checkTemplatePreviewHTMLPart->load(QUrl::fromUserInput(url));
}
-KCMPrintCheck::KCMPrintCheck(QWidget *parent, const QVariantList& args)
+KCMCheckPrinting::KCMCheckPrinting(QWidget *parent, const QVariantList& args)
: KCModule(parent, args)
{
PluginSettingsWidget* w = new PluginSettingsWidget(this);
@@ -79,10 +79,10 @@
w->urlSelected(QUrl::fromUserInput(PluginSettings::checkTemplateFile()));
}
-KCMPrintCheck::~KCMPrintCheck()
+KCMCheckPrinting::~KCMCheckPrinting()
{
}
-K_PLUGIN_FACTORY_WITH_JSON(KCMPrintCheckFactory, "kcm_printcheck.json", registerPlugin();)
+K_PLUGIN_FACTORY_WITH_JSON(KCMCheckPrintingFactory, "kcm_checkprinting.json", registerPlugin();)
-#include "kcm_printcheck.moc"
+#include "kcm_checkprinting.moc"
diff --git a/kmymoney/plugins/printcheck/kcm_printcheck.desktop b/kmymoney/plugins/checkprinting/kcm_checkprinting.desktop
rename from kmymoney/plugins/printcheck/kcm_printcheck.desktop
rename to kmymoney/plugins/checkprinting/kcm_checkprinting.desktop
--- a/kmymoney/plugins/printcheck/kcm_printcheck.desktop
+++ b/kmymoney/plugins/checkprinting/kcm_checkprinting.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Configure the print check plugin
+Name=Configure the check printing plugin
Name[ar]=اضبط ملحقة طبع الشّيكات
Name[bs]=Konfiguriši dodatak za provjeru štampe
Name[ca]=Configura el connector d'impressió de xecs
@@ -33,41 +33,41 @@
Icon=document-print
Type=Service
ServiceTypes=KCModule
-Exec=kcmshell5 printcheck
+Exec=kcmshell5 checkprinting
Categories=Qt;KDE;kmymoney;
-Keywords=printcheck;kmymoney;
-Keywords[bs]=printcheck;kmymoney;
+Keywords=checkprinting;kmymoney;
+Keywords[bs]=checkprinting;kmymoney;
Keywords[ca]=impressió de xec;kmymoney;
Keywords[ca@valencia]=impressió de xec;kmymoney;
-Keywords[cs]=printcheck;kmymoney;
-Keywords[da]=printcheck;kmymoney;
-Keywords[de]=printcheck;kmymoney;
-Keywords[el]=printcheck;kmymoney;
+Keywords[cs]=checkprinting;kmymoney;
+Keywords[da]=checkprinting;kmymoney;
+Keywords[de]=checkprinting;kmymoney;
+Keywords[el]=checkprinting;kmymoney;
Keywords[en_GB]=printcheque;kmymoney;
-Keywords[es]=printcheck;kmymoney;
+Keywords[es]=checkprinting;kmymoney;
Keywords[et]=tšeki trükkimine,kmymoney;
-Keywords[eu]=printcheck;kmymoney;
-Keywords[fi]=printcheck;kmymoney;
-Keywords[fr]=printcheck;kmymoney;
-Keywords[gl]=printcheck;kmymoney;cheque;
-Keywords[hu]=printcheck;kmymoney;
-Keywords[it]=printcheck;kmymoney;
-Keywords[kk]=printcheck;kmymoney;
-Keywords[nl]=printcheck;kmymoney;
+Keywords[eu]=checkprinting;kmymoney;
+Keywords[fi]=checkprinting;kmymoney;
+Keywords[fr]=checkprinting;kmymoney;
+Keywords[gl]=checkprinting;kmymoney;cheque;
+Keywords[hu]=checkprinting;kmymoney;
+Keywords[it]=checkprinting;kmymoney;
+Keywords[kk]=checkprinting;kmymoney;
+Keywords[nl]=checkprinting;kmymoney;
Keywords[pl]=czek;kmymoney;
Keywords[pt]=impressão;cheques;kmymoney;
Keywords[pt_BR]=impressão de cheques;kmymoney;
Keywords[ro]=tipărește;cec;kmymoney;
-Keywords[ru]=printcheck;kmymoney;чеки;
-Keywords[sk]=printcheck;kmymoney;
+Keywords[ru]=checkprinting;kmymoney;чеки;
+Keywords[sk]=checkprinting;kmymoney;
Keywords[sv]=checkutskrift;kmymoney;
-Keywords[tr]=printcheck;kmymoney;
-Keywords[uk]=printcheck;kmymoney;надрукувати;чек;
-Keywords[x-test]=xxprintcheckxx;xxkmymoneyxx;
-Keywords[zh_TW]=printcheck;kmymoney;
-X-KDE-Library=kcm_printcheck
-X-KDE-ParentApp=printcheck
-X-KDE-ParentComponents=printcheck
+Keywords[tr]=checkprinting;kmymoney;
+Keywords[uk]=checkprinting;kmymoney;надрукувати;чек;
+Keywords[x-test]=xxcheckprintingxx;xxkmymoneyxx;
+Keywords[zh_TW]=checkprinting;kmymoney;
+X-KDE-Library=kcm_checkprinting
+X-KDE-ParentApp=checkprinting
+X-KDE-ParentComponents=checkprinting
Comment=Permits the configuration of the print check plugin's options
Comment[bs]=Dopušta konfiguraciju opcija dodatka za štampanje čekva
Comment[ca]=Permet la configuració de les opcions del connector d'impressió de xecs
diff --git a/kmymoney/plugins/printcheck/numbertowords.h b/kmymoney/plugins/checkprinting/numbertowords.h
rename from kmymoney/plugins/printcheck/numbertowords.h
rename to kmymoney/plugins/checkprinting/numbertowords.h
diff --git a/kmymoney/plugins/printcheck/numbertowords.cpp b/kmymoney/plugins/checkprinting/numbertowords.cpp
rename from kmymoney/plugins/printcheck/numbertowords.cpp
rename to kmymoney/plugins/checkprinting/numbertowords.cpp
diff --git a/kmymoney/plugins/printcheck/pluginsettings.kcfg b/kmymoney/plugins/checkprinting/pluginsettings.kcfg
rename from kmymoney/plugins/printcheck/pluginsettings.kcfg
rename to kmymoney/plugins/checkprinting/pluginsettings.kcfg
--- a/kmymoney/plugins/printcheck/pluginsettings.kcfg
+++ b/kmymoney/plugins/checkprinting/pluginsettings.kcfg
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-
+
diff --git a/kmymoney/plugins/printcheck/pluginsettings.kcfgc b/kmymoney/plugins/checkprinting/pluginsettings.kcfgc
rename from kmymoney/plugins/printcheck/pluginsettings.kcfgc
rename to kmymoney/plugins/checkprinting/pluginsettings.kcfgc
diff --git a/kmymoney/plugins/printcheck/pluginsettingsdecl.ui b/kmymoney/plugins/checkprinting/pluginsettingsdecl.ui
rename from kmymoney/plugins/printcheck/pluginsettingsdecl.ui
rename to kmymoney/plugins/checkprinting/pluginsettingsdecl.ui
diff --git a/kmymoney/plugins/csv/import/core/csvimportercore.cpp b/kmymoney/plugins/csv/import/core/csvimportercore.cpp
--- a/kmymoney/plugins/csv/import/core/csvimportercore.cpp
+++ b/kmymoney/plugins/csv/import/core/csvimportercore.cpp
@@ -148,8 +148,7 @@
KSharedConfigPtr CSVImporterCore::configFile()
{
- return KSharedConfig::openConfig(QDir(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation))
- .filePath(QStringLiteral("csvimporterrc")));
+ return KSharedConfig::openConfig(QStringLiteral("kmymoney/csvimporterrc"));
}
void CSVImporterCore::profileFactory(const Profile type, const QString &name)
diff --git a/kmymoney/plugins/csv/import/pluginsettings.kcfg b/kmymoney/plugins/csv/import/pluginsettings.kcfg
--- a/kmymoney/plugins/csv/import/pluginsettings.kcfg
+++ b/kmymoney/plugins/csv/import/pluginsettings.kcfg
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-
+
diff --git a/kmymoney/plugins/icalendar/export/pluginsettings.kcfg b/kmymoney/plugins/icalendar/export/pluginsettings.kcfg
--- a/kmymoney/plugins/icalendar/export/pluginsettings.kcfg
+++ b/kmymoney/plugins/icalendar/export/pluginsettings.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-
+
diff --git a/kmymoney/plugins/kbanking/kbanking.kcfg b/kmymoney/plugins/kbanking/kbanking.kcfg
--- a/kmymoney/plugins/kbanking/kbanking.kcfg
+++ b/kmymoney/plugins/kbanking/kbanking.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-
+
diff --git a/kmymoney/plugins/printcheck/CMakeLists.txt b/kmymoney/plugins/printcheck/CMakeLists.txt
deleted file mode 100644
--- a/kmymoney/plugins/printcheck/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-# patch the version with the version defined in the build system
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/printcheck.json.in ${CMAKE_CURRENT_BINARY_DIR}/printcheck.json @ONLY)
-
-set(printcheck_PART_SRCS
- numbertowords.cpp
- printcheck.cpp
- ../../widgets/selectedtransaction.cpp
- )
-
-kconfig_add_kcfg_files(printcheck_PART_SRCS pluginsettings.kcfgc)
-
-add_library(printcheck MODULE ${printcheck_PART_SRCS})
-
-target_link_libraries(printcheck
- Qt5::PrintSupport
- KF5::I18n
- kmm_mymoney
- kmm_plugin
-)
-
-if(ENABLE_WEBENGINE)
- target_link_libraries(printcheck Qt5::WebEngineWidgets)
-else(ENABLE_WEBENGINE)
- target_link_libraries(printcheck KF5::WebKit)
-endif(ENABLE_WEBENGINE)
-
-install(TARGETS printcheck
- DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/")
-
-install(FILES printcheck.rc
- DESTINATION "${KXMLGUI_INSTALL_DIR}/printcheck")
-
-install(FILES check_template.html
- DESTINATION "${DATA_INSTALL_DIR}/printcheck")
-
-install(FILES check_template_green_linen.html
- DESTINATION "${DATA_INSTALL_DIR}/printcheck")
-
-# the KCM module
-
-set(kcm_printcheck_PART_SRCS
- kcm_printcheck.cpp
- )
-
-kconfig_add_kcfg_files(kcm_printcheck_PART_SRCS pluginsettings.kcfgc)
-
-ki18n_wrap_ui(kcm_printcheck_PART_SRCS pluginsettingsdecl.ui)
-
-add_library(kcm_printcheck MODULE ${kcm_printcheck_PART_SRCS})
-
-kcoreaddons_desktop_to_json(kcm_printcheck kcm_printcheck.desktop)
-
-target_link_libraries(kcm_printcheck
- Qt5::PrintSupport
- KF5::I18n
- KF5::ConfigWidgets
- KF5::Completion
- KF5::KIOWidgets
- KF5::CoreAddons
- )
-
-if(ENABLE_WEBENGINE)
- target_link_libraries(kcm_printcheck Qt5::WebEngineWidgets)
-else(ENABLE_WEBENGINE)
- target_link_libraries(kcm_printcheck KF5::WebKit)
-endif(ENABLE_WEBENGINE)
-
-install(TARGETS kcm_printcheck
- DESTINATION "${KDE_INSTALL_PLUGINDIR}")
-
-install(FILES kcm_printcheck.desktop
- DESTINATION "${SERVICES_INSTALL_DIR}")
diff --git a/kmymoney/plugins/printcheck/printcheck.rc b/kmymoney/plugins/printcheck/printcheck.rc
deleted file mode 100644
--- a/kmymoney/plugins/printcheck/printcheck.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-