[california/wip/month-connectors: 105/106] Merge branch 'master' into wip/month-connectors
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [california/wip/month-connectors: 105/106] Merge branch 'master' into wip/month-connectors
- Date: Wed, 13 Aug 2014 01:06:56 +0000 (UTC)
commit edfc41386cff608ee16293bf387727261a262572
Merge: dfff40a 4f1d575
Author: Jim Nelson <jim yorba org>
Date: Tue Aug 12 18:00:06 2014 -0700
Merge branch 'master' into wip/month-connectors
Conflicts:
src/toolkit/toolkit-button-connector.vala
src/view/month/month-grid.vala
NEWS | 11 +
THANKS | 3 +
california.doap | 6 +-
configure.ac | 21 +-
data/Makefile.am | 10 +-
...ornia.appdata.xml => california.appdata.xml.in} | 22 +-
data/org.yorba.california.gschema.xml | 8 +
debian/changelog | 12 +
debian/control | 2 +-
po/LINGUAS | 1 +
po/POTFILES.in | 12 +-
po/POTFILES.skip | 8 +-
po/cs.po | 414 ++++++---
po/de.po | 514 +++++++----
po/el.po | 969 +++++++++++++++-----
po/es.po | 878 +++++++++++++++---
po/he.po | 284 ++++---
po/hu.po | 901 ++++++++++++++++---
po/pl.po | 696 +++++++++++----
po/pt_BR.po | 294 ++++---
po/sl.po | 566 +++++++++---
po/tr.po | 646 +++++++++++++
src/Makefile.am | 52 +-
src/activator/activator-instance-list.vala | 5 +-
src/activator/activator-instance.vala | 2 +-
src/activator/activator-window.vala | 47 -
src/activator/activator.vala | 19 +-
.../caldav/caldav-activator-instance.vala | 27 +
src/activator/caldav/caldav-subscribe.vala | 31 +
src/activator/generic/generic-subscribe.vala | 107 +++
...-google.vala => google-activator-instance.vala} | 14 +-
...g-pane.vala => google-authenticating-pane.vala} | 22 +-
...st-pane.vala => google-calendar-list-pane.vala} | 23 +-
...ogle-login-pane.vala => google-login-pane.vala} | 15 +-
src/activator/webcal/activator-webcal-pane.vala | 89 --
...-webcal.vala => webcal-activator-instance.vala} | 14 +-
src/activator/webcal/webcal-subscribe.vala | 31 +
src/application/california-application.vala | 31 +-
src/application/california-settings.vala | 83 ++
src/application/main.vala | 7 +
.../backing-calendar-source-subscription.vala | 94 ++-
src/backing/backing-calendar-source.vala | 57 +-
src/backing/backing-error.vala | 6 +-
src/backing/backing-source.vala | 11 +-
.../backing-eds-calendar-source-subscription.vala | 195 +++--
src/backing/eds/backing-eds-calendar-source.vala | 121 ++-
src/backing/eds/backing-eds-store.vala | 4 +-
src/base/base-object.vala | 10 +-
src/calendar/calendar-date-span.vala | 24 +
src/calendar/calendar-date.vala | 55 +-
src/calendar/calendar-day-of-month.vala | 10 +-
src/calendar/calendar-day-of-week.vala | 42 +-
src/calendar/calendar-duration.vala | 35 -
src/calendar/calendar-exact-time-span.vala | 60 ++
src/calendar/calendar-exact-time.vala | 21 +
src/calendar/calendar-first-of-week.vala | 17 +-
src/calendar/calendar-olson-zone.vala | 7 +-
src/calendar/calendar-system.vala | 124 +++-
src/calendar/calendar-wall-time.vala | 109 ++-
src/calendar/calendar-week.vala | 16 +
src/calendar/calendar.vala | 55 +-
src/california-resources.xml | 18 +-
src/collection/collection-iterable.vala | 198 ++++-
src/collection/collection.vala | 14 +
src/component/component-date-time.vala | 116 ++-
src/component/component-details-parser.vala | 418 ++++++++-
src/component/component-event.vala | 193 +++--
src/component/component-instance.vala | 272 +++++-
src/component/component-recurrence-rule.vala | 586 ++++++++++++
src/component/component.vala | 132 +++-
src/host/host-create-update-event.vala | 394 +++++----
src/host/host-create-update-recurring.vala | 562 ++++++++++++
src/host/host-date-time-widget.vala | 375 ++++++++
src/host/host-event-time-settings.vala | 228 +++++
src/host/host-main-window-title.vala | 35 +
src/host/host-main-window.vala | 97 +-
src/host/host-quick-create-event.vala | 122 ++-
src/host/host-show-event.vala | 165 +++-
src/manager/manager-calendar-list-item.vala | 4 +-
src/manager/manager-calendar-list.vala | 41 +-
src/manager/manager-window.vala | 1 +
src/rc/activator-list.ui | 2 +-
src/rc/app-menu.interface | 4 -
src/rc/calendar-manager-list-item.ui | 2 +
src/rc/calendar-manager-list.ui | 116 ++-
src/rc/create-update-event.ui | 345 +++----
src/rc/create-update-recurring.ui | 549 +++++++++++
src/rc/date-time-widget.ui | 250 +++++
src/rc/event-time-settings.ui | 155 ++++
.../{webcal-subscribe.ui => generic-subscribe.ui} | 107 ++-
src/rc/google-calendar-list.ui | 6 +-
src/rc/google-login.ui | 19 +-
src/rc/main-window-title.ui | 84 ++
src/rc/quick-create-event.ui | 36 +-
src/rc/show-event.ui | 97 +--
src/rc/window-menu.interface | 6 -
src/tests/tests-calendar-date.vala | 110 ++-
src/tests/tests-calendar-exact-time.vala | 63 ++
src/tests/tests-calendar-wall-time.vala | 91 ++-
src/tests/tests-iterable.vala | 45 +
src/tests/tests-quick-add-recurring.vala | 715 +++++++++++++++
src/tests/tests-quick-add.vala | 139 +++-
src/tests/tests-string.vala | 62 ++
src/tests/tests.vala | 10 +-
src/toolkit/toolkit-button-connector.vala | 161 +---
src/toolkit/toolkit-button-event.vala | 4 +-
src/toolkit/toolkit-calendar-popup.vala | 26 +-
src/toolkit/toolkit-card.vala | 38 +-
src/toolkit/toolkit-deck.vala | 40 +-
.../toolkit-entry-clear-text-connector.vala | 66 ++
src/toolkit/toolkit-entry-filter-connector.vala | 87 ++
src/toolkit/toolkit-listbox-model.vala | 10 +
src/toolkit/toolkit-rotating-button-box.vala | 89 ++
src/toolkit/toolkit-stack-model.vala | 24 +-
src/toolkit/toolkit.vala | 38 +
src/unit-test/unit-test-harness.vala | 12 +-
src/util/util-gfx.vala | 92 +--
src/util/util-markup.vala | 84 ++
src/util/util-numeric.vala | 17 +
src/util/util-scheduled.vala | 213 +++++
src/util/util-string.vala | 40 +-
src/util/util-uri.vala | 24 +-
src/util/util.vala | 26 +
src/view/common/common-events-cell.vala | 10 +-
src/view/month/month-cell.vala | 13 +-
src/view/month/month-controller.vala | 30 +-
src/view/month/month-grid.vala | 28 +-
src/view/view-controllable.vala | 6 -
src/view/week/week-all-day-cell.vala | 8 +-
src/view/week/week-controller.vala | 28 +-
src/view/week/week-day-pane.vala | 86 ++-
src/view/week/week-grid.vala | 42 +-
vapi/langinfo.vapi | 100 ++
vapi/libecal-1.2.vapi | 56 +-
vapi/libecal-1.2/libecal-1.2-custom.vala | 18 +
vapi/libecal-1.2/libecal-1.2.metadata | 56 +-
vapi/libical.vapi | 72 +-
137 files changed, 13517 insertions(+), 3081 deletions(-)
---
diff --cc src/view/month/month-grid.vala
index f27a6f4,301fe87..a3b0c19
--- a/src/view/month/month-grid.vala
+++ b/src/view/month/month-grid.vala
@@@ -54,7 -48,9 +48,8 @@@ private class Grid : Gtk.Grid
private Gee.HashMap<Calendar.Date, Cell> date_to_cell = new Gee.HashMap<Calendar.Date, Cell>();
private Backing.CalendarSubscriptionManager? subscriptions = null;
- private Gdk.EventType button_press_type = Gdk.EventType.NOTHING;
- private Gdk.Point button_press_point = Gdk.Point();
+ private Toolkit.ButtonConnector cell_button_connector = new Toolkit.ButtonConnector();
+ private Scheduled? scheduled_subscription_update = null;
public Grid(Controller owner, Calendar.MonthOfYear month_of_year) {
this.owner = owner;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
