GNOME.org
 

[gnome-maps] Unify resource namespace and move ui files to data/ui

commit 7abe864ae5ff63782c0680d18ef5a3e3b66ad899
Author: Damián Nohales <damiannohales gmail com>
Date:   Mon Dec 22 17:28:57 2014 -0300

    Unify resource namespace and move ui files to data/ui
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733411

 data/org.gnome.Maps.data.gresource.xml            |   46 ++++++++++----------
 {src => data/ui}/account-row.ui                   |    0
 {src => data/ui}/app-menu.ui                      |    0
 {src => data/ui}/check-in-dialog.ui               |    0
 {src => data/ui}/context-menu.ui                  |    0
 {src => data/ui}/favorites-popover.ui             |    0
 {src => data/ui}/layers-popover.ui                |    0
 {src => data/ui}/main-window.ui                   |    0
 {src => data/ui}/map-bubble.ui                    |    0
 {src => data/ui}/notification.ui                  |    0
 {src => data/ui}/place-entry.ui                   |    0
 {src => data/ui}/place-list-row.ui                |    0
 {src => data/ui}/route-entry.ui                   |    0
 {src => data/ui}/search-popup.ui                  |    0
 {src => data/ui}/search-result-bubble.ui          |    0
 {src => data/ui}/share-dialog.ui                  |    0
 {src => data/ui}/sidebar.ui                       |    0
 {src => data/ui}/social-place-more-results-row.ui |    0
 {src => data/ui}/social-place-row.ui              |    0
 {src => data/ui}/user-location-bubble.ui          |    0
 {src => data/ui}/zoom-control.ui                  |    0
 po/POTFILES.in                                    |   20 +++++-----
 src/accountListBox.js                             |    2 +-
 src/application.js                                |    4 +-
 src/checkInDialog.js                              |    2 +-
 src/favoritesPopover.js                           |    2 +-
 src/placeListRow.js                               |    2 +-
 src/routeEntry.js                                 |    2 +-
 src/searchPopup.js                                |    2 +-
 src/shareDialog.js                                |    2 +-
 src/socialPlaceListBox.js                         |    4 +-
 src/utils.js                                      |    2 +-
 32 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/data/org.gnome.Maps.data.gresource.xml b/data/org.gnome.Maps.data.gresource.xml
index 6b68250..b499ea3 100644
--- a/data/org.gnome.Maps.data.gresource.xml
+++ b/data/org.gnome.Maps.data.gresource.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/maps">
-    <file preprocess="xml-stripblanks" alias="account-row.ui">../src/account-row.ui</file>
-    <file preprocess="xml-stripblanks" alias="app-menu.ui">../src/app-menu.ui</file>
-    <file preprocess="xml-stripblanks" alias="check-in-dialog.ui">../src/check-in-dialog.ui</file>
-    <file preprocess="xml-stripblanks" alias="context-menu.ui">../src/context-menu.ui</file>
-    <file preprocess="xml-stripblanks" alias="favorites-popover.ui">../src/favorites-popover.ui</file>
-    <file preprocess="xml-stripblanks" alias="layers-popover.ui">../src/layers-popover.ui</file>
-    <file preprocess="xml-stripblanks" alias="main-window.ui">../src/main-window.ui</file>
-    <file preprocess="xml-stripblanks" alias="map-bubble.ui">../src/map-bubble.ui</file>
-    <file preprocess="xml-stripblanks" alias="notification.ui">../src/notification.ui</file>
-    <file preprocess="xml-stripblanks" alias="place-entry.ui">../src/place-entry.ui</file>
-    <file preprocess="xml-stripblanks" alias="place-list-row.ui">../src/place-list-row.ui</file>
-    <file preprocess="xml-stripblanks" alias="route-entry.ui">../src/route-entry.ui</file>
-    <file preprocess="xml-stripblanks" alias="search-popup.ui">../src/search-popup.ui</file>
-    <file preprocess="xml-stripblanks" alias="search-result-bubble.ui">../src/search-result-bubble.ui</file>
-    <file preprocess="xml-stripblanks" alias="share-dialog.ui">../src/share-dialog.ui</file>
-    <file preprocess="xml-stripblanks" alias="sidebar.ui">../src/sidebar.ui</file>
-    <file preprocess="xml-stripblanks" 
alias="social-place-more-results-row.ui">../src/social-place-more-results-row.ui</file>
-    <file preprocess="xml-stripblanks" alias="social-place-row.ui">../src/social-place-row.ui</file>
-    <file preprocess="xml-stripblanks" alias="user-location-bubble.ui">../src/user-location-bubble.ui</file>
-    <file preprocess="xml-stripblanks" alias="zoom-control.ui">../src/zoom-control.ui</file>
+  <gresource prefix="/org/gnome/Maps">
+    <file preprocess="xml-stripblanks">ui/account-row.ui</file>
+    <file preprocess="xml-stripblanks">ui/app-menu.ui</file>
+    <file preprocess="xml-stripblanks">ui/check-in-dialog.ui</file>
+    <file preprocess="xml-stripblanks">ui/context-menu.ui</file>
+    <file preprocess="xml-stripblanks">ui/favorites-popover.ui</file>
+    <file preprocess="xml-stripblanks">ui/layers-popover.ui</file>
+    <file preprocess="xml-stripblanks">ui/main-window.ui</file>
+    <file preprocess="xml-stripblanks">ui/map-bubble.ui</file>
+    <file preprocess="xml-stripblanks">ui/notification.ui</file>
+    <file preprocess="xml-stripblanks">ui/place-entry.ui</file>
+    <file preprocess="xml-stripblanks">ui/place-list-row.ui</file>
+    <file preprocess="xml-stripblanks">ui/route-entry.ui</file>
+    <file preprocess="xml-stripblanks">ui/search-popup.ui</file>
+    <file preprocess="xml-stripblanks">ui/search-result-bubble.ui</file>
+    <file preprocess="xml-stripblanks">ui/share-dialog.ui</file>
+    <file preprocess="xml-stripblanks">ui/sidebar.ui</file>
+    <file preprocess="xml-stripblanks">ui/social-place-more-results-row.ui</file>
+    <file preprocess="xml-stripblanks">ui/social-place-row.ui</file>
+    <file preprocess="xml-stripblanks">ui/user-location-bubble.ui</file>
+    <file preprocess="xml-stripblanks">ui/zoom-control.ui</file>
     <file alias="application.css">gnome-maps.css</file>
-    <file alias="maptype-aerial.png">media/maptype-aerial.png</file>
-    <file alias="maptype-street.png">media/maptype-street.png</file>
+    <file alias="ui/maptype-aerial.png">media/maptype-aerial.png</file>
+    <file alias="ui/maptype-street.png">media/maptype-street.png</file>
   </gresource>
 </gresources>
\ No newline at end of file
diff --git a/src/account-row.ui b/data/ui/account-row.ui
similarity index 100%
rename from src/account-row.ui
rename to data/ui/account-row.ui
diff --git a/src/app-menu.ui b/data/ui/app-menu.ui
similarity index 100%
rename from src/app-menu.ui
rename to data/ui/app-menu.ui
diff --git a/src/check-in-dialog.ui b/data/ui/check-in-dialog.ui
similarity index 100%
rename from src/check-in-dialog.ui
rename to data/ui/check-in-dialog.ui
diff --git a/src/context-menu.ui b/data/ui/context-menu.ui
similarity index 100%
rename from src/context-menu.ui
rename to data/ui/context-menu.ui
diff --git a/src/favorites-popover.ui b/data/ui/favorites-popover.ui
similarity index 100%
rename from src/favorites-popover.ui
rename to data/ui/favorites-popover.ui
diff --git a/src/layers-popover.ui b/data/ui/layers-popover.ui
similarity index 100%
rename from src/layers-popover.ui
rename to data/ui/layers-popover.ui
diff --git a/src/main-window.ui b/data/ui/main-window.ui
similarity index 100%
rename from src/main-window.ui
rename to data/ui/main-window.ui
diff --git a/src/map-bubble.ui b/data/ui/map-bubble.ui
similarity index 100%
rename from src/map-bubble.ui
rename to data/ui/map-bubble.ui
diff --git a/src/notification.ui b/data/ui/notification.ui
similarity index 100%
rename from src/notification.ui
rename to data/ui/notification.ui
diff --git a/src/place-entry.ui b/data/ui/place-entry.ui
similarity index 100%
rename from src/place-entry.ui
rename to data/ui/place-entry.ui
diff --git a/src/place-list-row.ui b/data/ui/place-list-row.ui
similarity index 100%
rename from src/place-list-row.ui
rename to data/ui/place-list-row.ui
diff --git a/src/route-entry.ui b/data/ui/route-entry.ui
similarity index 100%
rename from src/route-entry.ui
rename to data/ui/route-entry.ui
diff --git a/src/search-popup.ui b/data/ui/search-popup.ui
similarity index 100%
rename from src/search-popup.ui
rename to data/ui/search-popup.ui
diff --git a/src/search-result-bubble.ui b/data/ui/search-result-bubble.ui
similarity index 100%
rename from src/search-result-bubble.ui
rename to data/ui/search-result-bubble.ui
diff --git a/src/share-dialog.ui b/data/ui/share-dialog.ui
similarity index 100%
rename from src/share-dialog.ui
rename to data/ui/share-dialog.ui
diff --git a/src/sidebar.ui b/data/ui/sidebar.ui
similarity index 100%
rename from src/sidebar.ui
rename to data/ui/sidebar.ui
diff --git a/src/social-place-more-results-row.ui b/data/ui/social-place-more-results-row.ui
similarity index 100%
rename from src/social-place-more-results-row.ui
rename to data/ui/social-place-more-results-row.ui
diff --git a/src/social-place-row.ui b/data/ui/social-place-row.ui
similarity index 100%
rename from src/social-place-row.ui
rename to data/ui/social-place-row.ui
diff --git a/src/user-location-bubble.ui b/data/ui/user-location-bubble.ui
similarity index 100%
rename from src/user-location-bubble.ui
rename to data/ui/user-location-bubble.ui
diff --git a/src/zoom-control.ui b/data/ui/zoom-control.ui
similarity index 100%
rename from src/zoom-control.ui
rename to data/ui/zoom-control.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7cb79d8..a82c767 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,25 +2,25 @@
 data/org.gnome.Maps.appdata.xml.in
 data/org.gnome.Maps.desktop.in
 data/org.gnome.Maps.gschema.xml.in
+[type: gettext/glade]data/ui/app-menu.ui
+[type: gettext/glade]data/ui/check-in-dialog.ui
+[type: gettext/glade]data/ui/context-menu.ui
+[type: gettext/glade]data/ui/main-window.ui
+[type: gettext/glade]data/ui/map-bubble.ui
+[type: gettext/glade]data/ui/search-popup.ui
+[type: gettext/glade]data/ui/share-dialog.ui
+[type: gettext/glade]src/sidebar.ui
+[type: gettext/glade]data/ui/social-place-more-results-row.ui
+[type: gettext/glade]data/ui/user-location-bubble.ui
 src/application.js
-[type: gettext/glade]src/app-menu.ui
-[type: gettext/glade]src/check-in-dialog.ui
 src/checkIn.js
 src/checkInDialog.js
-[type: gettext/glade]src/context-menu.ui
 src/geoclue.js
 src/mainWindow.js
-[type: gettext/glade]src/main-window.ui
 src/mapView.js
 src/place.js
-[type: gettext/glade]src/map-bubble.ui
 src/routeService.js
 src/searchResultBubble.js
-[type: gettext/glade]src/share-dialog.ui
-[type: gettext/glade]src/search-popup.ui
 src/sidebar.js
-[type: gettext/glade]src/sidebar.ui
-[type: gettext/glade]src/social-place-more-results-row.ui
 src/translations.js
-[type: gettext/glade]src/user-location-bubble.ui
 src/utils.js
diff --git a/src/accountListBox.js b/src/accountListBox.js
index f1a96a2..b68427e 100644
--- a/src/accountListBox.js
+++ b/src/accountListBox.js
@@ -30,7 +30,7 @@ const Application = imports.application;
 const AccountRow = new Lang.Class({
     Name: 'AccountRow',
     Extends: Gtk.ListBoxRow,
-    Template: 'resource:///org/gnome/maps/account-row.ui',
+    Template: 'resource:///org/gnome/Maps/ui/account-row.ui',
     InternalChildren: [ 'providerLabel',
                         'identityLabel',
                         'providerImage',
diff --git a/src/application.js b/src/application.js
index 3068dd9..b59e87e 100644
--- a/src/application.js
+++ b/src/application.js
@@ -113,7 +113,7 @@ const Application = new Lang.Class({
 
     _initAppMenu: function() {
         let builder = new Gtk.Builder();
-        builder.add_from_resource('/org/gnome/maps/app-menu.ui');
+        builder.add_from_resource('/org/gnome/Maps/ui/app-menu.ui');
 
         let menu = builder.get_object('app-menu');
         this.set_app_menu(menu);
@@ -125,7 +125,7 @@ const Application = new Lang.Class({
 
         GtkClutter.init(null);
 
-        Utils.loadStyleSheet(Gio.file_new_for_uri('resource:///org/gnome/maps/application.css'));
+        Utils.loadStyleSheet(Gio.file_new_for_uri('resource:///org/gnome/Maps/application.css'));
 
         application = this;
         this._initServices();
diff --git a/src/checkInDialog.js b/src/checkInDialog.js
index fe76689..71714fc 100644
--- a/src/checkInDialog.js
+++ b/src/checkInDialog.js
@@ -44,7 +44,7 @@ const Response = {
 const CheckInDialog = new Lang.Class({
     Name: 'CheckInDialog',
     Extends: Gtk.Dialog,
-    Template: 'resource:///org/gnome/maps/check-in-dialog.ui',
+    Template: 'resource:///org/gnome/Maps/ui/check-in-dialog.ui',
     InternalChildren: [ 'cancelButton',
                         'okButton',
                         'stack',
diff --git a/src/favoritesPopover.js b/src/favoritesPopover.js
index b7b09bc..926830f 100644
--- a/src/favoritesPopover.js
+++ b/src/favoritesPopover.js
@@ -33,7 +33,7 @@ const _ROW_HEIGHT = 50;
 const FavoritesPopover = new Lang.Class({
     Name: 'FavoritesPopover',
     Extends: Gtk.Popover,
-    Template: 'resource:///org/gnome/maps/favorites-popover.ui',
+    Template: 'resource:///org/gnome/Maps/ui/favorites-popover.ui',
     InternalChildren: [ 'mainGrid',
                         'revealer',
                         'entry',
diff --git a/src/placeListRow.js b/src/placeListRow.js
index 7966189..1b11e39 100644
--- a/src/placeListRow.js
+++ b/src/placeListRow.js
@@ -30,7 +30,7 @@ const ROW_HEIGHT = 50;
 const PlaceListRow = new Lang.Class({
     Name: 'PlaceListRow',
     Extends: Gtk.ListBoxRow,
-    Template: 'resource:///org/gnome/maps/place-list-row.ui',
+    Template: 'resource:///org/gnome/Maps/ui/place-list-row.ui',
     InternalChildren: [ 'icon',
                         'name',
                         'details',
diff --git a/src/routeEntry.js b/src/routeEntry.js
index 791ba69..ed6ed69 100644
--- a/src/routeEntry.js
+++ b/src/routeEntry.js
@@ -35,7 +35,7 @@ const Type = {
 const RouteEntry = new Lang.Class({
     Name: 'RouteEntry',
     Extends: Gtk.Grid,
-    Template: 'resource:///org/gnome/maps/route-entry.ui',
+    Template: 'resource:///org/gnome/Maps/ui/route-entry.ui',
     Children: [ 'iconEventBox' ],
     InternalChildren: [ 'entryGrid',
                         'icon',
diff --git a/src/searchPopup.js b/src/searchPopup.js
index 09a9547..bd3d03b 100644
--- a/src/searchPopup.js
+++ b/src/searchPopup.js
@@ -42,7 +42,7 @@ const SearchPopup = new Lang.Class({
     Signals : {
         'selected' : { param_types: [ GObject.TYPE_OBJECT ] }
     },
-    Template: 'resource:///org/gnome/maps/search-popup.ui',
+    Template: 'resource:///org/gnome/Maps/ui/search-popup.ui',
     InternalChildren: [ 'hintRevealer',
                         'scrolledWindow',
                         'stack',
diff --git a/src/shareDialog.js b/src/shareDialog.js
index c1421a9..747ee85 100644
--- a/src/shareDialog.js
+++ b/src/shareDialog.js
@@ -40,7 +40,7 @@ const _NUM_VISIBLE = 6;
 const ShareDialog = new Lang.Class({
     Name: 'ShareDialog',
     Extends: Gtk.Dialog,
-    Template: 'resource:///org/gnome/maps/share-dialog.ui',
+    Template: 'resource:///org/gnome/Maps/ui/share-dialog.ui',
     InternalChildren: [ 'list',
                         'weatherRow',
                         'weatherLabel',
diff --git a/src/socialPlaceListBox.js b/src/socialPlaceListBox.js
index c9e744d..4b0869f 100644
--- a/src/socialPlaceListBox.js
+++ b/src/socialPlaceListBox.js
@@ -28,7 +28,7 @@ const Mainloop = imports.mainloop;
 const SocialPlaceRow = new Lang.Class({
     Name: 'SocialPlaceRow',
     Extends: Gtk.ListBoxRow,
-    Template: 'resource:///org/gnome/maps/social-place-row.ui',
+    Template: 'resource:///org/gnome/Maps/ui/social-place-row.ui',
     InternalChildren: [ 'nameLabel',
                         'categoryLabel' ],
 
@@ -49,7 +49,7 @@ const SocialPlaceRow = new Lang.Class({
 const SocialPlaceMoreResultsRow = new Lang.Class({
     Name: 'SocialPlaceMoreResultsRow',
     Extends: Gtk.ListBoxRow,
-    Template: 'resource:///org/gnome/maps/social-place-more-results-row.ui'
+    Template: 'resource:///org/gnome/Maps/ui/social-place-more-results-row.ui'
 });
 
 const SocialPlaceListBox = new Lang.Class({
diff --git a/src/utils.js b/src/utils.js
index 79c857f..3a7c406 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -196,7 +196,7 @@ function dashedToCamelCase(name) {
 
 function getUIObject(res, ids) {
     let builder = new Gtk.Builder();
-    builder.add_from_resource('/org/gnome/maps/' + res + '.ui');
+    builder.add_from_resource('/org/gnome/Maps/ui/' + res + '.ui');
     let ret = {};
     ids.forEach(function(id) {
         ret[dashedToCamelCase(id)] = builder.get_object(id);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]