Commit ccb0807f authored by David Jarvie's avatar David Jarvie

Merge commit 'b3692451'

parents 3db9a0ba b3692451
KAlarm Change Log
=== Version 2.11.16 --- 15 April 2017 ===
+ Fix option text for using default email address from KMail/System Settings [KDE Bug 378722]
=== Version 2.11.15 (KDE Applications 17.04) --- 15 January 2017 ===
+ Report if terminal for command alarms is not configured.
+ Don't allow 'auto-hide in system tray' on Unity desktop [KDE Bug 373848]
=== Version 2.11.14 --- 19 February 2017 ===
+ Fix not showing main window if activated again while already running with --tray [Bug 374520]
+ Fix not showing main window if activated again while already running with --tray [KDE Bug 374520]
+ Fix --help, --version and option errors not being reported if KAlarm is already running.
+ Make command options --edit-new-* work [KDE Bug 376209]
......
......@@ -24,7 +24,7 @@
#undef QT3_SUPPORT
#define VERSION_SUFFIX "-5"
#define KALARM_VERSION "2.11.15" VERSION_SUFFIX
#define KALARM_VERSION "2.11.16" VERSION_SUFFIX
#define KALARM_NAME "KAlarm"
#define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application
......
......@@ -191,12 +191,12 @@
</entry>
<entry name="Base_EmailFrom" key="EmailFrom" type="String">
<label context="@label">'From' email address</label>
<whatsthis context="@info:whatsthis">Your email address, used to identify you as the sender when sending email alarms. Enter "@SystemSettings" to use the email address set in System Settings, "@KMail" to allow choice of KMail identities, or enter the actual email address otherwise.</whatsthis>
<whatsthis context="@info:whatsthis">Your email address, used to identify you as the sender when sending email alarms. Enter "@SystemSettings" to use the default email address set in KMail or System Settings, "@KMail" to allow choice of KMail identities, or enter the actual email address otherwise.</whatsthis>
<default code="true">KAlarmCal::Identities::identitiesExist() ? QLatin1String("@KMail") : QLatin1String("@SystemSettings")</default>
</entry>
<entry name="Base_EmailBccAddress" key="EmailBccAddress" type="String">
<label context="@label">'Bcc' email address</label>
<whatsthis context="@info:whatsthis">Your email address, used for blind copying email alarms to yourself. If you want blind copies to be sent to your account on the computer which KAlarm runs on, you can simply enter your user login name. Enter "@SystemSettings" to use the email address set in System Settings, or enter the actual email address otherwise.</whatsthis>
<whatsthis context="@info:whatsthis">Your email address, used for blind copying email alarms to yourself. If you want blind copies to be sent to your account on the computer which KAlarm runs on, you can simply enter your user login name. Enter "@SystemSettings" to use the default email address set in KMail or System Settings, or enter the actual email address otherwise.</whatsthis>
<default code="true">QLatin1String("@SystemSettings")</default>
</entry>
<entry name="Base_CmdXTermCommand" key="CmdXTerm" type="String">
......
/*
* kamail.cpp - email functions
* Program: kalarm
* Copyright © 2002-2016 by David Jarvie <djarvie@kde.org>
* Copyright © 2002-2017 by David Jarvie <djarvie@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -136,7 +136,7 @@ int KAMail::send(JobData& jobdata, QStringList& errmsgs)
break;
case Preferences::MAIL_FROM_SYS_SETTINGS:
errmsgs = errors(xi18nc("@info", "<para>No 'From' email address is configured.</para>"
"<para>Please set it in the KDE System Settings or in the <application>KAlarm</application> Configuration dialog.</para>"));
"<para>Please set a default address in <application>KMail</application> or KDE System Settings or in the <application>KAlarm</application> Configuration dialog.</para>"));
break;
case Preferences::MAIL_FROM_ADDR:
default:
......@@ -500,7 +500,7 @@ void KAMail::notifyQueued(const KAEvent& event)
}
/******************************************************************************
* Fetch the user's email address configured in the KDE System Settings.
* Fetch the user's email address configured in KMail or KDE System Settings.
*/
QString KAMail::controlCentreAddress()
{
......
......@@ -1064,10 +1064,10 @@ EmailPrefTab::EmailPrefTab(StackedScrollGroup* scrollGroup)
grid->addWidget(mEmailAddress, 1, 2);
// 'From' email address to be taken from System Settings
mFromCCentreButton = new RadioButton(i18nc("@option:radio", "Use address from System Settings"), group);
mFromCCentreButton = new RadioButton(xi18nc("@option:radio", "Use default address from <application>KMail</application> or System Settings"), group);
mFromAddressGroup->addButton(mFromCCentreButton, Preferences::MAIL_FROM_SYS_SETTINGS);
mFromCCentreButton->setWhatsThis(
i18nc("@info:whatsthis", "Check to use the email address set in KDE System Settings, to identify you as the sender when sending email alarms."));
xi18nc("@info:whatsthis", "Check to use the default email address set in <application>KMail</application> or KDE System Settings, to identify you as the sender when sending email alarms."));
grid->addWidget(mFromCCentreButton, 2, 1, 1, 2, Qt::AlignLeft);
// 'From' email address to be picked from KMail's identities when the email alarm is configured
......@@ -1100,10 +1100,10 @@ EmailPrefTab::EmailPrefTab(StackedScrollGroup* scrollGroup)
grid->addWidget(mEmailBccAddress, 5, 2);
// 'Bcc' email address to be taken from System Settings
mBccCCentreButton = new RadioButton(i18nc("@option:radio", "Use address from System Settings"), group);
mBccCCentreButton = new RadioButton(xi18nc("@option:radio", "Use default address from <application>KMail</application> or System Settings"), group);
mBccAddressGroup->addButton(mBccCCentreButton, Preferences::MAIL_FROM_SYS_SETTINGS);
mBccCCentreButton->setWhatsThis(
i18nc("@info:whatsthis", "Check to use the email address set in KDE System Settings, for blind copying email alarms to yourself."));
xi18nc("@info:whatsthis", "Check to use the default email address set in <application>KMail</application> or KDE System Settings, for blind copying email alarms to yourself."));
grid->addWidget(mBccCCentreButton, 6, 1, 1, 2, Qt::AlignLeft);
topLayout()->addStretch(); // top adjust the widgets
......@@ -1198,7 +1198,7 @@ QString EmailPrefTab::validateAddr(ButtonGroup* group, QLineEdit* addr, const QS
case Preferences::MAIL_FROM_SYS_SETTINGS:
if (!KAMail::controlCentreAddress().isEmpty())
return QString();
errmsg = i18nc("@info", "No email address is currently set in KDE System Settings. %1", errmsg);
errmsg = xi18nc("@info", "No default email address is currently set in <application>KMail</application> or KDE System Settings. %1", errmsg);
break;
case Preferences::MAIL_FROM_KMAIL:
if (Identities::identitiesExist())
......
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