GNOME.org
 

[california] Rename .ui files to match their composite class names

commit e98b3666f7e8af4537f7fd8e3c2672fc4f776123
Author: Jim Nelson <jim yorba org>
Date:   Fri Nov 21 14:45:01 2014 -0800

    Rename .ui files to match their composite class names

 po/POTFILES.in                                     |   25 +++++++++--------
 src/Makefile.am                                    |   26 +++++++++---------
 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                       |   28 ++++++++++----------
 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-quick-create-event.vala              |    2 +-
 src/host/host-show-event.vala                      |    2 +-
 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
 ...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
 29 files changed, 53 insertions(+), 52 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6695674..d4bdc75 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,22 +28,23 @@ src/manager/manager-calendar-list-item.vala
 src/manager/manager-remove-calendar.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/app-menu.interface
-[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/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/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/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 --git a/src/Makefile.am b/src/Makefile.am
index c77e94d..2749c2f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -195,25 +195,25 @@ 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/app-menu.interface \
-       rc/calendar-import.ui \
-       rc/calendar-list-item.ui \
-       rc/calendar-manager-list.ui \
-       rc/calendar-manager-list-item.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/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/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 --git a/src/activator/activator-instance-list.vala b/src/activator/activator-instance-list.vala
index 16532bc..9749fb5 100644
--- a/src/activator/activator-instance-list.vala
+++ b/src/activator/activator-instance-list.vala
@@ -6,7 +6,7 @@
 
 namespace California.Activator {
 
-[GtkTemplate (ui = "/org/yorba/california/rc/activator-list.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/activator-instance-list.ui")]
 public class InstanceList : Gtk.Grid, Toolkit.Card {
     public const string ID = "ActivatorInstanceList";
     
diff --git a/src/activator/generic/generic-subscribe.vala b/src/activator/generic/generic-subscribe.vala
index 9c6dc69..fbb5f59 100644
--- a/src/activator/generic/generic-subscribe.vala
+++ b/src/activator/generic/generic-subscribe.vala
@@ -6,7 +6,7 @@
 
 namespace California.Activator.Generic {
 
-[GtkTemplate (ui = "/org/yorba/california/rc/generic-subscribe.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/activator-generic-subscribe.ui")]
 internal abstract class Subscribe : Gtk.Grid, Toolkit.Card {
     public abstract string card_id { get; }
     
diff --git a/src/activator/google/google-authenticating-pane.vala 
b/src/activator/google/google-authenticating-pane.vala
index a329b3e..e398906 100644
--- a/src/activator/google/google-authenticating-pane.vala
+++ b/src/activator/google/google-authenticating-pane.vala
@@ -6,7 +6,7 @@
 
 namespace California.Activator.Google {
 
-[GtkTemplate (ui = "/org/yorba/california/rc/google-authenticating.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/activator-google-authenticating-pane.ui")]
 public class AuthenticatingPane : Gtk.Grid, Toolkit.Card {
     public const string ID = "GoogleAuthenticatingPane";
     
diff --git a/src/activator/google/google-calendar-list-pane.vala 
b/src/activator/google/google-calendar-list-pane.vala
index 3ffa98d..de1e75d 100644
--- a/src/activator/google/google-calendar-list-pane.vala
+++ b/src/activator/google/google-calendar-list-pane.vala
@@ -6,7 +6,7 @@
 
 namespace California.Activator.Google {
 
-[GtkTemplate (ui = "/org/yorba/california/rc/google-calendar-list.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/activator-google-calendar-list-pane.ui")]
 public class CalendarListPane : Gtk.Grid, Toolkit.Card {
     public const string ID = "GoogleCalendarListPane";
     
diff --git a/src/activator/google/google-login-pane.vala b/src/activator/google/google-login-pane.vala
index e1f5907..a018ba2 100644
--- a/src/activator/google/google-login-pane.vala
+++ b/src/activator/google/google-login-pane.vala
@@ -6,7 +6,7 @@
 
 namespace California.Activator.Google {
 
-[GtkTemplate (ui = "/org/yorba/california/rc/google-login.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/activator-google-login-pane.ui")]
 internal class LoginPane : Gtk.Grid, Toolkit.Card {
     public const string ID = "GoogleLoginPane";
     
diff --git a/src/california-resources.xml b/src/california-resources.xml
index 75d9909..3f09836 100644
--- a/src/california-resources.xml
+++ b/src/california-resources.xml
@@ -1,22 +1,22 @@
 <?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>
     <gresource prefix="/org/yorba/california">
-        <file compressed="true">rc/app-menu.interface</file>
+        <file compressed="true">rc/activator-google-authenticating-pane.ui</file>
     </gresource>
     <gresource prefix="/org/yorba/california">
-        <file compressed="true">rc/calendar-import.ui</file>
+        <file compressed="true">rc/activator-google-calendar-list-pane.ui</file>
     </gresource>
     <gresource prefix="/org/yorba/california">
-        <file compressed="false">rc/calendar-list-item.ui</file>
+        <file compressed="true">rc/activator-google-login-pane.ui</file>
     </gresource>
     <gresource prefix="/org/yorba/california">
-        <file compressed="false">rc/calendar-manager-list.ui</file>
+        <file compressed="true">rc/activator-instance-list.ui</file>
     </gresource>
     <gresource prefix="/org/yorba/california">
-        <file compressed="false">rc/calendar-manager-list-item.ui</file>
+        <file compressed="true">rc/app-menu.interface</file>
     </gresource>
     <gresource prefix="/org/yorba/california">
         <file compressed="true">rc/event-editor-attendees-card.ui</file>
@@ -34,28 +34,28 @@
         <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>
diff --git a/src/host/host-calendar-list-item.vala b/src/host/host-calendar-list-item.vala
index 9fc5213..fddadda 100644
--- a/src/host/host-calendar-list-item.vala
+++ b/src/host/host-calendar-list-item.vala
@@ -6,7 +6,7 @@
 
 namespace California.Host {
 
-[GtkTemplate (ui = "/org/yorba/california/rc/calendar-list-item.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/host-calendar-list-item.ui")]
 public class CalendarListItem : Gtk.Grid, Toolkit.MutableWidget {
     public Backing.CalendarSource calendar_source { get; private set; }
     
diff --git a/src/host/host-import-calendar.vala b/src/host/host-import-calendar.vala
index dfe2e62..6662cde 100644
--- a/src/host/host-import-calendar.vala
+++ b/src/host/host-import-calendar.vala
@@ -6,7 +6,7 @@
 
 namespace California.Host {
 
-[GtkTemplate (ui = "/org/yorba/california/rc/calendar-import.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/host-import-calendar.ui")]
 public class ImportCalendar : Gtk.Dialog {
     public Component.iCalendar ical { get; private set;}
     
diff --git a/src/host/host-main-window-title.vala b/src/host/host-main-window-title.vala
index a0c8280..ae9f24f 100644
--- a/src/host/host-main-window-title.vala
+++ b/src/host/host-main-window-title.vala
@@ -6,7 +6,7 @@
 
 namespace California.Host {
 
-[GtkTemplate (ui = "/org/yorba/california/rc/main-window-title.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/host-main-window-title.ui")]
 internal class MainWindowTitle : Gtk.Grid {
     public const string PROP_MOTION = "motion";
     
diff --git a/src/host/host-quick-create-event.vala b/src/host/host-quick-create-event.vala
index 92d02b3..b3ac1eb 100644
--- a/src/host/host-quick-create-event.vala
+++ b/src/host/host-quick-create-event.vala
@@ -6,7 +6,7 @@
 
 namespace California.Host {
 
-[GtkTemplate (ui = "/org/yorba/california/rc/quick-create-event.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/host-quick-create-event.ui")]
 public class QuickCreateEvent : Gtk.Grid, Toolkit.Card {
     public const string ID = "QuickCreateEvent";
     
diff --git a/src/host/host-show-event.vala b/src/host/host-show-event.vala
index c826247..ade79d9 100644
--- a/src/host/host-show-event.vala
+++ b/src/host/host-show-event.vala
@@ -10,7 +10,7 @@ namespace California.Host {
  * MESSAGE IN: Send the Component.Event to be displayed.
  */
 
-[GtkTemplate (ui = "/org/yorba/california/rc/show-event.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/host-show-event.ui")]
 public class ShowEvent : Gtk.Grid, Toolkit.Card {
     public const string ID = "ShowEvent";
     
diff --git a/src/manager/manager-calendar-list-item.vala b/src/manager/manager-calendar-list-item.vala
index f770cb4..e4a8ffa 100644
--- a/src/manager/manager-calendar-list-item.vala
+++ b/src/manager/manager-calendar-list-item.vala
@@ -10,7 +10,7 @@ namespace California.Manager {
  * An interactive list item in a { link CalendarList}.
  */
 
-[GtkTemplate (ui = "/org/yorba/california/rc/calendar-manager-list-item.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/manager-calendar-list-item.ui")]
 internal class CalendarListItem : Gtk.Grid, Toolkit.MutableWidget {
     private const int COLOR_DIM = 16;
     
diff --git a/src/manager/manager-calendar-list.vala b/src/manager/manager-calendar-list.vala
index 0c964d1..1c8ca62 100644
--- a/src/manager/manager-calendar-list.vala
+++ b/src/manager/manager-calendar-list.vala
@@ -10,7 +10,7 @@ namespace California.Manager {
  * A list of available calendars and basic configuration controls.
  */
 
-[GtkTemplate (ui = "/org/yorba/california/rc/calendar-manager-list.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/manager-calendar-list.ui")]
 internal class CalendarList : Gtk.Grid, Toolkit.Card {
     public const string PROP_SELECTED = "selected";
     
diff --git a/src/manager/manager-remove-calendar.vala b/src/manager/manager-remove-calendar.vala
index bc83107..b9ea41e 100644
--- a/src/manager/manager-remove-calendar.vala
+++ b/src/manager/manager-remove-calendar.vala
@@ -6,7 +6,7 @@
 
 namespace California.Manager {
 
-[GtkTemplate (ui = "/org/yorba/california/rc/remove-calendar.ui")]
+[GtkTemplate (ui = "/org/yorba/california/rc/manager-remove-calendar.ui")]
 private class RemoveCalendar : Gtk.Grid, Toolkit.Card {
     public const string ID = "RemoveCalendar";
     
diff --git a/src/rc/generic-subscribe.ui b/src/rc/activator-generic-subscribe.ui
similarity index 100%
rename from src/rc/generic-subscribe.ui
rename to src/rc/activator-generic-subscribe.ui
diff --git a/src/rc/google-authenticating.ui b/src/rc/activator-google-authenticating-pane.ui
similarity index 100%
rename from src/rc/google-authenticating.ui
rename to src/rc/activator-google-authenticating-pane.ui
diff --git a/src/rc/google-calendar-list.ui b/src/rc/activator-google-calendar-list-pane.ui
similarity index 100%
rename from src/rc/google-calendar-list.ui
rename to src/rc/activator-google-calendar-list-pane.ui
diff --git a/src/rc/google-login.ui b/src/rc/activator-google-login-pane.ui
similarity index 100%
rename from src/rc/google-login.ui
rename to src/rc/activator-google-login-pane.ui
diff --git a/src/rc/activator-list.ui b/src/rc/activator-instance-list.ui
similarity index 100%
rename from src/rc/activator-list.ui
rename to src/rc/activator-instance-list.ui
diff --git a/src/rc/calendar-list-item.ui b/src/rc/host-calendar-list-item.ui
similarity index 100%
rename from src/rc/calendar-list-item.ui
rename to src/rc/host-calendar-list-item.ui
diff --git a/src/rc/calendar-import.ui b/src/rc/host-import-calendar.ui
similarity index 100%
rename from src/rc/calendar-import.ui
rename to src/rc/host-import-calendar.ui
diff --git a/src/rc/main-window-title.ui b/src/rc/host-main-window-title.ui
similarity index 100%
rename from src/rc/main-window-title.ui
rename to src/rc/host-main-window-title.ui
diff --git a/src/rc/quick-create-event.ui b/src/rc/host-quick-create-event.ui
similarity index 100%
rename from src/rc/quick-create-event.ui
rename to src/rc/host-quick-create-event.ui
diff --git a/src/rc/show-event.ui b/src/rc/host-show-event.ui
similarity index 100%
rename from src/rc/show-event.ui
rename to src/rc/host-show-event.ui
diff --git a/src/rc/calendar-manager-list-item.ui b/src/rc/manager-calendar-list-item.ui
similarity index 100%
rename from src/rc/calendar-manager-list-item.ui
rename to src/rc/manager-calendar-list-item.ui
diff --git a/src/rc/calendar-manager-list.ui b/src/rc/manager-calendar-list.ui
similarity index 100%
rename from src/rc/calendar-manager-list.ui
rename to src/rc/manager-calendar-list.ui
diff --git a/src/rc/remove-calendar.ui b/src/rc/manager-remove-calendar.ui
similarity index 100%
rename from src/rc/remove-calendar.ui
rename to src/rc/manager-remove-calendar.ui
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]