[california/wip/734698-agenda] Rename agenda-row.ui to view-agenda-row.ui
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [california/wip/734698-agenda] Rename agenda-row.ui to view-agenda-row.ui
- Date: Thu, 27 Nov 2014 02:56:04 +0000 (UTC)
commit 7deb1176d72e541ab69b62aedcf1f7c1695f4b27
Author: Jim Nelson <jim yorba org>
Date: Wed Nov 26 13:22:52 2014 -0800
Rename agenda-row.ui to view-agenda-row.ui
src/Makefile.am | 2 +-
src/california-resources.xml | 7 +++----
src/rc/{agenda-row.ui => view-agenda-row.ui} | 0
src/view/agenda/agenda-row.vala | 6 ++++--
4 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index b12be00..64d4cd1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -204,7 +204,6 @@ california_RC = \
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/event-editor-attendees-card.ui \
rc/event-editor-date-time-card.ui \
@@ -219,6 +218,7 @@ california_RC = \
rc/manager-calendar-list.ui \
rc/manager-calendar-list-item.ui \
rc/manager-remove-calendar.ui \
+ rc/view-agenda-row.ui \
rc/window-menu.interface \
$(NULL)
diff --git a/src/california-resources.xml b/src/california-resources.xml
index f992154..366cfe0 100644
--- a/src/california-resources.xml
+++ b/src/california-resources.xml
@@ -3,7 +3,6 @@
<gresource prefix="/org/yorba/california">
<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="true">rc/activator-google-authenticating-pane.ui</file>
</gresource>
@@ -17,9 +16,6 @@
<file compressed="true">rc/activator-instance-list.ui</file>
</gresource>
<gresource prefix="/org/yorba/california">
- <file compressed="false">rc/agenda-row.ui</file>
- </gresource>
- <gresource prefix="/org/yorba/california">
<file compressed="true">rc/app-menu.interface</file>
</gresource>
<gresource prefix="/org/yorba/california">
@@ -62,6 +58,9 @@
<file compressed="true">rc/manager-remove-calendar.ui</file>
</gresource>
<gresource prefix="/org/yorba/california">
+ <file compressed="false">rc/view-agenda-row.ui</file>
+ </gresource>
+ <gresource prefix="/org/yorba/california">
<file compressed="true">rc/window-menu.interface</file>
</gresource>
</gresources>
diff --git a/src/rc/agenda-row.ui b/src/rc/view-agenda-row.ui
similarity index 100%
rename from src/rc/agenda-row.ui
rename to src/rc/view-agenda-row.ui
diff --git a/src/view/agenda/agenda-row.vala b/src/view/agenda/agenda-row.vala
index eb7f8fb..9df39c5 100644
--- a/src/view/agenda/agenda-row.vala
+++ b/src/view/agenda/agenda-row.vala
@@ -6,7 +6,7 @@
namespace California.View.Agenda {
-[GtkTemplate (ui = "/org/yorba/california/rc/agenda-row.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/view-agenda-row.ui")]
public class Row : Gtk.Box {
public new Component.Event event { get; private set; }
@@ -45,7 +45,9 @@ public class Row : Gtk.Box {
} else {
// hex value is an endash
time_label.label = "%s – %s".printf(
- event.exact_time_span.start_exact_time.to_wall_time()
+ event.exact_time_span.start_exact_time.to_wall_time(),
+ event.exact_time_span.end_exact_time.to_wall_time()
+ );
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]