Merge lp://staging/~elementary-apps/maya/maya-saucy into lp://staging/~elementary-apps/maya/trunk

Proposed by Corentin Noël
Status: Merged
Approved by: Corentin Noël
Approved revision: 493
Merged at revision: 487
Proposed branch: lp://staging/~elementary-apps/maya/maya-saucy
Merge into: lp://staging/~elementary-apps/maya/trunk
Diff against target: 6279 lines (+3163/-1812)
53 files modified
CMakeLists.txt (+46/-74)
INSTALL (+3/-2)
Maya/Model/SourceManager.vala (+0/-387)
Maya/View/SourceSelector.vala (+0/-241)
config.h.cmake (+0/-11)
data/style/calendar.css (+1/-1)
org.pantheon.Maya.gschema.xml (+0/-48)
plugins/CMakeLists.txt (+16/-0)
plugins/CalDAV/CMakeLists.txt (+35/-0)
plugins/CalDAV/CalDAV.vala (+60/-0)
plugins/CalDAV/CalDAVBackend.vala (+193/-0)
plugins/CalDAV/caldav.plugin (+8/-0)
plugins/Google/CMakeLists.txt (+35/-0)
plugins/Google/Google.vala (+59/-0)
plugins/Google/GoogleBackend.vala (+135/-0)
plugins/Google/google.plugin (+8/-0)
po/CMakeLists.txt (+3/-3)
schemas/CMakeLists.txt (+2/-0)
schemas/org.pantheon.maya.gschema.xml (+43/-0)
src/Application.vala (+50/-33)
src/Backends/Backend.vala (+30/-0)
src/Backends/BackendsManager.vala (+51/-0)
src/Backends/LocalBackend.vala (+69/-0)
src/Backends/PlacementWidget.vala (+31/-0)
src/CMakeLists.txt (+78/-0)
src/Model/CalendarModel.vala (+208/-102)
src/PluginManager.vala (+102/-0)
src/Settings/MayaSettings.vala (+2/-4)
src/Settings/SavedState.vala (+2/-2)
src/Threads.vala (+159/-0)
src/Utils.vala (+13/-10)
src/View/EventDialog.vala (+127/-126)
src/View/Grid/EventButton/EventButton.vala (+18/-0)
src/View/Grid/EventButton/MultiDayEventButton.vala (+1/-0)
src/View/Grid/EventButton/SingleDayEventButton.vala (+1/-0)
src/View/Grid/Grid.vala (+4/-0)
src/View/Grid/VAutoHider.vala (+1/-1)
src/View/Sidebar/AgendaView.vala (+32/-25)
src/View/Sidebar/EventWidget.vala (+2/-2)
src/View/Sidebar/Sidebar.vala (+2/-2)
src/View/Sidebar/SourceWidget.vala (+3/-8)
src/View/SourceDialog.vala (+238/-0)
src/View/SourceSelector.vala (+281/-0)
src/View/Widgets/ContractorButtonWithMenu.vala (+12/-8)
src/View/Widgets/DateSwitcher.vala (+1/-1)
src/View/Widgets/Postler/FlowBox.vala (+1/-1)
src/View/Widgets/Postler/GuestEntry.vala (+1/-1)
src/config.vala.cmake (+9/-0)
src/maya-calendar.deps (+9/-0)
src/maya-calendar.pc.cmake (+12/-0)
vapi/config.vapi (+0/-9)
vapi/libecalendar-1.2.vapi (+102/-99)
vapi/libedataserver-1.2.vapi (+864/-611)
To merge this branch: bzr merge lp://staging/~elementary-apps/maya/maya-saucy
Reviewer Review Type Date Requested Status
Corentin Noël Needs Resubmitting
Cody Garver (community) Needs Fixing
Danielle Foré Needs Fixing
David Gomes (community) Abstain
Review via email: mp+182224@code.staging.launchpad.net

Commit message

New Maya API and plugins as CalDAV and Google Calendar

Description of the change

A first revision of the next version, some functions have disappeared, I need to figure out how to have them again…

To post a comment you must log in.
479. By Corentin Noël

First work with multicalendars

480. By Corentin Noël

Added the backend management, the next step is to activate CalDAV and then Google calendars

481. By Corentin Noël

Added CalDAV and Google initial support

Revision history for this message
982c80311320c1b (alexander-wilms) wrote :

Great, tried it and it works. Only the radio buttons in the popover seem non-intuitive to me.

Revision history for this message
982c80311320c1b (alexander-wilms) wrote :

Maya crashes when I try adding an event to a Google calendar:

CalendarModel.vala:122: Cannot create calendar object: UNexpected HTTP status code 400 (Bad Request)
**
ERROR:/home/alexander/maya-saucy/build/src/Model/CalendarModel.c:426__lambda6_: assertion failes: (status==true)
Aborted (core dumped)

Revision history for this message
Corentin Noël (tintou) wrote :

This should be a dependancy error,
do you have theese packages installed ?

liboauth0
evolution-data-server-common
libedataserver-1.2-17
libebackend-1.2-6
librest-0.7-0
libedata-cal-1.2-20
libgdata13
evolution-data-server-uoa

Revision history for this message
982c80311320c1b (alexander-wilms) wrote :

Yes, I have all of them installed

Revision history for this message
David Gomes (davidgomes) wrote :

From the looks of the diff, there are random things I wanna fix here and there, but I'm on Windows without any text editor and no free time. If other devs (and Cody) want this merged right away, I'm okay with that, but if it's possible to wait until I'm back and you make the branch ~elementary-apps owned I'll be more than glad to do some fixing.

Also, adding ~elementary-design to the review because of the Google Accounts issue Daniel referred before (on BountySource I believe).

Revision history for this message
David Gomes (davidgomes) :
review: Abstain
482. By Corentin Noël

Changes on the calendar selector removed some warnings

Revision history for this message
Danielle Foré (danrabbit) wrote :

The app seems to run, but...

* adding a google calendar doesn't really make sense. I'm not sure what I'm doing. What is "user"? Is that my email address? Why wasn't I prompted for a password? "Create" doesn't really make sense as an action, I thought I was adding my account?
* What do the radio buttons do?
* I'm unable to delete the Google calendar that I added.
* There's an "edit" button but it doesn't do anything
* The default color for a calendar should probably never be black.

review: Needs Fixing
483. By Corentin Noël

Calendars are now immediately added + User interface enhancement

Revision history for this message
982c80311320c1b (alexander-wilms) wrote :

I noticed another bug:

When Maya starts up, the events of the selected day (the current date) are duplicated. Switching to another month and back fixes that.

484. By Corentin Noël

Calendars can now being modified, removed according to the elementary HIG (undo button…)

485. By Corentin Noël

Fixed a little bug with the calendarmodel

Revision history for this message
Corentin Noël (tintou) wrote :

Okay, a lot of changes now:

* Implemented the deletion according to the HIG conventions (providing an Undo button)
* Implemented the modification of calendars
* Removed the radio button (for the default calendar when creating an event) the user has to check the box when editing the calendar to make it default.
* Changed the color to Blue by default
* Added placeholder texts in every entry to show you example (you can enter your google user name if you have an @gmail.com or type the full address, it's detected afterward)
* Check for the calendar directly after the creation (and thus ask for a password if needed)
* Some ports to the new libecalendar and added required functions to the .vapi

486. By Corentin Noël

Fixed the event creation and modification

Revision history for this message
982c80311320c1b (alexander-wilms) wrote :

I tried adding an event with "all day" enabled for Sep 23. Both time widgets were set to 9:00. After clicking "Create event", an event was created that covered the time span from the 22nd, 22:00 to the 23rd, 22:00.

In Google Calendar, it shows up as one event: Mo, 23. September, 00:00 – Di, 24. September, 00:00, and is being shown in the top line in the week overview, which shows events that last the whole day.

Revision history for this message
David Gomes (davidgomes) wrote :

Google sync doens't seem to work for me. I've got a pretty "busy" schedule on Google Calendar, added my account but nothing seems to show up on Maya. (I prompted my username and then it asked for password).

487. By Cody Garver

Clean up style of newly added or modified CMake code

488. By Cody Garver

Merge trunk

489. By Cody Garver

Update INSTALL dependency list

Revision history for this message
Cody Garver (codygarver) wrote :

Revert translation changes. The .pot file should be updated after this is merged into trunk and we do not support bypassing the launchpad translations interface.

bzr revert -r 479 po/fr.po po/maya.pot
bzr commit -m "Reverted translations"

review: Needs Fixing
490. By Cody Garver

Reverted translations

491. By Cody Garver

FlowBox code style clean up

492. By Cody Garver

Update URL

493. By Cody Garver

Revert maya.pot to revision 477 of this branch

Revision history for this message
Cody Garver (codygarver) wrote :

I reverted the translations amongst other cleanup.

Revision history for this message
Corentin Noël (tintou) wrote :

Is it ready to merge into trunk ?

review: Needs Resubmitting
Revision history for this message
Cody Garver (codygarver) wrote :

How often do the events get refreshed to show new events received from the server?

Revision history for this message
Corentin Noël (tintou) wrote :

I don't know, everything is done by the evolution server.

Revision history for this message
Cody Garver (codygarver) wrote :

Does David Gomes have anything else to say before merge?

On Sun, Nov 17, 2013 at 5:32 AM, Corentin Noël <email address hidden> wrote:

> I don't know, everything is done by the evolution server.
> --
> https://code.launchpad.net/~elementary-apps/maya/maya-saucy/+merge/182224
> You are reviewing the proposed merge of lp:maya/isis into lp:maya.
>

--
Cody Garver

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches