diff --git a/ChangeLog b/ChangeLog index 981edc4..8ee8532 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ -2010-03-31 The Banshee Project +2010-05-07 The Banshee Project - Banshee 1.6.0 + Banshee 1.6.1 You probably are looking for the useful change summary detailed in the NEWS file, perfect for downstream maintainers. diff --git a/Makefile.am b/Makefile.am index 2241d5c..ae91fdb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,8 +82,11 @@ query-trace: MONO_PID=$$(ps aux | grep mono | grep '\--uninstalled' | grep -v 'cd bin' | awk '{print$$2}'); \ kill -USR2 $$MONO_PID -push-moblin: - @extras/push-moblin +push-meego: + @extras/push-meego + +monitor-meego: + @extras/monitor-meego gdb: @pushd bin; \ @@ -123,6 +126,19 @@ merge-docs: make -C docs/Hyena merge; \ make -C docs/Banshee merge; +package-patch: + @if [ -z '$(SINCE)' ]; then echo 'Specify a SINCE (e.g. make package-patch SINCE=1.6.0)'; exit 1; fi; + @if [ -f 'since-$(SINCE).patch' ]; then echo 'since-$(SINCE).patch already exists'; exit 1; fi; + @git diff-tree -p "$(SINCE).." | filterdiff \ + -x 'a/Makefile.am' \ + -x 'a/profile-configure' \ + -x 'a/po/*' \ + -x 'a/banshee.doap' \ + -x \*.csproj \ + -x \*.sln \ + -x \*extras/\* &> 'since-$(SINCE).patch' + @echo 'since-$(SINCE).patch is ready' + EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ diff --git a/Makefile.in b/Makefile.in index 71ecf83..44521d9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -213,8 +213,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -268,6 +268,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -1020,8 +1022,11 @@ query-trace: MONO_PID=$$(ps aux | grep mono | grep '\--uninstalled' | grep -v 'cd bin' | awk '{print$$2}'); \ kill -USR2 $$MONO_PID -push-moblin: - @extras/push-moblin +push-meego: + @extras/push-meego + +monitor-meego: + @extras/monitor-meego gdb: @pushd bin; \ @@ -1061,6 +1066,19 @@ merge-docs: make -C docs/Hyena merge; \ make -C docs/Banshee merge; +package-patch: + @if [ -z '$(SINCE)' ]; then echo 'Specify a SINCE (e.g. make package-patch SINCE=1.6.0)'; exit 1; fi; + @if [ -f 'since-$(SINCE).patch' ]; then echo 'since-$(SINCE).patch already exists'; exit 1; fi; + @git diff-tree -p "$(SINCE).." | filterdiff \ + -x 'a/Makefile.am' \ + -x 'a/profile-configure' \ + -x 'a/po/*' \ + -x 'a/banshee.doap' \ + -x \*.csproj \ + -x \*.sln \ + -x \*extras/\* &> 'since-$(SINCE).patch' + @echo 'since-$(SINCE).patch is ready' + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/NEWS b/NEWS index 34e95fb..e8a5e73 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ =============================================================================== -WELCOME TO BANSHEE 1.6.0 - Released March 31, 2010 +WELCOME TO BANSHEE 1.6.1 - Released May 7, 2010 =============================================================================== * Banshee is a multimedia management and playback application for GNOME. @@ -10,181 +10,40 @@ WELCOME TO BANSHEE 1.6.0 - Released March 31, 2010 experience automatic cover art fetching as you listen; and easily browse, search, and control your media collection." - * Learn More: http://banshee-project.org/download/archives/1.6.0 + * Learn More: http://banshee-project.org/download/archives/1.6.1 =============================================================================== NEW AWESOME FEATURES AND ENHANCEMENTS =============================================================================== - Banshee 1.6 is a stable release, the culmination of a year's work. There - are so many new features, bug fixes, and polish in this release, we won't - be able to do it all justice in these notes, but we'll try. These notes - aggregate the highlights from the 1.5 series releases. - - New Features Since 1.4: - - * Play Queue Auto DJ keeps the tunes coming - - Keep your Play Queue filled with endless music, selected randomly - by artist, album, song, rating, or score mode. - - * Sync device from playlist option - - Either manually manage what files are added/removed to your device, - or choose a playlist to sync from. You can make a size-limited smart - playlist to sync just the right amount to your device. - - * Grid View - - We are debuting a new grid mode for our custom list widget, visible - in the modified Album browser. It will be used for Videos, - Audiobooks, and more in future releases. - - * Banshee Community Extensions - - A new sub-project named Banshee Community Extensions has been - created. Its code is hosted on Gitorious, and its bugs tracked - in bugzilla.gnome.org. It already contains 15 extensions, including - Lyrics, Telepathy and Mirage, and has 19 maintainers. Its releases - track Banshee's; for more information, see - - http://banshee-project.org/download/extensions/ - - * Type-ahead find in track, artist, and album lists - - An alternative to filtering, type-ahead find jumps you to the first - track to match your query. Activate with shift+/, cancel with Esc, - and jump to next match with F3. In track list it matches against - artist, album, or title. - - * Automatic Scoring - - Songs now have scores, updated as you play and skip. The score - can be used in searches and smart playlists, and serve as a basis - for ratings. - - * New Shuffle Modes - - Shuffle by artist or album let you listen to everything by an artist - or on an album before jumping to a new random artist or album. - - Shuffle by rating or score lets you shuffle through your songs, with - higher rated or scored tracks being more likely to play. - - * Audiobooks library extension - - Rough first version, main benefits are separating your books from - your music and defining a different file system organization. In - future versions we plan to add intuitive bookmarking and a better - browsing experience. Enable in Extensions tab of Preferences. - - * Library-folder watcher extension - - Watches your libraries' folders for added, renamed, or deleted - files, and updates your libraries appropriately. Requires - Mono >= 2.4.3. Enable in Extensions tab of Preferences. - - * eMusic importer/downloader extension - - If you have purchased music from eMusic and have a .emx file, Banshee - will download and import the music files for you. Select - 'eMusic Files' from the normal Media > Import Media dialog. Enable - in Extensions tab of Preferences. - - * GIO file backend, supports non-local files - - This backend uses the GIO library to support importing local files - and network-share files alike. Requires glib >= 2.22 and Gio#. - - * Internet Archive extension - - Search and stream content from the Internet Archive's vast store of - media, including 70,000 concerts and 200,000 videos. Enable it in - the Extensions tab of the Preferences dialog. - - * YouTube Extension - - This extension shows YouTube videos in the Context Pane related to - what you're playing, and lets you watch them within Banshee. You - can enable it in the Extensions tab of the Preferences dialog. - - * Improved Metadata Handling - - Banshee is now able to read and write rating and playcount - information contained in your media files. Enable this option - in Preferences. - - Searching and smart playlists use unicode-aware case-insensitive - search; i.e. n matches Ñ and vice-versa, and similarly smart sorting. - - Artist/album/track sort fields are now supported, the License URI - field is now exposed and Creative Commons aware, and the BPM field - is exposed with an option to calculate it for all songs. - - * Gapless Playback - * Optional cover art in lower-left corner - * Cover art editable via drag-and-drop and right-click - * Playing song kept visible in the track list - * Separate library locations for Music, Video, and Podcast - * iTunes and Rhythmbox library/metadata importers + Banshee 1.6.1 is a stable bug-fix release, adding polish to 1.6.0. Enhancements: * More devices supported: - - Android: Nexus One, Desire, Galaxy, Droid, Pulse - - Other: Palm Pre, Nokia N900 + - Android: Galaxy Portal, DEXT/CLIQ + * Automatically scan Music and Video libraries on first start * Improve search responsiveness on large libraries - * Play Queue item count, size, duration now ignores old tracks - * Muinshee fixes: disable Auto-DJ, allow reordering, hide previous song - * Wikipedia context pane extension enabled by default - * Add tooltip to playback error column - * Enable 'Delete From Drive' action in File System Queue - * Cover art for unicode artist/albums now supported - * Dropped glade-sharp dep; GNOME 3.0 ready - * Add columns showing track sample rate and bits per sample - * Option to sort an artist's albums by year, not title - * Allow seeking in DAAP streams - * Additional tokens for file system organization (bgo#489861) - * Cleaner track change notification popup (bgo#565453) - * Move Last.fm settings to the preferences dialog - * Keyboard shortcut (ESC) to clear the search box (BGO #558938) - * Expose LAME's "preset" option (BGO #563303) - * Better support for devices running Rockbox - * Set video sync folder for Android and WebOS devices - * Auto-completion for composer, conductor, grouping and copyright (BGO #592129) - * Added the 'comment' search filter (BGO #380524) - * Selectable song properties (BGO #586106) - * Show a tooltip in track editor when the property is truncated (BGO #589782) - * Support importing/exporting XSPF playlists - * Support loading ASF playlists (BGO #545646) - * Whitelist .spx, 669, it, med, mod, mol, mtm, nst, s3m, stm, ult, wow, xm, and xnm (BGO #580014) - * Source-specific preferences, accessible via Preferences dialog and via sources' context menu - * Much improved child source sorting - live, persistent, with group-by-type option - * Podcast espisode details tabs in track information/editor - * Can rename podcasts - * Can unsubscribe/download/refresh multiple podcasts at a time - * New 'Creative Commons' default Last.fm station - * New Refresh button for Last.fm stations - * More accurate seeking with click/DnD, can use mouse scrollwheel - * Make it easier to edit and reset ratings - * Add mnemonics to track editor fields and import dialog - * Make previous button go back if less than 4 seconds into a song - - Notable Bugs Fixed (since 1.5.6): - - * Fix device support on upcoming distros with DeviceKit rename - * Restore equalizer preset correctly (bgo#614313) - * Handle broken symlinks correctly (bgo#614065) - * Allow overriding Android, Maemo, WebOS default settings (bgo#611991) - * Fix crash deleting playlist on mass storage device (bgo#613734) - * Fix issue with iTunes importer dialog sizing (bgo#613607) - * Fix play count calculation with gapless enabled (bgo#613418) - * Handle exceptions thrown by old plugins (Mirage, etc) - * Use panel-specific (eg monochrome) icon in notification area - * OS X build/bundle improvements - * Fix Windows compilation issues - * Fix gettext locale selection on Windows + * Add AlbumArtist to the search menu (bgo#615692) + * Improved Last.fm authentication experience + * Many enhancements to MeeGo support + + Notable Bugs Fixed (since 1.6.0): + + * Fix ListView a11y crash + * Fix Podcasts ListView right-click crash + * [TrackActions] Fix collection-modified crash + * [ColumnCellAlbum] Fix invalid cast crash + * Fix several custom-widget related crashes + * [Dap.Ipod] Fix a race condition + * [gapless] Fix rating resets (bgo#614863) + * [UserJobTile] Don't crash if icons are missing (bgo#615778) + * [BansheeQuery] Fix mime-type queries (bgo#601920) + * [MaemoDevice] Ignore the .videos directory (bgo#614825) + * [MaemoDevice] Set 'Music' and 'Video' as the default folders + * [MusicBrainzQueryJob] Escape album/artist (bgo#614569) + * 40 bugs fixed since 1.6.0 =============================================================================== SOURCES / PACKAGES @@ -193,9 +52,9 @@ SOURCES / PACKAGES Sources ------- - * Banshee 1.6.0 Tarballs: - http://download.banshee-project.org/banshee/stable/1.6.0/banshee-1-1.6.0.tar.bz2 - http://download.banshee-project.org/banshee/stable/1.6.0/banshee-1-1.6.0.tar.gz + * Banshee 1.6.1 Tarballs: + http://download.banshee-project.org/banshee/stable/1.6.1/banshee-1-1.6.1.tar.bz2 + http://download.banshee-project.org/banshee/stable/1.6.1/banshee-1-1.6.1.tar.gz Packages -------- @@ -212,13 +71,13 @@ Packages Binaries for Mac OS X 10.5 and 10.6: - * http://download.banshee-project.org/banshee/banshee-1-1.6.0.macosx.intel.dmg + * http://download.banshee-project.org/banshee/banshee-1-1.6.1.macosx.intel.dmg ChangeLogs & Checksums ---------------------- - * http://download.banshee-project.org/banshee/stable/1.6.0/banshee-1-1.6.0.changes - * http://download.banshee-project.org/banshee/stable/1.6.0/banshee-1-1.6.0.sha256sum + * http://download.banshee-project.org/banshee/stable/1.6.1/banshee-1-1.6.1.changes + * http://download.banshee-project.org/banshee/stable/1.6.1/banshee-1-1.6.1.sha256sum =============================================================================== @@ -287,7 +146,7 @@ REPORT BUGS - HELP THE PROJECT - GROW THE COMMUNITY hesitate to file bugs! * http://banshee-project.org/contribute/file-bugs - * http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&version=1.6.0 + * http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&version=1.6.1 =============================================================================== @@ -300,18 +159,14 @@ Contributors For This Release The following people directly contributed to the release of this version of Banshee. Without their help, there would be no release! - Aaron Bockover, Alexander Kojevnikov, Bertrand Lorentz, Chow Loong Jin, - Gabriel Burt, Iain Lane, Jeroen Budts, Jordi Mas, Julien Moutte, - Ján Sokoly, Ruben Vermeersch + Aaron Bockover, Alexander Kojevnikov, Andrés G. Aragoneses, + Benjamín Valero Espinosa, Chow Loong Jin, Gabriel Burt, Jeroen Budts, + Robin Stocker, Ruben Vermeersch The following people contributed updated translations to this release. Without them, our project's reach would be much more limited. - A S Alam, Andrej Žnidaršič, Aron Xu, Bruno Brouard, Christian Kirbach, - Daniel Nylander, Gabor Kelemen, Gianvito Cavasoli, - Inaki Larranaga Murgoitio, Joe Hansen, Jordi Mas, Leonid Kanter, - Marek Černocký, Mario Blättermann, Miloš Popović, Pablo Garrido, - Piotr Drąg, Wouter Bolsterlee, Žygimantas Beručka + Žygimantas Beručka Contributors In Past Releases ----------------------------- diff --git a/build/Makefile.in b/build/Makefile.in index 6f2e6db..44d1ea3 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -221,8 +221,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -276,6 +276,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/build/build.environment.mk b/build/build.environment.mk index d7c4c8e..593b3ea 100644 --- a/build/build.environment.mk +++ b/build/build.environment.mk @@ -100,6 +100,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -128,6 +130,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/build/m4/Makefile.in b/build/m4/Makefile.in index 4820e09..046b935 100644 --- a/build/m4/Makefile.in +++ b/build/m4/Makefile.in @@ -156,8 +156,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -211,6 +211,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/build/m4/banshee/dap-ipod.m4 b/build/m4/banshee/dap-ipod.m4 index a83e4c0..ccc0894 100644 --- a/build/m4/banshee/dap-ipod.m4 +++ b/build/m4/banshee/dap-ipod.m4 @@ -19,7 +19,7 @@ AC_DEFUN([BANSHEE_CHECK_DAP_IPOD], asms="`$PKG_CONFIG --variable=Libraries ipod-sharp` `$PKG_CONFIG --variable=Libraries ipod-sharp-ui`" for asm in $asms; do IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm" - [ -r "$asm.mdb" ] && IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm.mdb" + [[ -r "$asm.mdb" ]] && IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm.mdb" done AC_SUBST(IPODSHARP_ASSEMBLIES) AC_SUBST(IPODSHARP_LIBS) diff --git a/build/pkg-config/Makefile.in b/build/pkg-config/Makefile.in index cbf88ee..b8c917e 100644 --- a/build/pkg-config/Makefile.in +++ b/build/pkg-config/Makefile.in @@ -180,8 +180,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -235,6 +235,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/configure b/configure index 0191bcd..2665088 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for banshee-1 1.6.0. +# Generated by GNU Autoconf 2.63 for banshee-1 1.6.1. # # Report bugs to . # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='banshee-1' PACKAGE_TARNAME='banshee-1' -PACKAGE_VERSION='1.6.0' -PACKAGE_STRING='banshee-1 1.6.0' +PACKAGE_VERSION='1.6.1' +PACKAGE_STRING='banshee-1 1.6.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=banshee' # Factoring default headers for most tests. @@ -936,8 +936,10 @@ NDESK_DBUS_CFLAGS NDESK_DBUS_GLIB_LIBS NDESK_DBUS_GLIB_CFLAGS BANSHEE_DESKTOP_NAME -GNOME_LT_2_28_LIBS -GNOME_LT_2_28_CFLAGS +MEEGO_PANEL_LIBS +MEEGO_PANEL_CFLAGS +GNOME_2_28_LIBS +GNOME_2_28_CFLAGS ENABLE_LIBRARY_WATCHER_FALSE ENABLE_LIBRARY_WATCHER_TRUE MONO_2_4_3_LIBS @@ -1196,8 +1198,10 @@ MONO_MODULE_CFLAGS MONO_MODULE_LIBS MONO_2_4_3_CFLAGS MONO_2_4_3_LIBS -GNOME_LT_2_28_CFLAGS -GNOME_LT_2_28_LIBS +GNOME_2_28_CFLAGS +GNOME_2_28_LIBS +MEEGO_PANEL_CFLAGS +MEEGO_PANEL_LIBS NDESK_DBUS_GLIB_CFLAGS NDESK_DBUS_GLIB_LIBS NDESK_DBUS_CFLAGS @@ -1806,7 +1810,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures banshee-1 1.6.0 to adapt to many kinds of systems. +\`configure' configures banshee-1 1.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1880,7 +1884,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of banshee-1 1.6.0:";; + short | recursive ) echo "Configuration of banshee-1 1.6.1:";; esac cat <<\_ACEOF @@ -1983,10 +1987,14 @@ Some influential environment variables: C compiler flags for MONO_2_4_3, overriding pkg-config MONO_2_4_3_LIBS linker flags for MONO_2_4_3, overriding pkg-config - GNOME_LT_2_28_CFLAGS - C compiler flags for GNOME_LT_2_28, overriding pkg-config - GNOME_LT_2_28_LIBS - linker flags for GNOME_LT_2_28, overriding pkg-config + GNOME_2_28_CFLAGS + C compiler flags for GNOME_2_28, overriding pkg-config + GNOME_2_28_LIBS + linker flags for GNOME_2_28, overriding pkg-config + MEEGO_PANEL_CFLAGS + C compiler flags for MEEGO_PANEL, overriding pkg-config + MEEGO_PANEL_LIBS + linker flags for MEEGO_PANEL, overriding pkg-config NDESK_DBUS_GLIB_CFLAGS C compiler flags for NDESK_DBUS_GLIB, overriding pkg-config NDESK_DBUS_GLIB_LIBS @@ -2160,7 +2168,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -banshee-1 configure 1.6.0 +banshee-1 configure 1.6.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2174,7 +2182,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by banshee-1 $as_me 1.6.0, which was +It was created by banshee-1 $as_me 1.6.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -3024,7 +3032,7 @@ fi # Define the identity of the package. PACKAGE='banshee-1' - VERSION='1.6.0' + VERSION='1.6.1' cat >>confdefs.h <<_ACEOF @@ -5685,13 +5693,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5688: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5696: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5691: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5699: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5694: output\"" >&5) + (eval echo "\"\$as_me:5702: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6896,7 +6904,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6899 "configure"' > conftest.$ac_ext + echo '#line 6907 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8749,11 +8757,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8752: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8760: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8756: \$? = $ac_status" >&5 + echo "$as_me:8764: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9088,11 +9096,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9091: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9099: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9095: \$? = $ac_status" >&5 + echo "$as_me:9103: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9193,11 +9201,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9196: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9204: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9200: \$? = $ac_status" >&5 + echo "$as_me:9208: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9248,11 +9256,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9251: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9259: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9255: \$? = $ac_status" >&5 + echo "$as_me:9263: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12048,7 +12056,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12051 "configure" +#line 12059 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12144,7 +12152,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12147 "configure" +#line 12155 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12472,7 +12480,7 @@ API_VERSION=1.6 ASM_VERSION=1.6.0.0 -DISPLAY_VERSION="1.6.0" +DISPLAY_VERSION="1.6.1" @@ -15495,35 +15503,35 @@ fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for GNOME_LT_2_28" >&5 -$as_echo_n "checking for GNOME_LT_2_28... " >&6; } +{ $as_echo "$as_me:$LINENO: checking for GNOME_2_28" >&5 +$as_echo_n "checking for GNOME_2_28... " >&6; } -if test -n "$GNOME_LT_2_28_CFLAGS"; then - pkg_cv_GNOME_LT_2_28_CFLAGS="$GNOME_LT_2_28_CFLAGS" +if test -n "$GNOME_2_28_CFLAGS"; then + pkg_cv_GNOME_2_28_CFLAGS="$GNOME_2_28_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 < 2.28\"") >&5 - ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 < 2.28") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= 2.28\"") >&5 + ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= 2.28") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GNOME_LT_2_28_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0 < 2.28" 2>/dev/null` + pkg_cv_GNOME_2_28_CFLAGS=`$PKG_CONFIG --cflags "gnome-desktop-2.0 >= 2.28" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$GNOME_LT_2_28_LIBS"; then - pkg_cv_GNOME_LT_2_28_LIBS="$GNOME_LT_2_28_LIBS" +if test -n "$GNOME_2_28_LIBS"; then + pkg_cv_GNOME_2_28_LIBS="$GNOME_2_28_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 < 2.28\"") >&5 - ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 < 2.28") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= 2.28\"") >&5 + ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= 2.28") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GNOME_LT_2_28_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0 < 2.28" 2>/dev/null` + pkg_cv_GNOME_2_28_LIBS=`$PKG_CONFIG --libs "gnome-desktop-2.0 >= 2.28" 2>/dev/null` else pkg_failed=yes fi @@ -15541,24 +15549,96 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOME_LT_2_28_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-desktop-2.0 < 2.28" 2>&1` + GNOME_2_28_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-desktop-2.0 >= 2.28" 2>&1` else - GNOME_LT_2_28_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-desktop-2.0 < 2.28" 2>&1` + GNOME_2_28_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-desktop-2.0 >= 2.28" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GNOME_LT_2_28_PKG_ERRORS" >&5 + echo "$GNOME_2_28_PKG_ERRORS" >&5 { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - BANSHEE_DESKTOP_NAME="_Name=Banshee" + HAVE_GNOME_2_28=no elif test $pkg_failed = untried; then - BANSHEE_DESKTOP_NAME="_Name=Banshee" + HAVE_GNOME_2_28=no else - GNOME_LT_2_28_CFLAGS=$pkg_cv_GNOME_LT_2_28_CFLAGS - GNOME_LT_2_28_LIBS=$pkg_cv_GNOME_LT_2_28_LIBS + GNOME_2_28_CFLAGS=$pkg_cv_GNOME_2_28_CFLAGS + GNOME_2_28_LIBS=$pkg_cv_GNOME_2_28_LIBS { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } + HAVE_GNOME_2_28=yes +fi + +pkg_failed=no +{ $as_echo "$as_me:$LINENO: checking for MEEGO_PANEL" >&5 +$as_echo_n "checking for MEEGO_PANEL... " >&6; } + +if test -n "$MEEGO_PANEL_CFLAGS"; then + pkg_cv_MEEGO_PANEL_CFLAGS="$MEEGO_PANEL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"moblin-panel\"") >&5 + ($PKG_CONFIG --exists --print-errors "moblin-panel") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MEEGO_PANEL_CFLAGS=`$PKG_CONFIG --cflags "moblin-panel" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$MEEGO_PANEL_LIBS"; then + pkg_cv_MEEGO_PANEL_LIBS="$MEEGO_PANEL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"moblin-panel\"") >&5 + ($PKG_CONFIG --exists --print-errors "moblin-panel") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MEEGO_PANEL_LIBS=`$PKG_CONFIG --libs "moblin-panel" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + MEEGO_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "moblin-panel" 2>&1` + else + MEEGO_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "moblin-panel" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MEEGO_PANEL_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + HAVE_MEEGO_PANEL=no +elif test $pkg_failed = untried; then + HAVE_MEEGO_PANEL=no +else + MEEGO_PANEL_CFLAGS=$pkg_cv_MEEGO_PANEL_CFLAGS + MEEGO_PANEL_LIBS=$pkg_cv_MEEGO_PANEL_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + HAVE_MEEGO_PANEL=yes +fi +if test "x$HAVE_GNOME_2_28" = "xno" -o "x$HAVE_MEEGO_PANEL" = "xyes"; then BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player" +else + BANSHEE_DESKTOP_NAME="_Name=Banshee" fi @@ -18994,7 +19074,7 @@ $as_echo "$as_me: error: ipod-sharp was not found or is not up to date. Please i asms="`$PKG_CONFIG --variable=Libraries ipod-sharp` `$PKG_CONFIG --variable=Libraries ipod-sharp-ui`" for asm in $asms; do IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm" - -r "$asm.mdb" && IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm.mdb" + [ -r "$asm.mdb" ] && IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm.mdb" done @@ -21408,7 +21488,7 @@ fi -ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool build/pkg-config/Makefile data/Makefile data/org.bansheeproject.Banshee.service data/org.bansheeproject.CollectionIndexer.service data/audio-profiles/Makefile data/desktop-files/Makefile data/desktop-files/common.desktop data/icon-theme-hicolor/Makefile docs/Makefile docs/Hyena/Makefile docs/Banshee/Makefile po/Makefile.in tests/Makefile tests/Analyzer/Makefile tests/Performance/Makefile extras/Makefile libbanshee/Makefile gstreamer/Makefile gstreamer/equalizer/Makefile src/Makefile src/AssemblyInfo.cs src/Clients/Makefile src/Clients/Beroe/Makefile src/Clients/Booter/Makefile src/Clients/Booter/banshee-1.linux src/Clients/Booter/banshee-1.darwin src/Clients/Halie/Makefile src/Clients/Muinshee/Makefile src/Clients/Nereid/Makefile src/Core/Makefile src/Core/Banshee.CollectionIndexer/Makefile src/Core/Banshee.Core/Makefile src/Core/Banshee.Services/Makefile src/Core/Banshee.ThickClient/Makefile src/Core/Banshee.Widgets/Makefile src/Backends/Makefile src/Backends/Banshee.Gio/Makefile src/Backends/Banshee.Gnome/Makefile src/Backends/Banshee.GStreamer/Makefile src/Backends/Banshee.Hal/Makefile src/Backends/Banshee.Unix/Makefile src/Backends/Banshee.Osx/Makefile src/Backends/Banshee.NowPlaying.X11/Makefile src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile src/Libraries/Makefile src/Libraries/Hyena/Makefile src/Libraries/Hyena.Gui/Makefile src/Libraries/Lastfm/Makefile src/Libraries/Lastfm.Gui/Makefile src/Libraries/Migo/Makefile src/Libraries/Mono.Data.Sqlite/Makefile src/Libraries/Mono.Media/Makefile src/Libraries/Mtp/Makefile src/Libraries/Mtp/Mtp.dll.config src/Libraries/MusicBrainz/Makefile src/Dap/Makefile src/Dap/Banshee.Dap/Makefile src/Dap/Banshee.Dap.Ipod/Makefile src/Dap/Banshee.Dap.MassStorage/Makefile src/Dap/Banshee.Dap.Mtp/Makefile src/Dap/Banshee.Dap.Karma/Makefile src/Extensions/Makefile src/Extensions/Banshee.Audiobook/Makefile src/Extensions/Banshee.AudioCd/Makefile src/Extensions/Banshee.Bookmarks/Makefile src/Extensions/Banshee.BooScript/Makefile src/Extensions/Banshee.Bpm/Makefile src/Extensions/Banshee.CoverArt/Makefile src/Extensions/Banshee.Daap/Makefile src/Extensions/Banshee.Emusic/Makefile src/Extensions/Banshee.FileSystemQueue/Makefile src/Extensions/Banshee.InternetArchive/Makefile src/Extensions/Banshee.InternetRadio/Makefile src/Extensions/Banshee.Lastfm/Makefile src/Extensions/Banshee.LibraryWatcher/Makefile src/Extensions/Banshee.MiniMode/Makefile src/Extensions/Banshee.MeeGo/Makefile src/Extensions/Banshee.MultimediaKeys/Makefile src/Extensions/Banshee.NotificationArea/Makefile src/Extensions/Banshee.NowPlaying/Makefile src/Extensions/Banshee.PlayQueue/Makefile src/Extensions/Banshee.PlayerMigration/Makefile src/Extensions/Banshee.Podcasting/Makefile src/Extensions/Banshee.SqlDebugConsole/Makefile src/Extensions/Banshee.Sample/Makefile src/Extensions/Banshee.Torrent/Makefile src/Extensions/Banshee.RemoteAudio/Makefile src/Extensions/Banshee.Wikipedia/Makefile src/Extensions/Banshee.YouTube/Makefile extras/metrics/Makefile" +ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool build/pkg-config/Makefile data/Makefile data/org.bansheeproject.Banshee.service data/org.bansheeproject.CollectionIndexer.service data/audio-profiles/Makefile data/desktop-files/Makefile data/desktop-files/common.desktop data/icon-theme-hicolor/Makefile docs/Makefile docs/Hyena/Makefile docs/Banshee/Makefile po/Makefile.in tests/Makefile tests/Analyzer/Makefile tests/Performance/Makefile extras/Makefile libbanshee/Makefile gstreamer/Makefile gstreamer/equalizer/Makefile src/Makefile src/AssemblyInfo.cs src/Clients/Makefile src/Clients/Beroe/Makefile src/Clients/Booter/Makefile src/Clients/Booter/banshee-1.linux src/Clients/Booter/banshee-1.darwin src/Clients/Halie/Makefile src/Clients/Muinshee/Makefile src/Clients/Nereid/Makefile src/Clients/MeeGo/Makefile src/Core/Makefile src/Core/Banshee.CollectionIndexer/Makefile src/Core/Banshee.Core/Makefile src/Core/Banshee.Services/Makefile src/Core/Banshee.ThickClient/Makefile src/Core/Banshee.Widgets/Makefile src/Backends/Makefile src/Backends/Banshee.Gio/Makefile src/Backends/Banshee.Gnome/Makefile src/Backends/Banshee.GStreamer/Makefile src/Backends/Banshee.Hal/Makefile src/Backends/Banshee.Unix/Makefile src/Backends/Banshee.Osx/Makefile src/Backends/Banshee.NowPlaying.X11/Makefile src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile src/Libraries/Makefile src/Libraries/Hyena/Makefile src/Libraries/Hyena.Gui/Makefile src/Libraries/Lastfm/Makefile src/Libraries/Lastfm.Gui/Makefile src/Libraries/Migo/Makefile src/Libraries/Mono.Data.Sqlite/Makefile src/Libraries/Mono.Media/Makefile src/Libraries/Mtp/Makefile src/Libraries/Mtp/Mtp.dll.config src/Libraries/MusicBrainz/Makefile src/Dap/Makefile src/Dap/Banshee.Dap/Makefile src/Dap/Banshee.Dap.Ipod/Makefile src/Dap/Banshee.Dap.MassStorage/Makefile src/Dap/Banshee.Dap.Mtp/Makefile src/Dap/Banshee.Dap.Karma/Makefile src/Extensions/Makefile src/Extensions/Banshee.Audiobook/Makefile src/Extensions/Banshee.AudioCd/Makefile src/Extensions/Banshee.Bookmarks/Makefile src/Extensions/Banshee.BooScript/Makefile src/Extensions/Banshee.Bpm/Makefile src/Extensions/Banshee.CoverArt/Makefile src/Extensions/Banshee.Daap/Makefile src/Extensions/Banshee.Emusic/Makefile src/Extensions/Banshee.FileSystemQueue/Makefile src/Extensions/Banshee.InternetArchive/Makefile src/Extensions/Banshee.InternetRadio/Makefile src/Extensions/Banshee.Lastfm/Makefile src/Extensions/Banshee.LibraryWatcher/Makefile src/Extensions/Banshee.MiniMode/Makefile src/Extensions/Banshee.MeeGo/Makefile src/Extensions/Banshee.MultimediaKeys/Makefile src/Extensions/Banshee.NotificationArea/Makefile src/Extensions/Banshee.NowPlaying/Makefile src/Extensions/Banshee.PlayQueue/Makefile src/Extensions/Banshee.PlayerMigration/Makefile src/Extensions/Banshee.Podcasting/Makefile src/Extensions/Banshee.SqlDebugConsole/Makefile src/Extensions/Banshee.Sample/Makefile src/Extensions/Banshee.Torrent/Makefile src/Extensions/Banshee.RemoteAudio/Makefile src/Extensions/Banshee.Wikipedia/Makefile src/Extensions/Banshee.YouTube/Makefile extras/metrics/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22191,7 +22271,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by banshee-1 $as_me 1.6.0, which was +This file was extended by banshee-1 $as_me 1.6.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22254,7 +22334,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -banshee-1 config.status 1.6.0 +banshee-1 config.status 1.6.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -22671,6 +22751,7 @@ do "src/Clients/Halie/Makefile") CONFIG_FILES="$CONFIG_FILES src/Clients/Halie/Makefile" ;; "src/Clients/Muinshee/Makefile") CONFIG_FILES="$CONFIG_FILES src/Clients/Muinshee/Makefile" ;; "src/Clients/Nereid/Makefile") CONFIG_FILES="$CONFIG_FILES src/Clients/Nereid/Makefile" ;; + "src/Clients/MeeGo/Makefile") CONFIG_FILES="$CONFIG_FILES src/Clients/MeeGo/Makefile" ;; "src/Core/Makefile") CONFIG_FILES="$CONFIG_FILES src/Core/Makefile" ;; "src/Core/Banshee.CollectionIndexer/Makefile") CONFIG_FILES="$CONFIG_FILES src/Core/Banshee.CollectionIndexer/Makefile" ;; "src/Core/Banshee.Core/Makefile") CONFIG_FILES="$CONFIG_FILES src/Core/Banshee.Core/Makefile" ;; diff --git a/configure.ac b/configure.ac index 77766e0..a339b86 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Granularly define the version components dnl Remember to also update the Display Version m4_define([banshee_version_major], [1]) m4_define([banshee_version_minor], [6]) -m4_define([banshee_version_micro], [0]) +m4_define([banshee_version_micro], [1]) dnl set to 0 when doing an official release m4_define([banshee_version_pre_release], [0]) @@ -23,7 +23,7 @@ m4_define([banshee_version], dnl this can sometimes differ manually m4_define([banshee_display_version], - ["1.6.0"]) + ["1.6.1"]) m4_define([banshee_api_version], [banshee_version_major.banshee_version_minor]) @@ -79,8 +79,18 @@ dnl Check for mono >= 2.4.3 for LibraryWatcher extension, with fix for bnc#32233 PKG_CHECK_MODULES(MONO_2_4_3, mono >= 2.4.3, HAVE_MONO_2_4_3=yes, HAVE_MONO_2_4_3=no) AM_CONDITIONAL(ENABLE_LIBRARY_WATCHER, test "x$HAVE_MONO_2_4_3" = "xyes") -dnl Check for GNOME >= 2.28 to see if we should remove 'Media Player' from the app Name, bgo#596242 -PKG_CHECK_MODULES(GNOME_LT_2_28, gnome-desktop-2.0 < 2.28, BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player", BANSHEE_DESKTOP_NAME="_Name=Banshee") +dnl Check for GNOME >= 2.28 to see if we should remove +dnl 'Media Player' from the app Name, bgo#596242, except +dnl in MeeGo where GNOME >= 2.28, but we want the full name +PKG_CHECK_MODULES(GNOME_2_28, gnome-desktop-2.0 >= 2.28, + HAVE_GNOME_2_28=yes, HAVE_GNOME_2_28=no) +PKG_CHECK_MODULES(MEEGO_PANEL, moblin-panel, + HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no) +if test "x$HAVE_GNOME_2_28" = "xno" -o "x$HAVE_MEEGO_PANEL" = "xyes"; then + BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player" +else + BANSHEE_DESKTOP_NAME="_Name=Banshee" +fi AC_SUBST(BANSHEE_DESKTOP_NAME) dnl NDesk DBus libraries @@ -260,6 +270,7 @@ src/Clients/Booter/banshee-1.darwin src/Clients/Halie/Makefile src/Clients/Muinshee/Makefile src/Clients/Nereid/Makefile +src/Clients/MeeGo/Makefile src/Core/Makefile src/Core/Banshee.CollectionIndexer/Makefile diff --git a/data/Makefile.in b/data/Makefile.in index 6d44559..3d9afd0 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -223,8 +223,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -278,6 +278,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/data/audio-profiles/Makefile.in b/data/audio-profiles/Makefile.in index 2dcafbd..bf64015 100644 --- a/data/audio-profiles/Makefile.in +++ b/data/audio-profiles/Makefile.in @@ -180,8 +180,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -235,6 +235,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/data/desktop-files/Makefile.in b/data/desktop-files/Makefile.in index 61c628c..17074cb 100644 --- a/data/desktop-files/Makefile.in +++ b/data/desktop-files/Makefile.in @@ -181,8 +181,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -236,6 +236,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/data/icon-theme-hicolor/Makefile.in b/data/icon-theme-hicolor/Makefile.in index 5f51d16..3d4ba2b 100644 --- a/data/icon-theme-hicolor/Makefile.in +++ b/data/icon-theme-hicolor/Makefile.in @@ -156,8 +156,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -211,6 +211,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/debian/changelog b/debian/changelog index 2f40b1d..d985f33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +banshee (1.6.1-1) unstable; urgency=low + + * New bugfix upstream release: + + Enhancements: + - More devices supported: Android: Galaxy Portal, DEXT/CLIQ + - Automatically scan Music and Video libraries on first start + - Improve search responsiveness on large libraries + - Add AlbumArtist to the search menu (bgo#615692) + - Improved Last.fm authentication experience + - Many enhancements to MeeGo support + + Notable Bugs Fixed (since 1.6.0): + - Fix ListView a11y crash + - Fix Podcasts ListView right-click crash + - [TrackActions] Fix collection-modified crash + - [ColumnCellAlbum] Fix invalid cast crash + - Fix several custom-widget related crashes + - [Dap.Ipod] Fix a race condition + - [gapless] Fix rating resets (bgo#614863) + - [UserJobTile] Don't crash if icons are missing (bgo#615778) + - [BansheeQuery] Fix mime-type queries (bgo#601920) + - [MaemoDevice] Ignore the .videos directory (bgo#614825) + - [MaemoDevice] Set 'Music' and 'Video' as the default folders + - [MusicBrainzQueryJob] Escape album/artist (bgo#614569) + - 40 bugs fixed since 1.6.0 + * debian/source/format, debian/control, debian/rules: + + Move to 3.0 (quilt) format + + -- Chow Loong Jin Thu, 20 May 2010 00:43:45 +0800 + banshee (1.6.0-1) unstable; urgency=low * New upstream release: diff --git a/debian/control b/debian/control index b81fbfe..0b407fe 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Debian CLI Applications Team Uploaders: Sebastian Dröge , Chow Loong Jin Build-Depends: debhelper (>= 7.0.50), - quilt (>= 0.46-7~), autotools-dev, cli-common-dev (>= 0.5.7), intltool (>= 0.35), diff --git a/debian/rules b/debian/rules index 8856e3a..2e91ce1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,5 @@ #!/usr/bin/make -f -include /usr/share/quilt/quilt.make include /usr/share/cli-common/cli.make LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed @@ -39,4 +38,4 @@ override_dh_clistrip: dh_clistrip --dbg-package=banshee-dbg %: - dh --with=quilt $@ + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/docs/Banshee/Makefile.in b/docs/Banshee/Makefile.in index 78ffa90..1571f0b 100644 --- a/docs/Banshee/Makefile.in +++ b/docs/Banshee/Makefile.in @@ -181,8 +181,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -236,6 +236,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/docs/Hyena/Makefile.in b/docs/Hyena/Makefile.in index ca45586..80c790e 100644 --- a/docs/Hyena/Makefile.in +++ b/docs/Hyena/Makefile.in @@ -181,8 +181,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -236,6 +236,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/docs/Makefile.in b/docs/Makefile.in index 7bd1f11..7014953 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -196,8 +196,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -251,6 +251,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/extras/Makefile.in b/extras/Makefile.in index d019624..73e4d25 100644 --- a/extras/Makefile.in +++ b/extras/Makefile.in @@ -196,8 +196,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -251,6 +251,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/extras/metrics/Makefile.in b/extras/metrics/Makefile.in index 6247c0e..b214df6 100644 --- a/extras/metrics/Makefile.in +++ b/extras/metrics/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -475,6 +477,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -503,6 +507,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/gstreamer/Makefile.in b/gstreamer/Makefile.in index b2e4fc5..636c8d1 100644 --- a/gstreamer/Makefile.in +++ b/gstreamer/Makefile.in @@ -196,8 +196,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -251,6 +251,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/gstreamer/equalizer/Makefile.in b/gstreamer/equalizer/Makefile.in index 52931bd..85cdbd4 100644 --- a/gstreamer/equalizer/Makefile.in +++ b/gstreamer/equalizer/Makefile.in @@ -207,8 +207,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -262,6 +262,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/libbanshee/Makefile.in b/libbanshee/Makefile.in index 86bbc2e..aeae218 100644 --- a/libbanshee/Makefile.in +++ b/libbanshee/Makefile.in @@ -224,8 +224,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -279,6 +279,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h index 7145b1f..1b69d6f 100644 --- a/libbanshee/banshee-player-private.h +++ b/libbanshee/banshee-player-private.h @@ -86,6 +86,7 @@ typedef void (* BansheePlayerVisDataCallback) (BansheePlayer *player, gint typedef void (* BansheePlayerNextTrackStartingCallback) (BansheePlayer *player); typedef void (* BansheePlayerAboutToFinishCallback) (BansheePlayer *player); typedef GstElement * (* BansheePlayerVideoPipelineSetupCallback) (BansheePlayer *player, GstBus *bus); +typedef void (* BansheePlayerVideoPrepareWindowCallback) (BansheePlayer *player); typedef void (* BansheePlayerVolumeChangedCallback) (BansheePlayer *player, gdouble new_volume); typedef enum { @@ -106,6 +107,7 @@ struct BansheePlayer { BansheePlayerNextTrackStartingCallback next_track_starting_cb; BansheePlayerAboutToFinishCallback about_to_finish_cb; BansheePlayerVideoPipelineSetupCallback video_pipeline_setup_cb; + BansheePlayerVideoPrepareWindowCallback video_prepare_window_cb; BansheePlayerVolumeChangedCallback volume_changed_cb; // Pipeline Elements diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c index cb36fd6..f34dc21 100644 --- a/libbanshee/banshee-player-video.c +++ b/libbanshee/banshee-player-video.c @@ -178,6 +178,10 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus) #endif #endif + + if (player->video_prepare_window_cb != NULL) { + player->video_prepare_window_cb (player); + } } P_INVOKE void @@ -186,6 +190,12 @@ bp_set_video_pipeline_setup_callback (BansheePlayer *player, BansheePlayerVideoP SET_CALLBACK (video_pipeline_setup_cb); } +P_INVOKE void +bp_set_video_prepare_window_callback (BansheePlayer *player, BansheePlayerVideoPrepareWindowCallback cb) +{ + SET_CALLBACK (video_prepare_window_cb); +} + // --------------------------------------------------------------------------- // Public Functions // --------------------------------------------------------------------------- diff --git a/po/POTFILES.in b/po/POTFILES.in index 1fe7a81..7115c89 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -218,6 +218,7 @@ src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs +src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmPreferences.cs src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs @@ -227,6 +228,7 @@ src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/ContextPage.cs src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs +src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml diff --git a/po/da.po b/po/da.po index 9d18d6b..5194d09 100644 --- a/po/da.po +++ b/po/da.po @@ -28,8 +28,8 @@ msgid "" msgstr "" "Project-Id-Version: banshee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-30 23:31+0200\n" -"PO-Revision-Date: 2010-03-30 23:31+0200\n" +"POT-Creation-Date: 2010-04-30 20:05+0200\n" +"PO-Revision-Date: 2010-04-23 23:31+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -335,6 +335,7 @@ msgstr "Vis et ikon i statusfeltet for kontrol af Banshee." #. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml #: ../data/addin-xml-strings.cs:146 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164 #: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50 msgid "Now Playing" msgstr "Afspiller nu" @@ -883,61 +884,61 @@ msgstr "_Luk" msgid "Close" msgstr "Luk" -#: ../src/Clients/Booter/Booter/Entry.cs:146 +#: ../src/Clients/Booter/Booter/Entry.cs:150 msgid "Help Options" msgstr "Tilvalg for hjælp" -#: ../src/Clients/Booter/Booter/Entry.cs:147 +#: ../src/Clients/Booter/Booter/Entry.cs:151 msgid "Show this help" msgstr "Vis denne hjælp" -#: ../src/Clients/Booter/Booter/Entry.cs:148 +#: ../src/Clients/Booter/Booter/Entry.cs:152 msgid "Show options for controlling playback" msgstr "Vis tilvalg for kontrol af afspilning" -#: ../src/Clients/Booter/Booter/Entry.cs:149 +#: ../src/Clients/Booter/Booter/Entry.cs:153 msgid "Show options for querying the playing track" msgstr "Vis tilvalg for forespørgsel på det spillende nummer" -#: ../src/Clients/Booter/Booter/Entry.cs:150 +#: ../src/Clients/Booter/Booter/Entry.cs:154 msgid "Show options for querying the playing engine" msgstr "Vis tilvalg for forespørgsel på afspillermoteren" -#: ../src/Clients/Booter/Booter/Entry.cs:151 +#: ../src/Clients/Booter/Booter/Entry.cs:155 msgid "Show options for the user interface" msgstr "Vis tilvalg for brugergrænsefladen" -#: ../src/Clients/Booter/Booter/Entry.cs:152 +#: ../src/Clients/Booter/Booter/Entry.cs:156 msgid "Show options for developers and debugging" msgstr "Vis tilvalg for udviklere og fejlsøgning" -#: ../src/Clients/Booter/Booter/Entry.cs:153 +#: ../src/Clients/Booter/Booter/Entry.cs:157 msgid "Show all option groups" msgstr "Vis alle tilvalgsgrupper" -#: ../src/Clients/Booter/Booter/Entry.cs:154 +#: ../src/Clients/Booter/Booter/Entry.cs:158 msgid "Show version information" msgstr "Vis versionsinformation" -#: ../src/Clients/Booter/Booter/Entry.cs:157 +#: ../src/Clients/Booter/Booter/Entry.cs:161 msgid "Playback Control Options" msgstr "Tilvalg for kontrol af afspilning" -#: ../src/Clients/Booter/Booter/Entry.cs:158 +#: ../src/Clients/Booter/Booter/Entry.cs:162 msgid "" "Play the next track, optionally restarting if the 'restart' value is set" msgstr "" "Afspil det næste nummer, genstart eventuelt hvis \"restart\"-værdien " "(genstart) er sat" -#: ../src/Clients/Booter/Booter/Entry.cs:159 +#: ../src/Clients/Booter/Booter/Entry.cs:163 msgid "" "Play the previous track, optionally restarting if the 'restart value is set" msgstr "" "Afspil det forrige nummer, genstart eventuelt hvis \"restart\"-værdien " "(genstart) er sat" -#: ../src/Clients/Booter/Booter/Entry.cs:160 +#: ../src/Clients/Booter/Booter/Entry.cs:164 msgid "" "If the current song has been played longer than 4 seconds then restart it, " "otherwise the same as --previous" @@ -945,28 +946,28 @@ msgstr "" "Hvis den aktuelle sang er blevet spillet mere end 4 sekunder så genstart " "den, ellers det samme som --previous" -#: ../src/Clients/Booter/Booter/Entry.cs:161 +#: ../src/Clients/Booter/Booter/Entry.cs:165 msgid "Automatically start playing any tracks enqueued on the command line" msgstr "Start automatisk afspilning af numre sat i kø på kommandolinjen" -#: ../src/Clients/Booter/Booter/Entry.cs:162 +#: ../src/Clients/Booter/Booter/Entry.cs:166 msgid "Start playback" msgstr "Start afspilning" -#: ../src/Clients/Booter/Booter/Entry.cs:163 +#: ../src/Clients/Booter/Booter/Entry.cs:167 msgid "Pause playback" msgstr "Pause afspilning" # Skift afspilning -#: ../src/Clients/Booter/Booter/Entry.cs:164 +#: ../src/Clients/Booter/Booter/Entry.cs:168 msgid "Toggle playback" msgstr "Start/stop afspilning" -#: ../src/Clients/Booter/Booter/Entry.cs:165 +#: ../src/Clients/Booter/Booter/Entry.cs:169 msgid "Completely stop playback" msgstr "Stop afspilning fuldstændigt" -#: ../src/Clients/Booter/Booter/Entry.cs:167 +#: ../src/Clients/Booter/Booter/Entry.cs:171 msgid "" "Enable or disable playback stopping after the currently playing track (value " "should be either 'true' or 'false')" @@ -974,106 +975,106 @@ msgstr "" "Aktivér eller deaktivér afspilningsstop efter det spillende nummer (værdien " "skal være enten \"true\" (sand) eller \"false\" (falsk))" -#: ../src/Clients/Booter/Booter/Entry.cs:168 +#: ../src/Clients/Booter/Booter/Entry.cs:172 msgid "Set the playback volume (0-100), prefix with +/- for relative values" msgstr "Sæt afspilningsvolumen (0-100), præfiks med +/- for relative værdier" -#: ../src/Clients/Booter/Booter/Entry.cs:169 +#: ../src/Clients/Booter/Booter/Entry.cs:173 msgid "Seek to a specific point (seconds, float)" msgstr "Spol til et bestemt sted (sekunder, flydende)" -#: ../src/Clients/Booter/Booter/Entry.cs:170 +#: ../src/Clients/Booter/Booter/Entry.cs:174 msgid "Set the currently played track's rating (0 to 5)" msgstr "Angiv bedømmelse af det aktuelt spillede nummer (0 til 5)" -#: ../src/Clients/Booter/Booter/Entry.cs:173 +#: ../src/Clients/Booter/Booter/Entry.cs:177 msgid "Player Engine Query Options" msgstr "Tilvalg for forespørgsel på afspillermotor" -#: ../src/Clients/Booter/Booter/Entry.cs:174 +#: ../src/Clients/Booter/Booter/Entry.cs:178 msgid "Current player state" msgstr "Nuværende afspillertilstand" -#: ../src/Clients/Booter/Booter/Entry.cs:175 +#: ../src/Clients/Booter/Booter/Entry.cs:179 msgid "Last player state" msgstr "Sidste afspillertilstand" -#: ../src/Clients/Booter/Booter/Entry.cs:176 +#: ../src/Clients/Booter/Booter/Entry.cs:180 msgid "Query whether the player can be paused" msgstr "Forespørg om afspilleren kan pauses" -#: ../src/Clients/Booter/Booter/Entry.cs:177 +#: ../src/Clients/Booter/Booter/Entry.cs:181 msgid "Query whether the player can seek" msgstr "Forespørg om afspilleren kan spole" -#: ../src/Clients/Booter/Booter/Entry.cs:178 +#: ../src/Clients/Booter/Booter/Entry.cs:182 msgid "Player volume" msgstr "Afspillervolume" -#: ../src/Clients/Booter/Booter/Entry.cs:179 +#: ../src/Clients/Booter/Booter/Entry.cs:183 msgid "Player position in currently playing track" msgstr "Afspillerposition i det spillende nummer" -#: ../src/Clients/Booter/Booter/Entry.cs:182 +#: ../src/Clients/Booter/Booter/Entry.cs:186 msgid "Playing Track Metadata Query Options" msgstr "Tilvalg for forespørgsel af metadata på det spillende nummer" -#: ../src/Clients/Booter/Booter/Entry.cs:183 +#: ../src/Clients/Booter/Booter/Entry.cs:187 msgid "URI" msgstr "URI" -#: ../src/Clients/Booter/Booter/Entry.cs:184 +#: ../src/Clients/Booter/Booter/Entry.cs:188 #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:148 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:85 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89 msgid "Artist Name" msgstr "Kunstner" -#: ../src/Clients/Booter/Booter/Entry.cs:185 -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:149 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:86 +#: ../src/Clients/Booter/Booter/Entry.cs:189 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:150 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90 msgid "Album Title" msgstr "Albumtitel" -#: ../src/Clients/Booter/Booter/Entry.cs:186 +#: ../src/Clients/Booter/Booter/Entry.cs:190 #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:147 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:84 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88 msgid "Track Title" msgstr "Nummertitel" -#: ../src/Clients/Booter/Booter/Entry.cs:187 +#: ../src/Clients/Booter/Booter/Entry.cs:191 msgid "Duration" msgstr "Varighed" #. Translators: noun -#: ../src/Clients/Booter/Booter/Entry.cs:188 +#: ../src/Clients/Booter/Booter/Entry.cs:192 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117 msgid "Track Number" msgstr "Spornummer" #. Translators: noun -#: ../src/Clients/Booter/Booter/Entry.cs:189 +#: ../src/Clients/Booter/Booter/Entry.cs:193 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126 msgid "Track Count" msgstr "Antal spor" -#: ../src/Clients/Booter/Booter/Entry.cs:190 +#: ../src/Clients/Booter/Booter/Entry.cs:194 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149 #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:113 msgid "Disc Number" msgstr "Disknummer" -#: ../src/Clients/Booter/Booter/Entry.cs:191 -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:151 +#: ../src/Clients/Booter/Booter/Entry.cs:195 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:152 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177 #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92 msgid "Year" msgstr "År" -#: ../src/Clients/Booter/Booter/Entry.cs:192 +#: ../src/Clients/Booter/Booter/Entry.cs:196 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60 @@ -1081,59 +1082,75 @@ msgstr "År" msgid "Rating" msgstr "Bedømmelse" -#: ../src/Clients/Booter/Booter/Entry.cs:193 +#: ../src/Clients/Booter/Booter/Entry.cs:197 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322 msgid "Score" msgstr "Pointgivning" #. Translators: noun -#: ../src/Clients/Booter/Booter/Entry.cs:194 +#: ../src/Clients/Booter/Booter/Entry.cs:198 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143 msgid "Bit Rate" msgstr "Bitrate" -#: ../src/Clients/Booter/Booter/Entry.cs:197 +#: ../src/Clients/Booter/Booter/Entry.cs:201 msgid "User Interface Options" msgstr "Tilvalg for brugergrænseflade" -#: ../src/Clients/Booter/Booter/Entry.cs:198 +#: ../src/Clients/Booter/Booter/Entry.cs:202 msgid "Present the user interface on the active workspace" msgstr "Vis brugergrænsefladen på det aktive arbejdsområde" -#: ../src/Clients/Booter/Booter/Entry.cs:199 +#: ../src/Clients/Booter/Booter/Entry.cs:203 msgid "Hide the user interface" msgstr "Skjul brugergrænsefladen" -#: ../src/Clients/Booter/Booter/Entry.cs:200 +#: ../src/Clients/Booter/Booter/Entry.cs:204 msgid "Do not present the user interface, regardless of any other options" msgstr "Vis ikke brugergrænsefladen, uanset ethvert andet argument" -#: ../src/Clients/Booter/Booter/Entry.cs:203 +#: ../src/Clients/Booter/Booter/Entry.cs:205 +msgid "Present the import media dialog box" +msgstr "Vis dialogboksen for importering af medie" + +#: ../src/Clients/Booter/Booter/Entry.cs:206 +msgid "Present the about dialog" +msgstr "Vis dialogen om" + +#: ../src/Clients/Booter/Booter/Entry.cs:207 +msgid "Present the open location dialog" +msgstr "Vis dialogen for åbn placering" + +#: ../src/Clients/Booter/Booter/Entry.cs:208 +msgid "Present the preferences dialog" +msgstr "Vis dialogen for indstillinger" + +#: ../src/Clients/Booter/Booter/Entry.cs:211 msgid "Debugging and Development Options" msgstr "Tilvalg for fejlsøgning og udvikling" -#: ../src/Clients/Booter/Booter/Entry.cs:204 +#: ../src/Clients/Booter/Booter/Entry.cs:212 msgid "Enable general debugging features" msgstr "Aktivér generel fejlsøgningfunktionalitet" -#: ../src/Clients/Booter/Booter/Entry.cs:205 +#: ../src/Clients/Booter/Booter/Entry.cs:213 msgid "Enable debugging output of SQL queries" msgstr "Aktivér fejlsøgningsudskrift på SQL-forespørgsler" -#: ../src/Clients/Booter/Booter/Entry.cs:206 +#: ../src/Clients/Booter/Booter/Entry.cs:214 msgid "Enable debugging output of Mono.Addins" msgstr "Aktivér fejlsøgningsudskrift på Mono.Addins" -#: ../src/Clients/Booter/Booter/Entry.cs:207 +#: ../src/Clients/Booter/Booter/Entry.cs:215 msgid "Specify an alternate database to use" msgstr "Angiv en alternativ database som skal bruges" # hvad sker der her? -#: ../src/Clients/Booter/Booter/Entry.cs:208 +#: ../src/Clients/Booter/Booter/Entry.cs:216 msgid "Specify an alternate key, default is /apps/banshee-1/" msgstr "Angiv en alternativ tast, standard er /apps/bashee-1/" -#: ../src/Clients/Booter/Booter/Entry.cs:209 +#: ../src/Clients/Booter/Booter/Entry.cs:217 msgid "" "Optimize instance for running uninstalled; most notably, this will create an " "alternate Mono.Addins database in the working directory" @@ -1141,18 +1158,18 @@ msgstr "" "Optimér instansen til at køre afinstalleret. Mest bemærkelsesværdig, vil " "dette oprette en alternativ Mono.Addins-database i arbejdsmappen" -#: ../src/Clients/Booter/Booter/Entry.cs:211 +#: ../src/Clients/Booter/Booter/Entry.cs:219 msgid "Disable DBus support completely" msgstr "Deaktivér DBus-understøttelse fuldstændigt" -#: ../src/Clients/Booter/Booter/Entry.cs:213 +#: ../src/Clients/Booter/Booter/Entry.cs:221 #, csharp-format msgid "Skip loading a custom gtkrc file ({0}) if it exists" msgstr "" "Spring over indlæsning af brugerdefineret gtkrc-fil ({0}), hvis den " "eksisterer" -#: ../src/Clients/Booter/Booter/Entry.cs:244 +#: ../src/Clients/Booter/Booter/Entry.cs:252 #, csharp-format msgid "The following help arguments are invalid: {0}" msgstr "De følgende hjælpeargumenter er ugyldige: {0}" @@ -1197,26 +1214,34 @@ msgid "Play Song" msgstr "Afspil sang" #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:146 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:83 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87 msgid "Artist, Album, or Title" msgstr "Kunstner, album eller titel" -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:150 +#. Alias for %album_artist% +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:149 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78 +#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82 +msgid "Album Artist" +msgstr "Albumkunstner" + +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:151 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:91 msgid "Genre" msgstr "Genre" #. Translators: noun -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:152 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:153 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214 msgid "Comment" msgstr "Kommentar" #. Translators: this is a verb (command), not a noun (things) -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:173 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:174 #, csharp-format msgid "Search" msgstr "Søg" @@ -1526,13 +1551,6 @@ msgstr "{0}-mappe" msgid "Track Artist" msgstr "Kunstner" -#. Alias for %album_artist% -#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72 -#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78 -#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82 -msgid "Album Artist" -msgstr "Albumkunstner" - #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:83 msgid "Album Artist Initial" msgstr "Initialer albumkunstner" @@ -1846,7 +1864,7 @@ msgstr "Slet spilleliste" #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:396 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:169 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90 -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:367 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:372 #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:475 #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213 msgid "New Playlist" @@ -2965,11 +2983,11 @@ msgid "View detailed version and configuration information" msgstr "Vis detaljeret versions- og konfigurationsinformation" #. Prompt user for location of the playlist. -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:160 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:180 msgid "Import Playlist" msgstr "Importér spilleliste" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:161 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:181 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559 msgid "Playlists" msgstr "Spillelister" @@ -3232,7 +3250,7 @@ msgstr "Slet valgte elementer permanent fra lagringsmedie" #. Translators: this is a verb (command), not a noun (things) #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:169 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:108 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112 #, csharp-format msgid "_Search" msgstr "_Søg" @@ -3262,15 +3280,15 @@ msgstr "Søg mellem alle sange af denne kunstner" msgid "_Delete From \"{0}\"" msgstr "_Slet fra \"{0}\"" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:437 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:442 msgid "The folder could not be found." msgstr "Mappen kunne ikke findes." -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:438 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:443 msgid "Please check that the track's location is accessible by the system." msgstr "Undersøg venligst at nummerets placering kan tilgås af systemet." -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:504 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:509 #, csharp-format msgid "Are you sure you want to permanently delete this item?" msgid_plural "" @@ -3278,16 +3296,16 @@ msgid_plural "" msgstr[0] "Er du sikker på du vil slette dette element permanent?" msgstr[1] "Er du sikker på du vil slette de {0} valgte elementer permanent?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:508 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:513 msgid "If you delete the selection, it will be permanently lost." msgstr "Hvis du sletter det valgte vil det permament være tabt." -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:511 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:516 #, csharp-format msgid "Remove selection from {0}?" msgstr "Fjern valg fra {0}?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:514 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:519 #, csharp-format msgid "Are you sure you want to remove the selected item from your {1}?" msgid_plural "" @@ -3296,7 +3314,7 @@ msgstr[0] "Er du sikker på, at du vil fjerne det valgte element fra din {1}?" msgstr[1] "" "Er du sikker på, at du vil fjerne de valgte {0} elementer fra din {1}?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:543 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:548 msgid "View Track Information" msgstr "Vis nummerinformation" @@ -4228,27 +4246,27 @@ msgstr "Understøtter billeder" msgid "Track duration is zero" msgstr "Nummerets varighed er nul" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:627 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:631 msgid "Out of space on device" msgstr "Ikke mere plads på enhed" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:627 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:631 msgid "Please manually remove some songs" msgstr "Fjern venligst nogle sange manuelt" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:643 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:647 msgid "Syncing iPod" msgstr "Synkroniserer iPod" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:644 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:648 msgid "Preparing to synchronize..." msgstr "Klargør til synkronisering..." -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:665 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:669 msgid "Updating..." msgstr "Opdaterer..." -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:669 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:673 msgid "Flushing to disk..." msgstr "Gemmer til disk..." @@ -5812,7 +5830,15 @@ msgstr "{0}% lighed" msgid "Unknown Similarity" msgstr "Ukendt lighed" -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:69 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109 +msgid "Media" +msgstr "Medie" + +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119 +msgid "Library" +msgstr "Bibliotek" + +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131 msgid "Launch the Banshee Media Player" msgstr "Start Banshee medieafspiller" @@ -6541,9 +6567,3 @@ msgstr "Tilsluttet til Last.fm." #: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:100 msgid "Unknown Podcast" msgstr "Ukendt podcast" - -#~ msgid "Music Library" -#~ msgstr "Musikbibliotek" - -#~ msgid "Media" -#~ msgstr "Medie" diff --git a/po/lt.po b/po/lt.po index 479a43e..3c1f0aa 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: HEAD\n" "Report-Msgid-Bugs-To: " "http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=general\n" -"POT-Creation-Date: 2010-03-23 02:32+0000\n" -"PO-Revision-Date: 2010-03-30 19:25+0300\n" +"POT-Creation-Date: 2010-04-14 02:29+0000\n" +"PO-Revision-Date: 2010-04-15 13:05+0300\n" "Last-Translator: Žygimantas Beručka \n" "Language-Team: Lithuanian \n" "Language: lt\n" @@ -283,12 +283,10 @@ msgstr "Automatiškai atnaujina fonoteką ir videoteką" #. ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml #: ../data/addin-xml-strings.cs:127 -#| msgid "Device Support" msgid "MeeGo Support" msgstr "MeeGo palaikymas" #: ../data/addin-xml-strings.cs:128 -#| msgid "Provides Moblin integration, including a custom media panel." msgid "Provides MeeGo integration, including a custom media panel." msgstr "Integruoja MeeGo, įskaitant pasirinktinį medijos skydelį." @@ -325,6 +323,7 @@ msgstr "Pranešimų srityje rodyti piktogramą Banshee valdymui." #. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml #: ../data/addin-xml-strings.cs:146 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164 #: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50 msgid "Now Playing" msgstr "Dabar leidžiama" @@ -458,7 +457,6 @@ msgid "Bitrate" msgstr "Bitų dažnis" #: ../data/audio-profiles/aac-novell.xml.in.h:4 -#| msgid "Continue" msgid "Container" msgstr "Konteineris" @@ -487,12 +485,10 @@ msgid "MPEG-4 QuickTime" msgstr "MPEG-4 QuickTime" #: ../data/audio-profiles/aac-novell.xml.in.h:10 -#| msgid "Format" msgid "Output Format" msgstr "Išvesties formatas" #: ../data/audio-profiles/aac-novell.xml.in.h:11 -#| msgid "file" msgid "Profile" msgstr "Profilis" @@ -814,7 +810,7 @@ msgid "Could not create BPM detection driver." msgstr "Nepavyko sukurti BPM aptikimo tvarkyklės." #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:71 -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:707 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:710 msgid "Enable _gapless playback" msgstr "Įjungti _betarpę perklausą" @@ -831,15 +827,15 @@ msgstr "" msgid "Could not initialize GStreamer library" msgstr "Nepavyko inicijuoti GStreamer bibliotekos" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:388 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:391 msgid "Unknown Error" msgstr "Nežinoma klaida" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:701 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:704 msgid "_Enable ReplayGain correction" msgstr "Į_jungti ReplayGain korekciją" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:702 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:705 msgid "" "For tracks that have ReplayGain data, automatically scale (normalize) " "playback volume" @@ -847,10 +843,7 @@ msgstr "" "Automatiškai normalizuoti takelių, kuriuose yra ReplayGain duomenų, " "perklausos garsumą." -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:708 -#| msgid "" -#| "Eliminate the small playback gap on track change. Useful for concept " -#| "albums and classical music" +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:711 msgid "" "Eliminate the small playback gap on track change. Useful for concept albums " "and classical music." @@ -960,7 +953,6 @@ msgstr "" "būti „true“ arba „false“)" #: ../src/Clients/Booter/Booter/Entry.cs:168 -#| msgid "Set the playback volume (0-100)" msgid "Set the playback volume (0-100), prefix with +/- for relative values" msgstr "" "Nustatyti grojimo garsumą (0-100), norėdami nurodyti santykines reikšmes, " @@ -1012,19 +1004,19 @@ msgstr "URI" #: ../src/Clients/Booter/Booter/Entry.cs:184 #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:148 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:85 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89 msgid "Artist Name" msgstr "Atlikėjas" #: ../src/Clients/Booter/Booter/Entry.cs:185 #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:149 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:86 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90 msgid "Album Title" msgstr "Albumo pavadinimas" #: ../src/Clients/Booter/Booter/Entry.cs:186 #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:147 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:84 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88 msgid "Track Title" msgstr "Takelio pavadinimas" @@ -1057,7 +1049,7 @@ msgstr "Disko numeris" #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92 msgid "Year" msgstr "Metai" @@ -1096,31 +1088,47 @@ msgstr "Paslėpti naudotojo sąsają" msgid "Do not present the user interface, regardless of any other options" msgstr "Nerodyti naudotojo sąsajos, nepaisant bet kokių kitų parinkčių" +#: ../src/Clients/Booter/Booter/Entry.cs:201 +msgid "Present the import media dialog box" +msgstr "Rodyti medijos importavimo dialogą" + +#: ../src/Clients/Booter/Booter/Entry.cs:202 +msgid "Present the about dialog" +msgstr "Rodyti „Apie“ dialogą" + #: ../src/Clients/Booter/Booter/Entry.cs:203 +msgid "Present the open location dialog" +msgstr "Rodyti vietos atvėrimo dialogą" + +#: ../src/Clients/Booter/Booter/Entry.cs:204 +msgid "Present the preferences dialog" +msgstr "Rodyti nustatymų dialogą" + +#: ../src/Clients/Booter/Booter/Entry.cs:207 msgid "Debugging and Development Options" msgstr "Derinimo ir programavimo parinktys" -#: ../src/Clients/Booter/Booter/Entry.cs:204 +#: ../src/Clients/Booter/Booter/Entry.cs:208 msgid "Enable general debugging features" msgstr "Įjungti bendrąsias derinimo funkcijas" -#: ../src/Clients/Booter/Booter/Entry.cs:205 +#: ../src/Clients/Booter/Booter/Entry.cs:209 msgid "Enable debugging output of SQL queries" msgstr "Įjungti SQL užklausų derinimo išvestį" -#: ../src/Clients/Booter/Booter/Entry.cs:206 +#: ../src/Clients/Booter/Booter/Entry.cs:210 msgid "Enable debugging output of Mono.Addins" msgstr "Įjungti Mono.Addins derinimo išvestį" -#: ../src/Clients/Booter/Booter/Entry.cs:207 +#: ../src/Clients/Booter/Booter/Entry.cs:211 msgid "Specify an alternate database to use" msgstr "Nurodytkite alternatyvią naudotiną duomenų bazę" -#: ../src/Clients/Booter/Booter/Entry.cs:208 +#: ../src/Clients/Booter/Booter/Entry.cs:212 msgid "Specify an alternate key, default is /apps/banshee-1/" msgstr "Nurodytkite alternatyvų raktą, numatytasis – /apps/banshee-1/" -#: ../src/Clients/Booter/Booter/Entry.cs:209 +#: ../src/Clients/Booter/Booter/Entry.cs:213 msgid "" "Optimize instance for running uninstalled; most notably, this will create an " "alternate Mono.Addins database in the working directory" @@ -1128,16 +1136,16 @@ msgstr "" "Optimizuoti naudojimui neįdiegus. Pastebimiausias skirtumas yra tai, kad " "darbiniame aplanke bus sukurta alternatyvi Mono.Addins duomenų bazė" -#: ../src/Clients/Booter/Booter/Entry.cs:211 +#: ../src/Clients/Booter/Booter/Entry.cs:215 msgid "Disable DBus support completely" msgstr "Visiškai išjungti DBus palaikymą" -#: ../src/Clients/Booter/Booter/Entry.cs:213 +#: ../src/Clients/Booter/Booter/Entry.cs:217 #, csharp-format msgid "Skip loading a custom gtkrc file ({0}) if it exists" msgstr "Neįkelti pasirinktinio gtkrc failo ({0}), jei šis egzistuoja" -#: ../src/Clients/Booter/Booter/Entry.cs:244 +#: ../src/Clients/Booter/Booter/Entry.cs:248 #, csharp-format msgid "The following help arguments are invalid: {0}" msgstr "Šie žinyno parametrai yra netinkami: {0}" @@ -1182,7 +1190,7 @@ msgid "Play Song" msgstr "Leisti dainą" #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:146 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:83 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87 msgid "Artist, Album, or Title" msgstr "Atlikėjas, albumas ar pavadinimas" @@ -1190,7 +1198,7 @@ msgstr "Atlikėjas, albumas ar pavadinimas" #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:91 msgid "Genre" msgstr "Žanras" @@ -1423,71 +1431,71 @@ msgstr "" msgid "Refreshing Metadata" msgstr "Atnaujinami metaduomenys" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:257 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:252 msgid "Classical" msgstr "Klasika" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:260 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:255 msgid "Club" msgstr "Klubinė" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:263 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:258 msgid "Dance" msgstr "Šokių" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:266 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:261 msgid "Full Bass" msgstr "Visi žemi tonai" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:269 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:264 msgid "Full Bass and Treble" msgstr "Visi žemi ir aukšti tonai" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:272 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:267 msgid "Full Treble" msgstr "Visi aukšti tonai" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:275 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:270 msgid "Laptop Speakers and Headphones" msgstr "Nešiojamojo kompiuterio kolonėlės ir ausinės" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:278 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:273 msgid "Large Hall" msgstr "Didelė salė" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:281 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:276 msgid "Live" msgstr "Gyvai" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:284 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:279 msgid "Party" msgstr "Vakarėlis" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:287 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:282 msgid "Pop" msgstr "Pop" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:290 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:285 msgid "Reggae" msgstr "Regis" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:293 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:288 msgid "Rock" msgstr "Rokas" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:296 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:291 msgid "Ska" msgstr "Ska" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:299 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:294 msgid "Soft" msgstr "Rami" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:302 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:297 msgid "Soft Rock" msgstr "Ramus rokas" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:305 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:300 msgid "Techno" msgstr "Techno" @@ -2013,13 +2021,11 @@ msgstr "kps" #. Translators: noun #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:152 -#| msgid "Audio Sample Rate:" msgid "Sample Rate" msgstr "Garso elemento dažnis" #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok. #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154 -#| msgid "Sample" msgid "samplerate" msgstr "garsoelementodažnis" @@ -2034,7 +2040,6 @@ msgstr "Bitų garso elemente" #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok. #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163 -#| msgid "bitrate" msgid "bitspersample" msgstr "bitųgarsoelemente" @@ -2043,7 +2048,6 @@ msgid "bitdepth" msgstr "bitųgylis" #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163 -#| msgid "Station" msgid "quantization" msgstr "kvantizacija" @@ -2433,7 +2437,7 @@ msgstr "drm" #. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok. #: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:64 #: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:66 -#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:311 +#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:327 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212 @@ -2690,15 +2694,11 @@ msgstr "{0} kbps" #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:138 #, csharp-format -#| msgid "{0} day" -#| msgid_plural "{0} days" msgid "{0} Hz" msgstr "{0} Hz" #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:141 #, csharp-format -#| msgid "{0} item" -#| msgid_plural "{0} items" msgid "{0} bits" msgstr "{0} bitai (-ų)" @@ -2773,12 +2773,10 @@ msgstr "" "užduotys. Jų negalima automatiškai pratęsti kitą kartą paleidus Banshee." #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60 -#| msgid "Quit anyway" msgid "Quit Anyway" msgstr "Vistiek išeiti" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:61 -#| msgid "Continue running" msgid "Continue Running" msgstr "Naudotis toliau" @@ -2960,11 +2958,11 @@ msgid "View detailed version and configuration information" msgstr "Žiūrėti išsamią versijos ir konfigūracijos informaciją" #. Prompt user for location of the playlist. -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:160 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:180 msgid "Import Playlist" msgstr "Importuoti grojaraštį" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:161 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:181 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559 msgid "Playlists" msgstr "Grojaraščiai" @@ -3227,7 +3225,7 @@ msgstr "Negrįžtamai ištrinti pasirinktą (-us) elementą (-us) iš laikmenos" #. Translators: this is a verb (command), not a noun (things) #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:169 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:108 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112 #, csharp-format msgid "_Search" msgstr "_Ieškoti" @@ -3258,7 +3256,6 @@ msgid "_Delete From \"{0}\"" msgstr "_Ištrinti iš „{0}“" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:437 -#| msgid "The preferences service could not be found." msgid "The folder could not be found." msgstr "Nepavyko rasti aplanko." @@ -3295,7 +3292,6 @@ msgstr[1] "Ar tikrai norite iš {1} pašalinti {0} pasirinktus elementus?" msgstr[2] "Ar tikrai norite iš {1} pašalinti {0} pasirinktų elementų?" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:543 -#| msgid "_Edit Track Information" msgid "View Track Information" msgstr "Peržiūrėti takelio informaciją" @@ -4068,12 +4064,10 @@ msgstr[1] "Sinchronizuojant bus pašalinti {0} takeliai iš jūsų įrenginio." msgstr[2] "Sinchronizuojant bus pašalinta {0} takelių iš jūsų įrenginio." #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:368 -#| msgid "Are you sure you want to delete this {0}?" msgid "Are you sure you want to continue?" msgstr "Ar tikrai norite tęsti?" #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:376 -#| msgid "Love Track" msgid "Remove tracks" msgstr "Pašalinti takelius" @@ -4357,7 +4351,7 @@ msgstr "Reikalingas aplankų gylis" msgid "Supports Playlists" msgstr "Palaiko grojaraščius" -#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs:188 +#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs:189 msgid "Ringtones" msgstr "Skambėjimo tonai" @@ -5819,8 +5813,17 @@ msgstr "{0}% panašumas" msgid "Unknown Similarity" msgstr "Nežinomas panašumas" -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:72 -#| msgid "Banshee Media Player" +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109 +#| msgid "_Media" +msgid "Media" +msgstr "Medija" + +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119 +#| msgid "Music Library" +msgid "Library" +msgstr "Fonoteka" + +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131 msgid "Launch the Banshee Media Player" msgstr "Paleisti medijos leistuvą Banshee" @@ -5829,7 +5832,6 @@ msgid "Quick access panel for your media" msgstr "Greitos prieigos prie jūsų medijos skydelis" #: ../src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in.h:2 -#| msgid "Media" msgid "media" msgstr "medija" @@ -6157,11 +6159,11 @@ msgstr "Aplankyti tinklalapį" msgid "Subscribe to Podcast" msgstr "Užsisakyti Podcast kanalą" -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:322 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:325 msgid "Invalid URL" msgstr "Netinkamas URL" -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:323 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:326 msgid "Podcast URL is invalid." msgstr "Netinkamas Podcast URL." @@ -6243,13 +6245,11 @@ msgid "Stop SQL Monitoring" msgstr "Sustabdyti SQL stebėjimą" #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:136 -#| msgid "Recorded by:" msgid "Uploaded by" msgstr "Įkėlė" #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:233 #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:234 -#| msgid "Quit Banshee" msgid "Play in Banshee..." msgstr "Leisti programoje Banshee.." @@ -6259,7 +6259,6 @@ msgid "Play in Web Browser..." msgstr "Leisti žiniatinklio naršyklėje..." #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs:61 -#| msgid "File not found" msgid "No videos found" msgstr "Nerasta vaizdo įrašų" @@ -6556,9 +6555,6 @@ msgstr "Nežinomas Podcast kanalas" #~ msgid "Current source:" #~ msgstr "Dabartinis šaltinis:" -#~ msgid "Music Library" -#~ msgstr "Muzikos fonoteka" - #~ msgid "Home Directory" #~ msgstr "Namų aplankas" diff --git a/po/nl.po b/po/nl.po index 81cd991..d3c5d9d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: Banshee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-23 22:48+0100\n" -"PO-Revision-Date: 2010-03-23 22:51+0100\n" +"POT-Creation-Date: 2010-04-30 19:58+0200\n" +"PO-Revision-Date: 2010-04-30 20:12+0200\n" "Last-Translator: Wouter Bolsterlee \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -136,9 +136,8 @@ msgstr "" #. ../src/Dap/Banshee.Dap/Banshee.Dap.addin.xml #: ../data/addin-xml-strings.cs:58 -#, fuzzy msgid "Digital Media Player Support" -msgstr "Muziekspeler" +msgstr "Ondersteuning voor digitale mediaspelers)" #: ../data/addin-xml-strings.cs:59 msgid "Provides general support for many kinds of media player devices." @@ -156,9 +155,8 @@ msgstr "Luisterboeken, lezingen, enz. beheren" #: ../data/addin-xml-strings.cs:64 ../data/addin-xml-strings.cs:69 #: ../data/addin-xml-strings.cs:104 ../data/addin-xml-strings.cs:114 #: ../data/addin-xml-strings.cs:157 ../data/addin-xml-strings.cs:162 -#, fuzzy msgid "Core" -msgstr "Sluiten" +msgstr "Core" #. ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd.addin.xml #: ../data/addin-xml-strings.cs:67 @@ -184,29 +182,26 @@ msgstr "" #: ../data/addin-xml-strings.cs:133 ../data/addin-xml-strings.cs:138 #: ../data/addin-xml-strings.cs:143 ../data/addin-xml-strings.cs:152 #: ../data/addin-xml-strings.cs:181 -#, fuzzy msgid "Utilities" -msgstr "Mogelijkheden" +msgstr "Hulpmiddelen" #. ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml #: ../data/addin-xml-strings.cs:77 -#, fuzzy msgid "Boo Scripting" -msgstr "Sortering" +msgstr "Boo-scripting" #: ../data/addin-xml-strings.cs:78 msgid "Customize and extend Banshee with Boo-language scripts." -msgstr "" +msgstr "Banshee aanpassen en uitbreiden met in de taal Boo geschreven scripts." #. ../src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml #: ../data/addin-xml-strings.cs:82 -#, fuzzy msgid "BPM Detection" -msgstr "BPM detecteren" +msgstr "BPM-detectie" #: ../data/addin-xml-strings.cs:83 msgid "Detect the beats per minute (BPM) of your music." -msgstr "" +msgstr "Het aantal beats per minuut (BPM) van uw muziek detecten." #. ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml #: ../data/addin-xml-strings.cs:87 @@ -215,16 +210,16 @@ msgstr "Albumafbeeldingen laden" #: ../data/addin-xml-strings.cs:88 msgid "Fetch cover art for all items in your library." -msgstr "" +msgstr "Albumafbeelding laten voor alle items in de collectie." #. ../src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml #: ../data/addin-xml-strings.cs:92 msgid "DAAP Sharing" -msgstr "" +msgstr "DAAP-delen" #: ../data/addin-xml-strings.cs:93 msgid "Browse and listen to music shared over your local network." -msgstr "" +msgstr "Op het lokale netwerk gedeelde muziek doorbladeren en beluisteren." #. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml #: ../data/addin-xml-strings.cs:97 @@ -309,9 +304,8 @@ msgstr "" #. ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml #: ../data/addin-xml-strings.cs:136 -#, fuzzy msgid "Multimedia Keys" -msgstr "Mediabestanden" +msgstr "Multimedia-toetsen" #: ../data/addin-xml-strings.cs:137 msgid "Control playback via the multimedia keys on your keyboard." @@ -320,14 +314,15 @@ msgstr "" #. ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml #: ../data/addin-xml-strings.cs:141 msgid "Notification Area Icon" -msgstr "" +msgstr "Pictogram in het mededelingengebied" #: ../data/addin-xml-strings.cs:142 msgid "Display an icon in the notification area for controlling Banshee." -msgstr "" +msgstr "Een pictogram in het mededelingengebied tonen voor de bediening van Banshee." #. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml #: ../data/addin-xml-strings.cs:146 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164 #: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50 msgid "Now Playing" msgstr "Nu aan het afspelen" @@ -341,11 +336,11 @@ msgstr "" #. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml #: ../data/addin-xml-strings.cs:150 msgid "Importers for Amarok, Rhythmbox and iTunes" -msgstr "" +msgstr "Importeren uit Amarok, Rhythmbox en iTunes" #: ../data/addin-xml-strings.cs:151 msgid "Import your library from Amarok, Rhythmbox or iTunes." -msgstr "" +msgstr "Uw collectie uit Amarok, Rhythmbox of iTunes importeren." #. ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml #: ../data/addin-xml-strings.cs:155 @@ -355,7 +350,7 @@ msgstr "Afspeellijst" #: ../data/addin-xml-strings.cs:156 msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over." -msgstr "" +msgstr "Tracks in een ad-hoc-speellijst plaatsen, of de auto-DJ het over laten nemen." #. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml #: ../data/addin-xml-strings.cs:160 @@ -390,15 +385,13 @@ msgid "A sample source useful to developers." msgstr "" #: ../data/addin-xml-strings.cs:171 -#, fuzzy msgid "Sources" -msgstr "uren" +msgstr "Bronnen" #. ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml #: ../data/addin-xml-strings.cs:174 -#, fuzzy msgid "SQL Debug Console" -msgstr "SQL-console tonen" +msgstr "SQL-console (voor debugging)" #: ../data/addin-xml-strings.cs:175 msgid "Provides a UI for monitoring Banshee's SQL usage, and running queries." @@ -406,7 +399,7 @@ msgstr "" #: ../data/addin-xml-strings.cs:176 msgid "Debug" -msgstr "" +msgstr "Debug" #. ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml #: ../data/addin-xml-strings.cs:179 @@ -688,7 +681,7 @@ msgstr "Windows Media-audio" #: ../data/desktop-files/common.desktop.in.h:1 #: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76 #: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:94 -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:201 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:206 #: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60 msgid "Banshee Media Player" msgstr "Banshee-muziekspeler" @@ -702,7 +695,7 @@ msgstr "Muziekspeler" msgid "Play and organize your media collection" msgstr "Uw mediacollectie afpelen en beheren" -#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:268 +#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270 msgid "Could not create pipeline" msgstr "Aanmaken ‘pipeline’ mislukt" @@ -727,23 +720,23 @@ msgid "Could not create fakesink plugin" msgstr "Aanmaken ‘filesink’-plugin mislukt" #: ../libbanshee/banshee-bpmdetector.c:241 -#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:309 +#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311 msgid "Could not link pipeline elements" msgstr "Koppelen ‘pipeline’-elementen mislukt" -#: ../libbanshee/banshee-ripper.c:274 +#: ../libbanshee/banshee-ripper.c:276 msgid "Could not initialize element from cdda URI" msgstr "Initialisatie element op basis van cdda-uri mislukt" -#: ../libbanshee/banshee-ripper.c:288 +#: ../libbanshee/banshee-ripper.c:290 msgid "Could not create encoder pipeline" msgstr "Aanmaken encoder-pipeline mislukt" -#: ../libbanshee/banshee-ripper.c:294 +#: ../libbanshee/banshee-ripper.c:296 msgid "Could not create queue plugin" msgstr "Aanmaken ‘queue’-plugin mislukt" -#: ../libbanshee/banshee-ripper.c:302 +#: ../libbanshee/banshee-ripper.c:304 msgid "Could not create filesink plugin" msgstr "Aanmaken ‘filesink’-plugin mislukt" @@ -812,12 +805,12 @@ msgstr "Stuurprogramma voor cd's rippen niet gevonden." msgid "Could not create BPM detection driver." msgstr "Stuurprogramma voor BPM-detectie niet gevonden." -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:71 -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:707 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:80 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:738 msgid "Enable _gapless playback" msgstr "Afspelen zonder _tussenpauze" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:72 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:81 msgid "" "Eliminate the small playback gap on track change. Useful for concept albums " "and classical music" @@ -825,27 +818,27 @@ msgstr "" "De korte tussenpauze tussen nummers uitschakelen (vooral bedoeld voor " "concept-albums en klassieke muziek)" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:137 -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:176 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:146 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:181 msgid "Could not initialize GStreamer library" msgstr "Initialisatie GStreamer-bibliotheek mislukt" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:388 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:419 msgid "Unknown Error" msgstr "Onbekende fout" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:701 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:732 msgid "_Enable ReplayGain correction" msgstr "_ReplayGain-correctie inschakelen" -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:702 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:733 msgid "" "For tracks that have ReplayGain data, automatically scale (normalize) " "playback volume" msgstr "" "Automatisch het afspeelvolume van nummers met ReplayGain-data normaliseren." -#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:708 +#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:739 msgid "" "Eliminate the small playback gap on track change. Useful for concept albums " "and classical music." @@ -858,12 +851,12 @@ msgid "Could not create transcoder" msgstr "Aanmaken transcoder mislukt" #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91 -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:128 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:131 msgid "_Close" msgstr "Sl_uiten" #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92 -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:129 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132 msgid "Close" msgstr "Sluiten" @@ -1010,19 +1003,19 @@ msgstr "URI" #: ../src/Clients/Booter/Booter/Entry.cs:184 #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:148 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:85 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89 msgid "Artist Name" msgstr "Artiestnaam" #: ../src/Clients/Booter/Booter/Entry.cs:185 -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:149 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:86 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:150 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90 msgid "Album Title" msgstr "Albumtitel" #: ../src/Clients/Booter/Booter/Entry.cs:186 #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:147 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:84 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88 msgid "Track Title" msgstr "Nummertitel" @@ -1049,13 +1042,13 @@ msgid "Disc Number" msgstr "Aantal schijven" #: ../src/Clients/Booter/Booter/Entry.cs:191 -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:151 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:152 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177 #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92 msgid "Year" msgstr "Jaar" @@ -1087,39 +1080,60 @@ msgid "Present the user interface on the active workspace" msgstr "Presenteert de gebruikersinterface op het huidige werkblad" #: ../src/Clients/Booter/Booter/Entry.cs:199 +#, fuzzy +msgid "Enter the full-screen mode" +msgstr "Volledig scherm aan- of uitzetten" + +#: ../src/Clients/Booter/Booter/Entry.cs:200 msgid "Hide the user interface" msgstr "De gebruikersinterface verbergen" -#: ../src/Clients/Booter/Booter/Entry.cs:200 +#: ../src/Clients/Booter/Booter/Entry.cs:201 msgid "Do not present the user interface, regardless of any other options" msgstr "De gebruikersinterface niet presenteren, ongeacht andere opties" +#: ../src/Clients/Booter/Booter/Entry.cs:202 +msgid "Present the import media dialog box" +msgstr "" + #: ../src/Clients/Booter/Booter/Entry.cs:203 +msgid "Present the about dialog" +msgstr "" + +#: ../src/Clients/Booter/Booter/Entry.cs:204 +msgid "Present the open location dialog" +msgstr "" + +#: ../src/Clients/Booter/Booter/Entry.cs:205 +msgid "Present the preferences dialog" +msgstr "" + +#: ../src/Clients/Booter/Booter/Entry.cs:208 msgid "Debugging and Development Options" msgstr "Opties voor ontwikkelaars en debuggen" -#: ../src/Clients/Booter/Booter/Entry.cs:204 +#: ../src/Clients/Booter/Booter/Entry.cs:209 msgid "Enable general debugging features" msgstr "Algemene debugopties inschakelen" -#: ../src/Clients/Booter/Booter/Entry.cs:205 +#: ../src/Clients/Booter/Booter/Entry.cs:210 msgid "Enable debugging output of SQL queries" msgstr "Debuguitvoer van SQL-queries inschakelen" -#: ../src/Clients/Booter/Booter/Entry.cs:206 +#: ../src/Clients/Booter/Booter/Entry.cs:211 msgid "Enable debugging output of Mono.Addins" msgstr "Debuguitvoer van Mono.Addins inschakelen" -#: ../src/Clients/Booter/Booter/Entry.cs:207 +#: ../src/Clients/Booter/Booter/Entry.cs:212 msgid "Specify an alternate database to use" msgstr "Geef een alternatieve database" -#: ../src/Clients/Booter/Booter/Entry.cs:208 +#: ../src/Clients/Booter/Booter/Entry.cs:213 #, fuzzy msgid "Specify an alternate key, default is /apps/banshee-1/" msgstr "Geef een alternatieve database" -#: ../src/Clients/Booter/Booter/Entry.cs:209 +#: ../src/Clients/Booter/Booter/Entry.cs:214 msgid "" "Optimize instance for running uninstalled; most notably, this will create an " "alternate Mono.Addins database in the working directory" @@ -1127,16 +1141,16 @@ msgstr "" "Optimaliseren voor ongeïnstalleerd draaien; het meest opvallende is dat dit " "een alternative Mono.Addins-database in de werkmap aanmaakt." -#: ../src/Clients/Booter/Booter/Entry.cs:211 +#: ../src/Clients/Booter/Booter/Entry.cs:216 msgid "Disable DBus support completely" msgstr "DBus-ondersteuning volledig uitschakelen" -#: ../src/Clients/Booter/Booter/Entry.cs:213 +#: ../src/Clients/Booter/Booter/Entry.cs:218 #, csharp-format msgid "Skip loading a custom gtkrc file ({0}) if it exists" msgstr "Aangepast ‘gtkrc’-bestand ({0}) niet laden als het bestaat" -#: ../src/Clients/Booter/Booter/Entry.cs:244 +#: ../src/Clients/Booter/Booter/Entry.cs:249 #, csharp-format msgid "The following help arguments are invalid: {0}" msgstr "De volgende hulpparameters zijn ongeldig: {0}" @@ -1184,26 +1198,34 @@ msgid "Play Song" msgstr "Nummer spelen" #: ../src/Clients/Nereid/Nereid/ViewContainer.cs:146 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:83 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87 msgid "Artist, Album, or Title" msgstr "Artiest, album of titel" -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:150 +#. Alias for %album_artist% +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:149 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72 +#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78 +#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82 +msgid "Album Artist" +msgstr "Albumartiest" + +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:151 #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:91 msgid "Genre" msgstr "Genre" #. Translators: noun -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:152 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:153 #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214 msgid "Comment" msgstr "Commentaar" #. Translators: this is a verb (command), not a noun (things) -#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:173 +#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:174 #, csharp-format msgid "Search" msgstr "Zoeken" @@ -1212,7 +1234,7 @@ msgstr "Zoeken" #: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37 #: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:100 #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:137 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:92 msgid "Unknown Artist" msgstr "Onbekende artiest" @@ -1228,7 +1250,7 @@ msgid "Unknown Title" msgstr "Onbekende titel" #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:185 -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:92 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:93 msgid "Various Artists" msgstr "Meerdere uitvoerenden" @@ -1377,9 +1399,8 @@ msgid "Shuffle by _Song" msgstr "_Nummers door elkaar" #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48 -#, fuzzy msgid "by song" -msgstr "nummers" +msgstr "op nummer" #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:49 msgid "Play songs randomly from the playlist" @@ -1391,7 +1412,7 @@ msgid "Scanning for media" msgstr "Zoeken naar media" #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182 -#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1359 +#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1363 msgid "Scanning..." msgstr "Bezig met zoeken…" @@ -1421,86 +1442,86 @@ msgstr "Importeren ({0} van {1})" msgid "Rescanning {0} of {1}" msgstr "{0} van {1} aan het herlezen" -#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:230 +#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234 msgid "Upgrading your Banshee Database" msgstr "Banshee-database upgraden" -#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:231 +#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235 msgid "" "Please wait while your old Banshee database is migrated to the new format." msgstr "" "Even geduld tijdens het omzetten van de oude Banshee-database naar het " "nieuwe formaat." -#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1356 +#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1360 msgid "Refreshing Metadata" msgstr "Metadata bijwerken" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:257 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:252 msgid "Classical" msgstr "Klassiek" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:260 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:255 msgid "Club" msgstr "Club" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:263 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:258 msgid "Dance" msgstr "Dance" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:266 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:261 msgid "Full Bass" msgstr "Bastonen" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:269 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:264 msgid "Full Bass and Treble" msgstr "Bas- en hoge tonen" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:272 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:267 msgid "Full Treble" msgstr "Hoge tonen" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:275 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:270 msgid "Laptop Speakers and Headphones" msgstr "Laptopspeakers en koptelefoons" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:278 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:273 msgid "Large Hall" msgstr "Grote ruimte" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:281 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:276 msgid "Live" msgstr "Live" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:284 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:279 msgid "Party" msgstr "Feestje" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:287 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:282 msgid "Pop" msgstr "Pop" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:290 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:285 msgid "Reggae" msgstr "Reggae" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:293 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:288 msgid "Rock" msgstr "Rock" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:296 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:291 msgid "Ska" msgstr "Ska" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:299 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:294 msgid "Soft" msgstr "Soft" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:302 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:297 msgid "Soft Rock" msgstr "Soft Rock" -#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:305 +#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:300 msgid "Techno" msgstr "Techno" @@ -1522,13 +1543,6 @@ msgstr "{0}-map:" msgid "Track Artist" msgstr "Nummerartiest" -#. Alias for %album_artist% -#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72 -#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78 -#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82 -msgid "Album Artist" -msgstr "Albumartiest" - # Is dit correct? (Wouter Bolsterlee) #: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:83 msgid "Album Artist Initial" @@ -1635,7 +1649,7 @@ msgstr "In de laatste week geïmporteerde nummers" #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:122 msgid "Unheard" -msgstr "Nog nooit geluisterd" +msgstr "Nog nooit beluisterd" #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:123 msgid "Songs that have not been played or skipped" @@ -1730,16 +1744,16 @@ msgstr "" msgid "Problem with Player Engine" msgstr "Probleem met afspeelmotor" -#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:134 +#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135 #, csharp-format msgid "Converting {0} of {1}" msgstr "Converteren ({0} van {1})" -#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:134 +#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:135 msgid "Initializing" msgstr "Initialiseren" -#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:137 +#: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138 msgid "" "Files are currently being converted to another format. Would you like to " "stop this?" @@ -1858,10 +1872,10 @@ msgstr "Speellijst verwijderen" #. TODO generate name based on the track selection, or begin editing it #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:390 #: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:396 -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:169 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176 #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90 -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:367 -#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:475 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:372 +#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:487 #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213 msgid "New Playlist" msgstr "Nieuwe speellijst" @@ -2469,7 +2483,7 @@ msgstr "drm" #. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok. #: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:64 #: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:66 -#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:311 +#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:327 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210 #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212 @@ -2696,9 +2710,8 @@ msgid "Choose New Cover Art..." msgstr "Nieuwe albumafbeelding kiezen…" #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:97 -#, fuzzy msgid "Delete This Cover Art" -msgstr "De actieve basisinstelling verwijderen" +msgstr "Deze albumafbeelding verwijderen" #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:126 msgid "Track #" @@ -2733,16 +2746,15 @@ msgstr "{0} bits" #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:119 msgid "Make the context pane larger or smaller" -msgstr "" +msgstr "Het contextpaneel groter of kleiner maken" #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:123 msgid "Hide context pane" -msgstr "" +msgstr "Het contextpaneel verbergen" #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144 -#, fuzzy msgid "Waiting for playback to begin..." -msgstr "Wachten tot downloads zijn afgebroken…" +msgstr "Wachten tot afspelen start…" #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150 msgid "Loading..." @@ -2758,7 +2770,7 @@ msgstr "Nieuwe voorkeuzeinstelling" #. Translators: this is the window title when a track is playing #. {0} is the track title, {1} is the artist name -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:198 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:203 #, csharp-format msgid "{0} by {1}" msgstr "{0} door {1}" @@ -2828,7 +2840,7 @@ msgstr "" "Wilt u Banshee als standaardspeler instellen?" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72 -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:427 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:434 #, csharp-format msgid "Do not ask me this again" msgstr "Niet opnieuw vragen" @@ -3001,11 +3013,11 @@ msgid "View detailed version and configuration information" msgstr "Gedetailleerde versie- en configuratie-informatie tonen" #. Prompt user for location of the playlist. -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:160 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:180 msgid "Import Playlist" msgstr "Speellijst importeren" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:161 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:181 #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559 msgid "Playlists" msgstr "Speellijsten" @@ -3034,7 +3046,6 @@ msgid "Play the previous item" msgstr "Vorige nummer afspelen" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78 -#, fuzzy msgid "Seek _To..." msgstr "Spoelen naar…" @@ -3110,92 +3121,100 @@ msgstr "Het huidige nummer herhalen" msgid "Shuffle" msgstr "_Door elkaar" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:73 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:75 msgid "_New Playlist" msgstr "_Nieuwe speellijst" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:74 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:76 msgid "Create a new empty playlist" msgstr "Nieuwe (lege) speellijst aanmaken" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:77 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:79 msgid "New _Smart Playlist..." msgstr "Nieuwe slimme speellijst…" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:78 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:80 msgid "Create a new smart playlist" msgstr "Nieuwe slimme speellijst aanmaken" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:88 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:90 msgid "Import to Library" msgstr "Bestanden naar collectie importeren" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:89 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:91 msgid "Import source to library" msgstr "Bron importeren in collectie" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:92 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:94 msgid "Rename" msgstr "Hernoemen" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:95 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:97 msgid "Export Playlist..." msgstr "Speellijst exporteren…" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:96 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:98 msgid "Export a playlist" msgstr "Speellijst exporteren" # Huh? (Wouter Bolsterlee) -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:99 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:101 msgid "Unmap" msgstr "Loskoppelen" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:102 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:104 msgid "Source Properties" msgstr "Eigenschappen afspeelbron" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:105 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:107 msgid "Sort Children by" msgstr "Kinderen sorteren op" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:108 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:111 +msgid "Switch Source" +msgstr "Bron wisselen" + +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:112 +msgid "Switch to a source by typing its name" +msgstr "Naar een bron wisselen door de naam te typen" + +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:115 #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:50 msgid "Preferences" msgstr "Voorkeuren" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:109 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:116 msgid "Edit preferences related to this source" msgstr "Voorkeuren voor deze bron bewerken" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:113 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:120 msgid "New _Smart Playlist" msgstr "Nieuwe slimme speellijst" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:122 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129 #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:74 #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57 msgid "Refresh" msgstr "Herladen" # Niet helemaal zeker of dit is wat bedoeld wordt (Wouter Bolsterlee) -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:123 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:130 msgid "Refresh this randomly sorted smart playlist" msgstr "Deze speellijst in willekeurige volgorde herladen" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:290 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:297 msgid "Could not export playlist" msgstr "Kon speellijst niet exporteren" # Urgh, hele slechte string voor i18n. Voor de zekerheid maar tussen haakjes # gezet, want je weet nooit wat er op de plaats van de placeholder gaat komen… # (Wouter Bolsterlee) -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:418 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:425 #, csharp-format msgid "Are you sure you want to delete this {0}?" msgstr "Weet u zeker dat u deze ({0}) wilt verwijderen?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:461 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:468 msgid "Separate by Type" msgstr "Scheiden op Type" @@ -3286,7 +3305,7 @@ msgstr "Geselecteerde nummer(s) permanent van opslagmedium verwijderen" #. Translators: this is a verb (command), not a noun (things) #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:169 -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:108 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112 #, csharp-format msgid "_Search" msgstr "_Zoeken" @@ -3317,17 +3336,16 @@ msgstr "Alle nummers van deze artiest opzoeken" msgid "_Delete From \"{0}\"" msgstr "_Verwijderen van ‘{0}’" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:437 -#, fuzzy +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:442 msgid "The folder could not be found." -msgstr "De voorkeuren-service kon niet gevonden worden." +msgstr "De map kon niet gevonden worden." -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:438 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:443 msgid "Please check that the track's location is accessible by the system." -msgstr "" +msgstr "Controleer dat de tracklocatie voor het systeem toegankelijk is." # Vrij vertaald (Wouter Bolsterlee) -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:504 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:509 #, csharp-format msgid "Are you sure you want to permanently delete this item?" msgid_plural "" @@ -3336,19 +3354,19 @@ msgstr[0] "Weet u zeker dat u dit nummer voorgoed wilt verwijderen?" msgstr[1] "" "Weet u zeker dat u de {0} geselecteerde nummers voorgoed wilt verwijderen?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:508 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:513 msgid "If you delete the selection, it will be permanently lost." msgstr "Als u de selectie verwijdert, gaat deze permanent verloren." # Urgh, weer een hele slechte string voor i18n (Wouter Bolsterlee) -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:511 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:516 #, csharp-format msgid "Remove selection from {0}?" msgstr "Selectie verwijderen uit ‘{0}’?" # Urgh, en nog zo een… (Wouter Bolsterlee) # Vrij vertaald (Wouter Bolsterlee) -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:514 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:519 #, csharp-format msgid "Are you sure you want to remove the selected item from your {1}?" msgid_plural "" @@ -3358,7 +3376,7 @@ msgstr[0] "" msgstr[1] "" "Weet u zeker dat u de geselecteerde {0} nummers wilt verwijderen uit {1}?" -#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:543 +#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:548 #, fuzzy msgid "View Track Information" msgstr "Nummerinformatie _bewerken" @@ -3530,7 +3548,7 @@ msgstr "Teksten" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs:74 msgid "Advance to the next track and edit its title" -msgstr "" +msgstr "Naar de volgende track springen en de titel aanpassen" #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:42 msgid "Sorting" @@ -3745,9 +3763,8 @@ msgid "Enter or leave fullscreen mode" msgstr "Volledig scherm aan- of uitzetten" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:86 -#, fuzzy msgid "Show Cover _Art" -msgstr "_Albumafbeelding" +msgstr "_Albumafbeelding tonen" #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:87 msgid "Toggle display of album cover art" @@ -3796,7 +3813,7 @@ msgstr "{0}door{1} {2} {0}van{1} {3}" #. Translators: {0} and {1} are for markup so ignore them, {2} is for Album Title; #. e.g. 'from Killing with a Smile' #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:555 -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:512 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:521 #, csharp-format msgid "{0}from{1} {2}" msgstr "{0}door{1} {2}" @@ -3804,7 +3821,7 @@ msgstr "{0}door{1} {2}" #. Translators: {0} and {1} are for markup so ignore them, {2} is for Artist Name; #. e.g. 'by Parkway Drive' #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:559 -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:516 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:525 #, csharp-format msgid "{0}by{1} {2}" msgstr "{0}door{1} {2}" @@ -3931,7 +3948,7 @@ msgstr "Dit venster niet opnieuw weergeven" msgid "_Import" msgstr "Importeren" -#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:67 +#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69 #, fuzzy msgid "Videos From Photos Folder" msgstr "Video's uit fotomap" @@ -3973,7 +3990,7 @@ msgstr "Terug naar standaard" #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:120 #, csharp-format msgid "Reset location to default ({0})" -msgstr "" +msgstr "Standaardlocatie herstellen ({0})" #. FIXME this shouldn't be hard-coded to 'Source:', but this is the only #. user of this code atm... @@ -4042,9 +4059,8 @@ msgstr "" "invoeren" #: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58 -#, fuzzy msgid "Seek" -msgstr "weken" +msgstr "Spoelen" #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:148 msgid "Idle" @@ -4157,19 +4173,16 @@ msgstr[1] "" # gezet, want je weet nooit wat er op de plaats van de placeholder gaat komen… # (Wouter Bolsterlee) #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:368 -#, fuzzy msgid "Are you sure you want to continue?" -msgstr "Weet u zeker dat u deze ({0}) wilt verwijderen?" +msgstr "Weet u zeker dat u door wilt gaan?" #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:376 -#, fuzzy msgid "Remove tracks" -msgstr "Nummer als favoriet aanmerken" +msgstr "Tracks verwijderen" #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:52 -#, fuzzy msgid "Sync" -msgstr "{0} synchroniseren" +msgstr "synchroniseren" #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:68 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:97 @@ -4276,72 +4289,72 @@ msgstr "Nieuwe database opslaan…" msgid "Error rebuilding iPod database" msgstr "Fout bij opnieuw maken van iPod-database" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:98 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101 msgid "Device" msgstr "Apparaat" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:99 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102 msgid "Color" msgstr "Kleur" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:100 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103 msgid "Generation" msgstr "Generatie" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104 msgid "Capacity" msgstr "Capaciteit" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105 #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:148 msgid "Serial number" msgstr "Serienummer" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106 msgid "Produced on" msgstr "Geproduceerd op" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107 msgid "Firmware" msgstr "Firmware" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:108 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:111 msgid "Capabilities" msgstr "Mogelijkheden" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:109 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112 msgid "Supports cover art" msgstr "Ondersteunt albumafbeeldingen" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:110 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113 msgid "Supports photos" msgstr "Ondersteunt foto's" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:465 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:468 msgid "Track duration is zero" msgstr "Tracklengte is nul" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:627 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634 msgid "Out of space on device" msgstr "Geen ruimte meer op apparaat" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:627 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634 msgid "Please manually remove some songs" msgstr "Verwijder handmatige enkele nummers" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:643 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:650 msgid "Syncing iPod" msgstr "iPod aan het synchroniseren" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:644 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:651 msgid "Preparing to synchronize..." msgstr "Synchroniseren voorbereiden…" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:665 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:672 msgid "Updating..." msgstr "Bijwerken…" -#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:669 +#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:676 msgid "Flushing to disk..." msgstr "Naar schijf schrijven…" @@ -4421,7 +4434,7 @@ msgstr "iPod-database opnieuw maken…" msgid "Purchased Music" msgstr "Gekochte muziek" -#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs:82 +#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs:87 #, fuzzy msgid "Rockbox Device" msgstr "Apparaat" @@ -4448,7 +4461,7 @@ msgstr "Benodigde mapdiepte" msgid "Supports Playlists" msgstr "Ondersteunt speellijsten" -#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs:188 +#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs:189 #, fuzzy msgid "Ringtones" msgstr "minuten" @@ -4719,7 +4732,10 @@ msgid "_Automatically detect BPM for all songs" msgstr "_Automatisch BPM voor alle nummers detecteren" #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149 -msgid "Detect BPM for all songs that don't already have a value set" +#, fuzzy +msgid "" +"Detect beats per minute (BPM) for all songs that don't already have a value " +"set" msgstr "" "Automatisch BPM detecteren voor alle nummers die nog geen BPM-waarde hebben" @@ -4830,15 +4846,24 @@ msgstr "Wachtwoord:" msgid "Login" msgstr "Aanmelden" -#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:60 -msgid "Music Share" -msgstr "Gedeelde muziekmap" - +#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapResolverJob.cs:50 #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:106 #, csharp-format msgid "Connecting to {0}" msgstr "Verbinden met {0}" +#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178 +msgid "Add remote DAAP server" +msgstr "DAAP-server op afstand toevoegen" + +#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179 +msgid "Add a new remote DAAP server" +msgstr "Een nieuwe DAAP-server op afstand toevoegen" + +#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:60 +msgid "Music Share" +msgstr "Gedeelde muziekmap" + #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:202 #, csharp-format msgid "Logging in to {0}." @@ -4855,6 +4880,14 @@ msgstr[1] "{0} nummers aan het laden." msgid "Loading playlists" msgstr "Speellijsten laden" +#: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:45 +msgid "Open remote DAAP server" +msgstr "Een DAAP-server op afstand openen" + +#: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:50 +msgid "Enter server name and ip address:" +msgstr "Geef een servernaam en IP-adres:" + #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:46 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:133 #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:67 @@ -4952,11 +4985,11 @@ msgstr "Item sluiten" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:96 msgid "Getting item details from the Internet Archive" -msgstr "" +msgstr "Details van item opvragen uit het Internet Archive" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:147 msgid "Timed out getting item details from the Internet Archive" -msgstr "" +msgstr "Timeout bij opvragen van gegevens uit het Internet Archive" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:190 @@ -4965,7 +4998,7 @@ msgstr "Opnieuw proberen" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:150 msgid "Error getting item details from the Internet Archive" -msgstr "" +msgstr "Fout bij opvragen gegevens uit het Internet Archive" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:205 #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130 @@ -4987,9 +5020,8 @@ msgid "Venue:" msgstr "_Genre:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:223 -#, fuzzy msgid "Location:" -msgstr "Locatie" +msgstr "Locatie:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225 #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81 @@ -4997,67 +5029,57 @@ msgid "Date:" msgstr "Datum:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:227 -#, fuzzy msgid "Year:" -msgstr "_Jaar:" +msgstr "Jaar:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:229 -#, fuzzy msgid "Publisher:" -msgstr "Gepubliceerd" +msgstr "Uitgever:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230 msgid "Keywords:" -msgstr "" +msgstr "Sleutelwoorden:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:231 -#, fuzzy msgid "License URL:" -msgstr "Licentie" +msgstr "Licentie-URL:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:232 msgid "Language:" -msgstr "" +msgstr "Taal:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:236 -#, fuzzy msgid "Downloads, overall:" -msgstr "_Albumafbeelding downloaden" +msgstr "Downloads, totaal:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:237 -#, fuzzy msgid "Downloads, past month:" -msgstr "Download gepauzeerd" +msgstr "Downloads, deze maand:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:238 -#, fuzzy msgid "Downloads, past week:" -msgstr "Download gepauzeerd" +msgstr "Downloads, deze week:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:242 -#, fuzzy msgid "Added:" -msgstr "toevoegdatum" +msgstr "Toegevoegd:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:243 msgid "Added by:" -msgstr "" +msgstr "Toegevoegd door:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:244 -#, fuzzy msgid "Collections:" -msgstr "Voorwaarde:" +msgstr "Collecties:" # Vrij vertaald (Wouter Bolsterlee) #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:246 -#, fuzzy msgid "Contributor:" -msgstr "Bijdragen van:" +msgstr "Bijdrage van:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:247 -#, fuzzy msgid "Recorded by:" -msgstr "Aanbevolen" +msgstr "Opgenomen door:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:248 msgid "Lineage:" @@ -5065,53 +5087,50 @@ msgstr "" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:249 msgid "Transferred by:" -msgstr "" +msgstr "Overgedragen door:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:266 -#, fuzzy msgid "Reviews" -msgstr "Apparaat" +msgstr "Reviews" #. Translators: {0} is the number of reviewers, {1} is the average rating (not really relevant if there's only 1) #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:270 -#, fuzzy, csharp-format +#, csharp-format msgid "{0} reviewer" msgid_plural "{0} reviewers, avg {1}" -msgstr[0] "Eigenschappen {0}" -msgstr[1] "Eigenschappen {0}" +msgstr[0] "{0} reviewer" +msgstr[1] "{0} reviewers, gemiddeld {1}" #. Translators: {0} is the unicode-stars-rating, {1} is the name of a person who reviewed this item, and {1} is a date/time string #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:289 -#, fuzzy, csharp-format +#, csharp-format msgid "{0} by {1} on {2}" -msgstr "{0}door{1} {2}" +msgstr "{0} door {1} op {2}" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:319 msgid "Write your own review" -msgstr "" +msgstr "Uw eigen review schrijven" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109 -#, fuzzy msgid "Collection:" -msgstr "Voorwaarde:" +msgstr "Collectie:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118 #, csharp-format msgid "Optional Query" -msgstr "" +msgstr "Optionele query:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:163 msgid "Sort by:" -msgstr "" +msgstr "Sorteren op:" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:119 msgid "Preferred Media Types" msgstr "" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:122 -#, fuzzy msgid "_Audio" -msgstr "Audio" +msgstr "_Audio" #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:125 #, fuzzy @@ -5947,21 +5966,21 @@ msgstr "lastfm://" msgid "Last.fm Recommendations" msgstr "Aanbevelingen tonen" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:81 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:82 #, csharp-format msgid "Top Albums by {0}" msgstr "Topalbums door {0}" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:82 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:83 #, csharp-format msgid "Top Tracks by {0}" msgstr "Topnummers door {0}" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:179 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:180 msgid "Recommended Artists" msgstr "Aanbevolen artiesten" -#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:207 +#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:208 msgid "No similar artists found" msgstr "Geen gelijkende artiesten gevonden" @@ -5974,7 +5993,17 @@ msgstr "{0}% gelijkend" msgid "Unknown Similarity" msgstr "Onbekende gelijkenis" -#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:72 +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109 +#, fuzzy +msgid "Media" +msgstr "_Media" + +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119 +#, fuzzy +msgid "Library" +msgstr "Collectie bijwerken" + +#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131 msgid "Launch the Banshee Media Player" msgstr "Banshee-muziekspeler opstarten" @@ -6002,21 +6031,21 @@ msgstr "Terug naar volledige modus" msgid "Change repeat playback mode" msgstr "Herhaalmodus veranderen" -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:135 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:138 msgid "_Show Notifications" msgstr "Notificaties tonen" # Vrij vertaald (Wouter Bolsterlee) -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:136 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139 msgid "Show notifications when item changes" msgstr "Notificaties tonen wanneer het nummer verandert" # Vrij vertaald (Wouter Bolsterlee) -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:340 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:343 msgid "Still Running" msgstr "Nog actief" -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:341 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:344 msgid "" "Banshee was closed to the notification area. Use the Quit option to " "end your session." @@ -6024,18 +6053,18 @@ msgstr "" "Banshee is naar uw mededelingengebied gesloten. Gebruik de optie " "Afsluiten om de sessie te beëindigen." -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:470 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:479 msgid "Skip this item" msgstr "Dit nummer overslaan" -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:474 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483 msgid "Cannot show notification" msgstr "Kan notificatie niet tonen" #. Translators: {0} and {1} are for markup so ignore them, {2} and {3} #. are Artist Name and Album Title, respectively; #. e.g. 'by Parkway Drive from Killing with a Smile' -#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:508 +#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:517 #, fuzzy, csharp-format msgid "" "{0}by{1} {2}\n" @@ -6046,16 +6075,16 @@ msgstr "{0}door{1} {2} {0}van{1} {3}" msgid "Banshee" msgstr "Banshee" -#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143 +#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144 #, csharp-format msgid "Unable to import track: {0}" msgstr "Kon nummer niet importeren: {0}" -#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177 +#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178 msgid "Importing from Amarok failed" msgstr "Importeren van Amarok mislukt" -#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188 +#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189 msgid "Amarok" msgstr "Amarok" @@ -6136,7 +6165,7 @@ msgstr "_Speellijsten importeren" #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs:59 msgid "_Fill" -msgstr "" +msgstr "_Vullen" #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs:71 msgid "f_rom" @@ -6310,11 +6339,11 @@ msgstr "Website bezoeken" msgid "Subscribe to Podcast" msgstr "Op podcast abonneren" -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:322 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:325 msgid "Invalid URL" msgstr "Ongeldige URL" -#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:323 +#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:326 msgid "Podcast URL is invalid." msgstr "Podcast-url is ongeldig" diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs index e976a14..c9e1159 100644 --- a/src/AssemblyInfo.cs +++ b/src/AssemblyInfo.cs @@ -2,8 +2,8 @@ using System; using System.Reflection; using System.Runtime.CompilerServices; -[assembly: ApplicationVersion ("1.6.0", "1.6.0")] -[assembly: ApplicationBuildInformation ("git-checkout", "linux-gnu", "i686", "2010-03-31 14:09:15 EDT")] +[assembly: ApplicationVersion ("1.6.1", "1.6.1")] +[assembly: ApplicationBuildInformation ("git-checkout", "linux-gnu", "i686", "2010-05-07 14:50:09 EDT")] [assembly: AssemblyVersion ("1.6.0.0")] [assembly: AssemblyTitle ("Banshee")] diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs index 8d2b979..f17812d 100644 --- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs +++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs @@ -61,6 +61,7 @@ namespace Banshee.GStreamer internal delegate void BansheePlayerNextTrackStartingCallback (IntPtr player); internal delegate void BansheePlayerAboutToFinishCallback (IntPtr player); internal delegate IntPtr VideoPipelineSetupHandler (IntPtr player, IntPtr bus); + internal delegate void VideoPrepareWindowHandler (IntPtr player); internal delegate void BansheePlayerVolumeChangedCallback (IntPtr player, double newVolume); internal delegate void GstTaggerTagFoundCallback (IntPtr player, string tagName, ref GLib.Value value); @@ -85,6 +86,7 @@ namespace Banshee.GStreamer private BansheePlayerBufferingCallback buffering_callback; private BansheePlayerVisDataCallback vis_data_callback; private VideoPipelineSetupHandler video_pipeline_setup_callback; + private VideoPrepareWindowHandler video_prepare_window_callback; private GstTaggerTagFoundCallback tag_found_callback; private BansheePlayerNextTrackStartingCallback next_track_starting_callback; private BansheePlayerAboutToFinishCallback about_to_finish_callback; @@ -149,6 +151,7 @@ namespace Banshee.GStreamer buffering_callback = new BansheePlayerBufferingCallback (OnBuffering); vis_data_callback = new BansheePlayerVisDataCallback (OnVisualizationData); video_pipeline_setup_callback = new VideoPipelineSetupHandler (OnVideoPipelineSetup); + video_prepare_window_callback = new VideoPrepareWindowHandler (OnVideoPrepareWindow); tag_found_callback = new GstTaggerTagFoundCallback (OnTagFound); next_track_starting_callback = new BansheePlayerNextTrackStartingCallback (OnNextTrackStarting); about_to_finish_callback = new BansheePlayerAboutToFinishCallback (OnAboutToFinish); @@ -163,6 +166,7 @@ namespace Banshee.GStreamer bp_set_tag_found_callback (handle, tag_found_callback); bp_set_next_track_starting_callback (handle, next_track_starting_callback); bp_set_video_pipeline_setup_callback (handle, video_pipeline_setup_callback); + bp_set_video_prepare_window_callback (handle, video_prepare_window_callback); bp_set_volume_changed_callback (handle, volume_changed_callback); next_track_set = new EventWaitHandle (false, EventResetMode.ManualReset); @@ -686,6 +690,11 @@ namespace Banshee.GStreamer return clutter_video_sink; } + private void OnVideoPrepareWindow (IntPtr player) + { + OnEventChanged (PlayerEvent.PrepareVideoWindow); + } + #endregion #region Preferences @@ -785,6 +794,10 @@ namespace Banshee.GStreamer GstTaggerTagFoundCallback cb); [DllImport ("libbanshee.dll")] + private static extern void bp_set_video_prepare_window_callback (HandleRef player, + VideoPrepareWindowHandler cb); + + [DllImport ("libbanshee.dll")] private static extern void bp_set_next_track_starting_callback (HandleRef player, BansheePlayerNextTrackStartingCallback cb); diff --git a/src/Backends/Banshee.GStreamer/Makefile.in b/src/Backends/Banshee.GStreamer/Makefile.in index bc708b0..82be4a1 100644 --- a/src/Backends/Banshee.GStreamer/Makefile.in +++ b/src/Backends/Banshee.GStreamer/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -477,6 +479,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -505,6 +509,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Backends/Banshee.Gio/Makefile.in b/src/Backends/Banshee.Gio/Makefile.in index 04b13e5..f00f08a 100644 --- a/src/Backends/Banshee.Gio/Makefile.in +++ b/src/Backends/Banshee.Gio/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -475,6 +477,8 @@ RESOURCES = Banshee.Gio.addin.xml @ENABLE_GIO_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @ENABLE_GIO_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_GIO_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@ENABLE_GIO_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @ENABLE_GIO_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GIO_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GIO_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -503,6 +507,7 @@ RESOURCES = Banshee.Gio.addin.xml @ENABLE_GIO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GIO_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_GIO_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_GIO_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @ENABLE_GIO_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GIO_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_GIO_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs index 3011437..69635b3 100644 --- a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs +++ b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs @@ -70,6 +70,13 @@ namespace Banshee.GnomeBackend } } + public GConfConfigurationClient () + { + if (Hyena.PlatformDetection.IsMeeGo) { + throw new InvalidOperationException ("GConf is not supported on MeeGo"); + } + } + private string CreateKey (string @namespace, string part) { string hash_key = String.Concat (@namespace, part); diff --git a/src/Backends/Banshee.Gnome/Makefile.in b/src/Backends/Banshee.Gnome/Makefile.in index 9293ed6..e55f585 100644 --- a/src/Backends/Banshee.Gnome/Makefile.in +++ b/src/Backends/Banshee.Gnome/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -478,6 +480,8 @@ RESOURCES = \ @ENABLE_GNOME_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @ENABLE_GNOME_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_GNOME_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@ENABLE_GNOME_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @ENABLE_GNOME_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GNOME_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GNOME_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -506,6 +510,7 @@ RESOURCES = \ @ENABLE_GNOME_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GNOME_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_GNOME_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_GNOME_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @ENABLE_GNOME_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GNOME_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_GNOME_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Backends/Banshee.Hal/Makefile.in b/src/Backends/Banshee.Hal/Makefile.in index c984eb3..56aded1 100644 --- a/src/Backends/Banshee.Hal/Makefile.in +++ b/src/Backends/Banshee.Hal/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -483,6 +485,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -511,6 +515,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Backends/Banshee.NowPlaying.X11/Makefile.in b/src/Backends/Banshee.NowPlaying.X11/Makefile.in index 4b90c9d..dd8fd02 100644 --- a/src/Backends/Banshee.NowPlaying.X11/Makefile.in +++ b/src/Backends/Banshee.NowPlaying.X11/Makefile.in @@ -223,8 +223,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -278,6 +278,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -510,6 +512,8 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml @HAVE_XVIDMODE_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @HAVE_XVIDMODE_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_XVIDMODE_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@HAVE_XVIDMODE_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @HAVE_XVIDMODE_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_XVIDMODE_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_XVIDMODE_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -538,6 +542,7 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml @HAVE_XVIDMODE_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_XVIDMODE_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @HAVE_XVIDMODE_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_XVIDMODE_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @HAVE_XVIDMODE_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_XVIDMODE_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @HAVE_XVIDMODE_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in index 3af8342..b601ff4 100644 --- a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in +++ b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in @@ -209,8 +209,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -264,6 +264,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/src/Backends/Banshee.Osx/Makefile.in b/src/Backends/Banshee.Osx/Makefile.in index 8cd5dcb..d052107 100644 --- a/src/Backends/Banshee.Osx/Makefile.in +++ b/src/Backends/Banshee.Osx/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -481,6 +483,8 @@ RESOURCES = Banshee.Osx.addin.xml @PLATFORM_DARWIN_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @PLATFORM_DARWIN_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@PLATFORM_DARWIN_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@PLATFORM_DARWIN_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @PLATFORM_DARWIN_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @PLATFORM_DARWIN_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @PLATFORM_DARWIN_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -509,6 +513,7 @@ RESOURCES = Banshee.Osx.addin.xml @PLATFORM_DARWIN_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @PLATFORM_DARWIN_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @PLATFORM_DARWIN_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@PLATFORM_DARWIN_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @PLATFORM_DARWIN_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @PLATFORM_DARWIN_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @PLATFORM_DARWIN_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Backends/Banshee.Unix/Makefile.in b/src/Backends/Banshee.Unix/Makefile.in index 3b3ee58..71feb6e 100644 --- a/src/Backends/Banshee.Unix/Makefile.in +++ b/src/Backends/Banshee.Unix/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -474,6 +476,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -502,6 +506,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Backends/Makefile.in b/src/Backends/Makefile.in index 03c9c5d..70cf11a 100644 --- a/src/Backends/Makefile.in +++ b/src/Backends/Makefile.in @@ -196,8 +196,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -251,6 +251,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/src/Clients/Beroe/Makefile.in b/src/Clients/Beroe/Makefile.in index 123ec1e..bb38e20 100644 --- a/src/Clients/Beroe/Makefile.in +++ b/src/Clients/Beroe/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -467,6 +469,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -495,6 +499,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Clients/Booter/Booter/Entry.cs b/src/Clients/Booter/Booter/Entry.cs index 2d1cfd8..f4edc13 100644 --- a/src/Clients/Booter/Booter/Entry.cs +++ b/src/Clients/Booter/Booter/Entry.cs @@ -97,7 +97,11 @@ namespace Booter } else if (ApplicationContext.CommandLine.Contains ("client")) { BootClient (Path.GetFileNameWithoutExtension (ApplicationContext.CommandLine["client"])); } else { - BootClient ("Nereid"); + if (PlatformDetection.IsMeeGo) { + BootClient ("MeeGo"); + } else { + BootClient ("Nereid"); + } } } @@ -197,7 +201,11 @@ namespace Booter new LayoutGroup ("ui", Catalog.GetString ("User Interface Options"), new LayoutOption ("show|--present", Catalog.GetString ("Present the user interface on the active workspace")), new LayoutOption ("hide", Catalog.GetString ("Hide the user interface")), - new LayoutOption ("no-present", Catalog.GetString ("Do not present the user interface, regardless of any other options")) + new LayoutOption ("no-present", Catalog.GetString ("Do not present the user interface, regardless of any other options")), + new LayoutOption ("show-import-media", Catalog.GetString ("Present the import media dialog box")), + new LayoutOption ("show-about", Catalog.GetString ("Present the about dialog")), + new LayoutOption ("show-open-location", Catalog.GetString ("Present the open location dialog")), + new LayoutOption ("show-preferences", Catalog.GetString ("Present the preferences dialog")) ), new LayoutGroup ("debugging", Catalog.GetString ("Debugging and Development Options"), diff --git a/src/Clients/Booter/Makefile.in b/src/Clients/Booter/Makefile.in index b1231e6..0ad925d 100644 --- a/src/Clients/Booter/Makefile.in +++ b/src/Clients/Booter/Makefile.in @@ -184,8 +184,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -239,6 +239,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -468,6 +470,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -496,6 +500,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Clients/Halie/Halie/Client.cs b/src/Clients/Halie/Halie/Client.cs index 980d64f..0039950 100644 --- a/src/Clients/Halie/Halie/Client.cs +++ b/src/Clients/Halie/Halie/Client.cs @@ -43,7 +43,7 @@ namespace Halie { public static class Client { - // NOTE: Interface is copied from Banshee.ThickClient/Banshee.Gui + // NOTE: Interfaces are copied from Banshee.ThickClient/Banshee.Gui // since we don't want to link against any GUI assemblies for this // client. It's a simple interface [Interface ("org.bansheeproject.Banshee.ClientWindow")] @@ -53,6 +53,15 @@ namespace Halie void Hide (); } + [Interface ("org.bansheeproject.Banshee.GlobalUIActions")] + public interface IGlobalUIActions + { + void ShowImportDialog (); + void ShowAboutDialog (); + void ShowOpenLocationDialog (); + void ShowPreferencesDialog (); + } + private static bool hide_field; private static DBusCommandService command; @@ -73,7 +82,10 @@ namespace Halie command = DBusServiceManager.FindInstance ("/DBusCommandService"); hide_field = ApplicationContext.CommandLine.Contains ("hide-field"); - bool present = HandlePlayerCommands () && !ApplicationContext.CommandLine.Contains ("indexer"); + bool present = + HandlePlayerCommands () && + HandleGlobalUIActions () && + !ApplicationContext.CommandLine.Contains ("indexer"); HandleWindowCommands (present); HandleFiles (); } @@ -113,6 +125,34 @@ namespace Halie } } + private static bool HandleGlobalUIActions () + { + var global_ui_actions = DBusServiceManager.FindInstance ("/GlobalUIActions"); + var handled = false; + + if (ApplicationContext.CommandLine.Contains ("show-import-media")) { + global_ui_actions.ShowImportDialog (); + handled |= true; + } + + if (ApplicationContext.CommandLine.Contains ("show-about")) { + global_ui_actions.ShowAboutDialog (); + handled |= true; + } + + if (ApplicationContext.CommandLine.Contains ("show-preferences")) { + global_ui_actions.ShowPreferencesDialog (); + handled |= true; + } + + if (ApplicationContext.CommandLine.Contains ("show-open-location")) { + global_ui_actions.ShowOpenLocationDialog (); + handled |= true; + } + + return !handled; + } + private static bool HandlePlayerCommands () { IPlayerEngineService player = DBusServiceManager.FindInstance ("/PlayerEngine"); diff --git a/src/Clients/Halie/Makefile.in b/src/Clients/Halie/Makefile.in index 398d3de..8d74080 100644 --- a/src/Clients/Halie/Makefile.in +++ b/src/Clients/Halie/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -467,6 +469,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -495,6 +499,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Clients/Makefile.am b/src/Clients/Makefile.am index c0fea2a..c85adae 100644 --- a/src/Clients/Makefile.am +++ b/src/Clients/Makefile.am @@ -3,7 +3,8 @@ SUBDIRS = \ Booter \ Halie \ Muinshee \ - Nereid + Nereid \ + MeeGo MAINTAINERCLEANFILES = Makefile.in diff --git a/src/Clients/Makefile.in b/src/Clients/Makefile.in index e09f18f..e7bf66b 100644 --- a/src/Clients/Makefile.in +++ b/src/Clients/Makefile.in @@ -196,8 +196,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -251,6 +251,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -381,7 +383,8 @@ SUBDIRS = \ Booter \ Halie \ Muinshee \ - Nereid + Nereid \ + MeeGo MAINTAINERCLEANFILES = Makefile.in all: all-recursive diff --git a/src/Clients/MeeGo/Banshee.MeeGo.Client/MeeGoClient.cs b/src/Clients/MeeGo/Banshee.MeeGo.Client/MeeGoClient.cs new file mode 100644 index 0000000..133c44a --- /dev/null +++ b/src/Clients/MeeGo/Banshee.MeeGo.Client/MeeGoClient.cs @@ -0,0 +1,84 @@ +// +// MeeGoClient.cs +// +// Author: +// Aaron Bockover +// +// Copyright 2010 Novell, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +// The MeeGo client is just a wrapper around the Nereid client. +// This is done to ensure we can create the MeeGo panel instance as +// soon as possible. The problem with loading the panel through the +// /Banshee/ThickClient/GtkBaseClient/PostInitializeGtk extension +// point is that Mono.Addins.AddinManager.Initialize is extremely +// slow. Here's the scenario: +// +// (a) Banshee is not running at all +// (b) User clicks "Media" icon in the MeeGo toolbar +// (c) Banshee is started via its MeeGo toolbar DBus service +// (d) Meanwhile, the MeeGo toolbar is waiting for someone to +// actually acquire the DBus name as specified in the +// service file +// (e) Banshee is taking forever to load (stuck in Mono.Addins), so +// the MeeGo extension has not yet run (it is an addin), and +// thus its /Banshee/ThickClient/GtkBaseClient/PostInitializeGtk +// extension is never instantiated (which is an instance of +// Banshee.MeeGo.MeeGoPanel), and in turn, mpl_panel_gtk_new +// is not invoked in time (ultimately not acquiring the DBus +// name in time), and so the MeeGo toolbar gives up, and stops +// showing the panel (even in its "loading" state) +// +// So to work around this, we provide a separate entry point assembly +// for MeeGo, which can acquire the DBus name immediately after +// gtk_init is called. This satisfies the MeeGo toolbar, and we then +// can load the rest of Banshee as usual. When Mono.Addins loads the +// MeeGo extension, the actual panel contents are created, and the +// panel is populated (meanwhile the MeeGo panel UI is in 'startup' +// state, showing a spinner). When the GTK main loop finally runs, +// the panel UI shows up on screen. +// + +using System; +using System.IO; +using System.Reflection; + +using Banshee.Base; + +namespace Banshee.MeeGo.Client +{ + public class MeeGoClient : Nereid.Client + { + public new static void Main (string [] args) + { + // Normally Mono.Addins would load the MeeGo extension from the + // Extensions directory, so we need to load this reference manually + Assembly.LoadFile (Paths.Combine (Path.GetDirectoryName ( + Assembly.GetEntryAssembly ().Location), "Extensions", "Banshee.MeeGo.dll")); + Startup (args); + } + + protected override void InitializeGtk () + { + base.InitializeGtk (); + new Banshee.MeeGo.MeeGoPanel (); + } + } +} diff --git a/src/Clients/MeeGo/Makefile.am b/src/Clients/MeeGo/Makefile.am new file mode 100644 index 0000000..79b97fd --- /dev/null +++ b/src/Clients/MeeGo/Makefile.am @@ -0,0 +1,10 @@ +ASSEMBLY = MeeGo +TARGET = exe +LINK = $(REF_MEEGO) +SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs + +if HAVE_MEEGO +include $(top_srcdir)/build/build.mk +else +EXTRA_DIST = $(SOURCES) +endif diff --git a/src/Clients/MeeGo/Makefile.in b/src/Clients/MeeGo/Makefile.in new file mode 100644 index 0000000..b76af71 --- /dev/null +++ b/src/Clients/MeeGo/Makefile.in @@ -0,0 +1,846 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/build/build.environment.mk \ + $(top_srcdir)/build/build.mk \ + $(top_srcdir)/build/build.rules.mk +@ENABLE_TESTS_TRUE@@HAVE_MEEGO_TRUE@am__append_1 = " $(NUNIT_LIBS)" +subdir = src/Clients/MeeGo +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ + $(top_srcdir)/build/m4/shamrock/expansions.m4 \ + $(top_srcdir)/build/m4/shamrock/i18n.m4 \ + $(top_srcdir)/build/m4/shamrock/mono.m4 \ + $(top_srcdir)/build/m4/shamrock/monodoc.m4 \ + $(top_srcdir)/build/m4/shamrock/nunit.m4 \ + $(top_srcdir)/build/m4/shamrock/programs.m4 \ + $(top_srcdir)/build/m4/shamrock/util.m4 \ + $(top_srcdir)/build/m4/banshee/bnpx11.m4 \ + $(top_srcdir)/build/m4/banshee/boo.m4 \ + $(top_srcdir)/build/m4/banshee/daap.m4 \ + $(top_srcdir)/build/m4/banshee/dap-ipod.m4 \ + $(top_srcdir)/build/m4/banshee/dap-karma.m4 \ + $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \ + $(top_srcdir)/build/m4/banshee/dbus.m4 \ + $(top_srcdir)/build/m4/banshee/gio.m4 \ + $(top_srcdir)/build/m4/banshee/gnome-sharp.m4 \ + $(top_srcdir)/build/m4/banshee/gstreamer.m4 \ + $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \ + $(top_srcdir)/build/m4/banshee/libbanshee.m4 \ + $(top_srcdir)/build/m4/banshee/meego.m4 \ + $(top_srcdir)/build/m4/banshee/mono-addins.m4 \ + $(top_srcdir)/build/m4/banshee/moonlight.m4 \ + $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \ + $(top_srcdir)/build/m4/banshee/osx.m4 \ + $(top_srcdir)/build/m4/banshee/remote-audio.m4 \ + $(top_srcdir)/build/m4/banshee/taglib.m4 \ + $(top_srcdir)/build/m4/banshee/torrent.m4 \ + $(top_srcdir)/build/m4/banshee/webkit.m4 \ + $(top_srcdir)/build/m4/banshee/youtube.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(moduledir)" +SCRIPTS = $(module_SCRIPTS) +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ +API_VERSION = @API_VERSION@ +AR = @AR@ +ASM_VERSION = @ASM_VERSION@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BANSHEE_DESKTOP_NAME = @BANSHEE_DESKTOP_NAME@ +BNPX_CFLAGS = @BNPX_CFLAGS@ +BNPX_GTK_CFLAGS = @BNPX_GTK_CFLAGS@ +BNPX_GTK_LIBS = @BNPX_GTK_LIBS@ +BNPX_LIBS = @BNPX_LIBS@ +BOO_CFLAGS = @BOO_CFLAGS@ +BOO_LIBS = @BOO_LIBS@ +BUILD_HOST_CPU = @BUILD_HOST_CPU@ +BUILD_HOST_OS = @BUILD_HOST_OS@ +BUILD_TIME = @BUILD_TIME@ +BUILD_VENDOR_ID = @BUILD_VENDOR_ID@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ +CLUTTER_LIBS = @CLUTTER_LIBS@ +CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISPLAY_VERSION = @DISPLAY_VERSION@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOCDIR = @DOCDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_RELEASE = @ENABLE_RELEASE@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FC = @FC@ +FGREP = @FGREP@ +GCONFSHARP_CFLAGS = @GCONFSHARP_CFLAGS@ +GCONFSHARP_LIBS = @GCONFSHARP_LIBS@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@ +GDATASHARP_LIBS = @GDATASHARP_LIBS@ +GDATASHARP_REQUIRED_VERSION = @GDATASHARP_REQUIRED_VERSION@ +GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@ +GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@ +GDK_X11_CFLAGS = @GDK_X11_CFLAGS@ +GDK_X11_LIBS = @GDK_X11_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@ +GIOSHARP_LIBS = @GIOSHARP_LIBS@ +GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@ +GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@ +GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@ +GLIBSHARP_LIBS = @GLIBSHARP_LIBS@ +GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@ +GLIB_2_22_LIBS = @GLIB_2_22_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMCS_FLAGS = @GMCS_FLAGS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ +GREP = @GREP@ +GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@ +GST_CFLAGS = @GST_CFLAGS@ +GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@ +GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@ +GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@ +GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ +GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@ +GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@ +GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ +GTKSHARP_LIBS = @GTKSHARP_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@ +IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@ +IPODSHARP_CFLAGS = @IPODSHARP_CFLAGS@ +IPODSHARP_LIBS = @IPODSHARP_LIBS@ +KARMASHARP_ASSEMBLIES = @KARMASHARP_ASSEMBLIES@ +KARMASHARP_CFLAGS = @KARMASHARP_CFLAGS@ +KARMASHARP_LIBS = @KARMASHARP_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBBANSHEE_CFLAGS = @LIBBANSHEE_CFLAGS@ +LIBBANSHEE_LIBS = @LIBBANSHEE_LIBS@ +LIBMTP_CFLAGS = @LIBMTP_CFLAGS@ +LIBMTP_LIBS = @LIBMTP_LIBS@ +LIBMTP_SO_MAP = @LIBMTP_SO_MAP@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEFLAGS = @MAKEFLAGS@ +MAKEINFO = @MAKEINFO@ +MCS = @MCS@ +MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ +MKDIR_P = @MKDIR_P@ +MONO = @MONO@ +MONODOCER = @MONODOCER@ +MONOTORRENT_ASSEMBLIES = @MONOTORRENT_ASSEMBLIES@ +MONOTORRENT_DBUS_CFLAGS = @MONOTORRENT_DBUS_CFLAGS@ +MONOTORRENT_DBUS_LIBS = @MONOTORRENT_DBUS_LIBS@ +MONO_2_4_3_CFLAGS = @MONO_2_4_3_CFLAGS@ +MONO_2_4_3_LIBS = @MONO_2_4_3_LIBS@ +MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@ +MONO_ADDINS_GUI_CFLAGS = @MONO_ADDINS_GUI_CFLAGS@ +MONO_ADDINS_GUI_LIBS = @MONO_ADDINS_GUI_LIBS@ +MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@ +MONO_ADDINS_SETUP_CFLAGS = @MONO_ADDINS_SETUP_CFLAGS@ +MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@ +MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@ +MONO_MODULE_LIBS = @MONO_MODULE_LIBS@ +MONO_ZEROCONF_CFLAGS = @MONO_ZEROCONF_CFLAGS@ +MONO_ZEROCONF_LIBS = @MONO_ZEROCONF_LIBS@ +MOONLIGHT_CFLAGS = @MOONLIGHT_CFLAGS@ +MOONLIGHT_LIBS = @MOONLIGHT_LIBS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@ +NDESK_DBUS_GLIB_CFLAGS = @NDESK_DBUS_GLIB_CFLAGS@ +NDESK_DBUS_GLIB_LIBS = @NDESK_DBUS_GLIB_LIBS@ +NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@ +NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@ +NUNIT_CFLAGS = @NUNIT_CFLAGS@ +NUNIT_LIBS = @NUNIT_LIBS@ +OBJC = @OBJC@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +Q = @Q@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SQLITE_CFLAGS = @SQLITE_CFLAGS@ +SQLITE_LIBS = @SQLITE_LIBS@ +STRIP = @STRIP@ +TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@ +TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@ +USE_NLS = @USE_NLS@ +V = @V@ +VERSION = @VERSION@ +WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ +WEBKIT_LIBS = @WEBKIT_LIBS@ +XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ +XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@ +XVIDMODE_LIBS = @XVIDMODE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +expanded_bindir = @expanded_bindir@ +expanded_datadir = @expanded_datadir@ +expanded_libdir = @expanded_libdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +shavedir = @shavedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +ASSEMBLY = MeeGo +TARGET = exe +LINK = $(REF_MEEGO) $(am__append_1) +SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs + +# Initializers +@HAVE_MEEGO_TRUE@MONO_BASE_PATH = +@HAVE_MEEGO_TRUE@MONO_ADDINS_PATH = + +# Install Paths +@HAVE_MEEGO_TRUE@DEFAULT_INSTALL_DIR = $(pkglibdir) +@HAVE_MEEGO_TRUE@BACKENDS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Backends +@HAVE_MEEGO_TRUE@EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions + +# External libraries to link against, generated from configure +@HAVE_MEEGO_TRUE@LINK_SYSTEM = -r:System +@HAVE_MEEGO_TRUE@LINK_CAIRO = -r:Mono.Cairo +@HAVE_MEEGO_TRUE@LINK_MONO_POSIX = -r:Mono.Posix +@HAVE_MEEGO_TRUE@LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib +@HAVE_MEEGO_TRUE@LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS) +@HAVE_MEEGO_TRUE@LINK_GLIB = $(GLIBSHARP_LIBS) +@HAVE_MEEGO_TRUE@LINK_GTK = $(GTKSHARP_LIBS) +@HAVE_MEEGO_TRUE@LINK_GCONF = $(GCONFSHARP_LIBS) +@HAVE_MEEGO_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS) +@HAVE_MEEGO_TRUE@LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS) +@HAVE_MEEGO_TRUE@LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS) +@HAVE_MEEGO_TRUE@LINK_TAGLIB = $(TAGLIB_SHARP_LIBS) +@HAVE_MEEGO_TRUE@LINK_IPOD = $(IPODSHARP_LIBS) +@HAVE_MEEGO_TRUE@LINK_BOO = $(BOO_LIBS) +@HAVE_MEEGO_TRUE@LINK_WEBKIT = $(WEBKIT_LIBS) +@HAVE_MEEGO_TRUE@LINK_GDATA = $(GDATASHARP_LIBS) +@HAVE_MEEGO_TRUE@LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS) +@HAVE_MEEGO_TRUE@LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS) +@HAVE_MEEGO_TRUE@LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS) +@HAVE_MEEGO_TRUE@LINK_MONO_ADDINS_GUI_DEPS = $(MONO_ADDINS_GUI_LIBS) +@HAVE_MEEGO_TRUE@DIR_BIN = $(top_builddir)/bin + +# Mono.Data +@HAVE_MEEGO_TRUE@REF_SQLITE = -r:System -r:System.Data -r:System.Transactions +@HAVE_MEEGO_TRUE@LINK_SQLITE = -r:System.Data -r:$(DIR_BIN)/Mono.Data.Sqlite.dll + +# Hyena +@HAVE_MEEGO_TRUE@REF_HYENA = $(LINK_SYSTEM) $(LINK_SQLITE) $(LINK_MONO_POSIX) +@HAVE_MEEGO_TRUE@LINK_HYENA = -r:$(DIR_BIN)/Hyena.dll +@HAVE_MEEGO_TRUE@LINK_HYENA_DEPS = $(REF_HYENA) $(LINK_HYENA) + +# Hyena.Gui +@HAVE_MEEGO_TRUE@REF_HYENA_GUI = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_CAIRO) $(LINK_GTK) +@HAVE_MEEGO_TRUE@LINK_HYENA_GUI = -r:$(DIR_BIN)/Hyena.Gui.dll +@HAVE_MEEGO_TRUE@LINK_HYENA_GUI_DEPS = $(REF_HYENA_GUI) $(LINK_HYENA_GUI) + +# Lastfm +@HAVE_MEEGO_TRUE@REF_LASTFM = $(LINK_SYSTEM) $(LINK_MONO_MEDIA) $(LINK_MONO_POSIX) $(LINK_HYENA) $(LINK_ICSHARP_ZIP_LIB) +@HAVE_MEEGO_TRUE@LINK_LASTFM = -r:$(DIR_BIN)/Lastfm.dll +@HAVE_MEEGO_TRUE@LINK_LASTFM_DEPS = $(REF_LASTFM) $(LINK_LASTFM) + +# Lastfm.Gui +@HAVE_MEEGO_TRUE@REF_LASTFM_GUI = $(LINK_GLIB) $(LINK_GTK) $(LINK_LASTFM_DEPS) +@HAVE_MEEGO_TRUE@LINK_LASTFM_GUI = -r:$(DIR_BIN)/Lastfm.Gui.dll +@HAVE_MEEGO_TRUE@LINK_LASTFM_GUI_DEPS = $(REF_LASTFM_GUI) $(LINK_LASTFM_GUI) +@HAVE_MEEGO_TRUE@REF_MIGO = $(LINK_HYENA_DEPS) $(LINK_ICSHARP_ZIP_LIB) +@HAVE_MEEGO_TRUE@LINK_MIGO = -r:$(DIR_BIN)/Migo.dll +@HAVE_MEEGO_TRUE@LINK_MIGO_DEPS = $(REF_MIGO) $(LINK_MIGO) + +# Mono.Media +@HAVE_MEEGO_TRUE@REF_MONO_MEDIA = $(LINK_SYSTEM) +@HAVE_MEEGO_TRUE@LINK_MONO_MEDIA = -r:$(DIR_BIN)/Mono.Media.dll +@HAVE_MEEGO_TRUE@LINK_MONO_MEDIA_DEPS = $(REF_MONO_MEDIA) $(LINK_MONO_MEDIA) + +# Mtp +@HAVE_MEEGO_TRUE@REF_MTP = $(LINK_SYSTEM) $(LINK_MONO_POSIX) +@HAVE_MEEGO_TRUE@LINK_MTP = -r:$(DIR_BIN)/Mtp.dll +@HAVE_MEEGO_TRUE@LINK_MTP_DEPS = $(REF_MTP) $(LINK_MTP) + +# Karma +@HAVE_MEEGO_TRUE@REF_KARMA = $(LINK_SYSTEM) $(LINK_MONO_POSIX) +@HAVE_MEEGO_TRUE@LINK_KARMA = $(KARMASHARP_LIBS) +@HAVE_MEEGO_TRUE@LINK_KARMA_DEPS = $(REF_KARMA) $(LINK_KARMA) + +# MusicBrainz +@HAVE_MEEGO_TRUE@REF_MUSICBRAINZ = $(LINK_SYSTEM) +@HAVE_MEEGO_TRUE@LINK_MUSICBRAINZ = -r:$(DIR_BIN)/MusicBrainz.dll +@HAVE_MEEGO_TRUE@LINK_MUSICBRAINZ_DEPS = $(REF_MUSICBRAINZ) $(LINK_MUSICBRAINZ) + +# Core +@HAVE_MEEGO_TRUE@REF_BANSHEE_CORE = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_GLIB) \ +@HAVE_MEEGO_TRUE@ $(LINK_DBUS) $(LINK_TAGLIB) $(LINK_MONO_ADDINS_DEPS) + +@HAVE_MEEGO_TRUE@LINK_BANSHEE_CORE = -r:$(DIR_BIN)/Banshee.Core.dll +@HAVE_MEEGO_TRUE@LINK_BANSHEE_CORE_DEPS = $(REF_BANSHEE_CORE) $(LINK_BANSHEE_CORE) +@HAVE_MEEGO_TRUE@REF_BANSHEE_SERVICES = $(LINK_SQLITE) $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_MEDIA_DEPS) $(LINK_LASTFM_DEPS) +@HAVE_MEEGO_TRUE@LINK_BANSHEE_SERVICES = -r:$(DIR_BIN)/Banshee.Services.dll +@HAVE_MEEGO_TRUE@LINK_BANSHEE_SERVICES_DEPS = $(REF_BANSHEE_SERVICES) $(LINK_BANSHEE_SERVICES) +@HAVE_MEEGO_TRUE@REF_BANSHEE_WIDGETS = $(LINK_MONO_POSIX) $(LINK_HYENA_GUI_DEPS) +@HAVE_MEEGO_TRUE@LINK_BANSHEE_WIDGETS = -r:$(DIR_BIN)/Banshee.Widgets.dll +@HAVE_MEEGO_TRUE@LINK_BANSHEE_WIDGETS_DEPS = $(REF_BANSHEE_WIDGETS) $(LINK_BANSHEE_WIDGETS) +@HAVE_MEEGO_TRUE@REF_BANSHEE_THICKCLIENT = $(LINK_BANSHEE_WIDGETS_DEPS) \ +@HAVE_MEEGO_TRUE@ $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_HYENA_GUI_DEPS) $(LINK_MONO_ADDINS_SETUP_DEPS) $(LINK_MONO_ADDINS_GUI_DEPS) + +@HAVE_MEEGO_TRUE@LINK_BANSHEE_THICKCLIENT = -r:$(DIR_BIN)/Banshee.ThickClient.dll +@HAVE_MEEGO_TRUE@LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ +@HAVE_MEEGO_TRUE@ $(LINK_BANSHEE_THICKCLIENT) + +@HAVE_MEEGO_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@HAVE_MEEGO_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) +@HAVE_MEEGO_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) +@HAVE_MEEGO_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) +@HAVE_MEEGO_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) +@HAVE_MEEGO_TRUE@REF_BANSHEE_COLLECTIONINDEXER = $(LINK_SYSTEM) $(LINK_DBUS_NO_GLIB) $(LINK_MONO_POSIX) + +# Dap +@HAVE_MEEGO_TRUE@REF_DAP = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@LINK_DAP = -r:$(DIR_BIN)/Banshee.Dap.dll +@HAVE_MEEGO_TRUE@LINK_DAP_DEPS = $(REF_DAP) $(LINK_DAP) +@HAVE_MEEGO_TRUE@REF_DAP_MASS_STORAGE = $(LINK_DAP_DEPS) +@HAVE_MEEGO_TRUE@REF_DAP_MTP = $(LINK_DAP_DEPS) $(LINK_MTP_DEPS) +@HAVE_MEEGO_TRUE@REF_DAP_IPOD = $(LINK_DAP_DEPS) $(LINK_IPOD) +@HAVE_MEEGO_TRUE@REF_DAP_KARMA = $(LINK_DAP_DEPS) $(LINK_KARMA_DEPS) + +# Extensions +@HAVE_MEEGO_TRUE@REF_EXTENSION_AUDIOCD = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_BOOKMARKS = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_BOOSCRIPT = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BOO) +@HAVE_MEEGO_TRUE@REF_EXTENSION_BPM = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_COVERART = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_DAAP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_ICSHARP_ZIP_LIB) $(LINK_MONO_ZEROCONF) +@HAVE_MEEGO_TRUE@REF_EXTENSION_EMUSIC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MIGO_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) +@HAVE_MEEGO_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll +@HAVE_MEEGO_TRUE@LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \ +@HAVE_MEEGO_TRUE@ $(LINK_EXTENSION_PLAYQUEUE) + +@HAVE_MEEGO_TRUE@REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) +@HAVE_MEEGO_TRUE@REF_EXTENSION_NOWPLAYING = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@LINK_EXTENSION_NOWPLAYING = -r:$(DIR_BIN)/Banshee.NowPlaying.dll +@HAVE_MEEGO_TRUE@LINK_EXTENSION_NOWPLAYING_DEPS = $(REF_EXTENSION_NOWPLAYING) \ +@HAVE_MEEGO_TRUE@ $(LINK_EXTENSION_NOWPLAYING) + +@HAVE_MEEGO_TRUE@REF_EXTENSION_NOWPLAYING_CLUTTER = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF) + +# Backends +@HAVE_MEEGO_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) +@HAVE_MEEGO_TRUE@REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF) +@HAVE_MEEGO_TRUE@REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB) +@HAVE_MEEGO_TRUE@REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX) +@HAVE_MEEGO_TRUE@REF_BACKEND_HAL = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_DBUS) +@HAVE_MEEGO_TRUE@REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@REF_BACKEND_BNPX11 = $(LINK_EXTENSION_NOWPLAYING_DEPS) + +# Cute hack to replace a space with something +@HAVE_MEEGO_TRUE@colon := : +@HAVE_MEEGO_TRUE@empty := +@HAVE_MEEGO_TRUE@space := $(empty) $(empty) + +# Build path to allow running uninstalled +@HAVE_MEEGO_TRUE@RUN_PATH = $(subst $(space),$(colon), $(MONO_BASE_PATH)) +@HAVE_MEEGO_TRUE@UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq +@HAVE_MEEGO_TRUE@BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE) +@HAVE_MEEGO_TRUE@SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES)) \ +@HAVE_MEEGO_TRUE@ $(top_srcdir)/src/AssemblyInfo.cs +@HAVE_MEEGO_TRUE@RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES)) +@HAVE_MEEGO_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \ +@HAVE_MEEGO_TRUE@ -resource:$(resource),$(notdir $(resource))) + +@HAVE_MEEGO_TRUE@INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)" +@HAVE_MEEGO_TRUE@THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg) +@HAVE_MEEGO_TRUE@THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE)) +@HAVE_MEEGO_TRUE@ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET))) +@HAVE_MEEGO_TRUE@ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION) +@HAVE_MEEGO_TRUE@INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR))) +@ENABLE_TESTS_TRUE@@HAVE_MEEGO_TRUE@ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS" +@ENABLE_ATK_TRUE@@HAVE_MEEGO_TRUE@ENABLE_ATK_FLAG = "-define:ENABLE_ATK" +@HAVE_MEEGO_TRUE@FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE)) +@HAVE_MEEGO_TRUE@DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/') +@HAVE_MEEGO_TRUE@OUTPUT_FILES = \ +@HAVE_MEEGO_TRUE@ $(ASSEMBLY_FILE) \ +@HAVE_MEEGO_TRUE@ $(ASSEMBLY_FILE).mdb + +@HAVE_MEEGO_TRUE@moduledir = $(INSTALL_DIR_RESOLVED) +@HAVE_MEEGO_TRUE@module_SCRIPTS = $(OUTPUT_FILES) +@HAVE_MEEGO_FALSE@EXTRA_DIST = $(SOURCES) +@HAVE_MEEGO_TRUE@EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) +@HAVE_MEEGO_TRUE@CLEANFILES = $(OUTPUT_FILES) +@HAVE_MEEGO_TRUE@DISTCLEANFILES = *.pidb +@HAVE_MEEGO_TRUE@MAINTAINERCLEANFILES = Makefile.in +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/build.mk $(top_srcdir)/build/build.environment.mk $(top_srcdir)/build/build.rules.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Clients/MeeGo/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/Clients/MeeGo/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-moduleSCRIPTS: $(module_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" + @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(moduledir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(moduledir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-moduleSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(moduledir)" && rm -f $$files + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(SCRIPTS) +installdirs: + for dir in "$(DESTDIR)$(moduledir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +@HAVE_MEEGO_FALSE@uninstall-local: +@HAVE_MEEGO_FALSE@install-data-local: +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-data-local install-moduleSCRIPTS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-local uninstall-moduleSCRIPTS + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-moduleSCRIPTS install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-local \ + uninstall-moduleSCRIPTS + + +@HAVE_MEEGO_TRUE@all: $(ASSEMBLY_FILE) theme-icons + +@HAVE_MEEGO_TRUE@run: +@HAVE_MEEGO_TRUE@ @pushd $(top_builddir); \ +@HAVE_MEEGO_TRUE@ make run; \ +@HAVE_MEEGO_TRUE@ popd; + +@HAVE_MEEGO_TRUE@test: +@HAVE_MEEGO_TRUE@ @pushd $(top_builddir)/tests; \ +@HAVE_MEEGO_TRUE@ make $(ASSEMBLY); \ +@HAVE_MEEGO_TRUE@ popd; + +@HAVE_MEEGO_TRUE@build-debug: +@HAVE_MEEGO_TRUE@ @echo $(DEP_LINK) + +@HAVE_MEEGO_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE) + +@HAVE_MEEGO_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) +@HAVE_MEEGO_TRUE@ @mkdir -p $(top_builddir)/bin +@HAVE_MEEGO_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \ +@HAVE_MEEGO_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \ +@HAVE_MEEGO_TRUE@ $(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $@.config) -iwinmm -ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll -ilibigemacintegration.dylib -iCFRelease $(SOURCES_BUILD); \ +@HAVE_MEEGO_TRUE@ fi; +@HAVE_MEEGO_TRUE@ $(MCS) \ +@HAVE_MEEGO_TRUE@ $(GMCS_FLAGS) \ +@HAVE_MEEGO_TRUE@ $(ASSEMBLY_BUILD_FLAGS) \ +@HAVE_MEEGO_TRUE@ -nowarn:0278 -nowarn:0078 $$warn \ +@HAVE_MEEGO_TRUE@ -define:HAVE_GTK_2_10 -define:NET_2_0 \ +@HAVE_MEEGO_TRUE@ -debug -target:$(TARGET) -out:$@ \ +@HAVE_MEEGO_TRUE@ $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(ENABLE_ATK_FLAG) \ +@HAVE_MEEGO_TRUE@ $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD) +@HAVE_MEEGO_TRUE@ @if [ -e $(srcdir)/$(notdir $@.config) ]; then \ +@HAVE_MEEGO_TRUE@ cp $(srcdir)/$(notdir $@.config) $(top_builddir)/bin; \ +@HAVE_MEEGO_TRUE@ fi; +@HAVE_MEEGO_TRUE@ @if [ ! -z "$(EXTRA_BUNDLE)" ]; then \ +@HAVE_MEEGO_TRUE@ cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \ +@HAVE_MEEGO_TRUE@ fi; + +@HAVE_MEEGO_TRUE@theme-icons: $(THEME_ICONS_SOURCE) +@HAVE_MEEGO_TRUE@ @$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE) + +@HAVE_MEEGO_TRUE@install-data-local: $(THEME_ICONS_SOURCE) +@HAVE_MEEGO_TRUE@ @$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE) + +@HAVE_MEEGO_TRUE@uninstall-local: $(THEME_ICONS_SOURCE) +@HAVE_MEEGO_TRUE@ @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE) + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/Clients/Muinshee/Makefile.in b/src/Clients/Muinshee/Makefile.in index 6bbbcfa..afdff13 100644 --- a/src/Clients/Muinshee/Makefile.in +++ b/src/Clients/Muinshee/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -478,6 +480,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -506,6 +510,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Clients/Nereid/Makefile.in b/src/Clients/Nereid/Makefile.in index 03d1ba3..80a9dbc 100644 --- a/src/Clients/Nereid/Makefile.in +++ b/src/Clients/Nereid/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -471,6 +473,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -499,6 +503,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Clients/Nereid/Nereid/PlayerInterface.cs b/src/Clients/Nereid/Nereid/PlayerInterface.cs index 1c4d007..ca1e1c2 100644 --- a/src/Clients/Nereid/Nereid/PlayerInterface.cs +++ b/src/Clients/Nereid/Nereid/PlayerInterface.cs @@ -115,6 +115,11 @@ namespace Nereid interface_constructed = true; uint timer = Log.DebugTimerStart (); + if (PlatformDetection.IsMeeGo) { + Decorated = false; + Maximize (); + } + BuildPrimaryLayout (); ConnectEvents (); @@ -171,7 +176,7 @@ namespace Nereid Alignment toolbar_alignment = new Alignment (0.0f, 0.0f, 1.0f, 1.0f); toolbar_alignment.TopPadding = PlatformDetection.IsMeeGo ? 0u : 3u; - toolbar_alignment.BottomPadding = 3; + toolbar_alignment.BottomPadding = PlatformDetection.IsMeeGo ? 0u : 3u; header_toolbar = (Toolbar)ActionService.UIManager.GetWidget ("/HeaderToolbar"); header_toolbar.ShowArrow = false; @@ -179,6 +184,7 @@ namespace Nereid header_toolbar.Show (); if (PlatformDetection.IsMeeGo) { + header_toolbar.IconSize = IconSize.LargeToolbar; header_toolbar.Name = "moblin-toolbar"; } @@ -189,7 +195,7 @@ namespace Nereid AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Shrink, 0, 0); - Widget next_button = new NextButton (ActionService, PlatformDetection.IsMeeGo); + var next_button = new NextButton (ActionService, PlatformDetection.IsMeeGo); next_button.Show (); ActionService.PopulateToolbarPlaceholder (header_toolbar, "/HeaderToolbar/NextArrowButton", next_button); @@ -197,25 +203,29 @@ namespace Nereid seek_slider.Show (); ActionService.PopulateToolbarPlaceholder (header_toolbar, "/HeaderToolbar/SeekSlider", seek_slider); - TrackInfoDisplay track_info_display = new ClassicTrackInfoDisplay (); + var track_info_display = new ClassicTrackInfoDisplay (); track_info_display.Show (); var editable = TrackInfoDisplay.GetEditable (track_info_display); editable.Show (); ActionService.PopulateToolbarPlaceholder (header_toolbar, "/HeaderToolbar/TrackInfoDisplay", editable, true); if (PlatformDetection.IsMeeGo) { + track_info_display.ArtworkSpacing = 5; + seek_slider.LeftPadding = 20; + seek_slider.RightPadding = 20; + var menu = (Menu)(ActionService.UIManager.GetWidget ("/ToolbarMenu")); var menu_button = new Hyena.Widgets.MenuButton (new Image (Stock.Preferences, IconSize.LargeToolbar), menu, true); menu_button.Show (); ActionService.PopulateToolbarPlaceholder (header_toolbar, "/HeaderToolbar/ToolbarMenuPlaceholder", menu_button); - var close_button = new ToolButton (Stock.Close); + var close_button = new Button (Image.NewFromIconName ("window-close", IconSize.LargeToolbar)) { + TooltipText = Catalog.GetString ("Close") + }; + close_button.Clicked += (o, e) => Hide (); - close_button.Show (); + close_button.ShowAll (); ActionService.PopulateToolbarPlaceholder (header_toolbar, "/HeaderToolbar/ClosePlaceholder", close_button); - - ServiceManager.PlayerEngine.Volume = 100; - } else { var volume_button = new ConnectedVolumeButton (); volume_button.Show (); @@ -234,8 +244,23 @@ namespace Nereid source_view = new SourceView (); composite_view = new CompositeTrackSourceContents (); - Hyena.Widgets.ScrolledWindow source_scroll = new Hyena.Widgets.ScrolledWindow (); - source_scroll.AddWithFrame (source_view); + Container source_scroll; + if (PlatformDetection.IsMeeGo) { + source_scroll = new Gtk.ScrolledWindow () { + HscrollbarPolicy = PolicyType.Never, + VscrollbarPolicy = PolicyType.Automatic, + ShadowType = ShadowType.None + }; + source_scroll.Add (source_view); + + var color = new Gdk.Color ((byte)0xdd, (byte)0xdd, (byte)0xdd); + Gdk.Colormap.System.AllocColor (ref color, true, true); + source_view.ModifyBase (StateType.Normal, color); + } else { + var hyena_source_scroll = new Hyena.Widgets.ScrolledWindow (); + hyena_source_scroll.AddWithFrame (source_view); + source_scroll = hyena_source_scroll; + } composite_view.TrackView.HeaderVisible = false; view_container.Content = composite_view; @@ -435,10 +460,21 @@ namespace Nereid private void OnSourcePropertyChanged (object o, PropertyChangeEventArgs args) { - if (args.PropertyName == "Nereid.SourceContents") { - ThreadAssist.ProxyToMain (delegate { - UpdateSourceContents (previous_source); - }); + switch (args.PropertyName) { + case "Nereid.SourceContents": + ThreadAssist.ProxyToMain (delegate { + UpdateSourceContents (previous_source); + }); + break; + + case "FilterQuery": + var source = ServiceManager.SourceManager.ActiveSource; + ThreadAssist.ProxyToMain (delegate { + view_container.SearchEntry.Ready = false; + view_container.SearchEntry.Query = source.FilterQuery; + view_container.SearchEntry.Ready = true; + }); + break; } } diff --git a/src/Clients/Nereid/Nereid/ViewContainer.cs b/src/Clients/Nereid/Nereid/ViewContainer.cs index 9344852..efe388a 100644 --- a/src/Clients/Nereid/Nereid/ViewContainer.cs +++ b/src/Clients/Nereid/Nereid/ViewContainer.cs @@ -46,6 +46,7 @@ namespace Nereid { private SearchEntry search_entry; private HBox header; + private Alignment header_align; private EventBox header_box; private Label title_label; private Banshee.ContextPane.ContextPane context_pane; @@ -63,6 +64,12 @@ namespace Nereid private void BuildHeader () { + header_align = new Alignment (0.0f, 0.5f, 1.0f, 1.0f); + if (Hyena.PlatformDetection.IsMeeGo) { + header_align.RightPadding = 5; + header_align.TopPadding = 5; + } + header = new HBox (); footer = new VBox (); @@ -107,10 +114,11 @@ namespace Nereid } } - header.ShowAll (); + header_align.Add (header); + header_align.ShowAll (); search_entry.Show (); - PackStart (header, false, false, 0); + PackStart (header_align, false, false, 0); PackEnd (footer, false, false, 0); context_pane = new Banshee.ContextPane.ContextPane (); @@ -146,6 +154,7 @@ namespace Nereid AddSearchFilter (TrackFilterType.None, String.Empty, Catalog.GetString ("Artist, Album, or Title")); AddSearchFilter (TrackFilterType.SongName, "title", Catalog.GetString ("Track Title")); AddSearchFilter (TrackFilterType.ArtistName, "artist", Catalog.GetString ("Artist Name")); + AddSearchFilter (TrackFilterType.AlbumArtist, "albumartist", Catalog.GetString ("Album Artist")); AddSearchFilter (TrackFilterType.AlbumTitle, "album", Catalog.GetString ("Album Title")); AddSearchFilter (TrackFilterType.Genre, "genre", Catalog.GetString ("Genre")); AddSearchFilter (TrackFilterType.Year, "year", Catalog.GetString ("Year")); @@ -220,8 +229,8 @@ namespace Nereid } } - public HBox Header { - get { return header; } + public Alignment Header { + get { return header_align; } } public SearchEntry SearchEntry { diff --git a/src/Core/Banshee.CollectionIndexer/Makefile.in b/src/Core/Banshee.CollectionIndexer/Makefile.in index ddb8461..85c86c2 100644 --- a/src/Core/Banshee.CollectionIndexer/Makefile.in +++ b/src/Core/Banshee.CollectionIndexer/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -476,6 +478,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -504,6 +508,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Core/Banshee.Core/Banshee.Collection/TrackFilterType.cs b/src/Core/Banshee.Core/Banshee.Collection/TrackFilterType.cs index 9ab263a..e4c7d58 100644 --- a/src/Core/Banshee.Core/Banshee.Collection/TrackFilterType.cs +++ b/src/Core/Banshee.Core/Banshee.Collection/TrackFilterType.cs @@ -40,5 +40,6 @@ namespace Banshee.Collection Genre = 1 << 3, Year = 1 << 4, Comment = 1 << 5, + AlbumArtist= 1 << 6, } } diff --git a/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs b/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs index c0b05af..c9e9402 100644 --- a/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs +++ b/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs @@ -44,6 +44,7 @@ namespace Banshee.Collection public class TrackInfo : CacheableItem, ITrackInfo { public const string ExportVersion = "1.0"; + public static readonly double PlaybackSkippedThreshold = 0.5; public static readonly string UnknownTitle = Catalog.GetString ("Unknown Title"); @@ -86,7 +87,7 @@ namespace Banshee.Collection Score = (int) Math.Round ((((double)Score * total_plays) + (percentCompleted * 100)) / (total_plays + 1)); } - if (percentCompleted <= 0.5) { + if (percentCompleted <= PlaybackSkippedThreshold) { LastSkipped = DateTime.Now; SkipCount++; } else { diff --git a/src/Core/Banshee.Core/Banshee.Configuration/XmlConfigurationClient.cs b/src/Core/Banshee.Core/Banshee.Configuration/XmlConfigurationClient.cs index 1305899..b2edfce 100644 --- a/src/Core/Banshee.Core/Banshee.Configuration/XmlConfigurationClient.cs +++ b/src/Core/Banshee.Core/Banshee.Configuration/XmlConfigurationClient.cs @@ -42,6 +42,7 @@ namespace Banshee.Configuration private const string namespace_tag_name = "namespace"; private const string value_tag_name = "value"; private const string tag_identifier_attribute_name = "name"; + private const string skel_path = "/etc/skel/.config/banshee-1/config.xml"; private static string file_path { get { @@ -62,9 +63,18 @@ namespace Banshee.Configuration xml_document = new XmlDocument(); bool make_new_xml = true; - if(File.Exists(file_path)) { + + string load_path = null; + if (File.Exists (file_path)) { + load_path = file_path; + } else if (File.Exists (skel_path)) { + Hyena.Log.InformationFormat ("Restoring config.xml from {0}", skel_path); + load_path = skel_path; + } + + if (load_path != null && File.Exists (load_path)) { try { - xml_document.Load(file_path); + xml_document.Load (load_path); make_new_xml = false; } catch { // TODO try recovery? } diff --git a/src/Core/Banshee.Core/Makefile.in b/src/Core/Banshee.Core/Makefile.in index d3a8c64..69b2d17 100644 --- a/src/Core/Banshee.Core/Makefile.in +++ b/src/Core/Banshee.Core/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -535,6 +537,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -563,6 +567,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs index 41ff4b1..f07b07f 100644 --- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs +++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs @@ -159,6 +159,7 @@ namespace Banshee.Collection.Database public override void UpdateLastPlayed () { + Refresh (); base.UpdateLastPlayed (); Save (NotifySaved, BansheeQuery.LastPlayedField); } diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs index d5006cb..2c1fd80 100644 --- a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs +++ b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs @@ -220,6 +220,7 @@ namespace Banshee.MediaEngine pending_track = null; pending_uri = null; } + if (ThreadAssist.InMainThread) { RaiseEventChanged (args); } else { diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs index 79ec1f8..48652af 100644 --- a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs +++ b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs @@ -691,7 +691,8 @@ namespace Banshee.MediaEngine | PlayerEvent.Volume | PlayerEvent.Metadata | PlayerEvent.TrackInfoUpdated - | PlayerEvent.RequestNextTrack; + | PlayerEvent.RequestNextTrack + | PlayerEvent.PrepareVideoWindow; private const PlayerEvent event_default_mask = event_all_mask & ~PlayerEvent.Iterate; diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEvent.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEvent.cs index a5c714f..92f09da 100644 --- a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEvent.cs +++ b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEvent.cs @@ -109,7 +109,8 @@ namespace Banshee.MediaEngine Volume = 128, Metadata = 256, TrackInfoUpdated = 512, - RequestNextTrack = 1024 + RequestNextTrack = 1024, + PrepareVideoWindow = 2048 } public enum PlayerState diff --git a/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs b/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs index 92fdb91..cab9f1b 100644 --- a/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs +++ b/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs @@ -32,6 +32,7 @@ using System.Net; using System.Xml; using System.Text; using System.Collections.Generic; +using System.Web; using Hyena; using Banshee.Base; @@ -108,8 +109,10 @@ namespace Banshee.Metadata.MusicBrainz private string FindAsin () { + string album_artist = HttpUtility.UrlEncode (Track.AlbumArtist); + string album_title = HttpUtility.UrlEncode (Track.AlbumTitle); Uri uri = new Uri (String.Format ("http://musicbrainz.org/ws/1/release/?type=xml&artist={0}&title={1}", - Track.AlbumArtist, Track.AlbumTitle)); + album_artist, album_title)); HttpWebResponse response = GetHttpStream (uri); if (response == null) { diff --git a/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs b/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs index 890f3d6..e088ceb 100644 --- a/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs +++ b/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs @@ -275,7 +275,7 @@ namespace Banshee.Query public static QueryField MimeTypeField = new QueryField ( "mimetype", "MimeType", - Catalog.GetString ("Mime Type"), "CoreTracks.MimeType {0} OR CoreTracks.Uri {0}", typeof(ExactStringQueryValue), + Catalog.GetString ("Mime Type"), "CoreTracks.MimeType", typeof(ExactStringQueryValue), // Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok. Catalog.GetString ("type"), Catalog.GetString ("mimetype"), Catalog.GetString ("format"), Catalog.GetString ("ext"), "type", "mimetype", "format", "ext", "mime" diff --git a/src/Core/Banshee.Services/Makefile.in b/src/Core/Banshee.Services/Makefile.in index 565b217..85d0c7b 100644 --- a/src/Core/Banshee.Services/Makefile.in +++ b/src/Core/Banshee.Services/Makefile.in @@ -185,8 +185,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -240,6 +240,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -692,6 +694,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -720,6 +724,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs index d7ec9e9..bbae65e 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs @@ -60,10 +60,12 @@ namespace Banshee.Collection.Gui public ColumnCellAlbumAccessible (object bound_object, ColumnCellAlbum cell, ICellAccessibleParent parent) : base (bound_object, cell as ColumnCell, parent) { - AlbumInfo bound_album_info = (AlbumInfo)bound_object; - Name = String.Format ("{0} - {1}", - bound_album_info.DisplayTitle, - bound_album_info.DisplayArtistName); + var bound_album_info = bound_object as AlbumInfo; + if (bound_album_info != null) { + Name = String.Format ("{0} - {1}", + bound_album_info.DisplayTitle, + bound_album_info.DisplayArtistName); + } } } diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs index b4fb28a..95655eb 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs @@ -71,6 +71,7 @@ namespace Banshee.Collection.Gui public EditorBox (Widget child) { Child = child; + VisibleWindow = false; ButtonPressEvent += (o, a) => { if (a.Event.Button == 3 && IsSensitive ((int)a.Event.X, (int)a.Event.Y)) { diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DataViewChildAlbum.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DataViewChildAlbum.cs index 4db48fd..43eda16 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DataViewChildAlbum.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DataViewChildAlbum.cs @@ -154,7 +154,8 @@ namespace Banshee.Collection.Gui grad.AddColorStop (0, new Color (0, 0, 0, 0.65 * a)); grad.AddColorStop (1, new Color (0, 0, 0, 0.15 * a)); cr.Pattern = grad; - cr.Rectangle ((Cairo.Rectangle)image_allocation); + CairoExtensions.RoundedRectangle (cr, image_allocation.X, image_allocation.Y, + image_allocation.Width, image_allocation.Height, context.Theme.Context.Radius); cr.Fill (); grad.Destroy (); diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/PersistentColumnController.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/PersistentColumnController.cs index 2f7641e..6d3fdba 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/PersistentColumnController.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/PersistentColumnController.cs @@ -86,25 +86,20 @@ namespace Banshee.Collection.Gui loaded = false; + int i = 0; foreach (Column column in this) { if (column.Id != null) { string @namespace = MakeNamespace (column.Id); column.Visible = ConfigurationClient.Get (@namespace, "visible", column.Visible); column.Width = ConfigurationClient.Get (@namespace, "width", column.Width); + column.OrderHint = ConfigurationClient.Get (@namespace, "order", i); + } else { + column.OrderHint = -1; } + i++; } - // Create a copy so we can read the original index - List columns = new List (Columns); - - Columns.Sort (delegate (Column a, Column b) { - int a_order = a.Id == null ? -1 : ConfigurationClient.Get ( - MakeNamespace (a.Id), "order", columns.IndexOf (a)); - int b_order = b.Id == null ? -1 : ConfigurationClient.Get ( - MakeNamespace (b.Id), "order", columns.IndexOf (b)); - - return a_order.CompareTo (b_order); - }); + Columns.Sort ((a, b) => a.OrderHint.CompareTo (b.OrderHint)); string sort_ns = String.Format ("{0}.{1}.{2}", root_namespace, unique_source_id, "sort"); string sort_column_id = ConfigurationClient.Get (sort_ns, "column", null); diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs index 97e055c..d7912c2 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs @@ -65,7 +65,9 @@ namespace Banshee.Gui.Dialogs TransientFor = parent; } - WindowPosition = WindowPosition.CenterOnParent; + WindowPosition = TransientFor == null || !TransientFor.Visible + ? WindowPosition.Center + : WindowPosition.CenterOnParent; DestroyWithParent = true; accel_group = new AccelGroup (); diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs index 67055ab..42eed54 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs @@ -50,6 +50,7 @@ namespace Banshee.Gui.Widgets public ClassicTrackInfoDisplay () : base () { + ArtworkSpacing = 10; } protected ClassicTrackInfoDisplay (IntPtr native) : base (native) @@ -62,6 +63,18 @@ namespace Banshee.Gui.Widgets HidePopup (); } + protected override int ArtworkSizeRequest { + get { return artwork_size ?? base.ArtworkSizeRequest; } + } + + private int? artwork_size; + public int ArtworkSize { + get { return ArtworkSizeRequest; } + set { artwork_size = value; } + } + + public int ArtworkSpacing { get; set; } + #region Widget Window Management protected override void OnRealized () @@ -160,7 +173,7 @@ namespace Banshee.Gui.Widgets return; } - double offset = Allocation.Height + 10, y = 0; + double offset = ArtworkSizeRequest + ArtworkSpacing, y = 0; double x = Allocation.X + offset; double width = Allocation.Width - offset; int fl_width, fl_height, sl_width, sl_height; diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs index b30fad7..d0a9766 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs @@ -44,12 +44,13 @@ namespace Banshee.Gui.Widgets { private SeekSlider seek_slider; private StreamPositionLabel stream_position_label; + private Box box; public ConnectedSeekSlider () : this (SeekSliderLayout.Vertical) { } - public ConnectedSeekSlider (SeekSliderLayout layout) : base (0.0f, 0.0f, 1.0f, 1.0f) + public ConnectedSeekSlider (SeekSliderLayout layout) : base (0.5f, 0.5f, 1.0f, 0.0f) { RightPadding = 10; LeftPadding = 10; @@ -89,13 +90,16 @@ namespace Banshee.Gui.Widgets get { return seek_slider; } } + public int Spacing { + get { return box.Spacing; } + set { box.Spacing = value; } + } + private void BuildSeekSlider (SeekSliderLayout layout) { seek_slider = new SeekSlider (); stream_position_label = new StreamPositionLabel (seek_slider); - Box box; - if (layout == SeekSliderLayout.Horizontal) { box = new HBox (); box.Spacing = 5; diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/NextButton.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/NextButton.cs index 1c2f1ed..449c7a0 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/NextButton.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/NextButton.cs @@ -38,6 +38,7 @@ namespace Banshee.Gui.Widgets { PlaybackShuffleActions shuffle_actions; Widget button; + bool with_repeat_actions; public NextButton (InterfaceActionService actionService) : this (actionService, false) { @@ -45,10 +46,11 @@ namespace Banshee.Gui.Widgets public NextButton (InterfaceActionService actionService, bool withRepeatActions) { + with_repeat_actions = withRepeatActions; shuffle_actions = actionService.PlaybackActions.ShuffleActions; button = actionService.PlaybackActions["NextAction"].CreateToolItem (); - var menu = shuffle_actions.CreateMenu (withRepeatActions); + var menu = shuffle_actions.CreateMenu (with_repeat_actions); Construct (button, menu, true); TooltipText = actionService.PlaybackActions["NextAction"].Tooltip; @@ -62,7 +64,7 @@ namespace Banshee.Gui.Widgets Menu.Deactivate (); } - Menu = shuffle_actions.CreateMenu (); + Menu = shuffle_actions.CreateMenu (with_repeat_actions); ToggleButton.Sensitive = shuffle_actions.Sensitive; if (Arrow != null) { diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs index 8816833..bfe4445 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs @@ -320,7 +320,8 @@ namespace Banshee.Gui.Widgets protected virtual void RenderCoverArt (Cairo.Context cr, ImageSurface image) { - ArtworkRenderer.RenderThumbnail (cr, image, false, Allocation.X, Allocation.Y, + ArtworkRenderer.RenderThumbnail (cr, image, false, + Allocation.X, Allocation.Y + ArtworkOffset, ArtworkSizeRequest, ArtworkSizeRequest, !IsMissingImage (image), 0.0, IsMissingImage (image), BackgroundColor); @@ -328,8 +329,10 @@ namespace Banshee.Gui.Widgets protected virtual bool IsWithinCoverart (int x, int y) { - return x >= Allocation.X && y >= Allocation.Y && - x <= (Allocation.X + ArtworkSizeRequest) && y <= (Allocation.Y + ArtworkSizeRequest); + return x >= Allocation.X && + y >= Allocation.Y + ArtworkOffset && + x <= (Allocation.X + ArtworkSizeRequest) && + y <= (Allocation.Y + ArtworkOffset + ArtworkSizeRequest); } protected bool IsMissingImage (ImageSurface pb) @@ -343,6 +346,10 @@ namespace Banshee.Gui.Widgets protected abstract void RenderTrackInfo (Cairo.Context cr, TrackInfo track, bool renderTrack, bool renderArtistAlbum); + private int ArtworkOffset { + get { return (Allocation.Height - ArtworkSizeRequest) / 2; } + } + protected virtual int ArtworkSizeRequest { get { return Allocation.Height; } } diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs index b42fa42..e175d98 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs @@ -256,7 +256,10 @@ namespace Banshee.Gui.Widgets return; } - icon_pixbuf = new Gdk.Pixbuf (icon_names[0]); + try { + icon_pixbuf = new Gdk.Pixbuf (icon_names[0]); + } catch (GLib.GException) {} + if (icon_pixbuf != null) { Gdk.Pixbuf scaled = icon_pixbuf.ScaleSimple (22, 22, Gdk.InterpType.Bilinear); icon_pixbuf.Dispose (); diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs index 2274c82..8a9f6c4 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs @@ -40,7 +40,7 @@ using Banshee.Playlist; namespace Banshee.Gui { - public class GlobalActions : BansheeActionGroup + public class GlobalActions : BansheeActionGroup, IGlobalUIActions { public GlobalActions () : base ("Global") { @@ -126,6 +126,26 @@ namespace Banshee.Gui }); this["ExtensionsAction"].Visible = false; + + GLib.Timeout.Add (500, delegate { + if (ApplicationContext.CommandLine.Contains ("show-import-media")) { + OnImport (null, null); + } + + if (ApplicationContext.CommandLine.Contains ("show-about")) { + OnAbout (null, null); + } + + if (ApplicationContext.CommandLine.Contains ("show-open-location")) { + OnOpenLocation (null, null); + } + + if (ApplicationContext.CommandLine.Contains ("show-preferences")) { + OnPreferences (null, null); + } + + return false; + }); } #region Media Menu Actions @@ -225,5 +245,37 @@ namespace Banshee.Gui #endregion +#region IGlobalUIActions + + void IGlobalUIActions.ShowImportDialog () + { + Gtk.Application.Invoke (OnImport); + } + + void IGlobalUIActions.ShowAboutDialog () + { + Gtk.Application.Invoke (OnAbout); + } + + void IGlobalUIActions.ShowOpenLocationDialog () + { + Gtk.Application.Invoke (OnOpenLocation); + } + + void IGlobalUIActions.ShowPreferencesDialog () + { + Gtk.Application.Invoke (OnPreferences); + } + + IDBusExportable IDBusExportable.Parent { + get { return null; } + } + + string IService.ServiceName { + get { return "GlobalUIActions"; } + } + +#endregion + } } diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs index 0e3f988..59f0906 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs @@ -91,6 +91,10 @@ namespace Banshee.Gui } } + protected virtual void PreInitializeGtk () + { + } + protected virtual void InitializeGtk () { Log.Debug ("Initializing GTK"); @@ -100,6 +104,21 @@ namespace Banshee.Gui } Gtk.Application.Init (); + if (ApplicationContext.CommandLine.Contains ("debug-gtkrc")) { + Log.Information ("Note: gtkrc files will be checked for reload every 5 seconds!"); + GLib.Timeout.Add (5000, delegate { + if (Gtk.Rc.ReparseAll ()) { + Gtk.Rc.ResetStyles (Gtk.Settings.Default); + Log.Information ("gtkrc has been reloaded"); + } + return true; + }); + } + } + + protected virtual void PostInitializeGtk () + { + Log.Debug ("Post-Initializing GTK"); foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes ("/Banshee/ThickClient/GtkBaseClient/PostInitializeGtk")) { try { @@ -115,9 +134,10 @@ namespace Banshee.Gui // Set the process name so system process listings and commands are pretty ApplicationContext.TrySetProcessName (Application.InternalName); - Application.Initialize (); - + PreInitializeGtk (); InitializeGtk (); + Application.Initialize (); + PostInitializeGtk (); Gtk.Window.DefaultIconName = default_icon_name; diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs new file mode 100644 index 0000000..6f66b6e --- /dev/null +++ b/src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs @@ -0,0 +1,42 @@ +// +// IGlobalUIActions.cs +// +// Author: +// Aaron Bockover +// +// Copyright 2010 Novell, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using System; +using NDesk.DBus; + +using Banshee.ServiceStack; + +namespace Banshee.Gui +{ + [Interface ("org.bansheeproject.Banshee.GlobalUIActions")] + public interface IGlobalUIActions : IDBusExportable + { + void ShowImportDialog (); + void ShowAboutDialog (); + void ShowOpenLocationDialog (); + void ShowPreferencesDialog (); + } +} \ No newline at end of file diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs index b8bf081..286fcfa 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs @@ -71,6 +71,8 @@ namespace Banshee.Gui UIManager.AddUiFromResource ("core-ui-actions-layout.xml"); AddinManager.AddExtensionNodeHandler ("/Banshee/ThickClient/ActionGroup", OnExtensionChanged); + + ServiceManager.DBusServiceManager.RegisterObject (global_actions); } private void OnActiveSourceChanged (SourceEventArgs args) diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs index 1d8ebfc..1d0d779 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs @@ -329,6 +329,11 @@ namespace Banshee.Gui { Source active_source = ServiceManager.SourceManager.ActiveSource; + List children; + lock (ActivePrimarySource.Children) { + children = new List (ActivePrimarySource.Children); + } + // TODO find just the menu that was activated instead of modifying all proxies foreach (Widget proxy_widget in (o as Gtk.Action).Proxies) { MenuItem menu = proxy_widget as MenuItem; @@ -341,7 +346,7 @@ namespace Banshee.Gui submenu.Append (this ["AddToNewPlaylistAction"].CreateMenuItem ()); bool separator_added = false; - foreach (Source child in ActivePrimarySource.Children) { + foreach (Source child in children) { PlaylistSource playlist = child as PlaylistSource; if (playlist != null) { if (!separator_added) { diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs index c578c36..ea4696c 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceRowRenderer.cs @@ -32,6 +32,7 @@ using Gtk; using Gdk; using Pango; +using Hyena.Gui; using Hyena.Gui.Theming; using Hyena.Gui.Theatrics; @@ -225,22 +226,17 @@ namespace Banshee.Sources.Gui return; } - Gdk.GC mod_gc = widget.Style.TextGC (state); - if (state == StateType.Normal || (view != null && state == StateType.Prelight)) { - Gdk.Color fgcolor = widget.Style.Base (state); - Gdk.Color bgcolor = widget.Style.Text (state); + if (view != null && view.Cr != null) { + view.Cr.Color = state == StateType.Normal || (view != null && state == StateType.Prelight) + ? view.Theme.TextMidColor + : view.Theme.Colors.GetWidgetColor (GtkColorClass.Text, state); - mod_gc = new Gdk.GC (drawable); - mod_gc.Copy (widget.Style.TextGC (state)); - mod_gc.RgbFgColor = Hyena.Gui.GtkUtilities.ColorBlend (fgcolor, bgcolor); - mod_gc.RgbBgColor = fgcolor; + view.Cr.MoveTo ( + cell_area.X + cell_area.Width - count_layout_width - 2, + cell_area.Y + 0.5 + (double)(cell_area.Height - count_layout_height) / 2.0); + PangoCairoHelper.ShowLayout (view.Cr, count_layout); } - drawable.DrawLayout (mod_gc, - cell_area.X + cell_area.Width - count_layout_width - 2, - Middle (cell_area, count_layout_height), - count_layout); - count_layout.Dispose (); fd.Dispose (); } diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs index d83adbd..f62eca4 100644 --- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs +++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs @@ -146,12 +146,10 @@ namespace Banshee.Sources.Gui #region Gtk.Widget Overrides - protected override void OnRealized () + protected override void OnStyleSet (Style old_style) { - base.OnRealized (); - - theme = new GtkTheme (this); - // theme.RefreshColors (); + base.OnStyleSet (old_style); + theme = Hyena.Gui.Theming.ThemeEngine.CreateTheme (this); } protected override bool OnButtonPressEvent (Gdk.EventButton press) @@ -251,7 +249,12 @@ namespace Banshee.Sources.Gui try { cr = Gdk.CairoHelper.Create (evnt.Window); - return base.OnExposeEvent (evnt); + base.OnExposeEvent (evnt); + if (Hyena.PlatformDetection.IsMeeGo) { + theme.DrawFrameBorder (cr, new Gdk.Rectangle (0, 0, + Allocation.Width, Allocation.Height)); + } + return true; } finally { CairoExtensions.DisposeContext (cr); cr = null; diff --git a/src/Core/Banshee.ThickClient/Makefile.am b/src/Core/Banshee.ThickClient/Makefile.am index d8ac95b..21dd0a2 100644 --- a/src/Core/Banshee.ThickClient/Makefile.am +++ b/src/Core/Banshee.ThickClient/Makefile.am @@ -113,6 +113,7 @@ SOURCES = \ Banshee.Gui/IClientWindow.cs \ Banshee.Gui/IconThemeUtils.cs \ Banshee.Gui/IDisableKeybindings.cs \ + Banshee.Gui/IGlobalUIActions.cs \ Banshee.Gui/IHasSourceView.cs \ Banshee.Gui/InterfaceActionService.cs \ Banshee.Gui/PersistentPaneController.cs \ diff --git a/src/Core/Banshee.ThickClient/Makefile.in b/src/Core/Banshee.ThickClient/Makefile.in index 1573794..3c32acf 100644 --- a/src/Core/Banshee.ThickClient/Makefile.in +++ b/src/Core/Banshee.ThickClient/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -474,6 +476,7 @@ SOURCES = \ Banshee.Gui/IClientWindow.cs \ Banshee.Gui/IconThemeUtils.cs \ Banshee.Gui/IDisableKeybindings.cs \ + Banshee.Gui/IGlobalUIActions.cs \ Banshee.Gui/IHasSourceView.cs \ Banshee.Gui/InterfaceActionService.cs \ Banshee.Gui/PersistentPaneController.cs \ @@ -629,6 +632,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -657,6 +662,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs index 70eebb4..7d34c4d 100644 --- a/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs +++ b/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs @@ -71,6 +71,10 @@ namespace Banshee.Widgets get { return menu; } } + protected SearchEntry (IntPtr raw) : base (raw) + { + } + public SearchEntry() { ChangeTimeoutMs = 25; diff --git a/src/Core/Banshee.Widgets/Makefile.in b/src/Core/Banshee.Widgets/Makefile.in index fa8083a..c178507 100644 --- a/src/Core/Banshee.Widgets/Makefile.in +++ b/src/Core/Banshee.Widgets/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -487,6 +489,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -515,6 +519,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Core/Makefile.in b/src/Core/Makefile.in index 158bea8..6b88dd6 100644 --- a/src/Core/Makefile.in +++ b/src/Core/Makefile.in @@ -196,8 +196,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -251,6 +251,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs b/src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs index 9a989c7..97b6ee5 100644 --- a/src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs +++ b/src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs @@ -602,7 +602,11 @@ namespace Banshee.Dap.Ipod if (SupportsPlaylists) { // Add playlists from Banshee to the device - foreach (Source child in Children) { + List children = null; + lock (Children) { + children = new List (Children); + } + foreach (Source child in children) { PlaylistSource from = child as PlaylistSource; if (from != null && from.Count > 0) { IPod.Playlist playlist = ipod_device.TrackDatabase.CreatePlaylist (from.Name); diff --git a/src/Dap/Banshee.Dap.Ipod/Makefile.in b/src/Dap/Banshee.Dap.Ipod/Makefile.in index 19b3312..8761de2 100644 --- a/src/Dap/Banshee.Dap.Ipod/Makefile.in +++ b/src/Dap/Banshee.Dap.Ipod/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -477,6 +479,8 @@ EXTRA_BUNDLE = $(IPODSHARP_ASSEMBLIES) @ENABLE_IPOD_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @ENABLE_IPOD_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_IPOD_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@ENABLE_IPOD_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @ENABLE_IPOD_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_IPOD_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_IPOD_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -505,6 +509,7 @@ EXTRA_BUNDLE = $(IPODSHARP_ASSEMBLIES) @ENABLE_IPOD_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_IPOD_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_IPOD_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_IPOD_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @ENABLE_IPOD_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_IPOD_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_IPOD_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Dap/Banshee.Dap.Karma/Makefile.in b/src/Dap/Banshee.Dap.Karma/Makefile.in index 9551d71..4a51ca3 100644 --- a/src/Dap/Banshee.Dap.Karma/Makefile.in +++ b/src/Dap/Banshee.Dap.Karma/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -473,6 +475,8 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES) @ENABLE_KARMA_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @ENABLE_KARMA_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_KARMA_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@ENABLE_KARMA_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @ENABLE_KARMA_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_KARMA_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_KARMA_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -501,6 +505,7 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES) @ENABLE_KARMA_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_KARMA_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_KARMA_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_KARMA_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @ENABLE_KARMA_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_KARMA_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_KARMA_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml index dff3da8..e85b943 100644 --- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml +++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml @@ -35,13 +35,17 @@ + + vendor-id="0x04e8" product-id="0x6603,0x6601,0x6640,0x681d,0x681c"/> + +// +// Copyright (c) 2010 Novell, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using System; +using Gtk; +using Mono.Unix; + +using Lastfm.Gui; + +using Banshee.ServiceStack; +using Banshee.Preferences; + +using Banshee.Lastfm.Audioscrobbler; + +using StationError = Lastfm.StationError; +using RadioConnection = Lastfm.RadioConnection; + +namespace Banshee.Lastfm.Radio +{ + public class LastfmPreferences : IDisposable + { + private SourcePage source_page; + private Section account_section; + private Section prefs_section; + private SchemaPreference username_preference; + private Preference reporting_preference; + private LastfmSource source; + private AudioscrobblerService scrobbler; + + private bool Authorized { + get { return !String.IsNullOrEmpty (source.Account.SessionKey); } + } + + private bool NeedAuthorization { + get { return !String.IsNullOrEmpty (username_preference.Value) && !Authorized; } + } + + public string PageId { + get { return source_page.Id; } + } + + public LastfmPreferences (LastfmSource source) + { + var service = ServiceManager.Get (); + if (service == null) { + return; + } + + this.source = source; + + service.InstallWidgetAdapters += OnPreferencesServiceInstallWidgetAdapters; + source_page = new Banshee.Preferences.SourcePage (source) { + (account_section = new Section ("lastfm-account", Catalog.GetString ("Account"), 20) { + (username_preference = new SchemaPreference (LastfmSource.LastUserSchema, + Catalog.GetString ("_Username")) { + ShowLabel = false + }), + new VoidPreference ("lastfm-signup") + }), + (prefs_section = new Section ("lastfm-settings", Catalog.GetString ("Preferences"), 30)) + }; + + scrobbler = ServiceManager.Get (); + if (scrobbler != null) { + reporting_preference = new Preference ("enable-song-reporting", + Catalog.GetString ("_Enable Song Reporting"), null, scrobbler.Enabled); + reporting_preference.ValueChanged += root => scrobbler.Enabled = reporting_preference.Value; + prefs_section.Add (reporting_preference); + } + } + + public void Dispose () + { + PreferenceService service = ServiceManager.Get (); + if (service == null || source_page == null) { + return; + } + + service.InstallWidgetAdapters -= OnPreferencesServiceInstallWidgetAdapters; + source_page.Dispose (); + source_page = null; + } + + private enum SignInState { + SignedOut, + NeedAuthorization, + Failed, + SignedIn + } + + private SignInState sign_in_state; + private StationError last_sign_in_error; + private Table sign_in_box; + private LinkButton signup_button; + private LinkButton profile_page_button; + private bool need_authorization_checked = true; // state for at which button the auth arrows should point + + private void OnPreferencesServiceInstallWidgetAdapters (object sender, EventArgs args) + { + if (reporting_preference != null && scrobbler != null) { + reporting_preference.Value = scrobbler.Enabled; + } + + if (account_section == null) { + return; + } + + var align = new Alignment (0.0f, 0.0f, 1.0f, 1.0f) { + LeftPadding = 20, + RightPadding = 20 + }; + + sign_in_box = new Table (0, 0, false) { + ColumnSpacing = 6, + RowSpacing = 2 + }; + + align.Add (sign_in_box); + align.Show (); + + username_preference.DisplayWidget = align; + + align = new Alignment (0.5f, 0.5f, 1.0f, 1.0f) { + LeftPadding = 20, + RightPadding = 20, + TopPadding = 5 + }; + + var button_box = new HBox () { + Spacing = 6 + }; + + button_box.PackStart (new Badge (source.Account), false, false, 0); + + signup_button = new Gtk.LinkButton (source.Account.SignUpUrl, Catalog.GetString ("Sign up for Last.fm")); + signup_button.Xalign = 0f; + button_box.PackStart (signup_button, false, false, 0); + + profile_page_button = new Gtk.LinkButton (String.Empty, Catalog.GetString ("Visit Your Last.fm Profile Page")); + profile_page_button.Clicked += (o, e) => source.Account.VisitUserProfile (source.Account.UserName); + profile_page_button.Xalign = 0f; + button_box.PackStart (profile_page_button, false, false, 0); + + align.Add (button_box); + align.ShowAll (); + + account_section["lastfm-signup"].DisplayWidget = align; + + GetSignInState (); + BuildSignIn (); + } + + private void SignOut () + { + LastfmSource.LastSessionKeySchema.Set (String.Empty); + username_preference.Value = String.Empty; + source.Account.UserName = String.Empty; + source.Account.SessionKey = null; + source.Account.Save (); + } + + private void OnSignInClicked (object o, EventArgs args) + { + if (sign_in_state != SignInState.NeedAuthorization) { + sign_in_state = SignInState.NeedAuthorization; + } + + need_authorization_checked = !need_authorization_checked; + BuildSignIn (); + + source.Account.SessionKey = null; + source.Account.RequestAuthorization (); + } + + private void OnSignOutClicked (object o, EventArgs args) + { + SignOut (); + GetSignInState (); + BuildSignIn (); + } + + private void OnFinishSignInClicked (object o, EventArgs args) + { + last_sign_in_error = source.Account.FetchSessionKey (); + Hyena.Log.InformationFormat ("Last.fm authorization result = {0}", last_sign_in_error); + if (last_sign_in_error == StationError.TokenNotAuthorized) { + need_authorization_checked = true; + GetSignInState (); + } else if (last_sign_in_error == StationError.None) { + LastfmSource.LastSessionKeySchema.Set (source.Account.SessionKey); + source.Account.UserName = LastfmSource.LastUserSchema.Get (); + source.Account.Save (); + GetSignInState (); + } else { + SignOut (); + sign_in_state = SignInState.Failed; + } + BuildSignIn (); + } + + private void GetSignInState () + { + if (Authorized) { + sign_in_state = SignInState.SignedIn; + } else if (NeedAuthorization) { + sign_in_state = SignInState.NeedAuthorization; + } else { + sign_in_state = SignInState.SignedOut; + } + } + + private void BuildSignIn () + { + signup_button.Visible = sign_in_state != SignInState.SignedIn; + profile_page_button.Visible = sign_in_state == SignInState.SignedIn; + + var children = sign_in_box.Children; + foreach (var child in children) { + sign_in_box.Remove (child); + } + + var oauth_explain = Catalog.GetString ("Open Last.fm in a browser, giving you the option to authorize Banshee to work with your account"); + + switch (sign_in_state) { + case SignInState.SignedOut: + case SignInState.Failed: + need_authorization_checked = true; + + var username_entry = new Entry () { Text = username_preference.Value }; + username_entry.Changed += (o, e) => username_preference.Value = username_entry.Text; + username_entry.GrabFocus (); + + var sign_in_button = new Button (Catalog.GetString ("Log in to Last.fm")) { + TooltipText = oauth_explain + }; + sign_in_button.Clicked += OnSignInClicked; + + sign_in_box.Attach (new Label (Catalog.GetString ("_Username")), + 0, 1, 0, 1, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0); + sign_in_box.Attach (username_entry, + 1, 2, 0, 1, AttachOptions.Fill | AttachOptions.Expand, AttachOptions.Shrink, 0, 0); + sign_in_box.Attach (sign_in_button, + 2, 3, 0, 1, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0); + if (sign_in_state == SignInState.Failed) { + sign_in_box.Attach (new Hyena.Widgets.WrapLabel () { + Markup = String.Format ("{0}", GLib.Markup.EscapeText ( + RadioConnection.ErrorMessageFor (last_sign_in_error))) + }, 1, 3, 1, 2, AttachOptions.Fill | AttachOptions.Expand, AttachOptions.Shrink, 0, 0); + } + break; + case SignInState.NeedAuthorization: + sign_in_box.Attach (new Hyena.Widgets.WrapLabel () { + Markup = String.Format ("{0}", GLib.Markup.EscapeText ( + Catalog.GetString ("You need to allow Banshee to access your Last.fm account."))), + }, 0, 1, 0, 2, AttachOptions.Fill | AttachOptions.Expand, AttachOptions.Shrink, 0, 0); + + var r = need_authorization_checked ? 1u : 0u; + sign_in_box.Attach (new Image (Stock.GoForward, IconSize.Button), + 1, 2, r, r + 1, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0); + + sign_in_box.Attach (new Image (Stock.GoBack, IconSize.Button), + 3, 4, r, r + 1, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0); + + var check_auth_button = new Button (Catalog.GetString ("Finish Logging In")); + check_auth_button.Clicked += OnFinishSignInClicked; + sign_in_box.Attach (check_auth_button, + 2, 3, 0, 1, AttachOptions.Fill, AttachOptions.Shrink, 0, 0); + + var try_again_button = new Button (Catalog.GetString ("Try Again")) { + TooltipText = oauth_explain + }; + try_again_button.Clicked += OnSignInClicked; + sign_in_box.Attach (try_again_button, + 2, 3, 1, 2, AttachOptions.Fill, AttachOptions.Shrink, 0, 0); + break; + case SignInState.SignedIn: + sign_in_box.Attach (new Hyena.Widgets.WrapLabel () { + Markup = String.Format (Catalog.GetString ("You are logged in to Last.fm as the user {0}."), + source.Account.UserName) + }, 0, 1, 0, 1, AttachOptions.Fill | AttachOptions.Expand, AttachOptions.Shrink, 0, 0); + var log_out_button = new Button (Catalog.GetString ("Log out of Last.fm")); + log_out_button.Clicked += OnSignOutClicked; + sign_in_box.Attach (log_out_button, 1, 2, 0, 1, + AttachOptions.Shrink, AttachOptions.Shrink, 0, 0); + break; + } + + sign_in_box.ShowAll (); + } + } +} diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs index 1e636b4..0ca9697 100644 --- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs +++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs @@ -71,6 +71,8 @@ namespace Banshee.Lastfm.Radio get { return actions; } } + private LastfmPreferences preferences; + public LastfmSource () : base (lastfm, lastfm, 210, lastfm) { account = LastfmCore.Account; @@ -112,7 +114,7 @@ namespace Banshee.Lastfm.Radio Properties.Set ("Nereid.SourceContents.HeaderVisible", false); actions = new LastfmActions (this); - InstallPreferences (); + preferences = new LastfmPreferences (this); ServiceManager.SourceManager.AddSource (this); @@ -125,11 +127,12 @@ namespace Banshee.Lastfm.Radio Connection.StateChanged -= HandleConnectionStateChanged; ServiceManager.Get ().StateChanged -= HandleNetworkStateChanged; Connection.Dispose (); - UninstallPreferences (); + preferences.Dispose (); actions.Dispose (); actions = null; connection = null; + preferences = null; account = null; } @@ -278,101 +281,8 @@ namespace Banshee.Lastfm.Radio status_message.ThawNotify (); } - private SourcePage pref_page; - private Section pref_section; - private SchemaPreference user_pref; - - private void InstallPreferences () - { - PreferenceService service = ServiceManager.Get (); - if (service == null) { - return; - } - - service.InstallWidgetAdapters += OnPreferencesServiceInstallWidgetAdapters; - pref_page = new Banshee.Preferences.SourcePage (this); - pref_section = pref_page.Add (new Section ("lastfm-account", Catalog.GetString ("Account"), 20)); - pref_section.ShowLabel = false; - - user_pref = new SchemaPreference (LastUserSchema, Catalog.GetString ("_Username")); - pref_section.Add (user_pref); - pref_section.Add (new VoidPreference ("lastfm-signup")); - } - - private void UninstallPreferences () - { - PreferenceService service = ServiceManager.Get (); - if (service == null || pref_page == null) { - return; - } - - service.InstallWidgetAdapters -= OnPreferencesServiceInstallWidgetAdapters; - pref_page.Dispose (); - pref_page = null; - } - - private bool Authorized { get { return !String.IsNullOrEmpty (account.SessionKey); } } - private bool NeedAuth { get { return !String.IsNullOrEmpty (user_pref.Value) && !Authorized; } } - - private void OnPreferencesServiceInstallWidgetAdapters (object sender, EventArgs args) - { - if (pref_section == null) { - return; - } - - var user_entry = new Gtk.Entry (user_pref.Value ?? ""); - user_entry.Changed += (o, a) => { user_pref.Value = user_entry.Text; }; - - var auth_button = new Gtk.Button (Authorized ? Catalog.GetString ("Authorized!") : Catalog.GetString ("Authorize...")); - user_pref.ValueChanged += (s) => { auth_button.Sensitive = NeedAuth; }; - auth_button.Sensitive = NeedAuth; - auth_button.TooltipText = Catalog.GetString ("Open Last.fm in a browser, giving you the option to authorize Banshee to work with your account"); - auth_button.Clicked += delegate { - account.SessionKey = null; - account.RequestAuthorization (); - }; - - var signup_button = new Gtk.LinkButton (account.SignUpUrl, Catalog.GetString ("Sign up for Last.fm")); - signup_button.Xalign = 0f; - - var refresh_button = new Gtk.Button (new Gtk.Image (Gtk.Stock.Refresh, Gtk.IconSize.Button)); - user_pref.ValueChanged += (s) => { refresh_button.Sensitive = NeedAuth; }; - refresh_button.Sensitive = NeedAuth; - refresh_button.TooltipText = Catalog.GetString ("Check if Banshee has been authorized"); - refresh_button.Clicked += delegate { - if (String.IsNullOrEmpty (account.UserName) || account.SessionKey == null) { - account.UserName = LastUserSchema.Get (); - account.FetchSessionKey (); - account.Save (); - if (account.SessionKey != null) { - LastSessionKeySchema.Set (account.SessionKey); - } - } - - auth_button.Sensitive = refresh_button.Sensitive = NeedAuth; - auth_button.Label = Authorized - ? Catalog.GetString ("Authorized!") - : Catalog.GetString ("Authorize..."); - }; - - var auth_box = new Gtk.HBox () { Spacing = 6 }; - auth_box.PackStart (user_entry, true, true, 0); - auth_box.PackStart (auth_button, false, false, 0); - auth_box.PackStart (refresh_button, false, false, 0); - auth_box.ShowAll (); - - signup_button.Visible = String.IsNullOrEmpty (user_pref.Value); - - var button_box = new Gtk.HBox () { Spacing = 6 }; - button_box.PackStart (new Badge (account) { Visible = true}, false, false, 0); - button_box.PackStart (signup_button, true, true, 0); - - user_pref.DisplayWidget = auth_box; - pref_section["lastfm-signup"].DisplayWidget = button_box; - } - public override string PreferencesPageId { - get { return pref_page.Id; } + get { return preferences.PageId; } } public static readonly SchemaEntry EnabledSchema = new SchemaEntry ( diff --git a/src/Extensions/Banshee.Lastfm/Makefile.am b/src/Extensions/Banshee.Lastfm/Makefile.am index 5352929..41444eb 100644 --- a/src/Extensions/Banshee.Lastfm/Makefile.am +++ b/src/Extensions/Banshee.Lastfm/Makefile.am @@ -8,6 +8,7 @@ SOURCES = \ Banshee.Lastfm.Audioscrobbler/Queue.cs \ Banshee.Lastfm.Radio/LastfmActions.cs \ Banshee.Lastfm.Radio/LastfmColumnController.cs \ + Banshee.Lastfm.Radio/LastfmPreferences.cs \ Banshee.Lastfm.Radio/LastfmSource.cs \ Banshee.Lastfm.Radio/LastfmSourceContents.cs \ Banshee.Lastfm.Radio/LastfmTrackInfo.cs \ diff --git a/src/Extensions/Banshee.Lastfm/Makefile.in b/src/Extensions/Banshee.Lastfm/Makefile.in index 75a8e4c..389f483 100644 --- a/src/Extensions/Banshee.Lastfm/Makefile.in +++ b/src/Extensions/Banshee.Lastfm/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -372,6 +374,7 @@ SOURCES = \ Banshee.Lastfm.Audioscrobbler/Queue.cs \ Banshee.Lastfm.Radio/LastfmActions.cs \ Banshee.Lastfm.Radio/LastfmColumnController.cs \ + Banshee.Lastfm.Radio/LastfmPreferences.cs \ Banshee.Lastfm.Radio/LastfmSource.cs \ Banshee.Lastfm.Radio/LastfmSourceContents.cs \ Banshee.Lastfm.Radio/LastfmTrackInfo.cs \ @@ -491,6 +494,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -519,6 +524,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs index 6f1aef5..05a5d2d 100644 --- a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs +++ b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs @@ -66,6 +66,14 @@ namespace Banshee.LibraryWatcher */ AddLibrary (ServiceManager.SourceManager.MusicLibrary); AddLibrary (ServiceManager.SourceManager.VideoLibrary); + + if (ServiceManager.SourceManager.MusicLibrary.Count == 0) { + new Banshee.Collection.RescanPipeline (ServiceManager.SourceManager.MusicLibrary); + } + + if (ServiceManager.SourceManager.VideoLibrary.Count == 0) { + new Banshee.Collection.RescanPipeline (ServiceManager.SourceManager.VideoLibrary); + } } public void Dispose () diff --git a/src/Extensions/Banshee.LibraryWatcher/Makefile.in b/src/Extensions/Banshee.LibraryWatcher/Makefile.in index d81e886..cec6400 100644 --- a/src/Extensions/Banshee.LibraryWatcher/Makefile.in +++ b/src/Extensions/Banshee.LibraryWatcher/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -472,6 +474,8 @@ RESOURCES = Banshee.LibraryWatcher.addin.xml @ENABLE_LIBRARY_WATCHER_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @ENABLE_LIBRARY_WATCHER_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_LIBRARY_WATCHER_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@ENABLE_LIBRARY_WATCHER_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @ENABLE_LIBRARY_WATCHER_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_LIBRARY_WATCHER_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_LIBRARY_WATCHER_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -500,6 +504,7 @@ RESOURCES = Banshee.LibraryWatcher.addin.xml @ENABLE_LIBRARY_WATCHER_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_LIBRARY_WATCHER_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_LIBRARY_WATCHER_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_LIBRARY_WATCHER_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @ENABLE_LIBRARY_WATCHER_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_LIBRARY_WATCHER_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_LIBRARY_WATCHER_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml index eb5a5ef..1b39701 100644 --- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml +++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml @@ -18,9 +18,9 @@ - + - + diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs index f2e0681..d67ad7d 100644 --- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs +++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs @@ -1,21 +1,21 @@ // // MediaPanelContents.cs -// +// // Author: // Aaron Bockover -// -// Copyright 2009-2010 Novell, Inc. -// +// +// Copyright 2010 Novell, Inc. +// // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal // in the Software without restriction, including without limitation the rights // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell // copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: -// +// // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -25,12 +25,13 @@ // THE SOFTWARE. using System; -using Gtk; -using Mono.Unix; +using System.Collections.Generic; -// using Banshee.PlayQueue; +using Mono.Unix; +using Gtk; using Hyena; +using Hyena.Data; using Hyena.Gui; using Hyena.Data.Gui; @@ -39,61 +40,225 @@ using Banshee.Sources; using Banshee.Sources.Gui; using Banshee.Collection; using Banshee.Collection.Gui; -using Banshee.Collection.Database; +using Banshee.MediaEngine; +using Banshee.Gui.Widgets; namespace Banshee.MeeGo { - public class MediaPanelContents : VBox + public class MediaPanelContents : Table, ITrackModelSourceContents { + private ArtistListView artist_view; + private AlbumListView album_view; + private TerseTrackListView track_view; + private SourceComboBox source_combo_box; - private HBox header_box; private SearchEntry search_entry; - private MeeGoSourceContents source_contents; + private MeeGoTrackInfoDisplay track_info_display; + + private ISource source; + private Dictionary model_positions = new Dictionary (); + + protected MediaPanelContents (IntPtr raw) : base (raw) + { + } + + public MediaPanelContents () : base (2, 2, false) + { + BorderWidth = 5; + RowSpacing = 6; + ColumnSpacing = 7; + RedrawOnAllocate = true; + AppPaintable = true; + + BuildHeader (); + BuildLibrary (); + BuildNowPlaying (); + ConnectEvents (); + + SetSource (ServiceManager.SourceManager.ActiveSource); + } + + private void ConnectEvents () + { + ServiceManager.SourceManager.ActiveSourceChanged += OnActiveSourceChanged; + + ServiceManager.PlayerEngine.ConnectEvent ((args) => track_info_display.Visible = + ServiceManager.PlayerEngine.CurrentState != PlayerState.Idle, + PlayerEvent.StateChange | PlayerEvent.StartOfStream); + + source_combo_box.Model.Filter = (source) => + source == ServiceManager.SourceManager.MusicLibrary || + source.Parent == ServiceManager.SourceManager.MusicLibrary || + source.GetType ().FullName == "Banshee.PlayQueue.PlayQueueSource"; + source_combo_box.Model.Refresh (); + source_combo_box.UpdateActiveSource (); + + search_entry.Changed += OnSearchEntryChanged; + + artist_view.SelectionProxy.Changed += OnBrowserViewSelectionChanged; + album_view.SelectionProxy.Changed += OnBrowserViewSelectionChanged; + } + +#region UI Construction + + private void BuildHeader () + { + Attach (new Label { + Markup = String.Format ("{0}", + GLib.Markup.EscapeText (Catalog.GetString ("Media"))), + Xalign = 0.0f + }, + 0, 2, 0, 1, + AttachOptions.Fill | AttachOptions.Expand, + AttachOptions.Shrink, 12, 0); + } - public MediaPanelContents () + private void BuildLibrary () { - BorderWidth = 12; - Spacing = 12; + var box = new MeeGoHeaderBox () { Title = Catalog.GetString ("Library") }; - header_box = new HBox () { + // Build the Library Header + var header = new HBox () { Spacing = 5, BorderWidth = 5 }; - header_box.PackStart (source_combo_box = new SourceComboBox (), false, false, 0); - - var button = new Button (new Image () { + var app_button = new Button (new Image () { IconSize = (int)IconSize.LargeToolbar, IconName = "media-player-banshee" }) { TooltipText = Catalog.GetString ("Launch the Banshee Media Player") }; - - button.Clicked += (o, e) => { + app_button.Clicked += (o, e) => { ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary); ServiceManager.Get ().PresentPrimaryInterface (); }; - header_box.PackStart (button, false, false, 0); - header_box.PackStart (search_entry = new SearchEntry (), true, true, 0); - header_box.PackStart (new PlaybackBox (), false, false, 0); + header.PackStart (source_combo_box = new SourceComboBox (), false, false, 0); + header.PackStart (app_button, false, false, 0); + header.PackStart (search_entry = new SearchEntry (), true, true, 0); + box.PackStartHighlighted (header, false, false, 0, MeeGoHeaderBox.HighlightFlags.Background); + + // Build the Library Views + var views = new HBox () { Spacing = 5 }; + views.PackStart (SetupView (artist_view = new ArtistListView () { + Name = "meego-panel-artists", + WidthRequest = 150, + DoNotRenderNullModel = true + }), false, false, 0); + views.PackStart (SetupView (album_view = new AlbumListView () { + Name = "meego-panel-albums", + DoNotRenderNullModel = true + }), true, true, 0); + box.PackStart (views, true, true, 0); + + Attach (box, 0, 1, 1, 2, + AttachOptions.Expand | AttachOptions.Fill, + AttachOptions.Expand | AttachOptions.Fill, + 0, 0); + } - PackStart (header_box, false, false, 0); - PackStart (source_contents = new MeeGoSourceContents (), true, true, 0); + private void BuildNowPlaying () + { + var box = new MeeGoHeaderBox () { Title = Catalog.GetString ("Now Playing") }; - ShowAll (); + var seek_slider = new ConnectedSeekSlider (SeekSliderLayout.Horizontal); + seek_slider.StreamPositionLabel.FormatString = "{0}"; - source_combo_box.Model.Filter = (source) => - source == ServiceManager.SourceManager.MusicLibrary || - source.Parent == ServiceManager.SourceManager.MusicLibrary || - source.GetType ().FullName == "Banshee.PlayQueue.PlayQueueSource"; - source_combo_box.Model.Refresh (); - source_combo_box.UpdateActiveSource (); + track_info_display = new MeeGoTrackInfoDisplay () { + HeightRequest = 64, + NoShowAll = true + }; - search_entry.Changed += OnSearchEntryChanged; + track_view = new TerseTrackListView () { + Name = "meego-panel-tracks", + WidthRequest = 220 + }; + track_view.ColumnController.Insert (new Column (null, "indicator", + new ColumnCellStatusIndicator (null), 0.05, true, 20, 20), 0); + + box.PackStartHighlighted (track_info_display, false, false, 0, MeeGoHeaderBox.HighlightFlags.Background); + box.PackStartHighlighted (seek_slider, false, false, 0, MeeGoHeaderBox.HighlightFlags.Background); + box.PackStart (SetupView (track_view), true, true, 0); + box.PackStartHighlighted (new PlaybackBox (), false, false, 0, MeeGoHeaderBox.HighlightFlags.TopLine); + + Attach (box, 1, 2, 1, 2, + AttachOptions.Shrink, + AttachOptions.Expand | AttachOptions.Fill, + 0, 0); + } - source_contents.SetSource (ServiceManager.SourceManager.ActiveSource); - ServiceManager.SourceManager.ActiveSourceChanged += OnActiveSourceChanged; + private ScrolledWindow SetupView (Widget view) + { + var scrolled = new ScrolledWindow () { + VscrollbarPolicy = PolicyType.Automatic, + HscrollbarPolicy = PolicyType.Never, + ShadowType = ShadowType.None + }; + scrolled.Add (view); + return scrolled; + } + +#endregion + +#region Background Rendering + + protected override void OnParentSet (Widget previous) + { + base.OnParentSet (previous); + + if (Parent != null) { + Parent.ModifyBg (StateType.Normal, Style.White); + } + } + + protected override bool OnExposeEvent (Gdk.EventExpose evnt) + { + if (!Visible || !IsMapped) { + return true; + } + + RenderBackground (evnt.Window, evnt.Region); + foreach (var child in Children) { + PropagateExpose (child, evnt); + } + + return true; + } + + private void RenderBackground (Gdk.Window window, Gdk.Region region) + { + var cr = Gdk.CairoHelper.Create (window); + + var grad = new Cairo.LinearGradient (0, 0, 0, Allocation.Height); + grad.AddColorStop (0, CairoExtensions.RgbToColor (0xffffff)); + grad.AddColorStop (1, CairoExtensions.RgbToColor (0xc3c3c3)); + cr.Pattern = grad; + cr.Rectangle (0, 0, Allocation.Width, Allocation.Height); + cr.Fill (); + grad.Destroy (); + + CairoExtensions.DisposeContext (cr); + } + +#endregion + +#region Event Handlers + + private void OnBrowserViewSelectionChanged (object o, EventArgs args) + { + // Scroll the raising filter view to the top if "all" is selected + var selection = (Hyena.Collections.Selection)o; + if (!selection.AllSelected) { + return; + } + + if (artist_view.Selection == selection) { + artist_view.ScrollTo (0); + } else if (album_view.Selection == selection) { + album_view.ScrollTo (0); + } } private void OnSearchEntryChanged (object o, EventArgs args) @@ -121,52 +286,115 @@ namespace Banshee.MeeGo search_entry.ActivateFilter ((int)source.FilterType); } - source_contents.ResetSource (); - source_contents.SetSource (source); + ResetSource (); + SetSource (source); search_entry.Ready = true; }); } - protected override void OnParentSet (Widget previous) + internal void SyncSearchEntry () { - base.OnParentSet (previous); + OnActiveSourceChanged (null); + } - if (Parent != null) { - Parent.ModifyBg (StateType.Normal, Style.White); +#endregion + +#region View<->Model binding + + private void SetModel (IListModel model) + { + ListView view = FindListView (); + if (view != null) { + SetModel (view, model); + } else { + Hyena.Log.DebugFormat ("Unable to find view for model {0}", model); } } - protected override bool OnExposeEvent (Gdk.EventExpose evnt) + private void SetModel (ListView view, IListModel model) { - if (!Visible || !IsMapped) { - return true; + if (view.Model != null) { + model_positions[view.Model] = view.Vadjustment.Value; } - RenderBackground (evnt.Window, evnt.Region); - foreach (var child in Children) { - PropagateExpose (child, evnt); + if (model == null) { + view.SetModel (null); + return; + } + + if (!model_positions.ContainsKey (model)) { + model_positions[model] = 0.0; + } + + view.SetModel (model, model_positions[model]); + } + + private ListView FindListView () + { + foreach (var view in new IListView [] { artist_view, album_view, track_view }) { + if (view is ListView) { + return (ListView)view; + } + } + return null; + } + +#endregion + +#region ISourceContents + + public bool SetSource (ISource source) + { + var track_source = source as ITrackModelSource; + var filterable_source = source as IFilterableSource; + if (track_source == null) { + return false; + } + + this.source = source; + + SetModel (track_view, track_source.TrackModel); + + if (filterable_source != null && filterable_source.CurrentFilters != null) { + foreach (var model in filterable_source.CurrentFilters) { + if (model is IListModel) { + SetModel (artist_view, (model as IListModel)); + } else if (model is IListModel) { + SetModel (album_view, (model as IListModel)); + } + } } return true; } - private void RenderBackground (Gdk.Window window, Gdk.Region region) + public void ResetSource () { - var cr = Gdk.CairoHelper.Create (window); - cr.Color = new Cairo.Color (0xe7 / (double)0xff, - 0xea / (double)0xff, 0xfd / (double)0xff); + source = null; + SetModel (track_view, null); + SetModel (artist_view, null); + SetModel (album_view, null); + track_view.HeaderVisible = false; + } - CairoExtensions.RoundedRectangle (cr, - header_box.Allocation.X, - header_box.Allocation.Y, - header_box.Allocation.Width, - header_box.Allocation.Height, - 5); + public ISource Source { + get { return source; } + } - cr.Fill (); + public Widget Widget { + get { return this; } + } - CairoExtensions.DisposeContext (cr); +#endregion + +#region ITrackModelSourceContents + + public IListView TrackView { + get { return track_view; } } + +#endregion + } } diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoHeaderBox.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoHeaderBox.cs new file mode 100644 index 0000000..80bf61d --- /dev/null +++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoHeaderBox.cs @@ -0,0 +1,196 @@ +// +// MeeGoHeaderBox.cs +// +// Author: +// Aaron Bockover +// +// Copyright 2010 Novell, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using System; +using System.Collections.Generic; + +using Gtk; + +using Hyena.Gui; + +namespace Banshee.MeeGo +{ + public class MeeGoHeaderBox : VBox + { + [Flags] + public enum HighlightFlags + { + None = 0, + Background = 1, + TopLine = 2, + BottomLine = 4 + } + + private Dictionary highlight_widgets = new Dictionary (); + + private Alignment header; + private Label header_label; + private string header_label_text; + + protected MeeGoHeaderBox (IntPtr raw) : base (raw) + { + } + + public MeeGoHeaderBox () + { + BorderWidth = 5; + Spacing = 5; + RedrawOnAllocate = true; + AppPaintable = true; + + header = new Alignment (0.0f, 0.5f, 1.0f, 1.0f) { + LeftPadding = 10, + RightPadding = 10, + TopPadding = 5, + BottomPadding = 5 + }; + header_label = new Label () { Xalign = 0.0f }; + header.Add (header_label); + header.ShowAll (); + PackStart (header, false, false, 0); + } + + public void PackStartHighlighted (Widget child, bool expand, bool fill, uint padding, HighlightFlags highlightFlags) + { + PackStart (child, expand, fill, padding); + if (highlightFlags != HighlightFlags.None) { + highlight_widgets.Add (child, highlightFlags); + } + } + + protected override void OnRemoved (Widget widget) + { + base.OnRemoved (widget); + highlight_widgets.Remove (widget); + } + + public string Title { + get { return header_label_text; } + set { + header_label_text = value; + header_label.Markup = String.Format ("{0}", + GLib.Markup.EscapeText (value)); + } + } + + protected override bool OnExposeEvent (Gdk.EventExpose evnt) + { + if (!Visible || !IsMapped) { + return true; + } + + RenderBackground (evnt.Window, evnt.Region); + foreach (var child in Children) { + PropagateExpose (child, evnt); + } + + return true; + } + + private void RenderBackground (Gdk.Window window, Gdk.Region region) + { + var cr = Gdk.CairoHelper.Create (window); + + // Box background + CairoExtensions.RoundedRectangle (cr, + Allocation.X, + Allocation.Y, + Allocation.Width, + Allocation.Height, + 3); + cr.Color = CairoExtensions.RgbToColor (0xf9f9f9); + cr.Fill (); + + // Box border + cr.LineWidth = 1.0; + CairoExtensions.RoundedRectangle (cr, + Allocation.X + 0.5, + Allocation.Y + 0.5, + Allocation.Width - 1, + Allocation.Height - 1, + 3); + cr.Color = CairoExtensions.RgbToColor (0x8f8f8f); + cr.Stroke (); + + // Box header background + CairoExtensions.RoundedRectangle (cr, + Allocation.X + 3, + Allocation.Y + 3, + Allocation.Width - 6, + header.Allocation.Height + 3, + 2, CairoCorners.TopLeft | CairoCorners.TopRight); + cr.Color = CairoExtensions.RgbToColor (0xd7d9d6); + cr.Fill (); + + // Highlight children + foreach (var item in highlight_widgets) { + var widget = item.Key; + var flags = item.Value; + + if (!widget.Visible || !widget.IsMapped) { + continue; + } + + if ((flags & HighlightFlags.Background) != 0) { + cr.Rectangle ( + Allocation.X + 3, + widget.Allocation.Y - Spacing + 2, + Allocation.Width - 6, + widget.Allocation.Height + Spacing + 2); + cr.Color = CairoExtensions.RgbToColor (0xf6f6f6); + cr.Fill (); + } + + cr.LineWidth = 1; + cr.Color = CairoExtensions.RgbToColor (0x8f8f8f); + + if ((flags & HighlightFlags.TopLine) != 0) { + cr.MoveTo ( + Allocation.X + 0.5, + widget.Allocation.Y + 0.5); + cr.LineTo ( + Allocation.X + Allocation.Width - 1, + widget.Allocation.Y + 0.5); + cr.Stroke (); + } + + if ((flags & HighlightFlags.BottomLine) != 0) { + cr.MoveTo ( + Allocation.X + 0.5, + widget.Allocation.Y + widget.Allocation.Height + 0.5); + cr.LineTo ( + Allocation.X + Allocation.Width - 1, + widget.Allocation.Y + widget.Allocation.Height + 0.5); + cr.Stroke (); + } + } + + CairoExtensions.DisposeContext (cr); + } + } +} + diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs index 320c646..88486cb 100644 --- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs +++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs @@ -25,12 +25,14 @@ // THE SOFTWARE. using System; +using Mono.Unix; using Gtk; using MeeGo.Panel; using Hyena; using Banshee.Base; +using Banshee.ServiceStack; namespace Banshee.MeeGo { @@ -42,7 +44,6 @@ namespace Banshee.MeeGo private Window window_panel; public MediaPanelContents Contents { get; private set; } - public bool Enabled { get; private set; } public MeeGoPanel () { @@ -52,21 +53,20 @@ namespace Banshee.MeeGo Instance = this; - if (!ApplicationContext.CommandLine.Contains ("mutter-panel")) { - Log.Debug ("MeeGo extension enabled, but --mutter-panel not " + - "passed to command line; disabling panel integration."); - return; - } - - Enabled = true; - var timer = Log.DebugTimerStart (); try { Log.Debug ("Attempting to create MeeGo toolbar panel"); - embedded_panel = new PanelGtk ("banshee", "media", null, "media-button", true); - while (Application.EventsPending ()) { - Application.RunIteration (); + embedded_panel = new PanelGtk ("banshee", Catalog.GetString ("Banshee Media Player"), + null, "media-button", true); + embedded_panel.ShowBeginEvent += (o, e) => { + ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary); + if (Contents != null) { + Contents.SyncSearchEntry (); + } + }; + while (Gtk.Application.EventsPending ()) { + Gtk.Application.RunIteration (); } } catch (Exception e) { if (!(e is DllNotFoundException)) { @@ -84,10 +84,6 @@ namespace Banshee.MeeGo public void BuildContents () { - if (!Enabled) { - return; - } - var timer = Log.DebugTimerStart (); Contents = new MediaPanelContents (); Contents.ShowAll (); diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs index c46c4bf..ffac0f1 100644 --- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs +++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs @@ -47,19 +47,10 @@ namespace Banshee.MeeGo private InterfaceActionService interface_action_service; private SourceManager source_manager; private PlayerEngineService player; - private Source now_playing; - private MeeGoPanel panel; void IExtensionService.Initialize () { - // We need to create the MeeGo panel connection as soon as possible - // to keep mutter-moblin's toolbar from thinking we crashed (timing out). - // The contents of the panel will be constructed later on. - if (MeeGoPanel.Instance.Enabled) { - panel = MeeGoPanel.Instance; - } - elements_service = ServiceManager.Get (); interface_action_service = ServiceManager.Get (); source_manager = ServiceManager.SourceManager; @@ -101,16 +92,12 @@ namespace Banshee.MeeGo private void Initialize () { - // regular metacity does not seem to like this at all, crashing - // and complaining "Window manager warning: Buggy client sent a - // _NET_ACTIVE_WINDOW message with a timestamp of 0 for 0x2e00020" - if (panel != null) { - elements_service.PrimaryWindow.Decorated = false; - elements_service.PrimaryWindow.Maximize (); - } - - // Set the internal engine volume to 100% - ServiceManager.PlayerEngine.Volume = 100; + // If Banshee is running from the MeeGo client entry assembly, + // the MeeGoPanel will have already been created. If not, we + // assume we're probably not really running in a MeeGo environment, + // so we just create the panel here (which is likely to just be + // a separate top-level window for testing). + panel = MeeGoPanel.Instance ?? new MeeGoPanel (); if (panel == null) { Log.Warning ("MeeGo extension initialized without a panel"); @@ -129,43 +116,6 @@ namespace Banshee.MeeGo elements_service.PrimaryWindow.Hide (); return false; }; - - FindNowPlaying (); - ServiceManager.PlayerEngine.ConnectEvent (OnPlayerStateChanged, - PlayerEvent.StateChange | PlayerEvent.StartOfStream); - } - - private void OnPlayerStateChanged (PlayerEventArgs args) - { - var player = ServiceManager.PlayerEngine; - if (player.CurrentState == PlayerState.Playing && - player.CurrentTrack.HasAttribute (TrackMediaAttributes.VideoStream)) { - if (now_playing != null) { - ServiceManager.SourceManager.SetActiveSource (now_playing); - } - - PresentPrimaryInterface (); - } - } - - private void FindNowPlaying () - { - foreach (var src in ServiceManager.SourceManager.Sources) { - if (src.UniqueId.Contains ("now-playing")) { - now_playing = src; - break; - } - } - - if (now_playing != null) { - return; - } - - Banshee.ServiceStack.ServiceManager.SourceManager.SourceAdded += (args) => { - if (now_playing == null && args.Source.UniqueId.Contains ("now-playing")) { - now_playing = args.Source; - } - }; } public void PresentPrimaryInterface () @@ -181,6 +131,7 @@ namespace Banshee.MeeGo { if (panel != null) { panel.Dispose (); + panel = null; } interface_action_service = null; diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoSourceContents.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoSourceContents.cs deleted file mode 100644 index 5bcb516..0000000 --- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoSourceContents.cs +++ /dev/null @@ -1,211 +0,0 @@ -// -// MeeGoSourceContents.cs -// -// Author: -// Aaron Bockover -// -// Copyright 2010 Novell, Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -using System; -using System.Collections.Generic; - -using Gtk; - -using Hyena.Data; -using Hyena.Data.Gui; - -using Banshee.ServiceStack; -using Banshee.Sources; -using Banshee.Sources.Gui; -using Banshee.Collection; -using Banshee.Collection.Gui; -using Banshee.MediaEngine; - -namespace Banshee.MeeGo -{ - public class MeeGoSourceContents : HBox, ITrackModelSourceContents - { - private ArtistListView artist_view; - private AlbumListView album_view; - private TerseTrackListView track_view; - - private MeeGoTrackInfoDisplay track_info_display; - - private ISource source; - private Dictionary model_positions = new Dictionary (); - - public MeeGoSourceContents () - { - Spacing = 5; - - var side_box = new VBox () { - Spacing = 5 - }; - - PackStart (SetupView (artist_view = new ArtistListView ()), false, false, 0); - PackStart (SetupView (album_view = new AlbumListView ()), true, true, 0); - PackStart (side_box, false, false, 0); - side_box.PackStart (SetupView (track_view = new TerseTrackListView ()), true, true, 0); - track_view.ColumnController.Insert (new Column (null, "indicator", - new ColumnCellStatusIndicator (null), 0.05, true, 20, 20), 0); - side_box.PackStart (track_info_display = new MeeGoTrackInfoDisplay (), false, false, 0); - - track_info_display.HeightRequest = 64; - track_info_display.NoShowAll = true; - - artist_view.WidthRequest = 150; - track_view.WidthRequest = 220; - artist_view.DoNotRenderNullModel = true; - album_view.DoNotRenderNullModel = true; - - artist_view.SelectionProxy.Changed += OnBrowserViewSelectionChanged; - album_view.SelectionProxy.Changed += OnBrowserViewSelectionChanged; - - ServiceManager.PlayerEngine.ConnectEvent ((args) => track_info_display.Visible = - ServiceManager.PlayerEngine.CurrentState != PlayerState.Idle, - PlayerEvent.StateChange | PlayerEvent.StartOfStream); - } - - private ScrolledWindow SetupView (Widget view) - { - var scrolled = new ScrolledWindow () { - VscrollbarPolicy = PolicyType.Automatic, - HscrollbarPolicy = PolicyType.Never, - ShadowType = ShadowType.None - }; - scrolled.Add (view); - return scrolled; - } - - private void OnBrowserViewSelectionChanged (object o, EventArgs args) - { - // Scroll the raising filter view to the top if "all" is selected - var selection = (Hyena.Collections.Selection)o; - if (!selection.AllSelected) { - return; - } - - if (artist_view.Selection == selection) { - artist_view.ScrollTo (0); - } else if (album_view.Selection == selection) { - album_view.ScrollTo (0); - } - } - -#region View<->Model binding - - private void SetModel (IListModel model) - { - ListView view = FindListView (); - if (view != null) { - SetModel (view, model); - } else { - Hyena.Log.DebugFormat ("Unable to find view for model {0}", model); - } - } - - private void SetModel (ListView view, IListModel model) - { - if (view.Model != null) { - model_positions[view.Model] = view.Vadjustment.Value; - } - - if (model == null) { - view.SetModel (null); - return; - } - - if (!model_positions.ContainsKey (model)) { - model_positions[model] = 0.0; - } - - view.SetModel (model, model_positions[model]); - } - - private ListView FindListView () - { - foreach (var view in new IListView [] { artist_view, album_view, track_view }) { - if (view is ListView) { - return (ListView)view; - } - } - return null; - } - -#endregion - -#region ISourceContents - - public bool SetSource (ISource source) - { - var track_source = source as ITrackModelSource; - var filterable_source = source as IFilterableSource; - if (track_source == null) { - return false; - } - - this.source = source; - - SetModel (track_view, track_source.TrackModel); - - if (filterable_source != null && filterable_source.CurrentFilters != null) { - foreach (var model in filterable_source.CurrentFilters) { - if (model is IListModel) { - SetModel (artist_view, (model as IListModel)); - } else if (model is IListModel) { - SetModel (album_view, (model as IListModel)); - } - } - } - - return true; - } - - public void ResetSource () - { - source = null; - SetModel (track_view, null); - SetModel (artist_view, null); - SetModel (album_view, null); - track_view.HeaderVisible = false; - } - - public ISource Source { - get { return source; } - } - - public Widget Widget { - get { return this; } - } - -#endregion - -#region ITrackModelSourceContents - - public IListView TrackView { - get { return track_view; } - } - -#endregion - - } -} - diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTheme.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTheme.cs new file mode 100644 index 0000000..231ad0c --- /dev/null +++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTheme.cs @@ -0,0 +1,163 @@ +// +// MeeGoTheme.cs +// +// Author: +// Aaron Bockover +// +// Copyright 2010 Novell, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using System; + +using Gtk; +using Cairo; + +using Hyena.Gui; +using Hyena.Gui.Theming; + +namespace Banshee.MeeGo +{ + public class MeeGoThemeLoader + { + public MeeGoThemeLoader () + { + Hyena.Gui.Theming.ThemeEngine.SetCurrentTheme (); + } + } + + public class MeeGoTheme : GtkTheme + { + public MeeGoTheme (Widget widget) : base (widget) + { + } + + private bool IsSourceViewWidget; + private bool IsPanelWidget; + private bool IsRoundedFrameWidget; + + public override void PushContext () + { + IsPanelWidget = Widget != null && Widget.Name.StartsWith ("meego-panel"); + IsSourceViewWidget = Widget is Banshee.Sources.Gui.SourceView; + IsRoundedFrameWidget = Widget is Hyena.Widgets.RoundedFrame; + + PushContext (new ThemeContext () { + Radius = IsRoundedFrameWidget || IsSourceViewWidget ? 0 : 3, + ToplevelBorderCollapse = true + }); + } + + protected override void OnColorsRefreshed () + { + base.OnColorsRefreshed (); + } + + public override void DrawFrameBackground (Cairo.Context cr, Gdk.Rectangle alloc, + Cairo.Color color, Cairo.Pattern pattern) + { + if (!IsPanelWidget) { + base.DrawFrameBackground (cr, alloc, color, pattern); + } + } + + public override void DrawFrameBorder (Cairo.Context cr, Gdk.Rectangle alloc) + { + if (IsPanelWidget) { + return; + } else if (!IsSourceViewWidget) { + base.DrawFrameBorder (cr, alloc); + return; + } + + cr.Color = TextMidColor; + cr.LineWidth = 1.0; + cr.Antialias = Cairo.Antialias.None; + + cr.MoveTo (alloc.Right - 1, alloc.Top); + cr.LineTo (alloc.Right - 1, alloc.Bottom); + cr.Stroke (); + + if (Widget.Allocation.Bottom < Widget.Toplevel.Allocation.Height) { + cr.MoveTo (alloc.Left, alloc.Bottom - 1); + cr.LineTo (alloc.Right, alloc.Bottom - 1); + cr.Stroke (); + } + + cr.Antialias = Cairo.Antialias.Default; + } + + public override void DrawHeaderBackground (Cairo.Context cr, Gdk.Rectangle alloc) + { + CairoCorners corners = CairoCorners.TopLeft | CairoCorners.TopRight; + + LinearGradient grad = new LinearGradient (alloc.X, alloc.Y, alloc.X, alloc.Bottom); + grad.AddColorStop (0, CairoExtensions.RgbToColor (0xf6f3f3)); + grad.AddColorStop (0.33, CairoExtensions.RgbToColor (0xeeecec)); + grad.AddColorStop (0.66, CairoExtensions.RgbToColor (0xeeecec)); + grad.AddColorStop (1, CairoExtensions.RgbToColor (0xe1dfdf)); + + cr.Pattern = grad; + CairoExtensions.RoundedRectangle (cr, alloc.X, alloc.Y, alloc.Width, alloc.Height, Context.Radius, corners); + cr.Fill (); + + cr.Color = CairoExtensions.RgbToColor (0x919191); + cr.Rectangle (alloc.X, alloc.Bottom, alloc.Width, BorderWidth); + cr.Fill (); + grad.Destroy (); + } + + public override void DrawRowSelection (Cairo.Context cr, int x, int y, int width, int height, + bool filled, bool stroked, Cairo.Color color, CairoCorners corners) + { + if (!IsSourceViewWidget) { + base.DrawRowSelection (cr, x, y, width, height, filled, + stroked, color, corners, true); + return; + } + + y -= 1; + x -= 1; + width += 1; + height += 1; + + color = TextMidColor; + + base.DrawRowSelection (cr, x, y, width, height, + filled, false, color, corners, true); + + if (stroked) { + cr.Color = color; + cr.LineWidth = 1.0; + cr.Antialias = Cairo.Antialias.None; + + cr.MoveTo (x, y); + cr.LineTo (x + width, y); + cr.Stroke (); + + cr.MoveTo (x, y + height); + cr.LineTo (x + width, y + height); + cr.Stroke (); + + cr.Antialias = Cairo.Antialias.Default; + } + } + } +} + diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTrackInfoDisplay.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTrackInfoDisplay.cs index e18bc5b..886fcf5 100644 --- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTrackInfoDisplay.cs +++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTrackInfoDisplay.cs @@ -37,6 +37,10 @@ namespace Banshee.MeeGo { private Regex line_three_split; + protected MeeGoTrackInfoDisplay (IntPtr raw) : base (raw) + { + } + public MeeGoTrackInfoDisplay () : base () { } diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs index 1debcbf..2b33336 100644 --- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs +++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs @@ -34,19 +34,25 @@ using Banshee.ServiceStack; namespace Banshee.MeeGo { - public class PlaybackBox : HBox + public class PlaybackBox : Alignment { - public PlaybackBox () + protected PlaybackBox (IntPtr raw) : base (raw) { + } + + public PlaybackBox () : base (0.5f, 0.5f, 0.0f, 0.0f) + { + var box = new HBox (); var action_service = ServiceManager.Get (); - PackStart (action_service.PlaybackActions["PreviousAction"].CreateToolItem (), false, false, 0); - PackStart (action_service.PlaybackActions["PlayPauseAction"].CreateToolItem (), false, false, 0); - PackStart (new NextButton (action_service, true), false, false, 0); + TopPadding = 6; + + box.PackStart (action_service.PlaybackActions["PreviousAction"].CreateToolItem (), false, false, 0); + box.PackStart (action_service.PlaybackActions["PlayPauseAction"].CreateToolItem (), false, false, 0); + box.PackStart (new NextButton (action_service), false, false, 0); + box.PackStart (new RepeatActionButton (true), false, false, 0); - var seek_slider = new ConnectedSeekSlider (); - seek_slider.Show (); - PackStart (seek_slider, false, false, 0); + Add (box); } } } diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs index 722112f..33459d2 100644 --- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs +++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs @@ -37,6 +37,10 @@ namespace Banshee.MeeGo { public class SearchEntry : Banshee.Widgets.SearchEntry { + protected SearchEntry (IntPtr raw) : base (raw) + { + } + public SearchEntry () { BuildSearchEntry (); diff --git a/src/Extensions/Banshee.MeeGo/Makefile.am b/src/Extensions/Banshee.MeeGo/Makefile.am index 6792c4b..29cfcdf 100644 --- a/src/Extensions/Banshee.MeeGo/Makefile.am +++ b/src/Extensions/Banshee.MeeGo/Makefile.am @@ -7,9 +7,10 @@ INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR) SOURCES = \ Banshee.MeeGo/MediaPanelContents.cs \ + Banshee.MeeGo/MeeGoHeaderBox.cs \ Banshee.MeeGo/MeeGoPanel.cs \ Banshee.MeeGo/MeeGoService.cs \ - Banshee.MeeGo/MeeGoSourceContents.cs \ + Banshee.MeeGo/MeeGoTheme.cs \ Banshee.MeeGo/MeeGoTrackInfoDisplay.cs \ Banshee.MeeGo/PlaybackBox.cs \ Banshee.MeeGo/SearchEntry.cs \ diff --git a/src/Extensions/Banshee.MeeGo/Makefile.in b/src/Extensions/Banshee.MeeGo/Makefile.in index 254f2d3..e9f92ad 100644 --- a/src/Extensions/Banshee.MeeGo/Makefile.in +++ b/src/Extensions/Banshee.MeeGo/Makefile.in @@ -186,8 +186,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -241,6 +241,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -373,9 +375,10 @@ LINK = $(REF_EXTENSION_MEEGO) $(LINK_EXTENSION_PLAYQUEUE_DEPS) \ INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR) SOURCES = \ Banshee.MeeGo/MediaPanelContents.cs \ + Banshee.MeeGo/MeeGoHeaderBox.cs \ Banshee.MeeGo/MeeGoPanel.cs \ Banshee.MeeGo/MeeGoService.cs \ - Banshee.MeeGo/MeeGoSourceContents.cs \ + Banshee.MeeGo/MeeGoTheme.cs \ Banshee.MeeGo/MeeGoTrackInfoDisplay.cs \ Banshee.MeeGo/PlaybackBox.cs \ Banshee.MeeGo/SearchEntry.cs \ @@ -486,6 +489,8 @@ RESOURCES = Banshee.MeeGo.addin.xml @HAVE_MEEGO_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @HAVE_MEEGO_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@HAVE_MEEGO_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @HAVE_MEEGO_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_MEEGO_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_MEEGO_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -514,6 +519,7 @@ RESOURCES = Banshee.MeeGo.addin.xml @HAVE_MEEGO_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_MEEGO_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @HAVE_MEEGO_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MEEGO_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @HAVE_MEEGO_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_MEEGO_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @HAVE_MEEGO_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.MeeGo/meego-panel-banshee b/src/Extensions/Banshee.MeeGo/meego-panel-banshee index d65367f..9777ef3 100755 --- a/src/Extensions/Banshee.MeeGo/meego-panel-banshee +++ b/src/Extensions/Banshee.MeeGo/meego-panel-banshee @@ -1,3 +1,3 @@ #!/usr/bin/env bash -banshee-1 --hide --mutter-panel --redirect-log +banshee-1 --hide --redirect-log diff --git a/src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in b/src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in index 068ef53..04c7732 100644 --- a/src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in +++ b/src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Exec=@libexecdir@/meego-panel-banshee -_Name=media +_Name=Banshee Media Player _Comment=Quick access panel for your media OnlyShowIn=MOBLIN X-Moblin-Priority=Low diff --git a/src/Extensions/Banshee.MiniMode/Makefile.in b/src/Extensions/Banshee.MiniMode/Makefile.in index 45685be..0f927cb 100644 --- a/src/Extensions/Banshee.MiniMode/Makefile.in +++ b/src/Extensions/Banshee.MiniMode/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -473,6 +475,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -501,6 +505,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.MultimediaKeys/Makefile.in b/src/Extensions/Banshee.MultimediaKeys/Makefile.in index e406284..2252c35 100644 --- a/src/Extensions/Banshee.MultimediaKeys/Makefile.in +++ b/src/Extensions/Banshee.MultimediaKeys/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -469,6 +471,8 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml @ENABLE_GNOME_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @ENABLE_GNOME_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_GNOME_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@ENABLE_GNOME_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @ENABLE_GNOME_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GNOME_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GNOME_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -497,6 +501,7 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml @ENABLE_GNOME_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GNOME_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_GNOME_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_GNOME_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @ENABLE_GNOME_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_GNOME_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_GNOME_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.NotificationArea/Makefile.in b/src/Extensions/Banshee.NotificationArea/Makefile.in index 124f8b7..cc6fce9 100644 --- a/src/Extensions/Banshee.NotificationArea/Makefile.in +++ b/src/Extensions/Banshee.NotificationArea/Makefile.in @@ -184,8 +184,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ $(am__append_1) GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -239,6 +239,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -491,6 +493,8 @@ RESOURCES = \ @PLATFORM_DARWIN_FALSE@ $(LINK_BANSHEE_THICKCLIENT) @PLATFORM_DARWIN_FALSE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@PLATFORM_DARWIN_FALSE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@PLATFORM_DARWIN_FALSE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @PLATFORM_DARWIN_FALSE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @PLATFORM_DARWIN_FALSE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @PLATFORM_DARWIN_FALSE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -519,6 +523,7 @@ RESOURCES = \ @PLATFORM_DARWIN_FALSE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @PLATFORM_DARWIN_FALSE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @PLATFORM_DARWIN_FALSE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@PLATFORM_DARWIN_FALSE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @PLATFORM_DARWIN_FALSE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @PLATFORM_DARWIN_FALSE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @PLATFORM_DARWIN_FALSE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs index f411eaf..04721af 100644 --- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs +++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs @@ -35,8 +35,16 @@ namespace Banshee.NowPlaying { public class NowPlayingContents : EventBox, IDisposable { + private static Widget video_display; + + public static void CreateVideoDisplay () + { + if (video_display == null) { + video_display = new XOverlayVideoDisplay (); + } + } + private Table table; - private Widget video_display; private Widget substitute_audio_display; private bool video_display_initial_shown = false; @@ -49,7 +57,7 @@ namespace Banshee.NowPlaying table.NoShowAll = true; - video_display = new XOverlayVideoDisplay (); + CreateVideoDisplay (); IVideoDisplay ivideo_display = video_display as IVideoDisplay; if (ivideo_display != null) { diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs index 04ee475..c4d15bb 100644 --- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs +++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs @@ -58,6 +58,13 @@ namespace Banshee.NowPlaying ServiceManager.PlaybackController.Transition += OnPlaybackControllerTransition; ServiceManager.PlaybackController.TrackStarted += OnPlaybackControllerTrackStarted; ServiceManager.PlayerEngine.ConnectEvent (OnTrackInfoUpdated, PlayerEvent.TrackInfoUpdated); + ServiceManager.PlayerEngine.ConnectEvent (OnCreateVideoWindow, PlayerEvent.PrepareVideoWindow); + } + + private void OnCreateVideoWindow (PlayerEventArgs args) + { + ServiceManager.PlayerEngine.DisconnectEvent (OnCreateVideoWindow); + NowPlayingContents.CreateVideoDisplay (); } public void Dispose () diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/XOverlayVideoDisplay.cs b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/XOverlayVideoDisplay.cs index c365db5..de924f5 100644 --- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/XOverlayVideoDisplay.cs +++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/XOverlayVideoDisplay.cs @@ -44,31 +44,36 @@ namespace Banshee.NowPlaying public XOverlayVideoDisplay () : base () { WidgetFlags = WidgetFlags.NoWindow; + CreateVideoWindow (); } protected override void OnRealized () { WidgetFlags |= WidgetFlags.Realized; - + CreateVideoWindow (); GdkWindow = Parent.GdkWindow; + video_window.Reparent (GdkWindow, 0, 0); + video_window.MoveResize (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height); + video_window.ShowUnraised (); + } + private void CreateVideoWindow () + { if (video_window != null) { - video_window.Reparent (GdkWindow, 0, 0); - video_window.MoveResize (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height); - video_window.ShowUnraised (); return; } - Gdk.WindowAttr attributes = new Gdk.WindowAttr (); - attributes.WindowType = Gdk.WindowType.Child; - attributes.X = 0; - attributes.Y = 0; - attributes.Width = Allocation.Width; - attributes.Height = Allocation.Height; - attributes.Visual = Visual; - attributes.Wclass = Gdk.WindowClass.InputOutput; - attributes.Colormap = Colormap; - attributes.EventMask = (int)(Gdk.EventMask.ExposureMask | Gdk.EventMask.VisibilityNotifyMask); + var attributes = new Gdk.WindowAttr () { + WindowType = Gdk.WindowType.Child, + X = 0, + Y = 0, + Width = 0, + Height = 0, + Visual = Visual, + Wclass = Gdk.WindowClass.InputOutput, + Colormap = Colormap, + EventMask = (int)(Gdk.EventMask.ExposureMask | Gdk.EventMask.VisibilityNotifyMask) + }; Gdk.WindowAttributesType attributes_mask = Gdk.WindowAttributesType.X | @@ -76,7 +81,7 @@ namespace Banshee.NowPlaying Gdk.WindowAttributesType.Visual | Gdk.WindowAttributesType.Colormap; - video_window = new Gdk.Window (GdkWindow, attributes, attributes_mask); + video_window = new Gdk.Window (null, attributes, attributes_mask); video_window.UserData = Handle; video_window.SetBackPixmap (null, false); diff --git a/src/Extensions/Banshee.NowPlaying/Makefile.in b/src/Extensions/Banshee.NowPlaying/Makefile.in index 6be3fd5..4cf8dee 100644 --- a/src/Extensions/Banshee.NowPlaying/Makefile.in +++ b/src/Extensions/Banshee.NowPlaying/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -486,6 +488,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -514,6 +518,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.PlayQueue/Makefile.in b/src/Extensions/Banshee.PlayQueue/Makefile.in index b281f5d..cd1624d 100644 --- a/src/Extensions/Banshee.PlayQueue/Makefile.in +++ b/src/Extensions/Banshee.PlayQueue/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -480,6 +482,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -508,6 +512,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.PlayerMigration/Makefile.in b/src/Extensions/Banshee.PlayerMigration/Makefile.in index 1d2eb7f..cc83a21 100644 --- a/src/Extensions/Banshee.PlayerMigration/Makefile.in +++ b/src/Extensions/Banshee.PlayerMigration/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -474,6 +476,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -502,6 +506,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.Podcasting/Makefile.in b/src/Extensions/Banshee.Podcasting/Makefile.in index c6f18b6..300c283 100644 --- a/src/Extensions/Banshee.Podcasting/Makefile.in +++ b/src/Extensions/Banshee.Podcasting/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -507,6 +509,8 @@ RESOURCES = \ @ENABLE_PODCAST_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @ENABLE_PODCAST_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_PODCAST_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@ENABLE_PODCAST_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @ENABLE_PODCAST_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_PODCAST_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_PODCAST_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -535,6 +539,7 @@ RESOURCES = \ @ENABLE_PODCAST_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_PODCAST_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_PODCAST_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_PODCAST_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @ENABLE_PODCAST_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_PODCAST_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_PODCAST_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.RemoteAudio/Makefile.in b/src/Extensions/Banshee.RemoteAudio/Makefile.in index 701cabd..220495e 100644 --- a/src/Extensions/Banshee.RemoteAudio/Makefile.in +++ b/src/Extensions/Banshee.RemoteAudio/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -478,6 +480,8 @@ RESOURCES = \ @REMOTE_AUDIO_ENABLED_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @REMOTE_AUDIO_ENABLED_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@REMOTE_AUDIO_ENABLED_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@REMOTE_AUDIO_ENABLED_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @REMOTE_AUDIO_ENABLED_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @REMOTE_AUDIO_ENABLED_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @REMOTE_AUDIO_ENABLED_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -506,6 +510,7 @@ RESOURCES = \ @REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@REMOTE_AUDIO_ENABLED_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.Sample/Makefile.in b/src/Extensions/Banshee.Sample/Makefile.in index 23dc33f..84d5a7e 100644 --- a/src/Extensions/Banshee.Sample/Makefile.in +++ b/src/Extensions/Banshee.Sample/Makefile.in @@ -155,8 +155,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -210,6 +210,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/src/Extensions/Banshee.SqlDebugConsole/Makefile.in b/src/Extensions/Banshee.SqlDebugConsole/Makefile.in index ae0ac77..0fd9dcb 100644 --- a/src/Extensions/Banshee.SqlDebugConsole/Makefile.in +++ b/src/Extensions/Banshee.SqlDebugConsole/Makefile.in @@ -155,8 +155,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -210,6 +210,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/src/Extensions/Banshee.Torrent/Makefile.in b/src/Extensions/Banshee.Torrent/Makefile.in index a731e91..837c4e2 100644 --- a/src/Extensions/Banshee.Torrent/Makefile.in +++ b/src/Extensions/Banshee.Torrent/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -474,6 +476,8 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES) @HAVE_MONOTORRENT_DBUS_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @HAVE_MONOTORRENT_DBUS_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MONOTORRENT_DBUS_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@HAVE_MONOTORRENT_DBUS_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @HAVE_MONOTORRENT_DBUS_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_MONOTORRENT_DBUS_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_MONOTORRENT_DBUS_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -502,6 +506,7 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES) @HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_MONOTORRENT_DBUS_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.Wikipedia/Makefile.in b/src/Extensions/Banshee.Wikipedia/Makefile.in index 5d5bc3b..e6aea41 100644 --- a/src/Extensions/Banshee.Wikipedia/Makefile.in +++ b/src/Extensions/Banshee.Wikipedia/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -472,6 +474,8 @@ RESOURCES = Banshee.Wikipedia.addin.xml @HAVE_WEBKIT_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @HAVE_WEBKIT_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_WEBKIT_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@HAVE_WEBKIT_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @HAVE_WEBKIT_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_WEBKIT_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_WEBKIT_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -500,6 +504,7 @@ RESOURCES = Banshee.Wikipedia.addin.xml @HAVE_WEBKIT_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_WEBKIT_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @HAVE_WEBKIT_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_WEBKIT_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @HAVE_WEBKIT_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_WEBKIT_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @HAVE_WEBKIT_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Banshee.YouTube/Makefile.in b/src/Extensions/Banshee.YouTube/Makefile.in index 0187152..b017523 100644 --- a/src/Extensions/Banshee.YouTube/Makefile.in +++ b/src/Extensions/Banshee.YouTube/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -476,6 +478,8 @@ RESOURCES = Banshee.YouTube.addin.xml @HAVE_GDATA_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @HAVE_GDATA_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_GDATA_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@HAVE_GDATA_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @HAVE_GDATA_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_GDATA_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_GDATA_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -504,6 +508,7 @@ RESOURCES = Banshee.YouTube.addin.xml @HAVE_GDATA_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_GDATA_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @HAVE_GDATA_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@HAVE_GDATA_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @HAVE_GDATA_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @HAVE_GDATA_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @HAVE_GDATA_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Extensions/Makefile.in b/src/Extensions/Makefile.in index b071d21..ea4b953 100644 --- a/src/Extensions/Makefile.in +++ b/src/Extensions/Makefile.in @@ -196,8 +196,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -251,6 +251,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible.cs b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible.cs index dc2f8c9..035b762 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible.cs @@ -54,10 +54,10 @@ namespace Hyena.Data.Gui.Accessibility cell_cache = new Dictionary (); list_view.ModelChanged += (o, a) => OnModelChanged (); - list_view.Model.Reloaded += (o, a) => OnModelChanged (); + list_view.ModelReloaded += (o, a) => OnModelChanged (); OnModelChanged (); - list_view.Selection.FocusChanged += OnSelectionFocusChanged; + list_view.SelectionProxy.FocusChanged += OnSelectionFocusChanged; list_view.ActiveColumnChanged += OnSelectionFocusChanged; ListViewAccessible_Selection (); diff --git a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs index 8c500da..e5398c6 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs @@ -32,6 +32,10 @@ namespace Hyena.Data.Gui { public partial class ListView : ListViewBase, IListView { + protected ListView (IntPtr ptr) : base (ptr) + { + } + public ListView () { column_layout = new Pango.Layout (PangoContext); diff --git a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs index ca4c281..da18c63 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs @@ -33,6 +33,14 @@ namespace Hyena.Data.Gui { public class ListViewBase : Widget { + protected ListViewBase (IntPtr ptr) : base (ptr) + { + } + + public ListViewBase () + { + } + public void QueueDirtyRegion (Gdk.Rectangle region) { region.Intersect (Allocation); diff --git a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs index 74454c0..58c12a0 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs @@ -82,7 +82,7 @@ namespace Hyena.Data.Gui } public Selection Selection { - get { return model.Selection; } + get { return model == null ? null : model.Selection; } } private int HadjustmentValue { diff --git a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Model.cs b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Model.cs index 47255d3..9570702 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Model.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Model.cs @@ -37,6 +37,7 @@ namespace Hyena.Data.Gui { #pragma warning disable 0067 public event EventHandler ModelChanged; + public event EventHandler ModelReloaded; #pragma warning restore 0067 public void SetModel (IListModel model) @@ -128,6 +129,11 @@ namespace Hyena.Data.Gui private void OnModelReloadedHandler (object o, EventArgs args) { OnModelReloaded (); + + var handler = ModelReloaded; + if (handler != null) { + handler (this, EventArgs.Empty); + } } private void OnColumnControllerUpdatedHandler (object o, EventArgs args) diff --git a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs index 8b14a9e..02ac248 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs @@ -140,13 +140,7 @@ namespace Hyena.Data.Gui } } - // Focused frame border is bolder than BorderWidth, - // draw it after the rows to avoid visual artifacts. - if (HasFocus) { - Theme.DrawFrameBorderFocused (cairo_context, Allocation); - } else { - Theme.DrawFrameBorder (cairo_context, Allocation); - } + Theme.DrawFrameBorder (cairo_context, Allocation); PaintDraggingColumn (damage); diff --git a/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs b/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs index e67768a..20c155c 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs @@ -141,21 +141,52 @@ namespace Hyena.Gui.Theming public override void DrawFrameBorder (Cairo.Context cr, Gdk.Rectangle alloc) { - cr.LineWidth = BorderWidth; - cr.Color = border_color; - double offset = (double)cr.LineWidth / 2.0; - CairoExtensions.RoundedRectangle (cr, alloc.X + offset, alloc.Y + offset, - alloc.Width - cr.LineWidth, alloc.Height - cr.LineWidth, Context.Radius, CairoCorners.All); - cr.Stroke (); - } + var corners = CairoCorners.All; + double top_extend = 0; + double bottom_extend = 0; + double left_extend = 0; + double right_extend = 0; + + if (Context.ToplevelBorderCollapse) { + if (Widget.Allocation.Top <= Widget.Toplevel.Allocation.Top) { + corners &= ~(CairoCorners.TopLeft | CairoCorners.TopRight); + top_extend = cr.LineWidth; + } + + if (Widget.Allocation.Bottom >= Widget.Toplevel.Allocation.Bottom) { + corners &= ~(CairoCorners.BottomLeft | CairoCorners.BottomRight); + bottom_extend = cr.LineWidth; + } + + if (Widget.Allocation.Left <= Widget.Toplevel.Allocation.Left) { + corners &= ~(CairoCorners.BottomLeft | CairoCorners.TopLeft); + left_extend = cr.LineWidth; + } + + if (Widget.Allocation.Right >= Widget.Toplevel.Allocation.Right) { + corners &= ~(CairoCorners.BottomRight | CairoCorners.TopRight); + right_extend = cr.LineWidth; + } + } + + if (Widget.HasFocus) { + cr.LineWidth = BorderWidth * 1.5; + cr.Color = CairoExtensions.ColorShade (border_color, 0.8); + } else { + cr.LineWidth = BorderWidth; + cr.Color = border_color; + } - public override void DrawFrameBorderFocused (Cairo.Context cr, Gdk.Rectangle alloc) - { - cr.LineWidth = BorderWidth * 1.5; - cr.Color = CairoExtensions.ColorShade (border_color, 0.8); double offset = (double)cr.LineWidth / 2.0; - CairoExtensions.RoundedRectangle (cr, alloc.X + offset, alloc.Y + offset, - alloc.Width - cr.LineWidth, alloc.Height - cr.LineWidth, Context.Radius, CairoCorners.All); + + CairoExtensions.RoundedRectangle (cr, + alloc.X + offset - left_extend, + alloc.Y + offset - top_extend, + alloc.Width - cr.LineWidth + left_extend + right_extend, + alloc.Height - cr.LineWidth - top_extend + bottom_extend, + Context.Radius, + corners); + cr.Stroke (); } @@ -278,28 +309,43 @@ namespace Hyena.Gui.Theming public override void DrawRowSelection (Cairo.Context cr, int x, int y, int width, int height, bool filled, bool stroked, Cairo.Color color, CairoCorners corners) { + DrawRowSelection (cr, x, y, width, height, filled, stroked, color, corners, false); + } + + public void DrawRowSelection (Cairo.Context cr, int x, int y, int width, int height, + bool filled, bool stroked, Cairo.Color color, CairoCorners corners, bool flat_fill) + { Cairo.Color selection_color = color; Cairo.Color selection_highlight = CairoExtensions.ColorShade (selection_color, 1.24); Cairo.Color selection_stroke = CairoExtensions.ColorShade (selection_color, 0.85); selection_highlight.A = 0.5; selection_stroke.A = color.A; + LinearGradient grad = null; if (filled) { - Cairo.Color selection_fill_light = CairoExtensions.ColorShade (selection_color, 1.12); - Cairo.Color selection_fill_dark = selection_color; + if (flat_fill) { + cr.Color = selection_color; + } else { + Cairo.Color selection_fill_light = CairoExtensions.ColorShade (selection_color, 1.12); + Cairo.Color selection_fill_dark = selection_color; - selection_fill_light.A = color.A; - selection_fill_dark.A = color.A; + selection_fill_light.A = color.A; + selection_fill_dark.A = color.A; - LinearGradient grad = new LinearGradient (x, y, x, y + height); - grad.AddColorStop (0, selection_fill_light); - grad.AddColorStop (0.4, selection_fill_dark); - grad.AddColorStop (1, selection_fill_light); + grad = new LinearGradient (x, y, x, y + height); + grad.AddColorStop (0, selection_fill_light); + grad.AddColorStop (0.4, selection_fill_dark); + grad.AddColorStop (1, selection_fill_light); + + cr.Pattern = grad; + } - cr.Pattern = grad; CairoExtensions.RoundedRectangle (cr, x, y, width, height, Context.Radius, corners, true); cr.Fill (); - grad.Destroy (); + + if (grad != null) { + grad.Destroy (); + } } if (filled && stroked) { diff --git a/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/Theme.cs b/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/Theme.cs index 5d093c1..18d6de2 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/Theme.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/Theme.cs @@ -48,16 +48,21 @@ namespace Hyena.Gui.Theming private Cairo.Color view_fill; private Cairo.Color view_fill_transparent; + private Cairo.Color text_mid; + public GtkColors Colors { get { return colors; } } + public Widget Widget { get; private set; } + public Theme (Widget widget) : this (widget, new GtkColors ()) { } public Theme (Widget widget, GtkColors colors) { + this.Widget = widget; this.colors = colors; this.colors.Refreshed += delegate { OnColorsRefreshed (); }; this.colors.Widget = widget; @@ -73,6 +78,11 @@ namespace Hyena.Gui.Theming view_fill = colors.GetWidgetColor (GtkColorClass.Base, StateType.Normal); view_fill_transparent = view_fill; view_fill_transparent.A = 0; + + text_mid = CairoExtensions.AlphaBlend ( + colors.GetWidgetColor (GtkColorClass.Base, StateType.Normal), + colors.GetWidgetColor (GtkColorClass.Text, StateType.Normal), + 0.5); } #region Drawing @@ -114,8 +124,6 @@ namespace Hyena.Gui.Theming public abstract void DrawFrameBorder (Cairo.Context cr, Gdk.Rectangle alloc); - public abstract void DrawFrameBorderFocused (Cairo.Context cr, Gdk.Rectangle alloc); - public abstract void DrawHeaderBackground (Cairo.Context cr, Gdk.Rectangle alloc); public abstract void DrawColumnHeaderFocus (Cairo.Context cr, Gdk.Rectangle alloc); @@ -196,6 +204,11 @@ namespace Hyena.Gui.Theming get { return selection_stroke; } } + public Cairo.Color TextMidColor { + get { return text_mid; } + protected set { text_mid = value; } + } + public virtual int BorderWidth { get { return 1; } } @@ -212,26 +225,26 @@ namespace Hyena.Gui.Theming #region Contexts - public void PushContext () + public virtual void PushContext () { PushContext (new ThemeContext ()); } - public void PushContext (ThemeContext context) + public virtual void PushContext (ThemeContext context) { lock (this) { contexts.Push (context); } } - public ThemeContext PopContext () + public virtual ThemeContext PopContext () { lock (this) { return contexts.Pop (); } } - public ThemeContext Context { + public virtual ThemeContext Context { get { lock (this) { return contexts.Peek (); } } } diff --git a/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/ThemeContext.cs b/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/ThemeContext.cs index 5c7b6af..1f06569 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/ThemeContext.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/ThemeContext.cs @@ -33,6 +33,8 @@ namespace Hyena.Gui.Theming { public class ThemeContext { + public bool ToplevelBorderCollapse { get; set; } + private double radius = 0.0; public double Radius { get { return radius; } diff --git a/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs b/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs new file mode 100644 index 0000000..dbf0b18 --- /dev/null +++ b/src/Libraries/Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs @@ -0,0 +1,103 @@ +// +// ThemeTestModule.cs +// +// Author: +// Aaron Bockover +// +// Copyright 2010 Novell, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using System; +using Gtk; + +using Hyena.Gui; + +namespace Hyena.Gui.Theming +{ + [TestModule ("Theme")] + public class ThemeTestModule : Window + { + public ThemeTestModule () : base ("Theme") + { + var align = new Alignment (0.0f, 0.0f, 1.0f, 1.0f); + var theme_widget = new ThemeTestWidget (); + align.Add (theme_widget); + Add (align); + ShowAll (); + + int state = 0; + uint[,] borders = { + {0, 0, 0, 0}, + {10, 0, 0, 0}, + {0, 10, 0, 0}, + {0, 0, 10, 0}, + {0, 0, 0, 10}, + {10, 10, 0, 0}, + {10, 10, 10, 0}, + {10, 10, 10, 10}, + {10, 0, 0, 10}, + {0, 10, 10, 0} + }; + + GLib.Timeout.Add (2000, delegate { + Console.WriteLine (state); + align.TopPadding = borders[state, 0]; + align.RightPadding = borders[state, 1]; + align.BottomPadding = borders[state, 2]; + align.LeftPadding = borders[state, 3]; + if (++state % borders.GetLength (0) == 0) { + state = 0; + } + return true; + }); + } + + private class ThemeTestWidget : DrawingArea + { + private Theme theme; + + protected override void OnStyleSet (Style previous_style) + { + base.OnStyleSet (previous_style); + theme = ThemeEngine.CreateTheme (this); + theme.Context.Radius = 10; + } + + protected override bool OnExposeEvent (Gdk.EventExpose evnt) + { + Cairo.Context cr = null; + try { + var alloc = new Gdk.Rectangle () { + X = Allocation.X, + Y = Allocation.Y, + Width = Allocation.Width, + Height = Allocation.Height + }; + cr = Gdk.CairoHelper.Create (evnt.Window); + theme.DrawListBackground (cr, alloc, true); + theme.DrawFrameBorder (cr, alloc); + } finally { + CairoExtensions.DisposeContext (cr); + } + return true; + } + } + } +} diff --git a/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs b/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs index da888ad..4154570 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs @@ -67,6 +67,10 @@ namespace Hyena.Widgets border_stage.Iteration += OnBorderIteration; } + protected AnimatedBox (IntPtr raw) : base (raw) + { + } + #region Private private double Percent { diff --git a/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedHBox.cs b/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedHBox.cs index e38c455..d121fc7 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedHBox.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedHBox.cs @@ -37,5 +37,9 @@ namespace Hyena.Widgets public AnimatedHBox () : base (true) { } + + protected AnimatedHBox (IntPtr raw) : base (raw) + { + } } } diff --git a/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs b/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs index 6c5b3b4..0d59221 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs @@ -37,5 +37,9 @@ namespace Hyena.Widgets public AnimatedVBox () : base (false) { } + + protected AnimatedVBox (IntPtr raw) : base (raw) + { + } } } \ No newline at end of file diff --git a/src/Libraries/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs b/src/Libraries/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs index a6191fd..5d3c9c0 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs @@ -40,6 +40,10 @@ namespace Hyena.Widgets { } + protected ComplexMenuItem (IntPtr raw) : base (raw) + { + } + // Override OnAdded and OnRemoved so we can work with Gtk.Action/Gtk.UIManager // which otherwise would try to replace our child with a Label. private bool first_add = true; diff --git a/src/Libraries/Hyena.Gui/Hyena.Widgets/MenuButton.cs b/src/Libraries/Hyena.Gui/Hyena.Widgets/MenuButton.cs index 0971859..2dc9e1a 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Widgets/MenuButton.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Widgets/MenuButton.cs @@ -104,11 +104,11 @@ namespace Hyena.Widgets toggle_button.Active = false; } - protected ToggleButton ToggleButton { + public ToggleButton ToggleButton { get { return toggle_button; } } - protected Arrow Arrow { + public Arrow Arrow { get { return arrow; } } diff --git a/src/Libraries/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs b/src/Libraries/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs index a4276db..32ee848 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs @@ -60,6 +60,10 @@ namespace Hyena.Widgets Add (box); } + protected RatingMenuItem (IntPtr raw) : base (raw) + { + } + private int TransformX (double inx) { int x = (int)inx - entry.Allocation.X; diff --git a/src/Libraries/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs b/src/Libraries/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs index 5c6a125..ac28bf0 100644 --- a/src/Libraries/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs +++ b/src/Libraries/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs @@ -43,14 +43,13 @@ namespace Hyena.Widgets get { return theme; } } - private int frame_width = 3; - private Widget child; private Gdk.Rectangle child_allocation; private bool fill_color_set; private Cairo.Color fill_color; private bool draw_border = true; private Pattern fill_pattern; + private int frame_width; // Ugh, this is to avoid the GLib.MissingIntPtrCtorException seen by some; BGO #552169 protected RoundedFrame (IntPtr ptr) : base (ptr) @@ -89,10 +88,11 @@ namespace Hyena.Widgets #region Gtk.Widget Overrides - protected override void OnRealized () + protected override void OnStyleSet (Style previous_style) { - base.OnRealized (); + base.OnStyleSet (previous_style); theme = Hyena.Gui.Theming.ThemeEngine.CreateTheme (this); + frame_width = (int)theme.Context.Radius + 1; } protected override void OnSizeRequested (ref Requisition requisition) diff --git a/src/Libraries/Hyena.Gui/Makefile.am b/src/Libraries/Hyena.Gui/Makefile.am index c7c9bfa..c8effc1 100644 --- a/src/Libraries/Hyena.Gui/Makefile.am +++ b/src/Libraries/Hyena.Gui/Makefile.am @@ -57,6 +57,7 @@ SOURCES = \ Hyena.Gui.Theming/Theme.cs \ Hyena.Gui.Theming/ThemeContext.cs \ Hyena.Gui.Theming/ThemeEngine.cs \ + Hyena.Gui.Theming/ThemeTestModule.cs \ Hyena.Gui/ActionManager.cs \ Hyena.Gui/BaseWidgetAccessible.cs \ Hyena.Gui/CairoDamageDebugger.cs \ diff --git a/src/Libraries/Hyena.Gui/Makefile.in b/src/Libraries/Hyena.Gui/Makefile.in index 20a1ebb..12dbdda 100644 --- a/src/Libraries/Hyena.Gui/Makefile.in +++ b/src/Libraries/Hyena.Gui/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -422,6 +424,7 @@ SOURCES = \ Hyena.Gui.Theming/Theme.cs \ Hyena.Gui.Theming/ThemeContext.cs \ Hyena.Gui.Theming/ThemeEngine.cs \ + Hyena.Gui.Theming/ThemeTestModule.cs \ Hyena.Gui/ActionManager.cs \ Hyena.Gui/BaseWidgetAccessible.cs \ Hyena.Gui/CairoDamageDebugger.cs \ @@ -581,6 +584,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -609,6 +614,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Libraries/Hyena/Hyena.Collections/SelectionProxy.cs b/src/Libraries/Hyena/Hyena.Collections/SelectionProxy.cs index 6441e69..812fd54 100644 --- a/src/Libraries/Hyena/Hyena.Collections/SelectionProxy.cs +++ b/src/Libraries/Hyena/Hyena.Collections/SelectionProxy.cs @@ -36,6 +36,7 @@ namespace Hyena.Collections public event EventHandler Changed; public event EventHandler SelectionChanged; + public event EventHandler FocusChanged; public Selection Selection { get { return selection; } @@ -43,13 +44,17 @@ namespace Hyena.Collections if (selection == value) return; - if (selection != null) + if (selection != null) { selection.Changed -= HandleSelectionChanged; + selection.FocusChanged -= HandleSelectionFocusChanged; + } selection = value; - if (selection != null) + if (selection != null) { selection.Changed += HandleSelectionChanged; + selection.FocusChanged += HandleSelectionFocusChanged; + } OnSelectionChanged (); } @@ -63,6 +68,14 @@ namespace Hyena.Collections } } + protected virtual void OnFocusChanged () + { + EventHandler handler = FocusChanged; + if (handler != null) { + handler (selection, EventArgs.Empty); + } + } + protected virtual void OnSelectionChanged () { EventHandler handler = SelectionChanged; @@ -75,5 +88,10 @@ namespace Hyena.Collections { OnChanged (); } + + private void HandleSelectionFocusChanged (object o, EventArgs args) + { + OnFocusChanged (); + } } } diff --git a/src/Libraries/Hyena/Hyena.Data/ColumnDescription.cs b/src/Libraries/Hyena/Hyena.Data/ColumnDescription.cs index cdb6a12..5ddbb98 100644 --- a/src/Libraries/Hyena/Hyena.Data/ColumnDescription.cs +++ b/src/Libraries/Hyena/Hyena.Data/ColumnDescription.cs @@ -99,6 +99,8 @@ namespace Hyena.Data } } + public int OrderHint { get; set; } + public string Property { get { return property; } set { property = value; } diff --git a/src/Libraries/Hyena/Hyena/Log.cs b/src/Libraries/Hyena/Hyena/Log.cs index c000cc1..6a925fb 100644 --- a/src/Libraries/Hyena/Hyena/Log.cs +++ b/src/Libraries/Hyena/Hyena/Log.cs @@ -249,7 +249,7 @@ namespace Hyena TimeSpan duration = finish - timers[id]; string d_message; if (duration.TotalSeconds < 60) { - d_message = String.Format ("{0}s", duration.TotalSeconds); + d_message = duration.TotalSeconds.ToString (); } else { d_message = duration.ToString (); } diff --git a/src/Libraries/Hyena/Makefile.in b/src/Libraries/Hyena/Makefile.in index 47fb8c3..d2df73a 100644 --- a/src/Libraries/Hyena/Makefile.in +++ b/src/Libraries/Hyena/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -604,6 +606,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -632,6 +636,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Libraries/Lastfm.Gui/Makefile.in b/src/Libraries/Lastfm.Gui/Makefile.in index a26af3e..e784ed6 100644 --- a/src/Libraries/Lastfm.Gui/Makefile.in +++ b/src/Libraries/Lastfm.Gui/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -475,6 +477,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -503,6 +507,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Libraries/Lastfm/Makefile.in b/src/Libraries/Lastfm/Makefile.in index 85f3def..69862d9 100644 --- a/src/Libraries/Lastfm/Makefile.in +++ b/src/Libraries/Lastfm/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -482,6 +484,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -510,6 +514,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Libraries/Makefile.in b/src/Libraries/Makefile.in index 26da70c..57f67a0 100644 --- a/src/Libraries/Makefile.in +++ b/src/Libraries/Makefile.in @@ -196,8 +196,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -251,6 +251,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/src/Libraries/Migo/Makefile.in b/src/Libraries/Migo/Makefile.in index 3ffea97..abf21a2 100644 --- a/src/Libraries/Migo/Makefile.in +++ b/src/Libraries/Migo/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -538,6 +540,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -566,6 +570,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Libraries/Mono.Data.Sqlite/Makefile.in b/src/Libraries/Mono.Data.Sqlite/Makefile.in index c8c4a48..8856fb7 100644 --- a/src/Libraries/Mono.Data.Sqlite/Makefile.in +++ b/src/Libraries/Mono.Data.Sqlite/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -492,6 +494,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -520,6 +524,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Libraries/Mono.Media/Makefile.in b/src/Libraries/Mono.Media/Makefile.in index f71cd8d..eddf747 100644 --- a/src/Libraries/Mono.Media/Makefile.in +++ b/src/Libraries/Mono.Media/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -476,6 +478,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -504,6 +508,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Libraries/Mtp/Makefile.in b/src/Libraries/Mtp/Makefile.in index a6fc169..b0af8fd 100644 --- a/src/Libraries/Mtp/Makefile.in +++ b/src/Libraries/Mtp/Makefile.in @@ -186,8 +186,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -241,6 +241,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -484,6 +486,8 @@ SOURCES = \ @ENABLE_MTP_TRUE@ $(LINK_BANSHEE_THICKCLIENT) @ENABLE_MTP_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_MTP_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +@ENABLE_MTP_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) @ENABLE_MTP_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_MTP_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_MTP_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -512,6 +516,7 @@ SOURCES = \ @ENABLE_MTP_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_MTP_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_MTP_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +@ENABLE_MTP_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) @ENABLE_MTP_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) @ENABLE_MTP_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) @ENABLE_MTP_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Libraries/MusicBrainz/Makefile.in b/src/Libraries/MusicBrainz/Makefile.in index e235f0a..6b92c47 100644 --- a/src/Libraries/MusicBrainz/Makefile.in +++ b/src/Libraries/MusicBrainz/Makefile.in @@ -183,8 +183,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -238,6 +238,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -486,6 +488,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -514,6 +518,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/src/Makefile.in b/src/Makefile.in index a66edfe..bd995d8 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -197,8 +197,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -252,6 +252,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ diff --git a/tests/Analyzer/Makefile.in b/tests/Analyzer/Makefile.in index a8a199f..a0d56e1 100644 --- a/tests/Analyzer/Makefile.in +++ b/tests/Analyzer/Makefile.in @@ -157,8 +157,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -212,6 +212,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -437,6 +439,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -465,6 +469,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/tests/Makefile.in b/tests/Makefile.in index dfabef8..3913d23 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -198,8 +198,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -253,6 +253,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -478,6 +480,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -506,6 +510,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS) diff --git a/tests/Performance/Makefile.in b/tests/Performance/Makefile.in index bcc5e7f..035332d 100644 --- a/tests/Performance/Makefile.in +++ b/tests/Performance/Makefile.in @@ -157,8 +157,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMCS_FLAGS = @GMCS_FLAGS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_LT_2_28_CFLAGS = @GNOME_LT_2_28_CFLAGS@ -GNOME_LT_2_28_LIBS = @GNOME_LT_2_28_LIBS@ +GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@ +GNOME_2_28_LIBS = @GNOME_2_28_LIBS@ GOBJECT_QUERY = @GOBJECT_QUERY@ GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@ GREP = @GREP@ @@ -212,6 +212,8 @@ MAKEFLAGS = @MAKEFLAGS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ +MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@ +MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@ MKDIR_P = @MKDIR_P@ MONO = @MONO@ MONODOCER = @MONODOCER@ @@ -437,6 +439,8 @@ LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \ $(LINK_BANSHEE_THICKCLIENT) REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID) +REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO) REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS) REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS) @@ -465,6 +469,7 @@ REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS) +LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO) REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS) REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS) REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)