[rhythmbox] context: move code to subdir, add to build system
- From: Jonathan Matthew <jmatthew src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rhythmbox] context: move code to subdir, add to build system
- Date: Sun, 1 Nov 2009 06:00:38 +0000 (UTC)
commit 1e70c4035bbd01179ebe37e5a790f0e943e1532a
Author: Jonathan Matthew <jonathan fibula d14n org>
Date: Sat Oct 31 19:37:19 2009 +1000
context: move code to subdir, add to build system
configure.ac | 2 +
plugins/Makefile.am | 1 +
plugins/context/LyricsTab.py | 174 --------------------
plugins/context/context.rb-plugin | 9 -
plugins/context/context.rb-plugin.in | 9 +
plugins/context/{ => }/context/AlbumTab.py | 3 +-
plugins/context/{ => }/context/ArtistTab.py | 3 +-
plugins/context/{ => }/context/ContextView.py | 0
plugins/context/{ => }/context/LeoslyricsParser.py | 0
plugins/context/{ => }/context/LyrcParser.py | 0
plugins/context/{ => }/context/LyricsParse.py | 0
plugins/context/context/LyricsTab.py | 3 +-
plugins/context/context/Makefile.am | 4 +-
plugins/context/{ => }/context/__init__.py | 0
14 files changed, 21 insertions(+), 187 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 54b5f88..c617638 100644
--- a/configure.ac
+++ b/configure.ac
@@ -866,6 +866,8 @@ plugins/power-manager/Makefile
plugins/status-icon/Makefile
plugins/visualizer/Makefile
plugins/mmkeys/Makefile
+plugins/context/Makefile
+plugins/context/context/Makefile
bindings/Makefile
bindings/python/Makefile
bindings/vala/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 1f599f2..a9ea329 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -23,6 +23,7 @@ SUBDIRS += \
jamendo \
coherence \
im-status \
+ context \
rb
endif
diff --git a/plugins/context/context.rb-plugin.in b/plugins/context/context.rb-plugin.in
new file mode 100644
index 0000000..1a47293
--- /dev/null
+++ b/plugins/context/context.rb-plugin.in
@@ -0,0 +1,9 @@
+[RB Plugin]
+Loader=python
+Module=context
+IAge=1
+_Name=Context Panel
+_Description=Show information related to the currently playing artist and song.
+Authors=John Iacona <plate0salad gmail com>
+Copyright=Copyright © 2009 John Iacona
+Website=http://rhythmbox.org/
diff --git a/plugins/context/AlbumTab.py b/plugins/context/context/AlbumTab.py
similarity index 98%
rename from plugins/context/AlbumTab.py
rename to plugins/context/context/AlbumTab.py
index 2a17bdc..1491a95 100644
--- a/plugins/context/AlbumTab.py
+++ b/plugins/context/context/AlbumTab.py
@@ -91,7 +91,8 @@ class AlbumView (gobject.GObject) :
self.plugin = plugin
self.file = ""
- self.basepath = "file://" + os.path.split(plugin.find_file('AlbumTab.py'))[0]
+ plugindir = os.path.split(plugin.find_file ('context.rb-plugin'))[0]
+ self.basepath = "file://" + urllib.pathname2url (plugindir)
self.load_tmpl ()
self.connect_signals ()
diff --git a/plugins/context/ArtistTab.py b/plugins/context/context/ArtistTab.py
similarity index 98%
rename from plugins/context/ArtistTab.py
rename to plugins/context/context/ArtistTab.py
index 301dc41..c071842 100644
--- a/plugins/context/ArtistTab.py
+++ b/plugins/context/context/ArtistTab.py
@@ -93,7 +93,8 @@ class ArtistView (gobject.GObject) :
self.shell = shell
self.plugin = plugin
self.file = ""
- self.basepath = 'file://' + os.path.split(plugin.find_file('AlbumTab.py'))[0]
+ plugindir = os.path.split(plugin.find_file ('context.rb-plugin'))[0]
+ self.basepath = "file://" + urllib.pathname2url (plugindir)
self.load_tmpl ()
self.connect_signals ()
diff --git a/plugins/context/ContextView.py b/plugins/context/context/ContextView.py
similarity index 100%
rename from plugins/context/ContextView.py
rename to plugins/context/context/ContextView.py
diff --git a/plugins/context/LeoslyricsParser.py b/plugins/context/context/LeoslyricsParser.py
similarity index 100%
rename from plugins/context/LeoslyricsParser.py
rename to plugins/context/context/LeoslyricsParser.py
diff --git a/plugins/context/LyrcParser.py b/plugins/context/context/LyrcParser.py
similarity index 100%
rename from plugins/context/LyrcParser.py
rename to plugins/context/context/LyrcParser.py
diff --git a/plugins/context/LyricsParse.py b/plugins/context/context/LyricsParse.py
similarity index 100%
rename from plugins/context/LyricsParse.py
rename to plugins/context/context/LyricsParse.py
diff --git a/plugins/context/context/LyricsTab.py b/plugins/context/context/LyricsTab.py
index 69aae77..758aae7 100644
--- a/plugins/context/context/LyricsTab.py
+++ b/plugins/context/context/LyricsTab.py
@@ -81,7 +81,8 @@ class LyricsView (gobject.GObject):
self.shell = shell
self.plugin = plugin
self.file = ""
- self.basepath = 'file://' + os.path.split(plugin.find_file('AlbumTab.py'))[0]
+ plugindir = os.path.split(plugin.find_file ('context.rb-plugin'))[0]
+ self.basepath = "file://" + urllib.pathname2url (plugindir)
self.load_tmpl ()
self.connect_signals ()
diff --git a/plugins/context/context/Makefile.am b/plugins/context/context/Makefile.am
index 8ae1ebe..01705ee 100644
--- a/plugins/context/context/Makefile.am
+++ b/plugins/context/context/Makefile.am
@@ -5,7 +5,9 @@ plugin_PYTHON = \
AlbumTab.py \
ArtistTab.py \
ContextView.py \
- LastFM.py \
+ LeoslyricsParser.py \
+ LyrcParser.py \
+ LyricsParse.py \
LyricsTab.py \
__init__.py
diff --git a/plugins/context/__init__.py b/plugins/context/context/__init__.py
similarity index 100%
rename from plugins/context/__init__.py
rename to plugins/context/context/__init__.py
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]