Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Kalendar
Commits
c6ef02da
Commit
c6ef02da
authored
Sep 18, 2022
by
Claudio Cambra
Browse files
Use incidence popup in all calendar/task views by default
Signed-off-by:
Claudio Cambra
<
claudio.cambra@gmail.com
>
parent
555eea58
Pipeline
#234057
canceled with stage
in 1 minute and 51 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/contents/ui/Controls/KBMNavigationMouseArea.qml
View file @
c6ef02da
...
...
@@ -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
)
{
...
...
src/contents/ui/KalendarUtils/KalendarUiUtils.qml
View file @
c6ef02da
...
...
@@ -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
;
...
...
src/contents/ui/Settings/ViewSettingsPage.qml
View file @
c6ef02da
...
...
@@ -17,11 +17,11 @@ Kirigami.ScrollablePage {
}
Controls.CheckBox
{
text
:
i18n
(
"
Use popup to show incidence information
"
)
checked
:
Config
.
useIncidenceInfoPopup
InCalendarViews
enabled
:
!
Config
.
isUseIncidenceInfoPopupI
nCalendarViewsI
mmutable
&&
!
Kirigami
.
Settings
.
isMobile
checked
:
Config
.
useIncidenceInfoPopup
enabled
:
!
Config
.
isUseIncidenceInfoPopupImmutable
&&
!
Kirigami
.
Settings
.
isMobile
visible
:
!
Kirigami
.
Settings
.
isMobile
onClicked
:
{
Config
.
useIncidenceInfoPopup
InCalendarViews
=
!
Config
.
useIncidenceInfoPopup
InCalendarViews
;
Config
.
useIncidenceInfoPopup
=
!
Config
.
useIncidenceInfoPopup
;
Config
.
save
();
}
}
...
...
src/kalendarconfig.kcfg
View file @
c6ef02da
...
...
@@ -82,7 +82,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later
</group>
<group
name=
"GeneralView"
>
<entry
name=
"useIncidenceInfoPopup
InCalendarViews
"
type=
"Bool"
>
<entry
name=
"useIncidenceInfoPopup"
type=
"Bool"
>
<label>
Use a popup to view incidence information instead of a drawer.
</label>
<default>
true
</default>
</entry>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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