[kalarm/nokde4support] /: Remove 'clock time' option in favour of local system time zone
David Jarvie
null at kde.org
Wed Apr 18 18:10:57 UTC 2018
Git commit 335bfc1589d6f323d3ff505daacefa5089a5a329 by David Jarvie.
Committed on 18/04/2018 at 18:09.
Pushed by djarvie into branch 'nokde4support'.
Remove 'clock time' option in favour of local system time zone
M +9 -0 Changelog
M +23 -34 doc/index.docbook
M +3 -29 src/alarmtimewidget.cpp
M +0 -2 src/alarmtimewidget.h
M +0 -1 src/functions.cpp
M +2 -2 src/kalarm.h
https://commits.kde.org/kalarm/335bfc1589d6f323d3ff505daacefa5089a5a329
diff --git a/Changelog b/Changelog
index a8eee3b2..01c621cc 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,14 @@
KAlarm Change Log
+=== Version 2.12.0 (KDE Applications 18.08) --- 18 April 2018 ===
++ Use KADateTime instead of deprecated KDateTime.
++ Remove 'clock time' option, in favour of local system time zone.
++ Fix evaluation of work days.
++ Fix reminder-once alarms not being correctly loaded from calendar file.
++ Fix some regressions introduced in version 2.11.0, including:
+ Make global shortcuts available.
+ Default sound file selection dialogue to the system sound files directory.
+
=== Version 2.11.16 (KDE Applications 17.04.1) --- 15 April 2017 ===
+ Fix option text for using default email address from KMail/System Settings [KDE Bug 378722]
diff --git a/doc/index.docbook b/doc/index.docbook
index 3c9cd2db..a97ce46f 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -31,7 +31,7 @@
</authorgroup>
<copyright>
-<year>2001</year><year>2002</year><year>2003</year><year>2004</year><year>2005</year><year>2006</year><year>2007</year><year>2008</year><year>2009</year><year>2010</year><year>2011</year><year>2012</year><year>2013</year><year>2016</year>
+<year>2001</year><year>2002</year><year>2003</year><year>2004</year><year>2005</year><year>2006</year><year>2007</year><year>2008</year><year>2009</year><year>2010</year><year>2011</year><year>2012</year><year>2013</year><year>2016</year><year>2018</year>
<holder>&David.Jarvie;</holder>
</copyright>
@@ -39,8 +39,8 @@
<!-- Don't change format of date and version of the documentation -->
-<date>2016-12-06</date>
-<releaseinfo>2.11.11 (Applications 16.12)</releaseinfo>
+<date>2018-04-16</date>
+<releaseinfo>2.12.0 (Applications 18.08)</releaseinfo>
<abstract>
<para>&kalarm; is a personal alarm message, command and email scheduler by &kde;.</para>
@@ -1580,14 +1580,9 @@ will be your computer's time zone unless you have changed it.</para>
</listitem>
<listitem>
-<para>Check <guilabel>Ignore time zone</guilabel> if you want to use
-the local computer time (on whichever computer &kalarm; happens to be
-running on at the time), ignoring time zones.</para>
-
-<warning><para>You are recommended not to select this option if the
-alarm has a recurrence specified in hours and minutes; if you do, the
-alarm may occur at unexpected times after daylight saving time
-shifts.</para></warning>
+<para>Select <guilabel>System time zone</guilabel> if you want to use
+the local computer time zone (on whichever computer &kalarm; happens to
+be running on at the time).</para>
</listitem>
</itemizedlist>
@@ -3192,9 +3187,8 @@ time.</para>
If no time zone is specified, the local system time zone is
assumed. If a time zone specifier <replaceable>TZ</replaceable> is
present, it may be the name of a system time zone (⪚
- <userinput>Europe/London</userinput>), <userinput>UTC</userinput>
- representing the UTC time zone, or <userinput>Clock</userinput> to
- use the local computer clock and ignore time zones.</entry>
+ <userinput>Europe/London</userinput>), or <userinput>UTC</userinput>
+ representing the UTC time zone.</entry>
</row>
<row>
<entry><option>--triggerEvent
@@ -3501,7 +3495,7 @@ returned by <methodname>QDate::toString(Qt::ISODate)</methodname>). For
an alarm with a date and time, the string should be in the format
<replaceable>YYYY-MM-DDTHH:MM[:SS] [TZ]</replaceable> (as returned by
<methodname>QDateTime::toString(Qt::ISODate)</methodname>) or
-<replaceable>HH:MM[:SS] [Clock]</replaceable> (as returned by
+<replaceable>HH:MM[:SS]</replaceable> (as returned by
<methodname>QTime::toString(Qt::ISODate)</methodname>). If no date is
specified, today's date is used. Note that any seconds value is
ignored.</para>
@@ -3509,9 +3503,8 @@ ignored.</para>
<para>If no time zone is specified, the local system time zone is
assumed. If a time zone specifier <replaceable>TZ</replaceable> is
present, it may be the name of a system time zone (⪚
-<userinput>Europe/London</userinput>), <userinput>UTC</userinput>
-representing the UTC time zone, or <userinput>Clock</userinput> to use
-the local computer clock and ignore time zones.</para>
+<userinput>Europe/London</userinput>), or <userinput>UTC</userinput>
+representing the UTC time zone.</para>
</listitem>
</varlistentry>
@@ -3754,7 +3747,7 @@ returned by <methodname>QDate::toString(Qt::ISODate)</methodname>). For
an alarm with a date and time, the string should be in the format
<replaceable>YYYY-MM-DDTHH:MM[:SS] [TZ]</replaceable> (as returned by
<methodname>QDateTime::toString(Qt::ISODate)</methodname>) or
-<replaceable>HH:MM[:SS] [Clock]</replaceable> (as returned by
+<replaceable>HH:MM[:SS]</replaceable> (as returned by
<methodname>QTime::toString(Qt::ISODate)</methodname>). If no date is
specified, today's date is used. Note that any seconds value is
ignored.</para>
@@ -3762,9 +3755,8 @@ ignored.</para>
<para>If no time zone is specified, the local system time zone is
assumed. If a time zone specifier <replaceable>TZ</replaceable> is
present, it may be the name of a system time zone (⪚
-<userinput>Europe/London</userinput>), <userinput>UTC</userinput>
-representing the UTC time zone, or <userinput>Clock</userinput> to use
-the local computer clock and ignore time zones.</para>
+<userinput>Europe/London</userinput>), or <userinput>UTC</userinput>
+representing the UTC time zone.</para>
</listitem>
</varlistentry>
@@ -3971,7 +3963,7 @@ returned by <methodname>QDate::toString(Qt::ISODate)</methodname>). For
an alarm with a date and time, the string should be in the format
<replaceable>YYYY-MM-DDTHH:MM[:SS] [TZ]</replaceable> (as returned by
<methodname>QDateTime::toString(Qt::ISODate)</methodname>) or
-<replaceable>HH:MM[:SS] [Clock]</replaceable> (as returned by
+<replaceable>HH:MM[:SS]</replaceable> (as returned by
<methodname>QTime::toString(Qt::ISODate)</methodname>). If no date is
specified, today's date is used. Note that any seconds value is
ignored.</para>
@@ -3979,9 +3971,8 @@ ignored.</para>
<para>If no time zone is specified, the local system time zone is
assumed. If a time zone specifier <replaceable>TZ</replaceable> is
present, it may be the name of a system time zone (⪚
-<userinput>Europe/London</userinput>), <userinput>UTC</userinput>
-representing the UTC time zone, or <userinput>Clock</userinput> to use
-the local computer clock and ignore time zones.</para>
+<userinput>Europe/London</userinput>), or <userinput>UTC</userinput>
+representing the UTC time zone.</para>
</listitem>
</varlistentry>
@@ -4196,7 +4187,7 @@ returned by <methodname>QDate::toString(Qt::ISODate)</methodname>). For
an alarm with a date and time, the string should be in the format
<replaceable>YYYY-MM-DDTHH:MM[:SS] [TZ]</replaceable> (as returned by
<methodname>QDateTime::toString(Qt::ISODate)</methodname>) or
-<replaceable>HH:MM[:SS] [Clock]</replaceable> (as returned by
+<replaceable>HH:MM[:SS]</replaceable> (as returned by
<methodname>QTime::toString(Qt::ISODate)</methodname>). If no date is
specified, today's date is used. Note that any seconds value is
ignored.</para>
@@ -4204,9 +4195,8 @@ ignored.</para>
<para>If no time zone is specified, the local system time zone is
assumed. If a time zone specifier <replaceable>TZ</replaceable> is
present, it may be the name of a system time zone (⪚
-<userinput>Europe/London</userinput>), <userinput>UTC</userinput>
-representing the UTC time zone, or <userinput>Clock</userinput> to use
-the local computer clock and ignore time zones.</para>
+<userinput>Europe/London</userinput>), or <userinput>UTC</userinput>
+representing the UTC time zone.</para>
</listitem>
</varlistentry>
@@ -4389,7 +4379,7 @@ returned by <methodname>QDate::toString(Qt::ISODate)</methodname>). For
an alarm with a date and time, the string should be in the format
<replaceable>YYYY-MM-DDTHH:MM[:SS] [TZ]</replaceable> (as returned by
<methodname>QDateTime::toString(Qt::ISODate)</methodname>) or
-<replaceable>HH:MM[:SS] [Clock]</replaceable> (as returned by
+<replaceable>HH:MM[:SS]</replaceable> (as returned by
<methodname>QTime::toString(Qt::ISODate)</methodname>). If no date is
specified, today's date is used. Note that any seconds value is
ignored.</para>
@@ -4397,9 +4387,8 @@ ignored.</para>
<para>If no time zone is specified, the local system time zone is
assumed. If a time zone specifier <replaceable>TZ</replaceable> is
present, it may be the name of a system time zone (⪚
-<userinput>Europe/London</userinput>), <userinput>UTC</userinput>
-representing the UTC time zone, or <userinput>Clock</userinput> to use
-the local computer clock and ignore time zones.</para>
+<userinput>Europe/London</userinput>), or <userinput>UTC</userinput>
+representing the UTC time zone.</para>
</listitem>
</varlistentry>
diff --git a/src/alarmtimewidget.cpp b/src/alarmtimewidget.cpp
index 3f6dd79b..ea8fc3d1 100644
--- a/src/alarmtimewidget.cpp
+++ b/src/alarmtimewidget.cpp
@@ -220,17 +220,10 @@ void AlarmTimeWidget::init(Mode mode, const QString& title)
mTimeZoneBox->setWhatsThis(i18nc("@info:whatsthis", "Select the time zone to use for this alarm."));
label->setBuddy(mTimeZone);
layout->addWidget(mTimeZoneBox);
-
- // Time zone checkbox
- mNoTimeZone = new CheckBox(i18nc("@option:check", "Use local time zone"), topWidget);
- connect(mNoTimeZone, &CheckBox::toggled, this, &AlarmTimeWidget::slotTimeZoneToggled);
- mNoTimeZone->setWhatsThis(xi18nc("@info:whatsthis", "Check to use the computer's default time zone."));
- layout->addWidget(mNoTimeZone);
layout->addStretch();
// Initially show only the time zone button, not time zone selector
mTimeZoneBox->hide();
- mNoTimeZone->hide();
}
// Initialise the radio button statuses
@@ -253,10 +246,7 @@ void AlarmTimeWidget::setReadOnly(bool ro)
mAnyTimeCheckBox->setReadOnly(ro);
mAfterTimeRadio->setReadOnly(ro);
if (!mDeferring)
- {
mTimeZone->setReadOnly(ro);
- mNoTimeZone->setReadOnly(ro);
- }
mDelayTimeEdit->setReadOnly(ro);
}
@@ -364,8 +354,7 @@ void AlarmTimeWidget::setDateTime(const DateTime& dt)
mTimeSpec = dt.timeSpec().isValid() ? dt.timeSpec() : KADateTime::LocalZone;
else
{
- const QTimeZone tz = dt.timeZone();
- mNoTimeZone->setChecked(!tz.isValid());
+ const QTimeZone tz = (dt.timeSpec() == KADateTime::LocalZone) ? QTimeZone() : dt.timeZone();
mTimeZone->setTimeZone(tz);
slotTimeZoneChanged();
}
@@ -601,13 +590,8 @@ void AlarmTimeWidget::slotAnyTimeToggled(bool on)
*/
void AlarmTimeWidget::slotTimeZoneChanged()
{
- if (mNoTimeZone->isChecked())
- mTimeSpec = KADateTime::LocalZone;
- else
- {
- QTimeZone tz = mTimeZone->timeZone();
- mTimeSpec = tz.isValid() ? KADateTime::Spec(tz) : KADateTime::LocalZone;
- }
+ const QTimeZone tz = mTimeZone->timeZone();
+ mTimeSpec = tz.isValid() ? KADateTime::Spec(tz) : KADateTime::LocalZone;
if (!mTimeZoneBox->isVisible() && mTimeSpec != Preferences::timeSpec())
{
// The current time zone is not the default one, so
@@ -619,15 +603,6 @@ void AlarmTimeWidget::slotTimeZoneChanged()
updateTimes();
}
-/******************************************************************************
-* Called after the mNoTimeZone checkbox has been toggled.
-*/
-void AlarmTimeWidget::slotTimeZoneToggled(bool on)
-{
- mTimeZone->setEnabled(!on);
- slotTimeZoneChanged();
-}
-
/******************************************************************************
* Called after the mTimeZoneButton button has been clicked.
* Show the time zone selection controls, and hide the button.
@@ -636,7 +611,6 @@ void AlarmTimeWidget::showTimeZoneSelector()
{
mTimeZoneButton->hide();
mTimeZoneBox->show();
- mNoTimeZone->show();
}
/******************************************************************************
diff --git a/src/alarmtimewidget.h b/src/alarmtimewidget.h
index c37f6f32..24f02cef 100644
--- a/src/alarmtimewidget.h
+++ b/src/alarmtimewidget.h
@@ -77,7 +77,6 @@ class AlarmTimeWidget : public QFrame
void delayTimeChanged(int);
void slotAnyTimeToggled(bool);
void slotTimeZoneChanged();
- void slotTimeZoneToggled(bool);
void showTimeZoneSelector();
private:
@@ -95,7 +94,6 @@ class AlarmTimeWidget : public QFrame
TimeSpinBox* mDelayTimeEdit;
PushButton* mTimeZoneButton;
QWidget* mTimeZoneBox; // contains label and time zone combo box
- CheckBox* mNoTimeZone;
TimeZoneCombo* mTimeZone;
KADateTime mMinDateTime; // earliest allowed date/time
KADateTime mMaxDateTime; // latest allowed date/time
diff --git a/src/functions.cpp b/src/functions.cpp
index 02377751..f94fde08 100644
--- a/src/functions.cpp
+++ b/src/functions.cpp
@@ -416,7 +416,6 @@ UpdateResult modifyEvent(KAEvent& oldEvent, KAEvent& newEvent, QWidget* msgParen
// Remove "Don't show error messages again" for the old alarm
setDontShowErrors(oldId);
-
}
}
}
diff --git a/src/kalarm.h b/src/kalarm.h
index bf611592..e1eee115 100644
--- a/src/kalarm.h
+++ b/src/kalarm.h
@@ -1,7 +1,7 @@
/*
* kalarm.h - global header file
* Program: kalarm
- * Copyright © 2001-2017 by David Jarvie <djarvie at kde.org>
+ * Copyright © 2001-2018 by David Jarvie <djarvie at 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
@@ -24,7 +24,7 @@
#undef QT3_SUPPORT
#define VERSION_SUFFIX "-5"
-#define KALARM_VERSION "2.11.16" VERSION_SUFFIX
+#define KALARM_VERSION "2.12.0" VERSION_SUFFIX
#define KALARM_NAME "KAlarm"
#define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application
More information about the kde-doc-english
mailing list