Merge lp:~pkunal-parmar/ubuntu-calendar-app/deleteEvent into lp:ubuntu-calendar-app

Proposed by Kunal Parmar
Status: Merged
Approved by: David Planella
Approved revision: 162
Merged at revision: 186
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/deleteEvent
Merge into: lp:ubuntu-calendar-app
Diff against target: 97 lines (+14/-11)
3 files modified
EventDetails.qml (+12/-9)
EventListModel.qml (+1/-2)
TimeLineBase.qml (+1/-0)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/deleteEvent
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Mihir Soni Needs Fixing
Review via email: mp+191626@code.launchpad.net

Commit message

delete event,

Description of the change

delete event,

Note: there is some issue with EDS, due to which we are not getting notification when event it removed.
So if you restart calendar, you can see event is deleted

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

I did try to test this MR & not able to delete the any event.

file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml:33:9: QML QQuickImage: Failed to get image from provider: image://theme/delete,edit-delete-symbolic
virtual bool QOrganizerEDSEngine::startRequest(QtOrganizer::QOrganizerAbstractRequest*)
void QOrganizerEDSEngine::removeItemsAsync(QtOrganizer::QOrganizerItemRemoveRequest*)
static void QOrganizerEDSEngine::removeItemsAsyncStart(RemoveRequestData*)
Remove item size: 1
Fail to remove Items Cannot remove calendar object: Object not found

review: Needs Fixing
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

> I did try to test this MR & not able to delete the any event.
>
> file:///usr/lib/x86_64-linux-
> gnu/qt5/qml/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml:33:9: QML
> QQuickImage: Failed to get image from provider: image://theme/delete,edit-
> delete-symbolic
> virtual bool
> QOrganizerEDSEngine::startRequest(QtOrganizer::QOrganizerAbstractRequest*)
> void QOrganizerEDSEngine::removeItemsAsync(QtOrganizer::QOrganizerItemRemoveRe
> quest*)
> static void QOrganizerEDSEngine::removeItemsAsyncStart(RemoveRequestData*)
> Remove item size: 1
> Fail to remove Items Cannot remove calendar object: Object not found

yes, this is dues to some EDS issue,
you can find more details here.
https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1240505

158. By Kunal Parmar

making event bubble hiddle before deleting it

159. By Kunal Parmar

merge from trunk

160. By Kunal Parmar

Print statement removed

161. By Kunal Parmar

reverting menifest file

162. By Kunal Parmar

Commented out code removed

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Looks good to me and it works well with EDS on Trusty.

One thing I've noticed, and that it might be worth fixing is the following typo (gloablModel vs. globalModel):

48 + var eventModel = GlobalModel.gloablModel();

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'EventDetails.qml'
--- EventDetails.qml 2013-10-17 06:09:12 +0000
+++ EventDetails.qml 2014-01-18 03:15:47 +0000
@@ -4,6 +4,8 @@
4import Ubuntu.Components.ListItems 0.14import Ubuntu.Components.ListItems 0.1
5import Ubuntu.Components.Themes.Ambiance 0.15import Ubuntu.Components.Themes.Ambiance 0.1
66
7import "GlobalEventModel.js" as GlobalModel
8
7Page {9Page {
8 id: root10 id: root
911
@@ -39,10 +41,10 @@
39 var startTime = e.startDateTime.toLocaleTimeString(Qt.locale(), timeFormat);41 var startTime = e.startDateTime.toLocaleTimeString(Qt.locale(), timeFormat);
40 var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), timeFormat);42 var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), timeFormat);
4143
42 startHeader.value = startTime;44 startHeader.value = startTime;
43 endHeader.value = endTime;45 endHeader.value = endTime;
4446
45 // This is the event title47 // This is the event title
46 if( e.displayLabel) {48 if( e.displayLabel) {
47 titleLabel.text = e.displayLabel;49 titleLabel.text = e.displayLabel;
48 }50 }
@@ -59,7 +61,6 @@
59 for( var j = 0 ; j < attendees.length ; ++j ) {61 for( var j = 0 ; j < attendees.length ; ++j ) {
60 contactModel.append( {"name": attendees[j].name } );62 contactModel.append( {"name": attendees[j].name } );
61 }63 }
62
63 }64 }
64 // FIXME: need to cache map image to avoid duplicate download every time65 // FIXME: need to cache map image to avoid duplicate download every time
65 var imageSrc = "http://maps.googleapis.com/maps/api/staticmap?center="+location+66 var imageSrc = "http://maps.googleapis.com/maps/api/staticmap?center="+location+
@@ -70,16 +71,17 @@
7071
71 tools: ToolbarItems {72 tools: ToolbarItems {
7273
73 /*
74 ToolbarButton {74 ToolbarButton {
75 action: Action {75 action:Action {
76 text: i18n.tr("Add invite");76 text: i18n.tr("Delete");
77 iconSource: "image://theme/delete,edit-delete-symbolic"
77 onTriggered: {78 onTriggered: {
78 print(text + " not implemented");79 var eventModel = GlobalModel.gloablModel();
80 eventModel.removeItem(event);
81 pageStack.pop();
79 }82 }
80 }83 }
81 }84 }
82 */
8385
84 ToolbarButton {86 ToolbarButton {
85 action:Action {87 action:Action {
@@ -91,6 +93,7 @@
91 }93 }
92 }94 }
93 }95 }
96
94 Rectangle {97 Rectangle {
95 id:eventDetilsView98 id:eventDetilsView
96 anchors.fill: parent99 anchors.fill: parent
97100
=== modified file 'EventListModel.qml'
--- EventListModel.qml 2013-09-28 03:20:54 +0000
+++ EventListModel.qml 2014-01-18 03:15:47 +0000
@@ -3,14 +3,13 @@
33
4import QtOrganizer 5.04import QtOrganizer 5.0
55
6//http://qt.gitorious.org/qt/qtpim/blobs/master/examples/organizer/qmlorganizerlistview/qmlorganizerlistview.qml
7OrganizerModel {6OrganizerModel {
8 id: eventModel7 id: eventModel
9 manager:"eds"8 manager:"eds"
109
11 signal reloaded10 signal reloaded
1211
13 onItemCountChanged:{12 onModelChanged: {
14 reloaded();13 reloaded();
15 }14 }
16}15}
1716
=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml 2013-09-28 03:37:02 +0000
+++ TimeLineBase.qml 2014-01-18 03:15:47 +0000
@@ -65,6 +65,7 @@
65 if( children[i].objectName === "separator") {65 if( children[i].objectName === "separator") {
66 children[i].visible = false;66 children[i].visible = false;
67 } else {67 } else {
68 children[i].visible = false;
68 children[i].destroy();69 children[i].destroy();
69 }70 }
70 }71 }

Subscribers

People subscribed via source and target branches

to status/vote changes: