Commit 725f7388 authored by David Jarvie's avatar David Jarvie
Browse files

Bug 437676: In audio alarm edit dialog, don't show file name in encoded format

parent 66f22000
Pipeline #63120 passed with stage
in 7 minutes and 2 seconds
...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) ...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
set(PIM_VERSION "5.17.2") set(PIM_VERSION "5.17.2")
set(PIM_VERSION ${PIM_VERSION}) set(PIM_VERSION ${PIM_VERSION})
set(RELEASE_SERVICE_VERSION "21.04.2") set(RELEASE_SERVICE_VERSION "21.04.2")
set(KALARM_VERSION "3.2.1") set(KALARM_VERSION "3.2.2")
project(kalarm VERSION ${KALARM_VERSION}) project(kalarm VERSION ${KALARM_VERSION})
......
KAlarm Change Log KAlarm Change Log
=== Version 3.2.2 (KDE Applications 21.04.2) --- 26 May 2021 ===
* In audio alarm edit dialogue, don't show file name in encoded format [KDE Bug 437676]
=== Version 3.2.1 (KDE Applications 21.04.1) --- 6 May 2021 === === Version 3.2.1 (KDE Applications 21.04.1) --- 6 May 2021 ===
* In alarm list, don't hide display alarm colour for selected alarms [KDE Bug 436434] * In alarm list, don't hide display alarm colour for selected alarms [KDE Bug 436434]
* Fix date sometimes being hidden for selected alarms in alarm list [KDE Bug 436434] * Fix date sometimes being hidden for selected alarms in alarm list [KDE Bug 436434]
......
...@@ -312,7 +312,8 @@ SoundWidget::~SoundWidget() ...@@ -312,7 +312,8 @@ SoundWidget::~SoundWidget()
void SoundWidget::set(const QString& file, float volume, float fadeVolume, int fadeSeconds, int repeatPause) void SoundWidget::set(const QString& file, float volume, float fadeVolume, int fadeSeconds, int repeatPause)
{ {
// Initialise the control values // Initialise the control values
mFileEdit->setText(File::pathOrUrl(file)); QUrl url(file);
mFileEdit->setText(url.isLocalFile() ? url.toLocalFile() : url.toDisplayString());
if (mRepeatGroupBox) if (mRepeatGroupBox)
{ {
mRepeatGroupBox->setChecked(repeatPause >= 0); mRepeatGroupBox->setChecked(repeatPause >= 0);
......
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