Commit c6ef02da authored by Claudio Cambra's avatar Claudio Cambra
Browse files

Use incidence popup in all calendar/task views by default



Signed-off-by: Claudio Cambra's avatarClaudio Cambra <claudio.cambra@gmail.com>
parent 555eea58
Pipeline #234057 canceled with stage
in 1 minute and 51 seconds
......@@ -8,6 +8,7 @@ import QtQuick.Controls 2.15 as QQC2
MouseArea {
acceptedButtons: Qt.BackButton | Qt.ForwardButton
propagateComposedEvents: true
hoverEnabled: true
function repositionIncidencePopup() {
if(incidenceInfoPopup && incidenceInfoPopup.visible) {
......
......@@ -112,11 +112,9 @@ QtObject {
function setUpView(modelData, incidenceItem = null) {
// Choose between opening the incidence information in the drawer or the popup
const showingCalendarView = KalendarApplication.Event & appMain.pageStack.currentItem.mode;
const usingDrawer = Kirigami.Settings.isMobile ||
!incidenceItem ||
!showingCalendarView ||
!Config.useIncidenceInfoPopupInCalendarViews;
!Config.useIncidenceInfoPopup;
appMain.incidenceInfoDrawerEnabled = usingDrawer;
appMain.incidenceInfoPopupEnabled = !usingDrawer;
......
......@@ -17,11 +17,11 @@ Kirigami.ScrollablePage {
}
Controls.CheckBox {
text: i18n("Use popup to show incidence information")
checked: Config.useIncidenceInfoPopupInCalendarViews
enabled: !Config.isUseIncidenceInfoPopupInCalendarViewsImmutable && !Kirigami.Settings.isMobile
checked: Config.useIncidenceInfoPopup
enabled: !Config.isUseIncidenceInfoPopupImmutable && !Kirigami.Settings.isMobile
visible: !Kirigami.Settings.isMobile
onClicked: {
Config.useIncidenceInfoPopupInCalendarViews = !Config.useIncidenceInfoPopupInCalendarViews;
Config.useIncidenceInfoPopup = !Config.useIncidenceInfoPopup;
Config.save();
}
}
......
......@@ -82,7 +82,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later
</group>
<group name="GeneralView">
<entry name="useIncidenceInfoPopupInCalendarViews" type="Bool">
<entry name="useIncidenceInfoPopup" type="Bool">
<label>Use a popup to view incidence information instead of a drawer.</label>
<default>true</default>
</entry>
......
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