Differential D26565 Diff 73747 kcms/componentchooser/componentchooseremail.cpp

Changeset View

Standalone View

kcms/componentchooser/componentchooseremail.cpp

1	/***************************************************************************	1		/***************************************************************************
2	componentchooseremail.cpp	2		componentchooseremail.cpp
3	-------------------	3		-------------------
4	copyright : (C) 2002 by Joseph Wenninger	4		copyright : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
5	email : jowenn@kde.org	5		copyright : (C) 2020 by Méven Car <meven.car@enioka.com>
6	***************************************************************************/	6		***************************************************************************/
7		7
8	/***************************************************************************	8		/***************************************************************************
9	* *	9		* *
10	* This program is free software; you can redistribute it and/or modify *	10		* This program is free software; you can redistribute it and/or modify *
11	* it under the terms of the GNU General Public License version 2 as *	11		* it under the terms of the GNU General Public License version 2 as *
12	* published by the Free Software Foundation *	12		* published by the Free Software Foundation *
13	* *	13		* *
14	***************************************************************************/	14		***************************************************************************/
15		15
16	#include "componentchooseremail.h"	16		#include "componentchooseremail.h"
17		17
18	#include <kemailsettings.h>	18		#include <kemailsettings.h>
19	#include <kopenwithdialog.h>	19		#include <kopenwithdialog.h>
20		20
21	#include <KLocalizedString>	21		#include <KLocalizedString>
22	#include <KConfigGroup>	22		#include <KConfigGroup>
23	#include <KSharedConfig>	23		#include <KSharedConfig>
24	#include <KService>	24		#include <KService>
		25		#include <KServiceTypeTrader>
		26		#include <KBuildSycocaProgressDialog>
		27		#include <KMimeTypeTrader>
		28		#include <KShell>
		29
25	#include <QDBusConnection>	30		#include <QDBusConnection>
26	#include <QDBusMessage>	31		#include <QDBusMessage>
27	#include <QUrl>	32		#include <QUrl>
28	#include <QFile>	33		#include <QFile>
29	#include <QCheckBox>	34		#include <QCheckBox>
30		35
31	// for chmod:
32	#include <sys/types.h>
33	#include <sys/stat.h>
34	#include <QStandardPaths>
35
36
37	CfgEmailClient::CfgEmailClient(QWidget *parent)	36		CfgEmailClient::CfgEmailClient(QWidget *parent)
38	: QWidget(parent), Ui::EmailClientConfig_UI(), CfgPlugin()	37		: QWidget(parent), Ui::EmailClientConfig_UI(), CfgPlugin()
39	{	38		{
40	setupUi( this );	39		setupUi( this );
41		40
42	pSettings = new KEMailSettings();	41		pSettings = new KEMailSettings();
43		42
44	connect(kmailCB, &QRadioButton::toggled, this, &CfgEmailClient::configChanged);	43		connect(emailClientsCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated), this, &CfgEmailClient::selectEmailClient);
45	connect(txtEMailClient, &KLineEdit::textChanged, this, &CfgEmailClient::configChanged);
46	#ifdef Q_OS_UNIX
47	connect(chkRunTerminal, &QCheckBox::clicked, this, &CfgEmailClient::configChanged);
48	#else
49	chkRunTerminal->hide();
50	#endif
51	connect(btnSelectEmail, &QToolButton::clicked, this, &CfgEmailClient::selectEmailClient);
52	}	44		}
53		45
54	CfgEmailClient::~CfgEmailClient() {	46		CfgEmailClient::~CfgEmailClient() {
55	delete pSettings;	47		delete pSettings;
56	}	48		}
57		49
58	void CfgEmailClient::defaults()	50		void CfgEmailClient::defaults()
59	{	51		{
60	kmailCB->setChecked(true);	52		// select kmail if installed
61	txtEMailClient->clear();	53		if (m_kmailIndex != -1) {
62	chkRunTerminal->setChecked(false);	54		emailClientsCombo->setCurrentIndex(m_kmailIndex);
		55		}
63	}	56		}
64		57
65	bool CfgEmailClient::isDefaults() const	58		bool CfgEmailClient::isDefaults() const
66	{	59		{
67	return kmailCB->isChecked();	60		// if kmail is installed and is selected
		61		if (m_kmailIndex != -1) {
		62		return emailClientsCombo->currentIndex() == m_kmailIndex;
		63		}
		64
		65		return true;
68	}	66		}
		67		static const char s_AddedAssociations[] = "Added Associations";
			ervinUnsubmitted Done Not a huge fan of static consts appearing like this in the middle of the file. Could you please move them up before the ctor? Bonus point for putting them in the anonymous namespace. ervin: Not a huge fan of static consts appearing like this in the middle of the file. Could you please…
		68		static const auto s_mimetype = QStringLiteral("x-scheme-handler/mailto");
69		69
70	void CfgEmailClient::load(KConfig *)	70		void CfgEmailClient::load(KConfig *)
71	{	71		{
72	QString emailClient = pSettings->getSetting(KEMailSettings::ClientProgram);	72		const KService::Ptr emailClientService = KMimeTypeTrader::self()->preferredService(s_mimetype);
73	bool useKMail = (emailClient.isEmpty());
74		73
75	kmailCB->setChecked(useKMail);	74		const auto emailClients = KServiceTypeTrader::self()->query(QStringLiteral("Application"),
76	otherCB->setChecked(!useKMail);	75		QStringLiteral("'Email' in Categories and 'x-scheme-handler/mailto' in ServiceTypes"));
77	txtEMailClient->setText(emailClient);
78	txtEMailClient->setFixedHeight(txtEMailClient->sizeHint().height());
79	chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == QLatin1String("true")));
80		76
81	emit changed(false);	77		emailClientsCombo->clear();
		78		m_kmailIndex = -1;
		79		m_currentIndex = -1;
		80
		81		for (const auto &service : emailClients) {
		82
		83		emailClientsCombo->addItem(QIcon::fromTheme(service->icon()), service->name(), service->storageId());
82		84
		85		if (emailClientService && emailClientService->storageId() == service->storageId()) {
		86		emailClientsCombo->setCurrentIndex(emailClientsCombo->count() - 1);
		87		m_currentIndex = emailClientsCombo->count() - 1;
		88		}
		89		if (service->storageId() == QStringLiteral("org.kde.kmail2.desktop") \|\|
		90		service->storageId() == QStringLiteral("org.kde.kmail.desktop")) {
		91		m_kmailIndex = emailClientsCombo->count() - 1;
		92		}
83	}	93		}
84		94
85	void CfgEmailClient::configChanged()	95		// add the Added association to x-scheme-handler/mailto from the mimeapps.list file
86	{	96		const KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("mimeapps.list"), KConfig::NoGlobals, QStandardPaths::GenericConfigLocation);
87	emit changed(true);	97		const KConfigGroup addedApps(profile, s_AddedAssociations);
		98		const auto addedList = addedApps.readXdgListEntry(s_mimetype);
		99
		100		for (const auto &addedApp : addedList) {
		101		// without .desktop extension
		102		auto service = KService::serviceByStorageId(addedApp.mid(0, addedApp.length() -8));
		103		if (!service) {
		104		service = KService::serviceByStorageId(addedApp);
88	}	105		}
		106		if (service &&
			ervinUnsubmitted Done To simplify reading this I'd go for: if (!service) { continue; } and then I'd put the result of none_of in a properly named intermediate variable before checking it in its own if. Will make the intents clearer. ervin: To simplify reading this I'd go for: ``` if (!service) { continue; } ``` and then I'd put…
			ervinUnsubmitted Done I really meant if (!service) + continue to avoid yet another indentation level but OK, fair enough. ervin: I really meant if (!service) + continue to avoid yet another indentation level but OK, fair…
		107		// avoid duplicates entry when email clients are present in mimeapps.list's Added Associations too
		108		std::none_of(emailClients.constBegin(), emailClients.constEnd(), [service] (const KService::Ptr &serv) { return service->storageId() == serv->storageId(); })) {
		109		const auto icon = QIcon::fromTheme(!service->icon().isEmpty() ? service->icon() : QStringLiteral("application-x-shellscript"));
		110		emailClientsCombo->addItem(icon, service->name() + " (" + KShell::tildeCollapse(service->entryPath()) + ")", service->storageId());
89		111
90	void CfgEmailClient::selectEmailClient()	112		if (emailClientService && emailClientService->storageId() == service->storageId()) {
91	{	113		emailClientsCombo->setCurrentIndex(emailClientsCombo->count() - 1);
92	QList<QUrl> urlList;	114		m_currentIndex = emailClientsCombo->count() - 1;
93	KOpenWithDialog dlg(urlList, i18n("Select preferred email client:"), QString(), this);	115		}
94	// hide "Do not &close when command exits" here, we don't need it for a mail client
95	dlg.hideNoCloseOnExit();
96	if (dlg.exec() != QDialog::Accepted) return;
97	QString client = dlg.text();
98	m_emailClientService = dlg.service();
99
100	// get the preferred Terminal Application
101	KConfigGroup confGroup( KSharedConfig::openConfig(), QStringLiteral("General") );
102	QString preferredTerminal = confGroup.readPathEntry("TerminalApplication", QStringLiteral("konsole"));
103	preferredTerminal += QLatin1String(" -e ");
104
105	int len = preferredTerminal.length();
106	bool b = client.left(len) == preferredTerminal;
107	if (b) client = client.mid(len);
108	if (!client.isEmpty())
109	{
110	chkRunTerminal->setChecked(b);
111	txtEMailClient->setText(client);
112	}	116		}
113	}	117		}
114		118
		119		// add a other option to add a new email client with KOpenWithDialog
		120		emailClientsCombo->addItem(QIcon::fromTheme(QStringLiteral("application-x-shellscript")), i18n("Other..."), QStringLiteral());
115		121
116	void CfgEmailClient::save(KConfig *)	122		emit changed(false);
		123		}
		124
		125		void CfgEmailClient::selectEmailClient(int index)
117	{	126		{
118	if (kmailCB->isChecked())	127		if (index == emailClientsCombo->count() -1) {
		128		// Other option
		129
		130		KOpenWithDialog dlg(s_mimetype, QString(), this);
		131		dlg.setSaveNewApplications(true);
		132
		133		if (dlg.exec() != QDialog::Accepted) {
		134		// restore previous setting
		135		emailClientsCombo->setCurrentIndex(m_currentIndex);
		136		emit changed(false);
		137		} else {
		138		const auto service = dlg.service();
		139
		140		const auto icon = QIcon::fromTheme(!service->icon().isEmpty() ? service->icon() : QStringLiteral("application-x-shellscript"));
		141		emailClientsCombo->insertItem(emailClientsCombo->count() - 1, icon, service->name() + " (" + KShell::tildeCollapse(service->entryPath()) + ")", service->storageId());
		142
		143		// select newly inserted email client
		144		emailClientsCombo->setCurrentIndex(m_currentIndex);
			mevenAuthorUnsubmitted Done remove meven: remove
		145
		146		emit changed(true);
		147		return;
		148		}
		149		} else {
		150		emit changed(m_currentIndex != index);
		151		}
		152		}
		153
		154		void CfgEmailClient::save(KConfig *)
119	{	155		{
		156		const QString &storageId = emailClientsCombo->currentData().toString();
		157		const KService::Ptr emailClientService = KService::serviceByStorageId(storageId);
		158
		159		const bool kmailSelected = m_kmailIndex != -1 && emailClientsCombo->currentIndex() == m_kmailIndex;
		160		if (kmailSelected) {
120	pSettings->setSetting(KEMailSettings::ClientProgram, QString());	161		pSettings->setSetting(KEMailSettings::ClientProgram, QString());
121	pSettings->setSetting(KEMailSettings::ClientTerminal, QStringLiteral("false"));	162		pSettings->setSetting(KEMailSettings::ClientTerminal, QStringLiteral("false"));
		163		} else {
		164		pSettings->setSetting(KEMailSettings::ClientProgram, emailClientService->storageId());
		165		pSettings->setSetting(KEMailSettings::ClientTerminal, emailClientService->terminal() ? QStringLiteral("true") : QStringLiteral("false"));
122	}	166		}
123	else
124	{
125	pSettings->setSetting(KEMailSettings::ClientProgram, txtEMailClient->text());
126	pSettings->setSetting(KEMailSettings::ClientTerminal, (chkRunTerminal->isChecked()) ? "true" : "false");
127	}
128		167
129	// Save the default email client in mimeapps.list into the group [Default Applications]	168		// Save the default email client in mimeapps.list
		169		KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("mimeapps.list"), KConfig::NoGlobals, QStandardPaths::GenericConfigLocation);
		170		if (profile->isConfigWritable(true) && emailClientService) {
		171
130	KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("mimeapps.list"), KConfig::NoGlobals, QStandardPaths::GenericConfigLocation);	172		KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("mimeapps.list"), KConfig::NoGlobals, QStandardPaths::GenericConfigLocation);
131	if (profile->isConfigWritable(true)) {	173
		174		// Save the default application according to mime-apps-spec 1.0
132	KConfigGroup defaultApp(profile, "Default Applications");	175		KConfigGroup defaultApp(profile, "Default Applications");
133	if (kmailCB->isChecked()) {	176		defaultApp.writeXdgListEntry(s_mimetype, {emailClientService->storageId()});
134	QString kmailDesktop = QStringLiteral("org.kde.kmail.desktop");	177
135	if (KService::serviceByDesktopName(QStringLiteral("org.kde.kmail2"))) {	178		KConfigGroup addedApps(profile, "Added Associations");
136	kmailDesktop = QStringLiteral("org.kde.kmail2.desktop");	179		QStringList apps = addedApps.readXdgListEntry(s_mimetype);
137	}	180		apps.removeAll(emailClientService->storageId());
138	defaultApp.writeXdgListEntry("x-scheme-handler/mailto", QStringList(kmailDesktop));	181		apps.prepend(emailClientService->storageId()); // make it the preferred app, i.e first in list
139	} else if (m_emailClientService) {	182		addedApps.writeXdgListEntry(s_mimetype, apps);
140	defaultApp.writeXdgListEntry("x-scheme-handler/mailto", QStringList(m_emailClientService->storageId()));	183
141	}
142	profile->sync();	184		profile->sync();
143	}
144		185
145	// insure proper permissions -- contains sensitive data	186		m_currentIndex = emailClientsCombo->currentIndex();
146	QString cfgName(QStandardPaths::locate(QStandardPaths::ConfigLocation, QStringLiteral("emails")));	187
147	if (!cfgName.isEmpty())	188		// refresh cache
148	::chmod(QFile::encodeName(cfgName), 0600);	189		KBuildSycocaProgressDialog::rebuildKSycoca(this);
149	QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/Component"), QStringLiteral("org.kde.Kcontrol"), QStringLiteral("KDE_emailSettingsChanged") );	190
150	QDBusConnection::sessionBus().send(message);
151	emit changed(false);	191		emit changed(false);
152	}	192		}
		193		}
153		194