[polari] data: Add some hierarchy to resources

[Florian Müllner <fmuellner src gnome org>]

commit be7c8ce5bf013952838e2aa32638ab476a1ba58b
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Feb 4 22:08:44 2016 +0100

    data: Add some hierarchy to resources
    
    Don't dump everything into the base resource path, but split between
    css/ (stylesheets), gtk/ (automatic resources) and ui/ (.ui files).

 data/org.gnome.Polari.data.gresource.xml |   18 +++++++++---------
 src/connections.js                       |    2 +-
 src/entryArea.js                         |    2 +-
 src/joinDialog.js                        |    2 +-
 src/mainWindow.js                        |    4 ++--
 src/messageDialog.js                     |    2 +-
 src/roomList.js                          |    2 +-
 src/userList.js                          |    2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/data/org.gnome.Polari.data.gresource.xml b/data/org.gnome.Polari.data.gresource.xml
index c23ec51..0b737f5 100644
--- a/data/org.gnome.Polari.data.gresource.xml
+++ b/data/org.gnome.Polari.data.gresource.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/Polari">
-    <file alias="gtk/menus.ui" preprocess="xml-stripblanks">resources/menus.ui</file>
+    <file alias="css/application.css">resources/application.css</file>
     <file alias="gtk/help-overlay.ui" preprocess="xml-stripblanks">resources/help-overlay.ui</file>
-    <file alias="connection-details.ui" preprocess="xml-stripblanks">resources/connection-details.ui</file>
-    <file alias="entry-area.ui" preprocess="xml-stripblanks">resources/entry-area.ui</file>
-    <file alias="join-room-dialog.ui" preprocess="xml-stripblanks">resources/join-room-dialog.ui</file>
-    <file alias="main-window.ui" preprocess="xml-stripblanks">resources/main-window.ui</file>
-    <file alias="message-user-dialog.ui" preprocess="xml-stripblanks">resources/message-user-dialog.ui</file>
-    <file alias="room-list-header.ui" preprocess="xml-stripblanks">resources/room-list-header.ui</file>
-    <file alias="user-list-details.ui" preprocess="xml-stripblanks">resources/user-list-details.ui</file>
-    <file alias="application.css">resources/application.css</file>
+    <file alias="gtk/menus.ui" preprocess="xml-stripblanks">resources/menus.ui</file>
+    <file alias="ui/connection-details.ui" 
preprocess="xml-stripblanks">resources/connection-details.ui</file>
+    <file alias="ui/entry-area.ui" preprocess="xml-stripblanks">resources/entry-area.ui</file>
+    <file alias="ui/join-room-dialog.ui" preprocess="xml-stripblanks">resources/join-room-dialog.ui</file>
+    <file alias="ui/main-window.ui" preprocess="xml-stripblanks">resources/main-window.ui</file>
+    <file alias="ui/message-user-dialog.ui" 
preprocess="xml-stripblanks">resources/message-user-dialog.ui</file>
+    <file alias="ui/room-list-header.ui" preprocess="xml-stripblanks">resources/room-list-header.ui</file>
+    <file alias="ui/user-list-details.ui" preprocess="xml-stripblanks">resources/user-list-details.ui</file>
   </gresource>
 </gresources>
diff --git a/src/connections.js b/src/connections.js
index cbd0151..3537cdc 100644
--- a/src/connections.js
+++ b/src/connections.js
@@ -9,7 +9,7 @@ const Signals = imports.signals;
 const ConnectionDetails = new Lang.Class({
     Name: 'ConnectionDetails',
     Extends: Gtk.Box,
-    Template: 'resource:///org/gnome/Polari/connection-details.ui',
+    Template: 'resource:///org/gnome/Polari/ui/connection-details.ui',
     InternalChildren: ['serverEntry',
                        'descEntry',
                        'nickEntry',
diff --git a/src/entryArea.js b/src/entryArea.js
index a8377de..586c8ed 100644
--- a/src/entryArea.js
+++ b/src/entryArea.js
@@ -51,7 +51,7 @@ const ChatEntry = new Lang.Class({
 const EntryArea = new Lang.Class({
     Name: 'EntryArea',
     Extends: Gtk.Stack,
-    Template: 'resource:///org/gnome/Polari/entry-area.ui',
+    Template: 'resource:///org/gnome/Polari/ui/entry-area.ui',
     InternalChildren: ['chatEntry',
                        'nickButton',
                        'nickLabel',
diff --git a/src/joinDialog.js b/src/joinDialog.js
index 61308c1..618e97f 100644
--- a/src/joinDialog.js
+++ b/src/joinDialog.js
@@ -67,7 +67,7 @@ const JoinDialog = new Lang.Class({
 
     _createWidget: function() {
         let builder = new Gtk.Builder();
-        builder.add_from_resource('/org/gnome/Polari/join-room-dialog.ui');
+        builder.add_from_resource('/org/gnome/Polari/ui/join-room-dialog.ui');
 
         this.widget = builder.get_object('join_room_dialog');
 
diff --git a/src/mainWindow.js b/src/mainWindow.js
index 057cd94..97d1fd4 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -112,7 +112,7 @@ const MainWindow = new Lang.Class({
         this._createWidget(app);
 
         let provider = new Gtk.CssProvider();
-        let uri = 'resource:///org/gnome/Polari/application.css';
+        let uri = 'resource:///org/gnome/Polari/css/application.css';
         let file = Gio.File.new_for_uri(uri);
         try {
             provider.load_from_file(Gio.File.new_for_uri(uri));
@@ -239,7 +239,7 @@ const MainWindow = new Lang.Class({
 
     _createWidget: function(app) {
         let builder = new Gtk.Builder();
-        builder.add_from_resource('/org/gnome/Polari/main-window.ui');
+        builder.add_from_resource('/org/gnome/Polari/ui/main-window.ui');
 
         this.window = builder.get_object('main_window');
         this.window.application = app;
diff --git a/src/messageDialog.js b/src/messageDialog.js
index 5418533..f9343d8 100644
--- a/src/messageDialog.js
+++ b/src/messageDialog.js
@@ -58,7 +58,7 @@ const MessageDialog = new Lang.Class({
 
     _createWidget: function() {
         let builder = new Gtk.Builder();
-        builder.add_from_resource('/org/gnome/Polari/message-user-dialog.ui');
+        builder.add_from_resource('/org/gnome/Polari/ui/message-user-dialog.ui');
 
         this.widget = builder.get_object('message_user_dialog');
 
diff --git a/src/roomList.js b/src/roomList.js
index 56f19dc..7121ba2 100644
--- a/src/roomList.js
+++ b/src/roomList.js
@@ -163,7 +163,7 @@ const RoomListHeader = new Lang.Class({
     Name: 'RoomListHeader',
     Extends: Gtk.MenuButton,
     CssName: 'row',
-    Template: 'resource:///org/gnome/Polari/room-list-header.ui',
+    Template: 'resource:///org/gnome/Polari/ui/room-list-header.ui',
     InternalChildren: ['label',
                        'iconStack',
                        'popoverStatus',
diff --git a/src/userList.js b/src/userList.js
index 61c75c8..811d40e 100644
--- a/src/userList.js
+++ b/src/userList.js
@@ -106,7 +106,7 @@ const UserListPopover = new Lang.Class({
 const UserListDetails = new Lang.Class({
     Name: 'UserListDetails',
     Extends: Gtk.Frame,
-    Template: 'resource:///org/gnome/Polari/user-list-details.ui',
+    Template: 'resource:///org/gnome/Polari/ui/user-list-details.ui',
     InternalChildren: ['spinnerBox',
                        'spinner',
                        'detailsGrid',