commit 57c32f1aff52fe9788d3c6a432649e741d3c9e51
Author: Daniele Forsi <dani...@forsi.it>
Date: Fri Jan 7 15:14:05 2011 +0100
Translation fixes
* plugins/*/*.plugin
* Rename to plugins/*/*.plugin.in and mark for translation the Name
and Description fields.
* plugins/*/Makefile.am
* Use plugins/plugins.mk in the remaining makefiles.
* po/POTFILES.in
* Add plugins/*/*.plugin.in. Remove plugins/coverweb/coverweb.glade.h
since now it is automatically created and deleted during update-po.
* .gitignore
* Ignore generated .plugin files.
* POTFILES.skip
* Add data/glade/coverweb.glade because it is a symlink.
* POTFILES.in
* POTFILES.skip
* Replace *.xml.h with *.xml
* data/glade/Makefile.am
* Now gtkpod.glade is handled automatically via POTFILES.in.
.gitignore | 1 +
data/glade/Makefile.am | 3 -
plugins/core_preferences/core_prefs.plugin | 5 -
plugins/core_preferences/core_prefs.plugin.in | 5 +
plugins/cover_display/cover_display.plugin | 4 -
plugins/cover_display/cover_display.plugin.in | 4 +
plugins/coverweb/Makefile.am | 84 +------------------
plugins/coverweb/coverweb.plugin | 4 -
plugins/coverweb/coverweb.plugin.in | 4 +
plugins/details_editor/details_editor.plugin | 4 -
plugins/details_editor/details_editor.plugin.in | 4 +
plugins/exporter/exporter.plugin | 4 -
plugins/exporter/exporter.plugin.in | 4 +
plugins/filetype_flac/filetype_flac.plugin | 4 -
plugins/filetype_flac/filetype_flac.plugin.in | 4 +
plugins/filetype_m4a/filetype_m4a.plugin | 4 -
plugins/filetype_m4a/filetype_m4a.plugin.in | 4 +
plugins/filetype_mp3/filetype_mp3.plugin | 5 -
plugins/filetype_mp3/filetype_mp3.plugin.in | 5 +
plugins/filetype_mp4/filetype_mp4.plugin | 4 -
plugins/filetype_mp4/filetype_mp4.plugin.in | 4 +
plugins/filetype_ogg/filetype_ogg.plugin | 4 -
plugins/filetype_ogg/filetype_ogg.plugin.in | 4 +
plugins/filetype_ogg/oggfile.c | 2 +-
plugins/filetype_ogg/plugin.c | 2 +-
plugins/filetype_video/filetype_video.plugin | 4 -
plugins/filetype_video/filetype_video.plugin.in | 4 +
plugins/filetype_wav/filetype_wav.plugin | 4 -
plugins/filetype_wav/filetype_wav.plugin.in | 4 +
plugins/info_display/info_display.plugin | 4 -
plugins/info_display/info_display.plugin.in | 4 +
plugins/media_player/Makefile.am | 84 +------------------
plugins/media_player/media_player.plugin | 4 -
plugins/media_player/media_player.plugin.in | 4 +
plugins/mserv/Makefile.am | 72 +---------------
plugins/mserv/mserv.plugin | 4 -
plugins/mserv/mserv.plugin.in | 4 +
plugins/photo_editor/photo_editor.plugin | 4 -
plugins/photo_editor/photo_editor.plugin.in | 4 +
plugins/playlist_display/Makefile.am | 89 +-------------------
...t_display.plugin => playlist_display.plugin.in} | 4 +-
plugins/plugins.mk | 23 ++----
plugins/repository_editor/repository_editor.plugin | 4 -
.../repository_editor/repository_editor.plugin.in | 4 +
...ab_display.plugin => sorttab_display.plugin.in} | 4 +-
plugins/track_display/track_display.plugin | 5 -
plugins/track_display/track_display.plugin.in | 5 +
po/POTFILES.in | 29 +++++-
po/POTFILES.skip | 4 -
49 files changed, 123 insertions(+), 428 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7f2dfd..06714c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,7 @@ version
# /plugins/
/plugins/*.plugin
+/plugins/*/*.plugin
# links from dev env
/data/AUTHORS
diff --git a/data/glade/Makefile.am b/data/glade/Makefile.am
index 0934943..01ecc97 100644
--- a/data/glade/Makefile.am
+++ b/data/glade/Makefile.am
@@ -2,8 +2,5 @@ appdatadir = $(pkgdatadir)/data/glade
appdata_DATA = \
gtkpod.glade
-all-local:
- $(INTLTOOL_EXTRACT) -type=gettext/glade gtkpod.glade
-
EXTRA_DIST = \
$(appdata_DATA)
diff --git a/plugins/core_preferences/core_prefs.plugin.in
b/plugins/core_preferences/core_prefs.plugin.in
new file mode 100644
index 0000000..bf92c44
--- /dev/null
+++ b/plugins/core_preferences/core_prefs.plugin.in
@@ -0,0 +1,5 @@
+[Anjuta Plugin]
+Location=core_prefs:CorePrefsPlugin
+_Name=Core Preferences Plugin
+_Description=Modify Core Preferences
+UserActivatable=no
diff --git a/plugins/cover_display/cover_display.plugin.in
b/plugins/cover_display/cover_display.plugin.in
new file mode 100644
index 0000000..a4f16a8
--- /dev/null
+++ b/plugins/cover_display/cover_display.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=cover_display:CoverDisplayPlugin
+_Name=Cover Display Plugin
+_Description=Display Cover Artwork of Tracks
diff --git a/plugins/coverweb/Makefile.am b/plugins/coverweb/Makefile.am
index 9b277b5..574cbe5 100644
--- a/plugins/coverweb/Makefile.am
+++ b/plugins/coverweb/Makefile.am
@@ -4,9 +4,6 @@ plugin_name = coverweb
plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
-# Plugin description file
-plugin_in_files = $(plugin_file)
-
# Plugin UI file
coverweb_uidir = $(gtkpod_ui_dir)
coverweb_ui_DATA = $(plugin_name).ui
@@ -20,33 +17,21 @@ coverweb_pixmapsdir = $(gtkpod_image_dir)
coverweb_pixmaps_DATA =
# Where to install the plugin
-plugindir = $(gtkpod_plugin_dir)
coverweb_plugindir = $(gtkpod_plugin_dir)
coverweb_plugin_DATA = $(plugin_file)
SUBDIRS = icons
+include ../plugins.mk
+
# The plugin
plugin_LTLIBRARIES = libcoverweb.la
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DGTKPOD_DATA_DIR=\"$(gtkpod_data_dir)\" \
- -DGTKPOD_PLUGIN_DIR=\"$(gtkpod_plugin_dir)\" \
- -DGTKPOD_IMAGE_DIR=\"$(gtkpod_image_dir)\" \
- -DGTKPOD_GLADE_DIR=\"$(gtkpod_glade_dir)\" \
- -DGTKPOD_UI_DIR=\"$(gtkpod_ui_dir)\" \
- -DGTKPOD_SCRIPT_DIR=\""$(gtkpod_script_dir)"\" \
- -DPACKAGE_DATA_DIR=\"$(datadir)\" \
- -DPACKAGE_SRC_DIR=\"$(srcdir)\" \
- $(GTKPOD_CFLAGS) \
- $(WEBKIT_CFLAGS)
-
# Plugin sources
libcoverweb_la_SOURCES = plugin.c plugin.h \
coverweb.c coverweb.h \
coverweb_preferences.c
coverweb_preferences.h
-
+libcoverweb_la_CFLAGS = $(WEBKIT_CFLAGS)
libcoverweb_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS)
# Plugin dependencies
@@ -54,69 +39,6 @@ libcoverweb_la_LIBADD = \
$(LIBGTKPOD_LIBS) \
$(LIBANJUTA_LIBS) \
$(WEBKIT_LIBS)
-
-all-local: create-plugin-links create-ui-link create-glade-link
compile-glade-header
-
-# Creating symbolic links in plugin root directory
-create-plugin-links:
- echo "Creating plugin links"
- if [ ! -e ../$(plugin_lib) ]; then \
- ln -s `pwd`/.libs/$(plugin_lib) ../$(plugin_lib); \
- fi; \
- if [ ! -e ../$(plugin_file) ]; then \
- ln -s `pwd`/$(plugin_file) ../$(plugin_file); \
- fi;
-
-# Creating symbolic link to ui file in installed ui directory
-create-ui-link:
- if [ ! -e ../../data/ui/$(plugin_name).ui ]; then \
- ln -s `pwd`/$(plugin_name).ui ../../data/ui/$(plugin_name).ui; \
- fi;
-
-create-glade-link:
- if [ -e `pwd`/$(plugin_name).glade ]; then \
- if [ ! -e ../../data/glade/$(plugin_name).glade ]; then \
- ln -s `pwd`/$(plugin_name).glade
../../data/glade/$(plugin_name).glade; \
- fi; \
- fi; \
- if [ -e `pwd`/$(plugin_name).xml ]; then \
- if [ ! -e ../../data/glade/$(plugin_name).xml ]; then \
- ln -s `pwd`/$(plugin_name).xml
../../data/glade/$(plugin_name).xml; \
- fi; \
- fi;
-
-compile-glade-header:
- if [ -e `pwd`/$(plugin_name).glade ]; then \
- $(INTLTOOL_EXTRACT) -type=gettext/glade $(plugin_name).glade; \
- fi; \
- if [ -e `pwd`/$(plugin_name).xml ]; then \
- $(INTLTOOL_EXTRACT) -type=gettext/glade $(plugin_name).xml; \
- fi;
-
-# Clean up the links and files created purely for dev [ing
-clean-local: clean-plugin-files clean-ui-dir clean-glade-dir
-
-clean-plugin-files:
- if [ -h ../$(plugin_file) ]; then \
- rm -f ../$(plugin_lib) ../$(plugin_file); \
- fi;
-
-clean-ui-dir:
- if [ -h ../../data/ui/$(plugin_name).ui ]; then \
- rm -f ../../data/ui/$(plugin_name).ui; \
- fi;
-
-clean-glade-dir:
- if [ -h ../../data/glade/$(plugin_name).glade ]; then \
- rm -f ../../data/glade/$(plugin_name).glade; \
- fi; \
- if [ -h $(gtkpod_glade_dir)/$(plugin_name).xml ]; then \
- rm -f ../../data/glade/$(plugin_name).xml; \
- fi; \
- if [ -f $(plugin_name).glade.h ]; then \
- rm -f $(plugin_name).glade.h; \
- fi;
-
endif
EXTRA_DIST = \
diff --git a/plugins/coverweb/coverweb.plugin.in
b/plugins/coverweb/coverweb.plugin.in
new file mode 100644
index 0000000..94f58fc
--- /dev/null
+++ b/plugins/coverweb/coverweb.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=coverweb:CoverWebPlugin
+_Name=Cover Web Plugin
+_Description=Web Browser for downloading Cover Artwork
diff --git a/plugins/details_editor/details_editor.plugin.in
b/plugins/details_editor/details_editor.plugin.in
new file mode 100644
index 0000000..742927c
--- /dev/null
+++ b/plugins/details_editor/details_editor.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=details_editor:DetailsEditorPlugin
+_Name=Details Editor Plugin
+_Description=Edit Track detail of Files
diff --git a/plugins/exporter/exporter.plugin.in
b/plugins/exporter/exporter.plugin.in
new file mode 100644
index 0000000..cd32aef
--- /dev/null
+++ b/plugins/exporter/exporter.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=exporter:ExporterPlugin
+_Name=Exporter Plugin
+_Description=Export Tracks to File
diff --git a/plugins/filetype_flac/filetype_flac.plugin.in
b/plugins/filetype_flac/filetype_flac.plugin.in
new file mode 100644
index 0000000..02bc00e
--- /dev/null
+++ b/plugins/filetype_flac/filetype_flac.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=filetype_flac:FlacFileTypePlugin
+_Name=Flac File Type Plugin
+_Description=Support for the flac file type
diff --git a/plugins/filetype_m4a/filetype_m4a.plugin.in
b/plugins/filetype_m4a/filetype_m4a.plugin.in
new file mode 100644
index 0000000..fbc4a7c
--- /dev/null
+++ b/plugins/filetype_m4a/filetype_m4a.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=filetype_m4a:M4AFileTypePlugin
+_Name=M4A File Type Plugin
+_Description=Support for the m4a / m4p file type
diff --git a/plugins/filetype_mp3/filetype_mp3.plugin.in
b/plugins/filetype_mp3/filetype_mp3.plugin.in
new file mode 100644
index 0000000..0cb554c
--- /dev/null
+++ b/plugins/filetype_mp3/filetype_mp3.plugin.in
@@ -0,0 +1,5 @@
+[Anjuta Plugin]
+Location=filetype_mp3:MP3FileTypePlugin
+_Name=MP3 File Type Plugin
+_Description=Support for the MP3 file type
+UserActivatable=no
diff --git a/plugins/filetype_mp4/filetype_mp4.plugin.in
b/plugins/filetype_mp4/filetype_mp4.plugin.in
new file mode 100644
index 0000000..a5125df
--- /dev/null
+++ b/plugins/filetype_mp4/filetype_mp4.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=filetype_mp4:MP4FileTypePlugin
+_Name=MP4 File Type Plugin
+_Description=Support for the MP4 video file type
diff --git a/plugins/filetype_ogg/filetype_ogg.plugin.in
b/plugins/filetype_ogg/filetype_ogg.plugin.in
new file mode 100644
index 0000000..9baedd6
--- /dev/null
+++ b/plugins/filetype_ogg/filetype_ogg.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=filetype_ogg:OGGFileTypePlugin
+_Name=Ogg File Type Plugin
+_Description=Support for the Ogg file type
diff --git a/plugins/filetype_ogg/oggfile.c b/plugins/filetype_ogg/oggfile.c
index 42c8e78..96c94c3 100644
--- a/plugins/filetype_ogg/oggfile.c
+++ b/plugins/filetype_ogg/oggfile.c
@@ -77,7 +77,7 @@ Track *ogg_get_file_info(const gchar *oggFileName) {
}
else {
track = gp_track_new();
- track->description = g_strdup("OGG audio file");
+ track->description = g_strdup("Ogg audio file");
//FIXME
// Question whether ogg video files should be handled separately?
track->mediatype = ITDB_MEDIATYPE_AUDIO;
diff --git a/plugins/filetype_ogg/plugin.c b/plugins/filetype_ogg/plugin.c
index 1f02105..715a3d1 100644
--- a/plugins/filetype_ogg/plugin.c
+++ b/plugins/filetype_ogg/plugin.c
@@ -75,7 +75,7 @@ static void ogg_filetype_plugin_class_init(GObjectClass
*klass) {
static void ogg_filetype_iface_init(FileTypeInterface *iface) {
iface->category = AUDIO;
- iface->description = _("OGG audio file type");
+ iface->description = _("Ogg audio file type");
iface->name = "ogg";
iface->suffixes = g_list_append(iface->suffixes, "oga");
diff --git a/plugins/filetype_video/filetype_video.plugin.in
b/plugins/filetype_video/filetype_video.plugin.in
new file mode 100644
index 0000000..873bcf0
--- /dev/null
+++ b/plugins/filetype_video/filetype_video.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=filetype_video:VideoFileTypePlugin
+_Name=Video File Type Plugin
+_Description=Generic video file type
diff --git a/plugins/filetype_wav/filetype_wav.plugin.in
b/plugins/filetype_wav/filetype_wav.plugin.in
new file mode 100644
index 0000000..a3c6507
--- /dev/null
+++ b/plugins/filetype_wav/filetype_wav.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=filetype_wav:WavFileTypePlugin
+_Name=Wav File Type Plugin
+_Description=Support for the wav file type
diff --git a/plugins/info_display/info_display.plugin.in
b/plugins/info_display/info_display.plugin.in
new file mode 100644
index 0000000..e5d105f
--- /dev/null
+++ b/plugins/info_display/info_display.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=info_display:InfoDisplayPlugin
+_Name=Info Display Plugin
+_Description=Information dialog for connected iPods
diff --git a/plugins/media_player/Makefile.am b/plugins/media_player/Makefile.am
index 8f3032a..3e255fe 100644
--- a/plugins/media_player/Makefile.am
+++ b/plugins/media_player/Makefile.am
@@ -4,9 +4,6 @@ plugin_name = media_player
plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
-# Plugin description file
-plugin_in_files = $(plugin_file)
-
# Plugin UI file
media_player_uidir = $(gtkpod_ui_dir)
media_player_ui_DATA = $(plugin_name).ui
@@ -20,32 +17,20 @@ media_player_pixmapsdir = $(gtkpod_image_dir)
media_player_pixmaps_DATA =
# Where to install the plugin
-plugindir = $(gtkpod_plugin_dir)
media_player_plugindir = $(gtkpod_plugin_dir)
media_player_plugin_DATA = $(plugin_file)
SUBDIRS = icons
+include ../plugins.mk
+
# The plugin
plugin_LTLIBRARIES = libmedia_player.la
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DGTKPOD_DATA_DIR=\"$(gtkpod_data_dir)\" \
- -DGTKPOD_PLUGIN_DIR=\"$(gtkpod_plugin_dir)\" \
- -DGTKPOD_IMAGE_DIR=\"$(gtkpod_image_dir)\" \
- -DGTKPOD_SCRIPT_DIR=\""$(gtkpod_script_dir)"\" \
- -DGTKPOD_GLADE_DIR=\"$(gtkpod_glade_dir)\" \
- -DGTKPOD_UI_DIR=\"$(gtkpod_ui_dir)\" \
- -DPACKAGE_DATA_DIR=\"$(datadir)\" \
- -DPACKAGE_SRC_DIR=\"$(srcdir)\" \
- $(GTKPOD_CFLAGS) \
- $(GSTREAMER_CFLAGS)
-
# Plugin sources
libmedia_player_la_SOURCES = plugin.c plugin.h \
media_player.c
media_player.h
-
+libmedia_player_la_CFLAGS = $(GSTREAMER_CFLAGS)
libmedia_player_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS)
# Plugin dependencies
@@ -53,69 +38,6 @@ libmedia_player_la_LIBADD = \
$(LIBGTKPOD_LIBS) \
$(LIBANJUTA_LIBS) \
$(GSTREAMER_LIBS)
-
-all-local: create-plugin-links create-ui-link create-glade-link
compile-glade-header
-
-# Creating symbolic links in plugin root directory
-create-plugin-links:
- echo "Creating plugin links"
- if [ ! -e ../$(plugin_lib) ]; then \
- ln -s `pwd`/.libs/$(plugin_lib) ../$(plugin_lib); \
- fi; \
- if [ ! -e ../$(plugin_file) ]; then \
- ln -s `pwd`/$(plugin_file) ../$(plugin_file); \
- fi;
-
-# Creating symbolic link to ui file in installed ui directory
-create-ui-link:
- if [ ! -e ../../data/ui/$(plugin_name).ui ]; then \
- ln -s `pwd`/$(plugin_name).ui ../../data/ui/$(plugin_name).ui; \
- fi;
-
-create-glade-link:
- if [ -e `pwd`/$(plugin_name).glade ]; then \
- if [ ! -e ../../data/glade/$(plugin_name).glade ]; then \
- ln -s `pwd`/$(plugin_name).glade
../../data/glade/$(plugin_name).glade; \
- fi; \
- fi; \
- if [ -e `pwd`/$(plugin_name).xml ]; then \
- if [ ! -e ../../data/glade/$(plugin_name).xml ]; then \
- ln -s `pwd`/$(plugin_name).xml
../../data/glade/$(plugin_name).xml; \
- fi; \
- fi;
-
-compile-glade-header:
- if [ -e `pwd`/$(plugin_name).glade ]; then \
- $(INTLTOOL_EXTRACT) -type=gettext/glade $(plugin_name).glade; \
- fi; \
- if [ -e `pwd`/$(plugin_name).xml ]; then \
- $(INTLTOOL_EXTRACT) -type=gettext/glade $(plugin_name).xml; \
- fi;
-
-# Clean up the links and files created purely for dev [ing
-clean-local: clean-plugin-files clean-ui-dir clean-glade-dir
-
-clean-plugin-files:
- if [ -h ../$(plugin_file) ]; then \
- rm -f ../$(plugin_lib) ../$(plugin_file); \
- fi;
-
-clean-ui-dir:
- if [ -h ../../data/ui/$(plugin_name).ui ]; then \
- rm -f ../../data/ui/$(plugin_name).ui; \
- fi;
-
-clean-glade-dir:
- if [ -h ../../data/glade/$(plugin_name).glade ]; then \
- rm -f ../../data/glade/$(plugin_name).glade; \
- fi; \
- if [ -h $(gtkpod_glade_dir)/$(plugin_name).xml ]; then \
- rm -f ../../data/glade/$(plugin_name).xml; \
- fi; \
- if [ -f $(plugin_name).glade.h ]; then \
- rm -f $(plugin_name).glade.h; \
- fi;
-
endif
EXTRA_DIST = \
diff --git a/plugins/media_player/media_player.plugin.in
b/plugins/media_player/media_player.plugin.in
new file mode 100644
index 0000000..15ac543
--- /dev/null
+++ b/plugins/media_player/media_player.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=media_player:MediaPlayerPlugin
+_Name=Media Player Plugin
+_Description=Controls for playing tracks and videos
diff --git a/plugins/mserv/Makefile.am b/plugins/mserv/Makefile.am
index 9bbb01e..ab08377 100644
--- a/plugins/mserv/Makefile.am
+++ b/plugins/mserv/Makefile.am
@@ -2,9 +2,6 @@ plugin_name = mserv
plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
-# Plugin description file
-plugin_in_files = $(plugin_file)
-
# Plugin UI file
mserv_uidir = $(gtkpod_ui_dir)
mserv_ui_DATA = $(plugin_name).ui
@@ -18,27 +15,16 @@ mserv_pixmapsdir = $(gtkpod_image_dir)
mserv_pixmaps_DATA =
# Where to install the plugin
-plugindir = $(gtkpod_plugin_dir)
mserv_plugindir = $(gtkpod_plugin_dir)
mserv_plugin_DATA = $(plugin_file)
SUBDIRS = icons
+include ../plugins.mk
+
# The plugin
plugin_LTLIBRARIES = libmserv.la
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DGTKPOD_DATA_DIR=\"$(gtkpod_data_dir)\" \
- -DGTKPOD_PLUGIN_DIR=\"$(gtkpod_plugin_dir)\" \
- -DGTKPOD_IMAGE_DIR=\"$(gtkpod_image_dir)\" \
- -DGTKPOD_SCRIPT_DIR=\""$(gtkpod_script_dir)"\" \
- -DGTKPOD_GLADE_DIR=\"$(gtkpod_glade_dir)\" \
- -DGTKPOD_UI_DIR=\"$(gtkpod_ui_dir)\" \
- -DPACKAGE_DATA_DIR=\"$(datadir)\" \
- -DPACKAGE_SRC_DIR=\"$(srcdir)\" \
- $(GTKPOD_CFLAGS)
-
# Plugin sources
libmserv_la_SOURCES = plugin.c plugin.h \
mserv.c mserv.h \
@@ -51,60 +37,6 @@ libmserv_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS)
libmserv_la_LIBADD = \
$(LIBGTKPOD_LIBS) \
$(LIBANJUTA_LIBS)
-
-all-local: create-plugin-links create-ui-link create-glade-link
compile-glade-header
-
-# Creating symbolic links in plugin root directory
-create-plugin-links:
- echo "Creating plugin links"
- if [ ! -e ../$(plugin_lib) ]; then \
- ln -s `pwd`/.libs/$(plugin_lib) ../$(plugin_lib); \
- fi; \
- if [ ! -e ../$(plugin_file) ]; then \
- ln -s `pwd`/$(plugin_file) ../$(plugin_file); \
- fi;
-
-# Creating symbolic link to ui file in installed ui directory
-create-ui-link:
- if [ ! -e ../../data/ui/$(plugin_name).ui ]; then \
- ln -s `pwd`/$(plugin_name).ui ../../data/ui/$(plugin_name).ui; \
- fi;
-
-create-glade-link:
- if [ -e `pwd`/$(plugin_name).xml ]; then \
- if [ ! -e ../../data/glade/$(plugin_name).xml ]; then \
- ln -s `pwd`/$(plugin_name).xml
../../data/glade/$(plugin_name).xml; \
- fi; \
- fi;
-
-compile-glade-header:
- if [ -e `pwd`/$(plugin_name).glade ]; then \
- $(INTLTOOL_EXTRACT) -type=gettext/glade $(plugin_name).glade; \
- fi; \
- if [ -e `pwd`/$(plugin_name).xml ]; then \
- $(INTLTOOL_EXTRACT) -type=gettext/glade $(plugin_name).xml; \
- fi;
-
-# Clean up the links and files created purely for dev [ing
-clean-local: clean-plugin-files clean-ui-dir clean-glade-dir
-
-clean-plugin-files:
- if [ -h ../$(plugin_file) ]; then \
- rm -f ../$(plugin_lib) ../$(plugin_file); \
- fi;
-
-clean-ui-dir:
- if [ -h ../../data/ui/$(plugin_name).ui ]; then \
- rm -f ../../data/ui/$(plugin_name).ui; \
- fi;
-
-clean-glade-dir:
- if [ -h $(gtkpod_glade_dir)/$(plugin_name).xml ]; then \
- rm -f ../../data/glade/$(plugin_name).xml; \
- fi; \
- if [ -f $(plugin_name).glade.h ]; then \
- rm -f $(plugin_name).glade.h; \
- fi;
EXTRA_DIST = \
$(plugin_in_files) \
diff --git a/plugins/mserv/mserv.plugin.in b/plugins/mserv/mserv.plugin.in
new file mode 100644
index 0000000..7198f5e
--- /dev/null
+++ b/plugins/mserv/mserv.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=mserv:MservPlugin
+_Name=Mserv Jukebox Plugin
+_Description=Mserv is a jukebox-style music server (see http://www.mserv.org)
diff --git a/plugins/photo_editor/photo_editor.plugin.in
b/plugins/photo_editor/photo_editor.plugin.in
new file mode 100644
index 0000000..d1d4dae
--- /dev/null
+++ b/plugins/photo_editor/photo_editor.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=photo_editor:PhotoEditorPlugin
+_Name=Photo Editor Plugin
+_Description=Add and Remove Photographs
diff --git a/plugins/playlist_display/Makefile.am
b/plugins/playlist_display/Makefile.am
index 7e5f421..9011849 100644
--- a/plugins/playlist_display/Makefile.am
+++ b/plugins/playlist_display/Makefile.am
@@ -23,24 +23,7 @@ playlist_display_plugin_DATA = $(plugin_file)
SUBDIRS = icons
-# Plugin description file
-plugin_in_files = $(plugin_file)
-
-# Include paths
-AM_CPPFLAGS = \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DGTKPOD_DATA_DIR=\"$(gtkpod_data_dir)\" \
- -DGTKPOD_PLUGIN_DIR=\"$(gtkpod_plugin_dir)\" \
- -DGTKPOD_IMAGE_DIR=\"$(gtkpod_image_dir)\" \
- -DGTKPOD_SCRIPT_DIR=\""$(gtkpod_script_dir)"\" \
- -DGTKPOD_GLADE_DIR=\"$(gtkpod_glade_dir)\" \
- -DGTKPOD_UI_DIR=\"$(gtkpod_ui_dir)\" \
- -DPACKAGE_DATA_DIR=\"$(datadir)\" \
- -DPACKAGE_SRC_DIR=\"$(srcdir)\" \
- $(GTKPOD_CFLAGS)
-
-# Where to install the plugin
-plugindir = $(gtkpod_plugin_dir)
+include ../plugins.mk
# The plugin
plugin_LTLIBRARIES = libplaylist_display.la
@@ -66,73 +49,3 @@ EXTRA_DIST = \
$(playlist_display_glade_DATA) \
$(playlist_display_toolbar_DATA) \
$(playlist_display_pixmaps_DATA)
-
-all-local: create-plugin-links create-ui-link create-glade-link
compile-glade-header
-
-# Creating symbolic links in plugin root directory
-create-plugin-links:
- echo "Creating plugin links"
- if [ ! -e ../$(plugin_lib) ]; then \
- ln -s `pwd`/.libs/$(plugin_lib) ../$(plugin_lib); \
- fi; \
- if [ ! -e ../$(plugin_file) ]; then \
- ln -s `pwd`/$(plugin_file) ../$(plugin_file); \
- fi;
-
-# Creating symbolic link to ui file in installed ui directory
-create-ui-link:
- if [ ! -e ../../data/ui/$(plugin_name).ui ]; then \
- ln -s `pwd`/$(plugin_name).ui ../../data/ui/$(plugin_name).ui; \
- fi;
-
-create-glade-link:
- if [ -e `pwd`/$(plugin_name).glade ]; then \
- if [ ! -e ../../data/glade/$(plugin_name).glade ]; then \
- ln -s `pwd`/$(plugin_name).glade
../../data/glade/$(plugin_name).glade; \
- fi; \
- fi; \
- if [ -e `pwd`/$(plugin_name).xml ]; then \
- if [ ! -e ../../data/glade/$(plugin_name).xml ]; then \
- ln -s `pwd`/$(plugin_name).xml
../../data/glade/$(plugin_name).xml; \
- fi; \
- fi; \
- if [ -e `pwd`/$(plugin_name)_toolbar.xml ]; then \
- if [ ! -e ../../data/glade/$(plugin_name)_toolbar.xml ]; then \
- ln -s `pwd`/$(plugin_name)_toolbar.xml
../../data/glade/$(plugin_name)_toolbar.xml; \
- fi; \
- fi;
-
-compile-glade-header:
- if [ -e `pwd`/$(plugin_name).glade ]; then \
- $(INTLTOOL_EXTRACT) -type=gettext/glade $(plugin_name).glade; \
- fi; \
- if [ -e `pwd`/$(plugin_name).xml ]; then \
- $(INTLTOOL_EXTRACT) -type=gettext/glade $(plugin_name).xml; \
- fi;
-
-# Clean up the links and files created purely for dev [ing
-clean-local: clean-plugin-files clean-ui-dir clean-glade-dir
-
-clean-plugin-files:
- if [ -h ../$(plugin_file) ]; then \
- rm -f ../$(plugin_lib) ../$(plugin_file); \
- fi;
-
-clean-ui-dir:
- if [ -h ../../data/ui/$(plugin_name).ui ]; then \
- rm -f ../../data/ui/$(plugin_name).ui; \
- fi;
-
-clean-glade-dir:
- if [ -h ../../data/glade/$(plugin_name).glade ]; then \
- rm -f ../../data/glade/$(plugin_name).glade; \
- fi; \
- if [ -h ../../data/glade/$(plugin_name).xml ]; then \
- rm -f ../../data/glade/$(plugin_name).xml; \
- fi; \
- if [ -h ../../data/glade/$(plugin_name)_toolbar.xml ]; then \
- rm -f ../../data/glade/$(plugin_name)_toolbar.xml; \
- fi; \
- if [ -f $(plugin_name).glade.h ]; then \
- rm -f $(plugin_name).glade.h; \
- fi;
diff --git a/plugins/playlist_display/playlist_display.plugin
b/plugins/playlist_display/playlist_display.plugin.in
similarity index 59%
rename from plugins/playlist_display/playlist_display.plugin
rename to plugins/playlist_display/playlist_display.plugin.in
index d1f958c..c0629cd 100644
--- a/plugins/playlist_display/playlist_display.plugin
+++ b/plugins/playlist_display/playlist_display.plugin.in
@@ -1,5 +1,5 @@
[Anjuta Plugin]
Location=playlist_display:PlaylistDisplayPlugin
-Name=Playlist Display Plugin
-Description=Playlist View
+_Name=Playlist Display Plugin
+_Description=Playlist View
UserActivatable=no
diff --git a/plugins/plugins.mk b/plugins/plugins.mk
index da1d177..3776046 100644
--- a/plugins/plugins.mk
+++ b/plugins/plugins.mk
@@ -1,5 +1,5 @@
# Plugin description file
-plugin_in_files = $(plugin_file)
+plugin_in_files = $(plugin_file).in
# Include paths
AM_CPPFLAGS = \
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
-DGTKPOD_PLUGIN_DIR=\"$(gtkpod_plugin_dir)\" \
-DGTKPOD_IMAGE_DIR=\"$(gtkpod_image_dir)\" \
-DGTKPOD_GLADE_DIR=\"$(gtkpod_glade_dir)\" \
+ -DGTKPOD_SCRIPT_DIR=\"$(gtkpod_script_dir)\" \
-DGTKPOD_UI_DIR=\"$(gtkpod_ui_dir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)\" \
-DPACKAGE_SRC_DIR=\"$(srcdir)\" \
@@ -16,7 +17,7 @@ AM_CPPFLAGS = \
# Where to install the plugin
plugindir = $(gtkpod_plugin_dir)
-all-local: create-plugin-links create-ui-link create-glade-link
compile-glade-header
+all-local: create-plugin-links create-ui-link create-glade-link
# Creating symbolic links in plugin root directory
create-plugin-links:
@@ -46,14 +47,6 @@ create-glade-link:
fi; \
fi;
-compile-glade-header:
- if [ -e `pwd`/$(plugin_name).glade ]; then \
- $(INTLTOOL_EXTRACT) -type=gettext/glade $(plugin_name).glade; \
- fi; \
- if [ -e `pwd`/$(plugin_name).xml ]; then \
- $(INTLTOOL_EXTRACT) -type=gettext/glade $(plugin_name).xml; \
- fi;
-
# Clean up the links and files created purely for dev [ing
clean-local: clean-plugin-files clean-ui-dir clean-glade-dir
@@ -71,9 +64,9 @@ clean-glade-dir:
if [ -h ../../data/glade/$(plugin_name).glade ]; then \
rm -f ../../data/glade/$(plugin_name).glade; \
fi; \
- if [ -h ../../data/glade/$(plugin_name).xml ]; then \
+ if [ -h ../../data/glade/$(plugin_name).xml ]; then \
rm -f ../../data/glade/$(plugin_name).xml; \
- fi; \
- if [ -f $(plugin_name).glade.h ]; then \
- rm -f $(plugin_name).glade.h; \
- fi;
+ fi;
+
+# Create plugin description file with translations
+%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c
$(top_builddir)/po/.intltool-merge-cache
diff --git a/plugins/repository_editor/repository_editor.plugin.in
b/plugins/repository_editor/repository_editor.plugin.in
new file mode 100644
index 0000000..092ad1b
--- /dev/null
+++ b/plugins/repository_editor/repository_editor.plugin.in
@@ -0,0 +1,4 @@
+[Anjuta Plugin]
+Location=repository_editor:RepositoryEditorPlugin
+_Name=Repository Editor Plugin
+_Description=Edit iTunesDB Properties
diff --git a/plugins/sorttab_display/sorttab_display.plugin
b/plugins/sorttab_display/sorttab_display.plugin.in
similarity index 50%
rename from plugins/sorttab_display/sorttab_display.plugin
rename to plugins/sorttab_display/sorttab_display.plugin.in
index b5a1902..34e4f72 100644
--- a/plugins/sorttab_display/sorttab_display.plugin
+++ b/plugins/sorttab_display/sorttab_display.plugin.in
@@ -1,4 +1,4 @@
[Anjuta Plugin]
Location=sorttab_display:SorttabDisplayPlugin
-Name=Sorttab Display Plugin
-Description=Filter Track View
+_Name=Sorttab Display Plugin
+_Description=Filter Track View
diff --git a/plugins/track_display/track_display.plugin.in
b/plugins/track_display/track_display.plugin.in
new file mode 100644
index 0000000..e46ffb6
--- /dev/null
+++ b/plugins/track_display/track_display.plugin.in
@@ -0,0 +1,5 @@
+[Anjuta Plugin]
+Location=track_display:TrackDisplayPlugin
+_Name=Track Display Plugin
+_Description=Track View
+UserActivatable=no
\ No newline at end of file
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 48d492d..89b5bcb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,61 +24,78 @@ libgtkpod/sha1.c
libgtkpod/syncdir.c
libgtkpod/tools.c
plugins/core_preferences/core_prefs.c
-plugins/core_preferences/core_prefs.xml.h
+[type: gettext/ini]plugins/core_preferences/core_prefs.plugin.in
+[type: gettext/glade]plugins/core_preferences/core_prefs.xml
plugins/core_preferences/plugin.c
plugins/cover_display/cover_display.glade
plugins/cover_display/cover_display_context_menu.c
+[type: gettext/ini]plugins/cover_display/cover_display.plugin.in
plugins/cover_display/display_coverart.c
plugins/cover_display/fetchcover.c
plugins/cover_display/plugin.c
plugins/coverweb/coverweb.c
+plugins/coverweb/coverweb.glade
+[type: gettext/ini]plugins/coverweb/coverweb.plugin.in
plugins/coverweb/coverweb_preferences.c
plugins/coverweb/plugin.c
-plugins/coverweb/coverweb.glade
-plugins/coverweb/coverweb.glade.h
plugins/details_editor/details.c
plugins/details_editor/details_editor.glade
+[type: gettext/ini]plugins/details_editor/details_editor.plugin.in
plugins/details_editor/fetchcover.c
plugins/details_editor/plugin.c
-plugins/exporter/exporter.xml.h
+[type: gettext/ini]plugins/exporter/exporter.plugin.in
+[type: gettext/glade]plugins/exporter/exporter.xml
plugins/exporter/file_export.c
plugins/exporter/plugin.c
+[type: gettext/ini]plugins/filetype_flac/filetype_flac.plugin.in
plugins/filetype_flac/flacfile.c
plugins/filetype_flac/plugin.c
+[type: gettext/ini]plugins/filetype_m4a/filetype_m4a.plugin.in
plugins/filetype_m4a/mp4file.c
plugins/filetype_m4a/plugin.c
+[type: gettext/ini]plugins/filetype_mp3/filetype_mp3.plugin.in
plugins/filetype_mp3/mp3file.c
plugins/filetype_mp3/plugin.c
+[type: gettext/ini]plugins/filetype_mp4/filetype_mp4.plugin.in
plugins/filetype_mp4/mp4file.c
plugins/filetype_mp4/plugin.c
+[type: gettext/ini]plugins/filetype_ogg/filetype_ogg.plugin.in
plugins/filetype_ogg/oggfile.c
plugins/filetype_ogg/plugin.c
+[type: gettext/ini]plugins/filetype_video/filetype_video.plugin.in
plugins/filetype_video/plugin.c
+[type: gettext/ini]plugins/filetype_wav/filetype_wav.plugin.in
plugins/filetype_wav/plugin.c
plugins/filetype_wav/wavfile.c
plugins/info_display/info.c
+[type: gettext/ini]plugins/info_display/info_display.plugin.in
plugins/info_display/infoview.c
plugins/info_display/plugin.c
plugins/media_player/media_player.c
plugins/media_player/media_player.glade
+[type: gettext/ini]plugins/media_player/media_player.plugin.in
plugins/media_player/plugin.c
plugins/mserv/mserv.c
-plugins/mserv/mserv.xml.h
+[type: gettext/ini]plugins/mserv/mserv.plugin.in
+[type: gettext/glade]plugins/mserv/mserv.xml
plugins/mserv/plugin.c
plugins/photo_editor/display_photo.c
plugins/photo_editor/photo_editor.glade
plugins/photo_editor/photo_editor_context_menu.c
+[type: gettext/ini]plugins/photo_editor/photo_editor.plugin.in
plugins/photo_editor/plugin.c
plugins/playlist_display/display_playlists.c
plugins/playlist_display/playlist_display.glade
plugins/playlist_display/playlist_display_actions.c
plugins/playlist_display/playlist_display_context_menu.c
+[type: gettext/ini]plugins/playlist_display/playlist_display.plugin.in
plugins/playlist_display/plugin.c
plugins/repository_editor/plugin.c
plugins/repository_editor/repository_actions.c
plugins/repository_editor/repository_creator.c
plugins/repository_editor/repository_editor.c
plugins/repository_editor/repository_editor.glade
+[type: gettext/ini]plugins/repository_editor/repository_editor.plugin.in
plugins/repository_editor/repository_init.c
plugins/sorttab_display/date_parser.c
plugins/sorttab_display/display_sorttabs.c
@@ -86,10 +103,12 @@ plugins/sorttab_display/plugin.c
plugins/sorttab_display/sorttab_display.glade
plugins/sorttab_display/sorttab_display_actions.c
plugins/sorttab_display/sorttab_display_context_menu.c
+[type: gettext/ini]plugins/sorttab_display/sorttab_display.plugin.in
plugins/track_display/display_tracks.c
plugins/track_display/plugin.c
plugins/track_display/track_display.glade
plugins/track_display/track_display_context_menu.c
+[type: gettext/ini]plugins/track_display/track_display.plugin.in
plugins/track_display/track_display_preferences.c
src/anjuta-about.c
src/anjuta-action-callbacks.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index dc9f1c9..7ec9671 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -10,7 +10,3 @@ data/glade/playlist_display.glade
data/glade/repository_editor.glade
data/glade/sorttab_display.glade
data/glade/track_display.glade
-plugins/core_preferences/core_prefs.xml
-plugins/exporter/exporter.xml
-plugins/mserv/mserv.xml
-
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
