[california/wip/735942-double-click: 71/71] Merge branch 'master' into wip/735942-double-click

[Jim Nelson <jnelson src gnome org>]

commit 8b0638ef083ff8962f3f1fd4c1dcf83b37946629
Merge: 65ca3ea faccd29
Author: Jim Nelson <jim yorba org>
Date:   Tue Oct 21 18:54:40 2014 -0700

    Merge branch 'master' into wip/735942-double-click
    
    Conflicts:
        src/view/month/month-grid.vala

 Makefile.am                                        |    1 +
 NEWS                                               |   12 +
 README                                             |    5 +-
 THANKS                                             |    1 +
 configure.ac                                       |    6 +-
 debian/changelog                                   |   13 +
 debian/control                                     |    5 +-
 debian/rules                                       |    8 +-
 help/C/cal-add-calendar.page                       |  139 ++
 help/C/cal-change-view.page                        |   65 +
 help/C/cal-event-edit.page                         |  123 ++
 help/C/cal-event-quick-add.page                    |   89 ++
 help/C/cal-event-remove.page                       |   63 +
 help/C/cal-hide-a-calendar.page                    |   47 +
 help/C/cal-open-calendar-list.xml                  |    7 +
 help/C/cal-quickstart.page                         |   35 +
 help/C/cal-remove-calendar.page.stub               |   26 +
 help/C/cal-rename-calendar.page                    |   37 +
 help/C/cal-shortcut-keys.page                      |   91 ++
 help/C/gnome-help.sct                              |   22 +
 help/C/index.page                                  |   49 +
 help/C/legal.xml                                   |    5 +
 help/C/media/california-screenshot.png             |  Bin 0 -> 28760 bytes
 help/C/media/x-office-calendar.png                 |  Bin 0 -> 2848 bytes
 help/C/schematron.sh                               |    1 +
 help/Makefile.am                                   |   37 +
 po/LINGUAS                                         |    2 +
 po/POTFILES.in                                     |    5 +
 po/POTFILES.skip                                   |    3 +
 po/de.po                                           |  661 ++++++++--
 po/fi.po                                           | 1397 ++++++++++++++++++--
 po/he.po                                           | 1188 ++++++++++++++---
 po/hu.po                                           |  913 ++++++++++---
 po/id.po                                           | 1178 ++++++++++++++++
 po/pl.po                                           |  504 ++++++-
 po/pt_BR.po                                        |  496 ++++++-
 po/ru.po                                           | 1397 +++++++++++++++++++
 po/sv.po                                           | 1418 ++++++++++++++++++--
 src/Makefile.am                                    |   12 +-
 src/activator/activator.vala                       |    2 +-
 src/activator/generic/generic-subscribe.vala       |    7 +-
 .../google/google-calendar-list-pane.vala          |    2 +-
 src/application/california-application.vala        |   47 +-
 .../backing-calendar-source-subscription.vala      |    2 +-
 src/backing/backing-calendar-source.vala           |    4 +-
 src/backing/backing-source.vala                    |   29 +-
 src/backing/backing-store.vala                     |   15 +
 .../backing-eds-calendar-source-subscription.vala  |   29 +-
 src/backing/eds/backing-eds-calendar-source.vala   |   11 +-
 src/backing/eds/backing-eds-store.vala             |   42 +-
 src/calendar/calendar-date.vala                    |   13 +-
 src/calendar/calendar-day-of-week.vala             |   58 +
 src/calendar/calendar-exact-time-span.vala         |    8 +
 src/california-resources.xml                       |    3 +
 src/collection/collection.vala                     |   16 +
 src/component/component-date-time.vala             |    4 +-
 src/component/component-details-parser.vala        |   53 +-
 src/component/component-event.vala                 |   17 +-
 src/component/component-recurrence-rule.vala       |  289 ++++-
 src/host/host-create-update-event.vala             |   28 +-
 src/host/host-create-update-recurring.vala         |   77 +-
 src/host/host-import-calendar.vala                 |    2 +-
 src/host/host-main-window.vala                     |   10 +-
 src/host/host-quick-create-event.vala              |    8 +-
 src/host/host-show-event.vala                      |   24 +-
 src/manager/manager-calendar-list.vala             |   20 +-
 src/manager/manager-remove-calendar.vala           |   79 ++
 src/manager/manager-window.vala                    |    2 +-
 src/rc/activator-list.ui                           |    6 +-
 src/rc/app-menu.interface                          |    5 +
 src/rc/calendar-import.ui                          |    3 +-
 src/rc/calendar-manager-list-item.ui               |    1 +
 src/rc/calendar-manager-list.ui                    |    7 +-
 src/rc/create-update-event.ui                      |  102 +-
 src/rc/create-update-recurring.ui                  |   27 +-
 src/rc/generic-subscribe.ui                        |    5 +-
 src/rc/google-authenticating.ui                    |    9 +-
 src/rc/main-window-title.ui                        |    2 +
 src/rc/remove-calendar.ui                          |  119 ++
 src/rc/show-event.ui                               |   25 +-
 src/tests/tests-quick-add.vala                     |  212 +++-
 src/toolkit/toolkit-card.vala                      |   71 +-
 src/toolkit/toolkit-deck-popover.vala              |   11 +-
 src/toolkit/toolkit-deck-window.vala               |   36 +-
 src/toolkit/toolkit-deck.vala                      |   45 +-
 src/toolkit/toolkit-region-manager.vala            |  108 ++
 src/toolkit/toolkit-stack-model.vala               |   22 +-
 src/toolkit/toolkit.vala                           |   37 +-
 src/view/common/common-events-cell.vala            |   44 +-
 src/view/month/month-cell.vala                     |   12 +-
 src/view/month/month-controller.vala               |    4 +
 src/view/month/month-grid.vala                     |  141 +-
 src/view/week/week-day-pane.vala                   |  257 +++--
 src/view/week/week-grid.vala                       |   48 +-
 94 files changed, 11006 insertions(+), 1315 deletions(-)
---
diff --cc src/view/week/week-grid.vala
index 1cc8dd2,9ee6a7a..2996e5c
--- a/src/view/week/week-grid.vala
+++ b/src/view/week/week-grid.vala
@@@ -337,14 -375,12 +375,16 @@@ internal class Grid : Gtk.Box 
          
          Common.InstanceContainer instance_container = (Common.InstanceContainer) details.widget;
          
 -        // if an event is at this location, don't process
 -        if (instance_container.get_event_at(details.press_point) != null)
 -            return Toolkit.PROPAGATE;
 +        // if an event is at this location, open for editing
 +        Component.Event? event = instance_container.get_event_at(details.press_point);
 +        if (event != null) {
 +            owner.request_edit_event(event, instance_container, details.release_point);
 +            
 +            return Toolkit.STOP;
 +        }
          
+         Toolkit.set_toplevel_cursor(instance_container, null);
+         
          // if a DayPane, use double-click to determine rounded time of the event's start
          DayPane? day_pane = instance_container as DayPane;
          if (day_pane != null) {