[banshee: 11/11] Merge branch 'extension-prefs'
- From: Gabriel Burt <gburt src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [banshee: 11/11] Merge branch 'extension-prefs'
- Date: Sun, 20 Dec 2009 21:17:46 +0000 (UTC)
commit d91dd9aed4bf7b27a572101e6563217ea84a7d2e
Merge: 8c88d17 9fb9faf
Author: Gabriel Burt <gabriel burt gmail com>
Date: Sun Dec 20 13:16:32 2009 -0800
Merge branch 'extension-prefs'
Conflicts:
data/addin-xml-strings.cs
data/addin-xml-strings.cs | 91 ++++----
src/Core/Banshee.Core/Resources/contributors.xml | 12 +-
.../Banshee.Addins.Gui/AddinDetailsDialog.cs | 96 -------
.../Banshee.Addins.Gui/AddinTile.cs | 225 ----------------
.../Banshee.Addins.Gui/AddinView.cs | 275 +++++++++-----------
.../Banshee.Gui.Dialogs/AboutDialog.cs | 4 +-
.../DefaultPreferenceWidgets.cs | 11 +-
.../Banshee.ThickClient/Banshee.ThickClient.csproj | 2 -
src/Core/Banshee.ThickClient/Makefile.am | 2 -
.../Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml | 4 +-
.../Banshee.Dap.Karma/Banshee.Dap.Karma.addin.xml | 4 +-
.../Banshee.Dap.MassStorage.addin.xml | 4 +-
src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml | 4 +-
src/Dap/Banshee.Dap/Banshee.Dap.addin.xml | 1 -
.../Banshee.AudioCd/Banshee.AudioCd.addin.xml | 4 +-
.../Banshee.Audiobook/Banshee.Audiobook.addin.xml | 4 +-
.../Banshee.BooScript/Banshee.BooScript.addin.xml | 4 +-
.../Banshee.Bookmarks/Banshee.Bookmarks.addin.xml | 4 +-
src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml | 4 +-
.../Banshee.CoverArt/Banshee.CoverArt.addin.xml | 4 +-
src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml | 4 +-
.../Banshee.FileSystemQueue.addin.xml | 6 +-
.../Banshee.InternetArchive.addin.xml | 2 +-
.../Banshee.InternetRadio.addin.xml | 4 +-
.../Banshee.Lastfm/Banshee.Lastfm.addin.xml | 4 +-
.../Banshee.MiniMode/Banshee.MiniMode.addin.xml | 3 +-
.../Banshee.Moblin/Banshee.Moblin.addin.xml | 1 -
.../Banshee.MultimediaKeys.addin.xml | 4 +-
.../Banshee.NotificationArea.addin.xml | 4 +-
.../Banshee.PlayQueue/Banshee.PlayQueue.addin.xml | 4 +-
.../Banshee.PlayerMigration.addin.xml | 4 +-
.../Banshee.Podcasting.addin.xml | 4 +-
.../Banshee.Torrent/Banshee.Torrent.addin.xml | 4 +-
.../Banshee.Wikipedia/Banshee.Wikipedia.addin.xml | 4 +-
34 files changed, 227 insertions(+), 584 deletions(-)
---
diff --cc data/addin-xml-strings.cs
index 62028df,67f7fbb..bf682c9
--- a/data/addin-xml-strings.cs
+++ b/data/addin-xml-strings.cs
@@@ -36,145 -15,167 +36,146 @@@ internal static class AddinXmlStringCat
// ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml
Catalog.GetString (@"iPod Support");
- Catalog.GetString (@"Provides support for most iPod devices.");
- Catalog.GetString (@"Hardware");
+ Catalog.GetString (@"Support for most iPod devices.");
+ Catalog.GetString (@"Device Support");
+ // ../src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma.addin.xml
+ Catalog.GetString (@"Karma Support");
- Catalog.GetString (@"Provides support for Rio Karma devices.");
- Catalog.GetString (@"Hardware");
++ Catalog.GetString (@"Support for Rio Karma devices.");
++ Catalog.GetString (@"Device Support");
+
// ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
Catalog.GetString (@"Mass Storage Media Player Support");
- Catalog.GetString (@"Provides support for media players that use USB Mass Storage without keeping an internal database.");
- Catalog.GetString (@"Hardware");
+ Catalog.GetString (@"Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones.");
+ Catalog.GetString (@"Device Support");
// ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
Catalog.GetString (@"MTP Media Player Support");
- Catalog.GetString (@"Provides support for PlaysForSure digital media players that use MTP.");
- Catalog.GetString (@"Hardware");
+ Catalog.GetString (@"Support for MTP devices, including many Creative Zen devices.");
+ Catalog.GetString (@"Device Support");
- // ../src/Core/Banshee.Core/Banshee.Core.addin.xml
- Catalog.GetString (@"Provides low level non-GUI utilities.");
-
- // ../src/Core/Banshee.ThickClient/Banshee.ThickClient.addin.xml
- Catalog.GetString (@"Provides GUI utilities and services.");
-
- // ../src/Core/Banshee.Services/Banshee.Services.addin.xml
- Catalog.GetString (@"Provides non-GUI utilities and services.");
-
- // ../src/Extensions/Banshee.Sample/Banshee.Sample.addin.xml
- Catalog.GetString (@"Sample");
- Catalog.GetString (@"A sample source useful to developers.");
- Catalog.GetString (@"Sources");
-
- // ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
- Catalog.GetString (@"Mini Mode");
- Catalog.GetString (@"Control Banshee through a small window with only playback controls and track information.");
- Catalog.GetString (@"Utilities");
+ // ../src/Dap/Banshee.Dap/Banshee.Dap.addin.xml
+ Catalog.GetString (@"Digital Media Player Support");
+ Catalog.GetString (@"Provides general support for many kinds of media player devices.");
// ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook.addin.xml
Catalog.GetString (@"Audiobooks Library");
- Catalog.GetString (@"Useful for organizing audiobooks, lectures, etc.");
- Catalog.GetString (@"User Interface");
+ Catalog.GetString (@"Organize audiobooks, lectures, etc.");
+ Catalog.GetString (@"Core");
- // ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml
- Catalog.GetString (@"SQL Debug Console");
- Catalog.GetString (@"Provides a UI for monitoring Banshee's SQL usage, and running queries.");
- Catalog.GetString (@"Debug");
-
- // ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
- Catalog.GetString (@"Internet Archive");
- Catalog.GetString (@"Browse and search the Internet Archive's vast media collection.");
- Catalog.GetString (@"Online Sources");
-
- // ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml
- Catalog.GetString (@"Internet Radio");
- Catalog.GetString (@"Listen to and organize Internet Radio stations.");
+ // ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd.addin.xml
+ Catalog.GetString (@"Audio CD Support");
- Catalog.GetString (@"Provides support for listening to and ripping Audio CDs.");
- Catalog.GetString (@"Hardware");
++ Catalog.GetString (@"Listen to and rip Audio CDs.");
+ Catalog.GetString (@"Core");
- // ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
- Catalog.GetString (@"Wikipedia");
- Catalog.GetString (@"View artist information from Wikipedia in the context pane.");
- Catalog.GetString (@"Context Pane");
-
- // ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml
- Catalog.GetString (@"Torrent Downloader");
- Catalog.GetString (@"Support downloading BitTorrent files from podcasts.");
+ // ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks.addin.xml
+ Catalog.GetString (@"Bookmarks");
- Catalog.GetString (@"Allows for saving specific positions in tracks so you can resume playback later.");
- Catalog.GetString (@"User Interface");
++ Catalog.GetString (@"Save your position in tracks so you can resume playback later.");
+ Catalog.GetString (@"Utilities");
- // ../src/Extensions/Template/Template.addin.xml
-
- // ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
- Catalog.GetString (@"Multimedia Keys");
- Catalog.GetString (@"Control playback via the multimedia keys on your keyboard.");
+ // ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml
+ Catalog.GetString (@"Boo Scripting");
- Catalog.GetString (@"The Boo Scripting plugin allows users to quickly customize and extend Banshee through the Boo programming language.");
- Catalog.GetString (@"Developers");
++ Catalog.GetString (@"Customize and extend Banshee with Boo-language scripts.");
+ Catalog.GetString (@"Utilities");
// ../src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml
Catalog.GetString (@"BPM Detection");
- Catalog.GetString (@"Detect the beats per minute (BPM) of your music");
- Catalog.GetString (@"User Interface");
+ Catalog.GetString (@"Detect the beats per minute (BPM) of your music.");
+ Catalog.GetString (@"Utilities");
- // ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml
- Catalog.GetString (@"Play Queue");
- Catalog.GetString (@"Queue tracks in an ad-hoc playlist, or let the Auto DJ take over.");
- Catalog.GetString (@"Core");
+ // ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml
+ Catalog.GetString (@"Cover Art Fetching");
- Catalog.GetString (@"Provides UI to enable the user to fetch cover art");
- Catalog.GetString (@"User Interface");
++ Catalog.GetString (@"Fetch cover art for all items in your library.");
++ Catalog.GetString (@"Utilities");
// ../src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml
- Catalog.GetString (@"DAAP");
+ Catalog.GetString (@"DAAP Sharing");
Catalog.GetString (@"Browse and listen to music shared over your local network.");
+ Catalog.GetString (@"Utilities");
- // ../src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks.addin.xml
- Catalog.GetString (@"Bookmarks");
- Catalog.GetString (@"Save your position in tracks so you can resume playback later.");
- Catalog.GetString (@"Utilities");
-
- // ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
- Catalog.GetString (@"Notification Area Icon");
- Catalog.GetString (@"Display an icon in the notification area for controlling Banshee.");
- Catalog.GetString (@"Utilities");
-
- // ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd.addin.xml
- Catalog.GetString (@"Audio CD Support");
- Catalog.GetString (@"Listen to and rip Audio CDs.");
+ // ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml
- Catalog.GetString (@"File System Queue");
- Catalog.GetString (@"Provides a source that allows files to be previewed without actually importing to the library.");
- Catalog.GetString (@"User Interface");
++ Catalog.GetString (@"File System Preview Queue");
++ Catalog.GetString (@"Preview files without importing to your library.");
+ Catalog.GetString (@"Core");
- // ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio.addin.xml
- Catalog.GetString (@"Remote Audio");
- Catalog.GetString (@"Provides support for remote speakers like the Airport Express");
+ // ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
+ Catalog.GetString (@"Internet Archive");
+ Catalog.GetString (@"Browse and search the Internet Archive's vast media collection.");
- Catalog.GetString (@"User Interface");
++ Catalog.GetString (@"Online Sources");
- // ../src/Extensions/Banshee.Moblin/Banshee.Moblin.addin.xml
- Catalog.GetString (@"Moblin Support");
- Catalog.GetString (@"Provides Moblin integration, including a custom media panel.");
+ // ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml
+ Catalog.GetString (@"Internet Radio");
- Catalog.GetString (@"Provides an interface for managing Internet Radio stations");
- Catalog.GetString (@"User Interface");
++ Catalog.GetString (@"Listen to and organize Internet Radio stations.");
++ Catalog.GetString (@"Core");
// ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml
Catalog.GetString (@"Last.fm Radio and Scrobbling");
- Catalog.GetString (@"Provides tightly integrated Last.fm streaming radio and community features.");
- Catalog.GetString (@"User Interface");
+ Catalog.GetString (@"Last.fm streaming radio, scrobbling, and context pane recommendations.");
+ Catalog.GetString (@"Online Sources");
- // ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml
- Catalog.GetString (@"File System Preview Queue");
- Catalog.GetString (@"Preview files without importing to your library.");
- Catalog.GetString (@"Core");
+ // ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
+ Catalog.GetString (@"Mini Mode");
- Catalog.GetString (@"Mini Mode allows controlling Banshee through a small window with only playback controls and track information.");
++ Catalog.GetString (@"Control Banshee through a small window with only playback controls and track information.");
++ Catalog.GetString (@"Utilities");
- // ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
- Catalog.GetString (@"Podcasts");
- Catalog.GetString (@"Subscribe to podcasts and stream or download episodes.");
- Catalog.GetString (@"Core");
+ // ../src/Extensions/Banshee.Moblin/Banshee.Moblin.addin.xml
+ Catalog.GetString (@"Moblin Support");
+ Catalog.GetString (@"Provides Moblin integration, including a custom media panel.");
- Catalog.GetString (@"User Interface");
+
+ // ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
+ Catalog.GetString (@"Multimedia Keys");
- Catalog.GetString (@"Provides support for handling playback through the use of keyboard controls.");
- Catalog.GetString (@"User Interface");
++ Catalog.GetString (@"Control playback via the multimedia keys on your keyboard.");
++ Catalog.GetString (@"Utilities");
+
+ // ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
+ Catalog.GetString (@"Notification Area Icon");
- Catalog.GetString (@"Displays an icon in the notification area and allows Banshee to be controlled through it.");
- Catalog.GetString (@"User Interface");
++ Catalog.GetString (@"Display an icon in the notification area for controlling Banshee.");
++ Catalog.GetString (@"Utilities");
// ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
Catalog.GetString (@"Now Playing");
Catalog.GetString (@"Provides a source that displays embedded video and provides fullscreen video playback and controls.");
- // ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml
- Catalog.GetString (@"Cover Art Fetching");
- Catalog.GetString (@"Fetch cover art for all items in your library.");
- Catalog.GetString (@"Utilities");
-
// ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
Catalog.GetString (@"Importers for Amarok, Rhythmbox and iTunes");
- Catalog.GetString (@"Import your Amarok, Rhythmbox or iTunes music library");
- Catalog.GetString (@"Core");
+ Catalog.GetString (@"Import your library from Amarok, Rhythmbox or iTunes.");
+ Catalog.GetString (@"Utilities");
- // ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml
- Catalog.GetString (@"Boo Scripting");
- Catalog.GetString (@"Customize and extend Banshee with Boo-language scripts.");
- Catalog.GetString (@"Utilities");
+ // ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml
+ Catalog.GetString (@"Play Queue");
- Catalog.GetString (@"Provides a source that acts as a queue of playing tracks. When the queue is populated, all playback happens from the queue in a forced order.");
- Catalog.GetString (@"User Interface");
++ Catalog.GetString (@"Queue tracks in an ad-hoc playlist, or let the Auto DJ take over.");
++ Catalog.GetString (@"Core");
- // ../src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.addin.xml
- Catalog.GetString (@"Provides an X11 backend for video support, which enables proper fullscreen support.");
+ // ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
+ Catalog.GetString (@"Podcasts");
- Catalog.GetString (@"Allows subscribing to and managing of Podcasts.");
- Catalog.GetString (@"User Interface");
++ Catalog.GetString (@"Subscribe to podcasts and stream or download episodes.");
++ Catalog.GetString (@"Core");
- // ../src/Backends/Banshee.GStreamer/Banshee.GStreamer.addin.xml
- Catalog.GetString (@"GStreamer multimedia services including playback, CD ripping, and transcoding.");
+ // ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio.addin.xml
+ Catalog.GetString (@"Remote Audio");
+ Catalog.GetString (@"Provides support for remote speakers like the Airport Express");
- // ../src/Backends/Banshee.Hal/Banshee.Hal.addin.xml
- Catalog.GetString (@"Provides hardware support through HAL.");
+ // ../src/Extensions/Banshee.Sample/Banshee.Sample.addin.xml
+ Catalog.GetString (@"Sample");
+ Catalog.GetString (@"A sample source useful to developers.");
+ Catalog.GetString (@"Sources");
- // ../src/Backends/Banshee.Unix/Banshee.Unix.addin.xml
- Catalog.GetString (@"Provides POSIX/UNIX support, including IO.");
+ // ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml
+ Catalog.GetString (@"SQL Debug Console");
+ Catalog.GetString (@"Provides a UI for monitoring Banshee's SQL usage, and running queries.");
+ Catalog.GetString (@"Debug");
- // ../src/Backends/Banshee.Gnome/Banshee.Gnome.addin.xml
- Catalog.GetString (@"Backend providers for the GNOME platform. Includes GConf support and general GNOME integration.");
+ // ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml
+ Catalog.GetString (@"Torrent Downloader");
- Catalog.GetString (@"Adds support for downloading BitTorrent files from podcasts.");
++ Catalog.GetString (@"Support downloading BitTorrent files from podcasts.");
++ Catalog.GetString (@"Utilities");
- // ../src/Backends/Banshee.Osx/Banshee.Osx.addin.xml
- Catalog.GetString (@"Backend providers for the OSX platform. Includes general OSX integration.");
+ // ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
+ Catalog.GetString (@"Wikipedia");
- Catalog.GetString (@"View artist information from Wikipedia in the context pane");
- Catalog.GetString (@"User Interface");
++ Catalog.GetString (@"View artist information from Wikipedia in the context pane.");
++ Catalog.GetString (@"Context Pane");
- // ../src/Backends/Banshee.Gio/Banshee.Gio.addin.xml
- Catalog.GetString (@"GIO IO backend");
+ // ../src/Extensions/Template/Template.addin.xml
}
}
diff --cc src/Core/Banshee.ThickClient/Makefile.am
index 9f476c0,ac9a2a8..97f1750
--- a/src/Core/Banshee.ThickClient/Makefile.am
+++ b/src/Core/Banshee.ThickClient/Makefile.am
@@@ -3,13 -3,7 +3,11 @@@ TARGET = librar
ASSEMBLY_BUILD_FLAGS = -unsafe
LINK = $(REF_BANSHEE_THICKCLIENT)
+if HAVE_GLIBSHARP_2_12_7
+BUILD_DEFINES = "-define:HAVE_GLIBSHARP_2_12_7"
+endif
+
SOURCES = \
- Banshee.Addins.Gui/AddinDetailsDialog.cs \
- Banshee.Addins.Gui/AddinTile.cs \
Banshee.Addins.Gui/AddinView.cs \
Banshee.Collection.Gui/AlbumListView.cs \
Banshee.Collection.Gui/ArtistListView.cs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
