[pim/kalarm] /: Remove obsolete references to email address in System Settings

[David Jarvie]

Git commit 7b5491379393de89d4a842433c6816b407cc157b by David Jarvie.
Committed on 17/04/2022 at 16:14.
Pushed by djarvie into branch 'master'.

Remove obsolete references to email address in System Settings

M  +8    -10   doc/index.docbook
M  +7    -7    src/prefdlg.cpp

https://invent.kde.org/pim/kalarm/commit/7b5491379393de89d4a842433c6816b407cc157b

diff --git a/doc/index.docbook b/doc/index.docbook
index cfe6658b..00478d6a 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -39,8 +39,8 @@
 
 <!-- Don't change format of date and version of the documentation -->
 
-<date>2022-3-10</date>
-<releaseinfo>3.4.0 (KDE Gear 22.04)</releaseinfo>
+<date>2022-4-17</date>
+<releaseinfo>3.8.0 (KDE Gear 22.08)</releaseinfo>
 
 <abstract>
 <para>&kalarm; is a personal alarm message, command and email scheduler by &kde;.</para>
@@ -1548,7 +1548,7 @@ this option inapplicable.</para>
 copy of the email to yourself when the alarm is triggered. The email
 address to which the copy will be sent may be set in the
 <link linkend="preferences-email">Configuration dialog</link>, the
-default being your email address set in &kmail; or the &systemsettings;.</para>
+default being your email address set in &kmail;.</para>
 </listitem>
 </itemizedlist>
 
@@ -2144,7 +2144,7 @@ displayed. (For reminder messages, the date/time shown is that for the
 main alarm or its recurrence, not the reminder message time, and a
 “Reminder” heading is shown.)</para>
 
-<para>The notification automatically closes after a  short time-out.
+<para>The notification automatically closes after a short time-out.
 (Note that the time-out is common to all applications; it can be
 changed in &systemsettings;.) After a notification times out, it can
 still be seen in the notification history until you remove it or
@@ -2845,9 +2845,8 @@ email alarms:</para>
 address.</para>
 </listitem>
 
-<listitem><para>Select <guilabel>Use default address from KMail or System
-Settings</guilabel> to use your default email address which is configured
-in &kmail; or the &systemsettings;.</para>
+<listitem><para>Select <guilabel>Use default address from KMail</guilabel>
+to use your default email address which is configured in &kmail;.</para>
 </listitem>
 
 <listitem><para>Select <guilabel>Use &kmail; identities</guilabel> to
@@ -2871,9 +2870,8 @@ computer which &kalarm; runs on, you could simply enter your user
 login name here.</para>
 </listitem>
 
-<listitem><para>Select <guilabel>Use default address from KMail or System
-Settings</guilabel> to use your default email address which is configured
-in &kmail; or the &systemsettings;.</para>
+<listitem><para>Select <guilabel>Use default address from KMail</guilabel>
+to use your default email address which is configured in &kmail;.</para>
 </listitem>
 </itemizedlist>
 </listitem>
diff --git a/src/prefdlg.cpp b/src/prefdlg.cpp
index 0773b554..a94cf9f7 100644
--- a/src/prefdlg.cpp
+++ b/src/prefdlg.cpp
@@ -1049,11 +1049,11 @@ EmailPrefTab::EmailPrefTab(StackedScrollGroup* scrollGroup)
     mFromAddrButton->setFocusWidget(mEmailAddress);
     grid->addWidget(mEmailAddress, 1, 2);
 
-    // 'From' email address to be taken from System Settings
-    mFromCCentreButton = new RadioButton(xi18nc("@option:radio", "Use default address from <application>KMail</application> or System Settings"), group);
+    // 'From' email address to be taken from KMail
+    mFromCCentreButton = new RadioButton(xi18nc("@option:radio", "Use default address from <application>KMail</application>"), group);
     mFromAddressGroup->addButton(mFromCCentreButton, Preferences::MAIL_FROM_SYS_SETTINGS);
     mFromCCentreButton->setWhatsThis(
-          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."));
+          xi18nc("@info:whatsthis", "Check to use the default email address set in <application>KMail</application>, 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
@@ -1085,11 +1085,11 @@ EmailPrefTab::EmailPrefTab(StackedScrollGroup* scrollGroup)
     mBccAddrButton->setFocusWidget(mEmailBccAddress);
     grid->addWidget(mEmailBccAddress, 5, 2);
 
-    // 'Bcc' email address to be taken from System Settings
-    mBccCCentreButton = new RadioButton(xi18nc("@option:radio", "Use default address from <application>KMail</application> or System Settings"), group);
+    // 'Bcc' email address to be taken from KMail
+    mBccCCentreButton = new RadioButton(xi18nc("@option:radio", "Use default address from <application>KMail</application>"), group);
     mBccAddressGroup->addButton(mBccCCentreButton, Preferences::MAIL_FROM_SYS_SETTINGS);
     mBccCCentreButton->setWhatsThis(
-          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."));
+          xi18nc("@info:whatsthis", "Check to use the default email address set in <application>KMail</application>, for blind copying email alarms to yourself."));
     grid->addWidget(mBccCCentreButton, 6, 1, 1, 2, Qt::AlignLeft);
 
     topLayout()->addStretch();    // top adjust the widgets
@@ -1184,7 +1184,7 @@ QString EmailPrefTab::validateAddr(ButtonGroup* group, QLineEdit* addr, const QS
         case Preferences::MAIL_FROM_SYS_SETTINGS:
             if (!KAMail::controlCentreAddress().isEmpty())
                 return {};
-            errmsg = xi18nc("@info", "No default email address is currently set in <application>KMail</application> or KDE System Settings. %1", errmsg);
+            errmsg = xi18nc("@info", "No default email address is currently set in <application>KMail</application>. %1", errmsg);
             break;
         case Preferences::MAIL_FROM_KMAIL:
             if (Identities::identitiesExist())