Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KAlarm
Commits
c0d2f30e
Commit
c0d2f30e
authored
Dec 26, 2020
by
Laurent Montel
😁
Browse files
We depends against kf5.77
parent
75ea8116
Pipeline
#45369
passed with stage
in 18 minutes and 5 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/newalarmaction.cpp
View file @
c0d2f30e
...
...
@@ -8,8 +8,6 @@
#include "newalarmaction.h"
#include <kwidgetsaddons_version.h>
#include "functions.h"
#include "templatemenuaction.h"
#include "resources/datamodel.h"
...
...
@@ -75,11 +73,7 @@ NewAlarmAction::NewAlarmAction(bool templates, const QString& label, QObject* pa
connect
(
DataModel
::
allTemplateListModel
(),
&
EventListModel
::
haveEventsStatus
,
this
,
&
NewAlarmAction
::
slotCalendarStatusChanged
);
slotCalendarStatusChanged
();
// initialise action states
}
#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 77, 0)
setPopupMode
(
QToolButton
::
InstantPopup
);
#else
setDelayed
(
false
);
#endif
connect
(
menu
(),
&
QMenu
::
aboutToShow
,
this
,
&
NewAlarmAction
::
slotInitMenu
);
connect
(
menu
(),
&
QMenu
::
triggered
,
this
,
&
NewAlarmAction
::
slotSelected
);
}
...
...
src/templatemenuaction.cpp
View file @
c0d2f30e
...
...
@@ -12,7 +12,6 @@
#include "resourcescalendar.h"
#include "kalarm_debug.h"
#include <kwidgetsaddons_version.h>
#include <KAlarmCal/KAEvent>
#include <QMenu>
...
...
@@ -21,11 +20,7 @@
TemplateMenuAction
::
TemplateMenuAction
(
const
QIcon
&
icon
,
const
QString
&
label
,
QObject
*
parent
)
:
KActionMenu
(
icon
,
label
,
parent
)
{
#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 77, 0)
setPopupMode
(
QToolButton
::
InstantPopup
);
#else
setDelayed
(
false
);
#endif
connect
(
menu
(),
&
QMenu
::
aboutToShow
,
this
,
&
TemplateMenuAction
::
slotInitMenu
);
connect
(
menu
(),
&
QMenu
::
triggered
,
this
,
&
TemplateMenuAction
::
slotSelected
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment