Commit 870c2a61 authored by David Jarvie's avatar David Jarvie
Browse files

Make defer dialogue accessible when a full screen window is active

parent 7fdd9d20
KAlarm Change Log
=== Version 2.13.1 (KDE Applications 19.12.1) --- 30 December 2019 ===
+ Make defer dialogue accessible when a full screen window is active.
+ Only show 'Cancel Deferral' in defer dialogue if a deferral is already active.
=== Version 2.13.0 (KDE Applications 19.12) --- 19 November 2019 ===
......
......@@ -142,18 +142,19 @@ class MessageText : public KTextEdit
// Basic flags for the window
static const Qt::WindowFlags WFLAGS = Qt::WindowStaysOnTopHint;
static const Qt::WindowFlags WFLAGS2 = Qt::WindowContextHelpButtonHint;
static const Qt::WindowFlags WFLAGS = Qt::WindowStaysOnTopHint;
static const Qt::WindowFlags WFLAGS2 = Qt::WindowContextHelpButtonHint;
static const Qt::WidgetAttribute WidgetFlags = Qt::WA_DeleteOnClose;
// Error message bit masks
enum {
enum
{
ErrMsg_Speak = 0x01,
ErrMsg_AudioFile = 0x02
};
QList<MessageWin*> MessageWin::mWindowList;
QList<MessageWin*> MessageWin::mWindowList;
QMap<EventId, unsigned> MessageWin::mErrorMessages;
bool MessageWin::mRedisplayed = false;
// There can only be one audio thread at a time: trying to play multiple
......@@ -2131,6 +2132,8 @@ void MessageWin::checkDeferralLimit()
void MessageWin::slotDefer()
{
mDeferDlg = new DeferAlarmDlg(KADateTime::currentDateTime(Preferences::timeSpec()).addSecs(60), mDateTime.isDateOnly(), false, this);
if (windowFlags() & Qt::X11BypassWindowManagerHint)
mDeferDlg->setWindowFlags(mDeferDlg->windowFlags() | Qt::X11BypassWindowManagerHint);
mDeferDlg->setObjectName(QStringLiteral("DeferDlg")); // used by LikeBack
mDeferDlg->setDeferMinutes(mDefaultDeferMinutes > 0 ? mDefaultDeferMinutes : Preferences::defaultDeferTime());
mDeferDlg->setLimit(mEvent);
......
Supports Markdown
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