[gnome-music/wip/merge: 256/343] Make the application identifier and resource paths consistent



commit 8d7390188ad8b7a20292c533cbfa30ad9df7a6db
Author: Arnel A. Borja <arnelborja src gnome org>
Date:   Thu Jul 18 18:37:28 2013 +0800

    Make the application identifier and resource paths consistent

 data/gnome-music.gresource.xml |    2 +-
 gnomemusic/application.py      |    2 +-
 gnomemusic/player.py           |    4 ++--
 gnomemusic/toolbar.py          |    2 +-
 gnomemusic/view.py             |    2 +-
 gnomemusic/widgets.py          |    8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/data/gnome-music.gresource.xml b/data/gnome-music.gresource.xml
index 24a708c..3db14e2 100644
--- a/data/gnome-music.gresource.xml
+++ b/data/gnome-music.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/music">
+  <gresource prefix="/org/gnome/Music">
     <file preprocess="xml-stripblanks">app-menu.ui</file>
     <file>application.css</file>
     <file preprocess="xml-stripblanks">AlbumWidget.ui</file>
diff --git a/gnomemusic/application.py b/gnomemusic/application.py
index f28bf29..0695cbb 100644
--- a/gnomemusic/application.py
+++ b/gnomemusic/application.py
@@ -9,7 +9,7 @@ class Application(Gtk.Application):
                                  flags=Gio.ApplicationFlags.FLAGS_NONE)
         GLib.set_application_name("Music")
 
-        cssProviderFile = Gio.File.new_for_uri('resource:///org/gnome/music/application.css')
+        cssProviderFile = Gio.File.new_for_uri('resource:///org/gnome/Music/application.css')
         cssProvider = Gtk.CssProvider()
         cssProvider.load_from_file(cssProviderFile)
         screen = Gdk.Screen.get_default()
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index 22b1195..b698472 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -363,7 +363,7 @@ class Player(GObject.GObject):
 
     def _setup_view(self):
         self._ui = Gtk.Builder()
-        self._ui.add_from_resource('/org/gnome/music/PlayerToolbar.ui')
+        self._ui.add_from_resource('/org/gnome/Music/PlayerToolbar.ui')
         self.eventBox = self._ui.get_object('eventBox')
         self.prevBtn = self._ui.get_object('previous_button')
         self.playBtn = self._ui.get_object('play_button')
@@ -659,7 +659,7 @@ class Player(GObject.GObject):
 class SelectionToolbar():
         def __init__(self):
             self._ui = Gtk.Builder()
-            self._ui.add_from_resource('/org/gnome/music/SelectionToolbar.ui')
+            self._ui.add_from_resource('/org/gnome/Music/SelectionToolbar.ui')
             self.eventbox = self._ui.get_object("eventbox1")
             self._add_to_playlist_button = self._ui.get_object("button1")
             self.eventbox.set_visible(False)
diff --git a/gnomemusic/toolbar.py b/gnomemusic/toolbar.py
index 9df694b..e130302 100644
--- a/gnomemusic/toolbar.py
+++ b/gnomemusic/toolbar.py
@@ -20,7 +20,7 @@ class Toolbar(GObject.GObject):
         GObject.GObject.__init__(self)
         self._stackSwitcher = Gtk.StackSwitcher()
         self._ui = Gtk.Builder()
-        self._ui.add_from_resource('/org/gnome/music/Headerbar.ui')
+        self._ui.add_from_resource('/org/gnome/Music/Headerbar.ui')
         self.header_bar = self._ui.get_object('header-bar')
         self._selectButton = self._ui.get_object('select-button')
         self._cancelButton = self._ui.get_object('done-button')
diff --git a/gnomemusic/view.py b/gnomemusic/view.py
index 292743f..4310f6f 100644
--- a/gnomemusic/view.py
+++ b/gnomemusic/view.py
@@ -228,7 +228,7 @@ class Empty(Gtk.Stack):
         Gtk.Stack.__init__(self,
                            transition_type=Gtk.StackTransitionType.CROSSFADE)
         builder = Gtk.Builder()
-        builder.add_from_resource('/org/gnome/music/NoMusic.ui')
+        builder.add_from_resource('/org/gnome/Music/NoMusic.ui')
         widget = builder.get_object('container')
         self.add(widget)
         self.show_all()
diff --git a/gnomemusic/widgets.py b/gnomemusic/widgets.py
index 9d40860..b5d68f7 100644
--- a/gnomemusic/widgets.py
+++ b/gnomemusic/widgets.py
@@ -69,7 +69,7 @@ class AlbumWidget(Gtk.EventBox):
         self._symbolicIcon = self.cache.make_default_icon(256, 256)
 
         self.ui = Gtk.Builder()
-        self.ui.add_from_resource('/org/gnome/music/AlbumWidget.ui')
+        self.ui.add_from_resource('/org/gnome/Music/AlbumWidget.ui')
         self.model = Gtk.ListStore(
             GObject.TYPE_STRING,  # title
             GObject.TYPE_STRING,
@@ -306,7 +306,7 @@ class ArtistAlbums(Gtk.VBox):
         self.artist = artist
         self.albums = albums
         self.ui = Gtk.Builder()
-        self.ui.add_from_resource('/org/gnome/music/ArtistAlbumsWidget.ui')
+        self.ui.add_from_resource('/org/gnome/Music/ArtistAlbumsWidget.ui')
         self.set_border_width(0)
         self.ui.get_object("artist").set_label(self.artist)
         self.widgets = []
@@ -470,7 +470,7 @@ class ArtistAlbumWidget(Gtk.HBox):
         self.songs = []
 
         self.ui = Gtk.Builder()
-        self.ui.add_from_resource('/org/gnome/music/ArtistAlbumWidget.ui')
+        self.ui.add_from_resource('/org/gnome/Music/ArtistAlbumWidget.ui')
 
         self.cache = AlbumArtCache.get_default()
         pixbuf = self.cache.make_default_icon(128, 128)
@@ -493,7 +493,7 @@ class ArtistAlbumWidget(Gtk.HBox):
         else:
             for i, track in enumerate(self.tracks):
                 ui = Gtk.Builder()
-                ui.add_from_resource('/org/gnome/music/TrackWidget.ui')
+                ui.add_from_resource('/org/gnome/Music/TrackWidget.ui')
                 song_widget = ui.get_object("eventbox1")
                 self.songs.append(song_widget)
                 ui.get_object("num")\


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]