[california/wip/month-connectors: 25/25] 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: 25/25] Merge branch 'master' into wip/month-connectors
- Date: Thu, 5 Jun 2014 19:59:54 +0000 (UTC)
commit dfff40acd3cb655258c28ae0d3484704c2ba39e9
Merge: ca98436 953f2a5
Author: Jim Nelson <jim yorba org>
Date: Thu Jun 5 12:59:53 2014 -0700
Merge branch 'master' into wip/month-connectors
Conflicts:
src/view/month/month-grid.vala
Makefile.am | 2 +
NEWS | 7 +
configure.ac | 6 +-
data/Makefile.am | 16 ++
data/california.appdata.xml | 32 +++
data/org.yorba.california.gschema.xml | 52 ++++
debian/changelog | 8 +
po/POTFILES.in | 2 +
po/POTFILES.skip | 4 +
po/ca.po | 244 ++++++++++++-------
po/cs.po | 247 ++++++++++++-------
po/pl.po | 313 ++++++++++++++----------
po/pt_BR.po | 143 ++++++++---
src/Makefile.am | 5 +
src/application/california-application.vala | 73 +++++-
src/application/california-resource.vala | 6 +-
src/application/california-settings.vala | 144 +++++++++++
src/base/base-object.vala | 17 ++
src/calendar/calendar-date.vala | 38 +++
src/calendar/calendar-system.vala | 2 +-
src/calendar/calendar-unit.vala | 10 +-
src/calendar/calendar-wall-time.vala | 25 ++-
src/california-resources.xml | 3 +
src/component/component-details-parser.vala | 70 ++++--
src/component/component-event.vala | 59 +++++
src/host/host-create-update-event.vala | 23 ++-
src/host/host-main-window.vala | 263 +++++++++++++++------
src/host/host-quick-create-event.vala | 82 +++++-
src/host/host-show-event.vala | 107 +++-----
src/rc/create-update-event.ui | 141 ++++++++---
src/rc/quick-create-event.ui | 47 +++-
src/rc/show-event.ui | 157 ++++++++++--
src/rc/window-menu.interface | 26 ++
src/tests/tests-calendar-date.vala | 52 ++++
src/tests/tests-quick-add.vala | 72 ++++++
src/toolkit/toolkit-button-connector.vala | 52 ++---
src/toolkit/toolkit-button-event.vala | 33 +++-
src/toolkit/toolkit-event-connector.vala | 4 -
src/toolkit/toolkit-motion-connector.vala | 117 +++++++++
src/toolkit/toolkit-motion-event.vala | 69 ++++++
src/toolkit/toolkit.vala | 10 +
src/view/common/common-events-cell.vala | 59 +++--
src/view/common/common-instance-container.vala | 65 +++++
src/view/common/common.vala | 2 -
src/view/month/month-cell.vala | 8 +-
src/view/month/month-controller.vala | 17 ++-
src/view/month/month-grid.vala | 20 +--
src/view/view-controllable.vala | 9 +-
src/view/view-palette.vala | 128 ++++++++---
src/view/view.vala | 4 -
src/view/week/week-all-day-cell.vala | 10 +-
src/view/week/week-controller.vala | 23 ++-
src/view/week/week-day-pane.vala | 105 +++++++-
src/view/week/week-grid.vala | 179 ++++++++++++--
src/view/week/week-hour-runner.vala | 4 +-
src/view/week/week-pane.vala | 24 ++-
56 files changed, 2638 insertions(+), 802 deletions(-)
---
diff --cc src/view/month/month-grid.vala
index b6da372,8203f62..f27a6f4
--- a/src/view/month/month-grid.vala
+++ b/src/view/month/month-grid.vala
@@@ -385,24 -398,18 +385,14 @@@ private class Grid : Gtk.Grid
// if an existing event is double-clicked, ignore, as the single click handler is displaying
// it (but stop propagation)
- if (release_cell.get_event_at(release_point) != null)
- return true;
-
- // if no date, still avoid propagating event
- if (release_cell.date == null)
- return true;
+ if (release_cell.get_event_at(release_cell_point) != null)
+ return; // true;
- // TODO: Define default time better
- Calendar.ExactTime start;
- if(release_cell.date.equal_to(Calendar.System.today)) {
- start = new Calendar.ExactTime.now(Calendar.Timezone.local);
- } else {
- start = new Calendar.ExactTime(Calendar.Timezone.local, release_cell.date,
- new Calendar.WallTime(13, 0, 0));
- }
-
- Calendar.ExactTime end = start.adjust_time(1, Calendar.TimeUnit.HOUR);
-
- owner.request_create_timed_event(new Calendar.ExactTimeSpan(start, end), release_cell,
release_cell_point);
+ owner.request_create_all_day_event(new Calendar.DateSpan(press_cell.date, release_cell.date),
- release_cell, release_point);
++ release_cell, release_cell_point);
// stop propagation
- return true;
+ //return true;
}
private bool on_cell_motion_event(Gtk.Widget widget, Gdk.EventMotion event) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]