Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Calindori
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Plasma Mobile
Calindori
Commits
5dbfe912
Commit
5dbfe912
authored
Mar 15, 2019
by
Dimitris Kardarakos
1
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nicolasfella/calindori-addaction'
parents
8b47c7e2
aa38cde2
Pipeline
#1795
passed with stage
in 10 minutes and 49 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
22 deletions
+39
-22
src/contents/ui/Main.qml
src/contents/ui/Main.qml
+1
-1
src/contents/ui/TodosView.qml
src/contents/ui/TodosView.qml
+38
-21
No files found.
src/contents/ui/Main.qml
View file @
5dbfe912
...
...
@@ -182,7 +182,7 @@ Kirigami.ApplicationWindow {
calendar
:
localCalendar
onEditTask
:
root
.
pageStack
.
push
(
todoPage
,
{
startdt
:
modelData
.
dtstart
,
uid
:
modelData
.
uid
,
todoData
:
modelData
})
onTask
Dele
ted
:
root
.
refreshNeeded
()
onTask
sUpda
ted
:
root
.
refreshNeeded
()
}
Component
{
...
...
src/contents/ui/TodosView.qml
View file @
5dbfe912
...
...
@@ -30,19 +30,37 @@ Kirigami.Page {
property
var
calendar
signal
editTask
(
var
modelData
)
signal
task
Dele
ted
signal
task
sUpda
ted
function
reload
()
{
cardsListview
.
model
.
reloadTasks
();
}
title
:
qsTr
(
"
Tasks
"
)
actions.main
:
Kirigami.Action
{
icon.name
:
"
resource-calendar-insert
"
text
:
qsTr
(
"
Add task
"
)
onTriggered
:
pageStack
.
push
(
todoPage
,
{
startdt
:
todoDt
}
)
}
Component
{
id
:
todoPage
TodoPage
{
calendar
:
localCalendar
onTaskeditcompleted
:
{
tasksUpdated
();
pageStack
.
pop
(
todoPage
);
}
}
}
Kirigami.CardsListView
{
id
:
cardsListview
anchors.fill
:
parent
model
:
Calindori.TodosModel
{
filterdt
:
root
.
todoDt
memorycalendar
:
root
.
calendar
.
memorycalendar
...
...
@@ -56,47 +74,46 @@ Kirigami.Page {
Kirigami.Action
{
text
:
qsTr
(
"
Delete
"
)
icon.name
:
"
delete
"
onTriggered
:
{
root
.
calendar
.
deleteTask
(
model
.
uid
);
task
Dele
ted
();
}
task
sUpda
ted
();
}
},
Kirigami.Action
{
text
:
qsTr
(
"
Edit
"
)
icon.name
:
"
editor
"
onTriggered
:
root
.
editTask
(
model
)
}
}
]
contentItem
:
Column
{
Controls2.Label
{
wrapMode
:
Text
.
WordWrap
text
:
model
.
description
}
RowLayout
{
visible
:
model
.
dtstart
.
toLocaleTimeString
(
Qt
.
locale
())
!=
""
Controls2.Label
{
wrapMode
:
Text
.
WordWrap
text
:
model
.
dtstart
.
toLocaleTimeString
(
Qt
.
locale
(),
Locale
.
ShortFormat
)
}
}
}
RowLayout
{
visible
:
model
.
location
!=
""
Controls2.Label
{
wrapMode
:
Text
.
WordWrap
text
:
model
.
location
}
}
}
}
}
}
}
}
}
Dimitris Kardarakos
@dkardarakos
mentioned in merge request
!6 (closed)
·
Mar 15, 2019
mentioned in merge request
!6 (closed)
mentioned in merge request !6
Toggle commit list
Write
Preview
Markdown
is supported
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