[california/wip/734698-agenda: 4/4] Merge branch 'master' into wip/734698-agenda

From: Jim Nelson <jnelson src gnome org>
To: commits-list gnome org
Cc:
Subject: [california/wip/734698-agenda: 4/4] Merge branch 'master' into wip/734698-agenda
Date: Mon, 24 Nov 2014 22:34:32 +0000 (UTC)
commit ff26417ce0790796966e8509ab5def75be8c39dc
Merge: 3b2b437 f739187
Author: Jim Nelson <jim yorba org>
Date:   Fri Nov 21 16:09:09 2014 -0800

    Merge branch 'master' into wip/734698-agenda
    
    Conflicts:
        po/POTFILES.in
        src/Makefile.am
        src/california-resources.xml

 po/POTFILES.in                                     |   43 +++++++++--------
 po/POTFILES.skip                                   |    7 ++-
 src/Makefile.am                                    |   49 ++++++++++---------
 src/activator/activator-instance-list.vala         |    2 +-
 src/activator/generic/generic-subscribe.vala       |    2 +-
 .../google/google-authenticating-pane.vala         |    2 +-
 .../google/google-calendar-list-pane.vala          |    2 +-
 src/activator/google/google-login-pane.vala        |    2 +-
 src/california-resources.xml                       |   41 ++++++++--------
 .../event-editor-attendees-card.vala}              |   17 +++----
 .../event-editor-date-time-card.vala}              |   18 ++++---
 .../event-editor-date-time-widget.vala}            |    4 +-
 src/event-editor/event-editor-deck.vala            |   33 +++++++++++++
 .../event-editor-main-card.vala}                   |   46 ++++++++++--------
 .../event-editor-recurring-card.vala}              |   16 ++++--
 src/event-editor/event-editor.vala                 |   34 ++++++++++++++
 src/host/host-calendar-list-item.vala              |    2 +-
 src/host/host-import-calendar.vala                 |    2 +-
 src/host/host-main-window-title.vala               |    2 +-
 src/host/host-main-window.vala                     |   29 +----------
 src/host/host-quick-create-event.vala              |    2 +-
 src/host/host-show-event.vala                      |    2 +-
 src/host/host.vala                                 |    8 +++-
 src/manager/manager-calendar-list-item.vala        |    2 +-
 src/manager/manager-calendar-list.vala             |    2 +-
 src/manager/manager-remove-calendar.vala           |    2 +-
 ...subscribe.ui => activator-generic-subscribe.ui} |    0
 ....ui => activator-google-authenticating-pane.ui} |    0
 ...t.ui => activator-google-calendar-list-pane.ui} |    0
 ...gle-login.ui => activator-google-login-pane.ui} |    0
 ...ctivator-list.ui => activator-instance-list.ui} |    0
 ...es-editor.ui => event-editor-attendees-card.ui} |   14 +++---
 ...-settings.ui => event-editor-date-time-card.ui} |    6 +-
 ...-widget.ui => event-editor-date-time-widget.ui} |    2 +-
 ...e-update-event.ui => event-editor-main-card.ui} |    8 ++--
 ...recurring.ui => event-editor-recurring-card.ui} |   30 ++++++------
 ...dar-list-item.ui => host-calendar-list-item.ui} |    0
 ...{calendar-import.ui => host-import-calendar.ui} |    0
 ...n-window-title.ui => host-main-window-title.ui} |    0
 ...-create-event.ui => host-quick-create-event.ui} |    0
 src/rc/{show-event.ui => host-show-event.ui}       |    0
 ...-list-item.ui => manager-calendar-list-item.ui} |    0
 ...ar-manager-list.ui => manager-calendar-list.ui} |    0
 ...move-calendar.ui => manager-remove-calendar.ui} |    0
 src/toolkit/toolkit-card.vala                      |    2 -
 src/toolkit/toolkit-deck.vala                      |   24 ++++++----
 46 files changed, 267 insertions(+), 190 deletions(-)
---
diff --cc po/POTFILES.in
index 78b96b6,d4bdc75..43df6bf
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -24,27 -26,25 +26,28 @@@ src/host/host-quick-create-event.val
  src/host/host-show-event.vala
  src/manager/manager-calendar-list-item.vala
  src/manager/manager-remove-calendar.vala
 +src/view/agenda/agenda-controller.vala
 +src/view/agenda/agenda-row.vala
  src/view/month/month-controller.vala
  src/view/week/week-controller.vala
- [type: gettext/glade]src/rc/activator-list.ui
+ [type: gettext/glade]src/rc/activator-generic-subscribe.ui
+ [type: gettext/glade]src/rc/activator-google-authenticating-pane.ui
+ [type: gettext/glade]src/rc/activator-google-calendar-list-pane.ui
+ [type: gettext/glade]src/rc/activator-google-login-pane.ui
+ [type: gettext/glade]src/rc/activator-instance-list.ui
 +[type: gettext/glade]src/rc/agenda-row.ui
  [type: gettext/glade]src/rc/app-menu.interface
- [type: gettext/glade]src/rc/attendees-editor.ui
- [type: gettext/glade]src/rc/calendar-import.ui
- [type: gettext/glade]src/rc/calendar-manager-list-item.ui
- [type: gettext/glade]src/rc/calendar-manager-list.ui
- [type: gettext/glade]src/rc/create-update-event.ui
- [type: gettext/glade]src/rc/create-update-recurring.ui
- [type: gettext/glade]src/rc/date-time-widget.ui
- [type: gettext/glade]src/rc/event-time-settings.ui
- [type: gettext/glade]src/rc/generic-subscribe.ui
- [type: gettext/glade]src/rc/google-authenticating.ui
- [type: gettext/glade]src/rc/google-calendar-list.ui
- [type: gettext/glade]src/rc/google-login.ui
- [type: gettext/glade]src/rc/main-window-title.ui
- [type: gettext/glade]src/rc/quick-create-event.ui
- [type: gettext/glade]src/rc/remove-calendar.ui
- [type: gettext/glade]src/rc/show-event.ui
+ [type: gettext/glade]src/rc/event-editor-attendees-card.ui
+ [type: gettext/glade]src/rc/event-editor-date-time-card.ui
+ [type: gettext/glade]src/rc/event-editor-date-time-widget.ui
+ [type: gettext/glade]src/rc/event-editor-main-card.ui
+ [type: gettext/glade]src/rc/event-editor-recurring-card.ui
+ [type: gettext/glade]src/rc/host-calendar-list-item.ui
+ [type: gettext/glade]src/rc/host-import-calendar.ui
+ [type: gettext/glade]src/rc/host-main-window-title.ui
+ [type: gettext/glade]src/rc/host-quick-create-event.ui
+ [type: gettext/glade]src/rc/host-show-event.ui
+ [type: gettext/glade]src/rc/manager-calendar-list.ui
+ [type: gettext/glade]src/rc/manager-calendar-list-item.ui
+ [type: gettext/glade]src/rc/manager-remove-calendar.ui
  [type: gettext/glade]src/rc/window-menu.interface
diff --cc src/Makefile.am
index 944a2af,2749c2f..b12be00
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -196,26 -195,25 +199,26 @@@ california_SOURCES = 
        $(NULL)
  
  california_RC = \
-       rc/activator-list.ui \
+       rc/activator-generic-subscribe.ui \
+       rc/activator-google-authenticating-pane.ui \
+       rc/activator-google-calendar-list-pane.ui \
+       rc/activator-google-login-pane.ui \
+       rc/activator-instance-list.ui \
 +      rc/agenda-row.ui \
        rc/app-menu.interface \
-       rc/attendees-editor.ui \
-       rc/calendar-import.ui \
-       rc/calendar-list-item.ui \
-       rc/calendar-manager-list.ui \
-       rc/calendar-manager-list-item.ui \
-       rc/create-update-event.ui \
-       rc/create-update-recurring.ui \
-       rc/date-time-widget.ui \
-       rc/event-time-settings.ui \
-       rc/generic-subscribe.ui \
-       rc/google-authenticating.ui \
-       rc/google-calendar-list.ui \
-       rc/google-login.ui \
-       rc/main-window-title.ui \
-       rc/quick-create-event.ui \
-       rc/remove-calendar.ui \
-       rc/show-event.ui \
+       rc/event-editor-attendees-card.ui \
+       rc/event-editor-date-time-card.ui \
+       rc/event-editor-date-time-widget.ui \
+       rc/event-editor-main-card.ui \
+       rc/event-editor-recurring-card.ui \
+       rc/host-calendar-list-item.ui \
+       rc/host-import-calendar.ui \
+       rc/host-main-window-title.ui \
+       rc/host-quick-create-event.ui \
+       rc/host-show-event.ui \
+       rc/manager-calendar-list.ui \
+       rc/manager-calendar-list-item.ui \
+       rc/manager-remove-calendar.ui \
        rc/window-menu.interface \
        $(NULL)
  
diff --cc src/california-resources.xml
index 83cbcb2,3f09836..f992154
--- a/src/california-resources.xml
+++ b/src/california-resources.xml
@@@ -1,64 -1,61 +1,65 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <gresources>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/activator-list.ui</file>
+         <file compressed="true">rc/activator-generic-subscribe.ui</file>
      </gresource>
++        <file compressed="true">rc/app-menu.interface</file>
      <gresource prefix="/org/yorba/california">
-         <file compressed="false">rc/agenda-row.ui</file>
+         <file compressed="true">rc/activator-google-authenticating-pane.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/app-menu.interface</file>
+         <file compressed="true">rc/activator-google-calendar-list-pane.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/attendees-editor.ui</file>
+         <file compressed="true">rc/activator-google-login-pane.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/calendar-import.ui</file>
+         <file compressed="true">rc/activator-instance-list.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="false">rc/calendar-list-item.ui</file>
++        <file compressed="false">rc/agenda-row.ui</file>
 +    </gresource>
 +    <gresource prefix="/org/yorba/california">
-         <file compressed="false">rc/calendar-manager-list.ui</file>
+         <file compressed="true">rc/app-menu.interface</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="false">rc/calendar-manager-list-item.ui</file>
+         <file compressed="true">rc/event-editor-attendees-card.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="false">rc/create-update-event.ui</file>
+         <file compressed="false">rc/event-editor-date-time-card.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="false">rc/create-update-recurring.ui</file>
+         <file compressed="false">rc/event-editor-date-time-widget.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="false">rc/date-time-widget.ui</file>
+         <file compressed="false">rc/event-editor-main-card.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="false">rc/event-time-settings.ui</file>
+         <file compressed="false">rc/event-editor-recurring-card.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/generic-subscribe.ui</file>
+         <file compressed="false">rc/host-calendar-list-item.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/google-authenticating.ui</file>
+         <file compressed="true">rc/host-import-calendar.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/google-calendar-list.ui</file>
+         <file compressed="true">rc/host-main-window-title.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/google-login.ui</file>
+         <file compressed="true">rc/host-quick-create-event.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/main-window-title.ui</file>
+         <file compressed="false">rc/host-show-event.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/quick-create-event.ui</file>
+         <file compressed="false">rc/manager-calendar-list.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="true">rc/remove-calendar.ui</file>
+         <file compressed="false">rc/manager-calendar-list-item.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
-         <file compressed="false">rc/show-event.ui</file>
+         <file compressed="true">rc/manager-remove-calendar.ui</file>
      </gresource>
      <gresource prefix="/org/yorba/california">
          <file compressed="true">rc/window-menu.interface</file>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]