[california/wip/732029-gtk-312: 15/15] Merge branch 'master' into wip/732029-gtk-312

[Jim Nelson <jnelson src gnome org>]

commit 9ded8471daa5679072432ea95da9c24173bd3d56
Merge: 9d726f6 7db5494
Author: Jim Nelson <jim yorba org>
Date:   Thu Aug 14 19:18:17 2014 -0700

    Merge branch 'master' into wip/732029-gtk-312
    
    Conflicts:
        src/host/host-show-event.vala

 po/POTFILES.in                              |    2 +-
 po/el.po                                    |  742 +++++++++++++++++++++------
 po/pl.po                                    |  218 +++++---
 src/Makefile.am                             |    3 +
 src/calendar/calendar-date-ordering.vala    |   47 ++
 src/calendar/calendar-span.vala             |    2 +-
 src/calendar/calendar-system.vala           |   74 +++
 src/calendar/calendar-wall-time.vala        |   24 +-
 src/calendar/calendar.vala                  |   42 ++
 src/california-resources.xml                |    3 +
 src/component/component-details-parser.vala |  171 ++++++-
 src/host/host-date-time-widget.vala         |   10 +
 src/host/host-event-time-settings.vala      |   55 ++-
 src/host/host-main-window-title.vala        |   35 ++
 src/host/host-main-window.vala              |   29 +-
 src/host/host-show-event.vala               |    9 +
 src/manager/manager-calendar-list.vala      |    4 +-
 src/rc/calendar-manager-list.ui             |   48 +--
 src/rc/main-window-title.ui                 |   84 +++
 src/rc/show-event.ui                        |   33 ++
 src/tests/tests-quick-add.vala              |  228 ++++++++-
 src/view/month/month-grid.vala              |  160 +++----
 src/view/month/month.vala                   |    2 +
 23 files changed, 1593 insertions(+), 432 deletions(-)
---
diff --cc src/host/host-main-window.vala
index e343cfc,26dd5fd..8f2ed22
--- a/src/host/host-main-window.vala
+++ b/src/host/host-main-window.vala
@@@ -187,9 -171,8 +173,8 @@@ public class MainWindow : Gtk.Applicati
          view_switcher.get_style_context().add_class(Gtk.STYLE_CLASS_LINKED);
          view_switcher.get_style_context().add_class(Gtk.STYLE_CLASS_RAISED);
          
 -        // pack left-side of window
 +        // pack left-side of header bar
          headerbar.pack_start(today);
-         headerbar.pack_start(nav_buttons);
          headerbar.pack_start(view_switcher);
          
          quick_add_button = new Gtk.Button.from_icon_name("list-add-symbolic", Gtk.IconSize.MENU);
@@@ -213,16 -196,23 +198,16 @@@
          // see https://bugzilla.gnome.org/show_bug.cgi?id=729771
          Gtk.SizeGroup size = new Gtk.SizeGroup(Gtk.SizeGroupMode.VERTICAL);
          size.add_widget(today);
-         size.add_widget(prev);
-         size.add_widget(next);
+         size.add_widget(custom_title.next_button);
+         size.add_widget(custom_title.prev_button);
          size.add_widget(quick_add_button);
 -        size.add_widget(calendars);
 +        size.add_widget(calendar_button);
          size.add_widget(window_menu);
          
 -        // pack right-side of window ... note that this was fixed in 3.12, reversing the order of
 -        // how widgets need to be packed at the end
 -#if GTK_312
 +        // pack right-side of header bar
          headerbar.pack_end(window_menu);
 -        headerbar.pack_end(calendars);
 -        headerbar.pack_end(quick_add_button);
 -#else
 +        headerbar.pack_end(calendar_button);
          headerbar.pack_end(quick_add_button);
 -        headerbar.pack_end(calendars);
 -        headerbar.pack_end(window_menu);
 -#endif
          
          Gtk.Box layout = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
          // if on Unity, since headerbar is not the titlebar, need to pack it like any other widget
diff --cc src/host/host-show-event.vala
index 9a47ebc,d5cd3f4..5ee6bd7
--- a/src/host/host-show-event.vala
+++ b/src/host/host-show-event.vala
@@@ -43,9 -41,12 +43,15 @@@ public class ShowEvent : Gtk.Grid, Tool
      private Gtk.Label where_text;
      
      [GtkChild]
+     private Gtk.Label calendar_label;
+     
+     [GtkChild]
+     private Gtk.Label calendar_text;
+     
+     [GtkChild]
 +    private Gtk.ScrolledWindow description_text_window;
 +    
 +    [GtkChild]
      private Gtk.Label description_text;
      
      [GtkChild]