Merge lp:~noskcaj/ubuntu/trusty/gmusicbrowser/1.1.12 into lp:ubuntu/trusty/gmusicbrowser

[Jackson Doak]

New upstream release. I haven't put it in debian since alioth broke.

[Daniel Holbach (dholbach)]

Text conflict in gmbrc.default

review: Needs Fixing

Unmerged revisions

20. By Jackson Doak on 2014-02-15

update-maintainer

19. By Jackson Doak on 2014-02-15

New upstream release.

=== modified file '.pc/shimmer-layouts/gmbrc.default'
--- .pc/shimmer-layouts/gmbrc.default	2011-03-23 19:23:40 +0000
+++ .pc/shimmer-layouts/gmbrc.default	2014-02-15 20:02:02 +0000
@@ -9,6 +9,7 @@
 # of the plugin found at the top of the plugin file :
 PLUGIN_LYRICS: 1
 PLUGIN_FETCHCOVER: 1
+PLUGIN_AUTOSAVE: 1
 
 # default player layout
 #Layout: Small player

=== modified file '.pc/shimmer-layouts/gmusicbrowser.pl'
--- .pc/shimmer-layouts/gmusicbrowser.pl	2014-01-25 14:17:08 +0000
+++ .pc/shimmer-layouts/gmusicbrowser.pl	2014-02-15 20:02:02 +0000
@@ -79,8 +79,8 @@
 {
  TRUE  => 1,
  FALSE => 0,
- VERSION => '1.1011',
- VERSIONSTRING => '1.1.11',
+ VERSION => '1.1012',
+ VERSIONSTRING => '1.1.12',
  PIXPATH => $DATADIR.SLASH.'pix'.SLASH,
  PROGRAM_NAME => 'gmusicbrowser',
 # PERL510 => $^V ge 'v5.10',
@@ -151,8 +151,9 @@
 
 our %Alias_ext;	#define alternate file extensions (ie: .ogg files treated as .oga files)
 INIT {%Alias_ext=(ogg=> 'oga', m4b=>'m4a');} #needs to be in a INIT block because used in a INIT block in gmusicbrowser_tags.pm
+our @ScanExt= qw/mp3 ogg oga flac mpc ape wv m4a m4b/;
 
-our $debug;
+our ($Verbose,$debug);
 our %CmdLine;
 our ($HomeDir,$SaveFile,$FIFOFile,$ImportFile,$DBus_id);
 sub find_gmbrc_file { my @f= map $_[0].$_, '','.gz','.xz'; return wantarray ? (grep { -e $_ } @f) : first { -e $_ } @f }
@@ -185,7 +186,8 @@
 -nogst  : do not use gstreamer
 -server	: send playing song to connected icecast clent
 -port N : listen for connection on port N in icecast server mode
--debug	: print lots of mostly useless informations
+-verbose: print some info, like the file being played
+-debug	: print lots of mostly useless informations, implies -verbose
 -backtrace : print a backtrace for every warning
 -nodbus	: do not provide DBus services
 -dbus-id KEY : append .KEY to the DBus service id used by gmusicbrowser (org.gmusicbrowser)
@@ -243,7 +245,8 @@
 	elsif($arg eq '-ro')		{$CmdLine{ro}=$CmdLine{rotags}=1}
 	elsif($arg eq '-rotags')	{$CmdLine{rotags}=1}
 	elsif($arg eq '-port')		{$CmdLine{port}=shift if $ARGV[0]}
-	elsif($arg eq '-debug')		{$debug=1}
+	elsif($arg eq '-verbose')	{$Verbose=1}
+	elsif($arg eq '-debug')		{$debug=$Verbose=4}
 	elsif($arg eq '-backtrace')	{ $SIG{ __WARN__ } = \&Carp::cluck; $SIG{ __DIE__ } = \&Carp::confess; }
 	elsif($arg eq '-nofifo')	{$FIFOFile=''}
 	elsif($arg eq '-workspace')	{$CmdLine{workspace}=shift if defined $ARGV[0]} #requires Gnome2::Wnck
@@ -450,7 +453,7 @@
 $DRAGTYPES{$DRAGTYPES[$_][0]}=$_ for DRAG_FILE,DRAG_USTRING,DRAG_STRING,DRAG_ID,DRAG_ARTIST,DRAG_ALBUM,DRAG_FILTER,DRAG_MARKUP;
 
 our @submenuRemove=
-(	{ label => sub {$_[0]{mode} eq 'Q' ? _"Remove from queue" : $_[0]{mode} eq 'A' ? _"Remove from playlist" : _"Remove from list"},	code => sub { $_[0]{self}->RemoveSelected; }, mode => 'BLQA'},
+(	{ label => sub {$_[0]{mode} eq 'Q' ? _"Remove from queue" : $_[0]{mode} eq 'A' ? _"Remove from playlist" : _"Remove from list"},	code => sub { $_[0]{self}->RemoveSelected; }, mode => 'BLQA', istrue=> 'allowremove', },
 	{ label => _"Remove from library",	code => sub { SongsRemove($_[0]{IDs}); }, },
 	{ label => _"Remove from disk",		code => sub { DeleteFiles($_[0]{IDs}); },	test => sub {!$CmdLine{ro}},	stockicon => 'gtk-delete' },
 );
@@ -1192,6 +1195,8 @@
 	Rewind		=> [\&Rewind,				_"Rewind",_"Number of seconds",qr/^\d+$/],
 	Seek		=> [sub {SkipTo($_[1])},		_"Seek",_"Number of seconds",qr/^\d+$/],
 	Stop		=> [\&Stop,				_"Stop"],
+	Pause		=> [sub {Pause() if $TogPlay; },	_"Pause"],
+	Play		=> [sub {PlayPause() unless $TogPlay; },_"Play"],
 	Browser		=> [\&OpenBrowser,			_"Open Browser"],
 	OpenQueue	=> [\&EditQueue,			_"Open Queue window"],
 	OpenSearch	=> [sub { Layout::Window->new($Options{LayoutS}, uniqueid=>'Search'); },	_"Open Search window"],
@@ -1488,6 +1493,11 @@
 	return $utf8name;
 }
 
+sub get_event_window
+{	my $widget=shift;
+	$widget||= Gtk2->get_event_widget(Gtk2->get_current_event);
+	return find_ancestor($widget,'Gtk2::Window');
+}
 sub get_layout_widget
 {	find_ancestor($_[0],'Layout');
 }
@@ -2038,6 +2048,7 @@
 		$oldversion||=delete $Options{version} || VERSION;  # for version <=1.1.7
 		if ($oldversion>VERSION) { warn "Loading a gmbrc saved with a more recent version of gmusicbrowser, try upgrading gmusicbrowser if there are problems\n"; }
 		if ($oldversion<1.10091) {delete $Options{$_} for qw/Diacritic_sort gst_volume Simplehttp_CacheSize mplayer_use_replaygain/;} #cleanup old options
+		if ($oldversion<=1.1011) {delete $Options{$_} for qw/ScanPlayOnly/;} #cleanup old options
 		$Options{AutoRemoveCurrentSong}= delete $Options{TAG_auto_check_current} if $oldversion<1.1005 && exists $Options{TAG_auto_check_current};
 		$Options{PlayedMinPercent}= 100*delete $Options{PlayedPercent} if exists $Options{PlayedPercent};
 		if ($Options{ArtistSplit}) # for versions <= 1.1.5
@@ -2181,7 +2192,7 @@
 sub SaveTags	#save tags _and_ settings
 {	my $fork=shift; #if true, save in a forked process
 	HasChanged('Save');
-	if ($CmdLine{demo}) { warn "-demo option => not saving tags/settings\n"; return }
+	if ($CmdLine{demo}) { warn "-demo option => not saving tags/settings\n" if $Verbose || !$fork; return }
 
 	my $ext='';
 	my $SaveFile= $SaveFile; #do a local copy to locally remove .gz extension if present
@@ -2231,7 +2242,7 @@
 	my $error;
 	(my$fh,my$tempfile,$ext)= Open_gmbrc("$SaveFile.new.$$"."$ext",1);
 	unless ($fh) { warn "Save aborted\n"; POSIX::_exit(0) if $fork; return; }
-	warn "Writing tags in $SaveFile$ext ...\n";
+	warn "Writing tags in $SaveFile$ext ...\n" if $Verbose || !$fork;
 
 	print $fh "# gmbrc version=".VERSION." time=".time."\n"  or $error||=$!;
 
@@ -2248,7 +2259,7 @@
 	}
 	#save fields properties, like album pictures ...
 	for my $field (sort keys %$extrasub)
-	{	print $fh "\n[$field]\n$extra_subfields->{$field}\n"  or $error++;
+	{	print $fh "\n[$field]\n$extra_subfields->{$field}\n"  or $error||=$!;
 		my $h= $extrasub->{$field}->();
 		for my $key (sort keys %$h)
 		{	my $vals= $h->{$key};
@@ -2297,7 +2308,7 @@
 		unlink $_ for find_gmbrc_file($SaveFile); #make sure there is no other old gmbrc without .bak, as they could cause confusion
 	}
 	rename $tempfile,$SaveFile.$ext  or warn $!;
-	warn "Writing tags in $SaveFile$ext ... done\n";
+	warn "Writing tags in $SaveFile$ext ... done\n" if $Verbose || !$fork;
 	POSIX::_exit(0) if $fork;
 }
 
@@ -2508,7 +2519,7 @@
 	warn $error."\n";
 	return if $Options{IgnorePlayError};
 	my $dialog = Gtk2::MessageDialog->new
-		( undef, [qw/modal destroy-with-parent/],
+		( $MainWindow, [qw/modal destroy-with-parent/],
 		  'error','close','%s',
 		  $error
 		);
@@ -4075,7 +4086,7 @@
 sub PopupContextMenu
 {	my $args=$_[1];
 	my $menu=BuildMenu(@_);
-	PopupMenu($menu,nomenupos=>!$args->{usemenupos});
+	PopupMenu($menu,nomenupos=>!$args->{usemenupos},self=>$args->{self});
 }
 
 sub PopupMenu
@@ -4083,6 +4094,8 @@
 	return unless $menu->get_children;
 	$menu->show_all;
 	my $event= $args{event} || Gtk2->get_current_event;
+	my $widget= $args{self} || Gtk2->get_event_widget($event);
+	$menu->attach_to_widget($widget,undef) if $widget;
 	my $posfunction= $args{posfunction}; # usually undef
 	my $button=my $time=0;
 	if ($event)
@@ -4135,12 +4148,26 @@
 	my @order= 0..$#labels;
 	@order=sort {superlc($labels[$a]) cmp superlc($labels[$b])} @order if ref $choices eq 'HASH' || $tree;
 
+	my $selection;
 	my $smenu_callback=sub
 	 {	my $sub=$_[1];
-		$sub->( $args, $_[0]{selected} );
+		my $selected= $_[0]{selected};
+		if ($selection && $options{return_list})
+		{	$selection->{$selected} ^=1;
+			$selected= [sort grep $selection->{$_}, keys %$selection];
+		}
+		$sub->($args, $selected);
 	 };
-	my $check;
+	my ($check,$radio);
 	$check= $options{check}($args) if $options{check};
+	if (defined $check)
+	{	$selection={};
+		if (ref $check)	{ $selection->{$_}=1 for @$check; }
+		else
+		{	$radio=1;
+			$selection->{$check}=1;
+		}
+	}
 	for my $i (@order)
 	{	my $label=$labels[$i];
 		my $value=$values[$i];
@@ -4151,13 +4178,10 @@
 			$item->set_submenu($submenu);
 		}
 		else
-		{	if (defined $check)
+		{	if ($selection)
 			{	$item=Gtk2::CheckMenuItem->new_with_label($label);
-				if (ref $check)	{ $item->set_active(1) if grep $_ eq $value, @$check; }
-				else
-				{	$item->set_draw_as_radio(1);
-					$item->set_active(1) if $check eq $value;
-				}
+				$item->set_active(1) if $selection->{$value};
+				$item->set_draw_as_radio(1) if $radio;
 			}
 			$item->{selected}= $value;
 			$item->signal_connect(activate => $smenu_callback, $options{code} );
@@ -4323,7 +4347,7 @@
 {	my ($IDs,$copy)=@_;
 	my $msg=$copy	?	_"Choose directory to copy files to"
 			:	_"Choose directory to move files to";
-	my $newdir=ChooseDir($msg, Songs::Get($IDs->[0],'path').SLASH);
+	my $newdir=ChooseDir($msg, path=>Songs::Get($IDs->[0],'path').SLASH);
 	CopyMoveFiles($IDs,copy=>$copy,basedir=>$newdir) if defined $newdir;
 }
 
@@ -4406,7 +4430,8 @@
 }
 
 sub ChooseDir
-{	my ($msg,$path,$extrawidget,$remember_key,$multiple,$allowfiles) = @_;
+{	my ($msg,%opt)=@_;
+	my ($path,$extrawidget,$remember_key,$multiple,$allowfiles) = @opt{qw/path extrawidget remember_key multiple allowfiles/};
 	my $mode= $allowfiles ? 'open' : 'select-folder';
 	# there is no mode in Gtk2::FileChooserDialog that let you select both files or folders (Bug #136294), so use Gtk2::FileChooserWidget directly as it doesn't interfere with the ok button (in "open" mode pressing ok in a Gtk2::FileChooserDialog while a folder is selected go inside that folder rather than emiiting the ok response with that folder selected)
 	my $dialog=Gtk2::Dialog->new($msg,undef,[], 'gtk-ok' => 'ok', 'gtk-cancel' => 'none');
@@ -4418,6 +4443,8 @@
 	$dialog->vbox->set_spacing(5);			#
 	::SetWSize($dialog,'ChooseDir','750x580');
 
+	if (ref $allowfiles) { FileChooser_add_filters($filechooser,@$allowfiles); }
+
 	if ($remember_key)	{ $path= $Options{$remember_key}; }
 	elsif ($path)		{ $path= url_escape($path); }
 	$filechooser->set_current_folder_uri("file://".$path) if $path;
@@ -4456,6 +4483,17 @@
 #	return $path;
 #}
 
+sub FileChooser_add_filters
+{	my ($filechooser,@patterns)=@_;
+	for my $aref (@patterns)
+	{	my $filter= Gtk2::FileFilter->new;
+		if ($aref->[1])	{ $filter->add_mime_type($_)	for split / /,$aref->[1]; }
+		if ($aref->[2])	{ $filter->add_pattern($_)	for split / /,$aref->[2]; }
+		$filter->set_name($aref->[0]);
+		$filechooser->add_filter($filter);
+	}
+}
+
 sub ChooseFiles
 {	my ($text,$remember_key,@patterns)=@_;
 	$text||=_"Choose files";
@@ -4463,13 +4501,7 @@
 					'gtk-ok' => 'ok',
 					'gtk-cancel' => 'none');
 	$dialog->set_select_multiple(1);
-	for my $aref (@patterns)
-	{	my $filter= Gtk2::FileFilter->new;
-		if ($aref->[1])	{ $filter->add_mime_type($_)	for split / /,$aref->[1]; }
-		if ($aref->[2])	{ $filter->add_pattern($_)	for split / /,$aref->[2]; }
-		$filter->set_name($aref->[0]);
-		$dialog->add_filter($filter);
-	}
+	FileChooser_add_filters($dialog,@patterns);
 	if ($remember_key)
 	{	my $path= decode_url($Options{$remember_key});
 		$dialog->set_current_folder($path);
@@ -4495,18 +4527,11 @@
 					'gtk-ok' => 'ok',
 					'gtk-cancel' => 'none');
 
-	for my $aref
-	(	[_"Pictures and music files",'image/*','*.mp3 *.flac *.m4a *.m4b *.ogg *.oga' ],
+	FileChooser_add_filters($dialog,
+		[_"Pictures and music files",'image/*','*.mp3 *.flac *.m4a *.m4b *.ogg *.oga' ],
 		[_"Pictures files",'image/*'],
 		[_"All files",undef,'*'],
-	)
-	{	my $filter= Gtk2::FileFilter->new;
-		#$filter->add_mime_type('image/'.$_) for qw/jpeg gif png bmp/;
-		if ($aref->[1])	{ $filter->add_mime_type($_)	for split / /,$aref->[1]; }
-		if ($aref->[2])	{ $filter->add_pattern($_)	for split / /,$aref->[2]; }
-		$filter->set_name($aref->[0]);
-		$dialog->add_filter($filter);
-	}
+	);
 
 	my $preview=Gtk2::VBox->new;
 	my $label=Gtk2::Label->new;
@@ -4760,7 +4785,7 @@
 	return unless @$IDs;
 	my $text=(@$IDs==1)? "'".Songs::Display($IDs->[0],'file')."'" : __("%d file","%d files",scalar @$IDs);
 	my $dialog = Gtk2::MessageDialog->new
-		( undef,
+		( ::get_event_window(),
 		  'modal',
 		  'warning','cancel','%s',
 		  __x(_("About to delete {files}\nAre you sure ?"), files => $text)
@@ -5454,19 +5479,17 @@
 	return @IDs;
 }
 
-sub MakeScanRegex	#FIXME
-{	my $s;
-	if ($Options{ScanPlayOnly})
-	{	my %ext; $ext{$_}=1 for ($PlayNext_package||$Play_package)->supported_formats;
-		$ext{$_}=1 for grep $ext{$Alias_ext{$_}}, keys %Alias_ext;
-		$s=join '|',keys %ext;
-	}
-	else { $s='mp3|ogg|oga|flac|mpc|ape|wv|m4a|m4b'; } #FIXME find a better way
-	$ScanRegex=qr/\.(?:$s)$/i;
+sub MakeScanRegex
+{	my %ext; $ext{$_}=1 for @ScanExt;
+	my $ignore= $Options{ScanIgnore} || [];
+	delete $ext{$_} for @$ignore;
+	my $re=join '|', sort keys %ext;
+	warn "Scan regular expression is empty\n" unless $re;
+	$ScanRegex=qr/\.(?:$re)$/i;
 }
 
 sub ScanFolder
-{	warn "ScanFolder(@_)\n";
+{	warn "Scanning : @_\n" if $Verbose;
 	my $dir=$_[0];
 	$dir=~s#^file://##;
 	MakeScanRegex() unless $ScanRegex;
@@ -6165,47 +6188,6 @@
 }
 sub Set_replaygain { $Play_package->RG_set_options() if $Play_package->can('RG_set_options'); }
 
-sub pref_artists_update_desc
-{	my $button=shift;
-	my $hash= $button->{hash};
-	my $key=  $button->{key};
-	my $text= join '  ',map $hash->{$_}||=qq("$_"), @{ $Options{$key} };
-	$text||= $button->{empty};
-	unless ($button->{label})
-	{	my $label= $button->{label}= Gtk2::Label->new;
-		#$label->set_ellipsize('end');
-		my $hbox=Gtk2::HBox->new(0,0);
-		$hbox->pack_start($label,1,1,2);
-		$hbox->pack_start($_,0,0,2) for Gtk2::VSeparator->new, Gtk2::Arrow->new('down','none');
-		$button->add($hbox);
-	}
-	$button->{label}->set_text($text);
-}
-sub pref_artists_change_cb
-{	my $button= $_[0]{button};
-	my $key= $button->{key};
-	my $l= $Options{$key};
-	my $before=@$l;
-	@$l= grep $_ ne $_[1], @$l;
-	push @$l,$_[1] if $before==@$l;
-	@$l= sort @$l;
-	pref_artists_update_desc($button);
-	Songs::UpdateArtistsRE();
-}
-sub pref_artists_button_cb
-{	my ($button,$event)=@_;
-	my $menu=BuildChoiceMenu
-	(	$button->{hash},
-		check=> sub { $Options{$_[0]{button}{key}} },
-		code => \&pref_artists_change_cb,
-		'reverse'=>1,
-		args => {button=>$button},
-	);
-	PopupMenu($menu,event=>$event);
-	1;
-}
-
-
 sub PrefMisc
 {	#Default rating
 	my $DefRating=NewPrefSpinButton('DefaultRating',0,100, step=>10, page=>20, text=>_"Default rating : %d %", cb=> sub
@@ -6231,24 +6213,13 @@
 	my $shutentry=NewPrefEntry(Shutdown_cmd => _"Shutdown command :", tip => _"Command used when\n'turn off computer when queue empty'\nis selected", cb=> \&Update_QueueActionList);
 
 	#artist splitting
-	my $asplit_label= Gtk2::Label->new(_"Split artist names on :");
-	my $asplit=Gtk2::Button->new;
-	$asplit->set_tooltip_text(_"Used for the Artists field");
-	$asplit->{hash}= \%Artists_split;
-	$asplit->{key}= 'Artists_split_re';
-	$asplit->{empty}= _"no splitting";
-	pref_artists_update_desc($asplit);
-	$asplit->signal_connect(button_press_event=> \&pref_artists_button_cb);
-
+	my $asplit= NewPrefMultiCombo( Artists_split_re=>\%Artists_split,
+		text=>_"Split artist names on :", tip=>_"Used for the Artists field", separator=> '  ',
+		empty=>_"no splitting", cb=>\&Songs::UpdateArtistsRE );
 	#artist in title
-	my $atitle_label= Gtk2::Label->new(_"Extract guest artist from title :");
-	my $atitle=Gtk2::Button->new;
-	$atitle->set_tooltip_text(_"Used for the Artists field");
-	$atitle->{hash}= \%Artists_from_title;
-	$atitle->{key}= 'Artists_title_re';
-	$atitle->{empty}= _"ignore title";
-	pref_artists_update_desc($atitle);
-	$atitle->signal_connect(button_press_event=> \&pref_artists_button_cb);
+	my $atitle= NewPrefMultiCombo( Artists_title_re=>\%Artists_from_title,
+		text=>_"Extract guest artist from title :", tip=>_"Used for the Artists field", separator=> '  ',
+		empty=>_"ignore title", cb=>\&Songs::UpdateArtistsRE );
 
 	#date format
 	my $dateex= mktime(5,4,3,2,0,(localtime)[5]);
@@ -6278,7 +6249,7 @@
 	my $playedpercent= NewPrefSpinButton('PlayedMinPercent'	,0,100,  text=>_"Threshold to count a song as played : %d %");
 	my $playedseconds= NewPrefSpinButton('PlayedMinSeconds'	,0,99999,text=>_"or %d seconds");
 
-	my $vbox= Vpack( $checkR1,$checkR2,$checkR4, $DefRating,$ProxyCheck, [$asplit_label, $asplit],[$atitle_label, $atitle],
+	my $vbox= Vpack( $checkR1,$checkR2,$checkR4, $DefRating,$ProxyCheck, $asplit, $atitle,
 			[0,$datealign,$preview], $screensaver,$shutentry, $always_in_pl,
 			$recent_include_not_played, $volstep, $pixcache,
 			[ $playedpercent, $playedseconds ],
@@ -6442,7 +6413,7 @@
 {	my $parent=shift;
 	$parent=~s/([^$QSLASH]+)$//o;
 	my $folder=$1;
-	my $new=ChooseDir(_"Move folder to",$parent);
+	my $new=ChooseDir(_"Move folder to", path=>$parent);
 	return unless $new;
 	my $old=$parent.$folder.SLASH;
 	$new.=SLASH.$folder.SLASH;
@@ -6513,7 +6484,10 @@
 	$sw->set_policy ('automatic', 'automatic');
 	$sw->add($treeview);
 
-	my $Cscanall=NewPrefCheckButton(ScanPlayOnly => _"Do not add songs that can't be played", cb=>sub {$ScanRegex=undef});
+	my $extensions= NewPrefMultiCombo(ScanIgnore => {map {$_=>$_} @ScanExt},
+		text=>_"Ignored file extensions :", tip=>_"Files with these extensions won't be added", empty=>_"none",
+		cb=>sub {$ScanRegex=undef}, );
+
 	my $CScan=NewPrefCheckButton(StartScan => _"Search for new songs on startup");
 	my $CCheck=NewPrefCheckButton(StartCheck => _"Check for updated/deleted songs on startup");
 	my $BScan= NewIconButton('gtk-refresh',_"scan now", sub { IdleScan();	});
@@ -6557,7 +6531,7 @@
 			[$addbut,$rmdbut,'-',$reorg],
 			[$CCheck,'-',$BCheck],
 			[$CScan,'-',$BScan],
-			$Cscanall,
+			$extensions,
 			$autoremove,
 			[$lengthcheck,'-',$Blengthcheck],
 			$masterfiltercheck,
@@ -6567,7 +6541,8 @@
 }
 sub ChooseAddPath
 {	my ($addtolibrary,$allowfiles)=@_;
-	my @dirs=ChooseDir(_"Choose folder to add",undef,undef,'LastFolder_Add',1,$allowfiles);
+	$allowfiles&&= [ [_"Music files", undef, join(' ',map "*.$_", sort @ScanExt) ], [_"All files",undef,'*']  ];
+	my @dirs=ChooseDir(_"Choose folder to add", remember_key=>'LastFolder_Add', multiple=>1, allowfiles=>$allowfiles);
 	@dirs=map url_escape($_), @dirs;
 	AddPath($addtolibrary,@dirs);
 }
@@ -6605,7 +6580,7 @@
 	my $IDlist= Songs::MakeFilterFromGID($field,$gid)->filter;
 	if (my $nb=@$IDlist)
 	{	my $dialog = Gtk2::MessageDialog->new
-			( undef, #FIXME
+			( ::get_event_window(),
 			  [qw/modal destroy-with-parent/],
 			  'warning','ok-cancel',
 			  __("This label is set for %d song.","This label is set for %d songs.",$nb)."\n".
@@ -6679,7 +6654,7 @@
 			my ($label,$nb)=$store->get_value($iter);
 			if ($nb)
 			{	my $dialog = Gtk2::MessageDialog->new
-					( undef, #FIXME
+					( $treeview->get_toplevel,
 					  [qw/modal destroy-with-parent/],
 					  'warning','ok-cancel','%s',
 					  __("This label is set for %d song.","This label is set for %d songs.",$nb)."\n".
@@ -6902,7 +6877,7 @@
 		&$cb if $cb;
 	});
 	$button->signal_connect( clicked => sub
-	{	my $file= $folder? ChooseDir($text,$Options{$key}) : undef;
+	{	my $file= $folder? ChooseDir($text, path=>$Options{$key}) : undef;
 		return unless $file;
 		# could simply $entry->set_text(), but wouldn't work with filenames with broken encoding
 		SetOption( $key, url_escape($file) );
@@ -6973,15 +6948,66 @@
 	my $combo= NewPrefCombo($key => $buildlist, text => $text, sizeg1=>$sg1,sizeg2=>$sg2, tree=>1, cb => $cb, event=>'Layouts');
 	my $set_tooltip= sub	#show layout author in tooltip
 	 {	return if $_[1] && $_[1] ne $key;
-		my $author= $Layout::Layouts{$Options{$key}}{Author};
-		$author&&= _("by").' '.$author;
-		$_[0]->set_tooltip_text($author);
+		my $layoutdef= $Layout::Layouts{$Options{$key}};
+		my $tip= $layoutdef->{PATH}.$layoutdef->{FILE}.':'.$layoutdef->{LINE};
+		if (my $author= $layoutdef->{Author}) {	$tip= _("by")." $author\n$tip"; }
+		$_[0]->set_tooltip_text($tip);
 	 };
 	Watch( $combo, Option => $set_tooltip);
 	$set_tooltip->($combo);
 	return $combo;
 }
 
+sub NewPrefMultiCombo
+{	my ($key,$possible_values_hash,%opt)=@_;
+	my $sep= $opt{separator}|| ', ';
+	my $display_cb= $opt{display} || sub
+	 {	my $values= $Options{$key} || [];
+		return $opt{empty} unless @$values;
+		return join $sep,map $possible_values_hash->{$_}||=qq("$_"), @$values;
+	 };
+	$display_cb= sub {$opt{display}} if !ref $display_cb; # label in the button is a constant
+	my $button= Gtk2::Button->new;
+
+	my $label_value= Gtk2::Label->new;
+	#$label_value->set_ellipsize('end');
+	my $hbox=Gtk2::HBox->new(0,0);
+	$hbox->pack_start($label_value,1,1,2);
+	$hbox->pack_start($_,0,0,2) for Gtk2::VSeparator->new, Gtk2::Arrow->new('down','none');
+	$button->add($hbox);
+	$label_value->set_text( $display_cb->() );
+
+	my $change_cb=sub
+	 {	my $button= $_[0]{button};
+		$Options{$key}= $_[1];
+		$label_value->set_text( $display_cb->() );
+		$opt{cb}->() if $opt{cb};
+	 };
+	my $click_cb=sub
+	 {	my ($button,$event)=@_;
+		my $menu=BuildChoiceMenu
+		(	$possible_values_hash,
+			check=> sub { $Options{$key}||[] },
+			code => $change_cb,
+			'reverse'=>1, return_list=>1,
+			args => {button=>$button},
+		);
+		PopupMenu($menu,event=>$event);
+		1;
+	 };
+
+	$button->signal_connect(button_press_event=> \&$click_cb);
+	my $widget=$button;
+	if (defined $opt{text})
+	{	my $hbox0= Gtk2::HBox->new;
+		my $label= Gtk2::Label->new($opt{text});
+		$hbox0->pack_start($_, FALSE, FALSE, 2) for $label,$button;
+		$widget=$hbox0;
+	}
+	$widget->set_tooltip_text($opt{tip}) if $opt{tip};
+	return $widget;
+}
+
 sub NewIconButton
 {	my ($icon,$text,$coderef,$style,$tip)=@_;
 	my $but=Gtk2::Button->new;
@@ -8727,7 +8753,7 @@
 	$entry->signal_connect(activate=> \&GMB::FilterBox::activate);
 	$button->signal_connect( clicked => sub
 	{	my $self=$_[0]->parent;
-		my $folder= ::ChooseDir(_"Choose a folder", $self->{value});
+		my $folder= ::ChooseDir(_"Choose a folder", path=>$self->{value});
 		return unless $folder;
 		$busy=1;
 		$self->Set( ::url_escape($folder) );

=== modified file '.pc/shimmer-layouts/gmusicbrowser_layout.pm'
--- .pc/shimmer-layouts/gmusicbrowser_layout.pm	2014-01-25 14:17:08 +0000
+++ .pc/shimmer-layouts/gmusicbrowser_layout.pm	2014-02-15 20:02:02 +0000
@@ -757,35 +757,36 @@
 
 sub ReadLayoutFile
 {	my $file=shift;
-	my $path=$file; $path=~s#[^/]+$##;
 	return unless -f $file;
 	open my$fh,"<:utf8",$file  or do { warn $!; return };
 	my $first;
+	my $linecount=0; my ($linefirst,$linenext);
 	while (1)
 	{	my ($next,$longline);
 		my @lines=($first);
 		while (local $_=<$fh>)
-	 	{	s#^\s+##;
+		{	$linecount++;
+			s#^\s+##;
 			next if m/^#/;
 			s#\s*[\n\r]+$##;
 			if (s#\\$##) {$longline.=$_;next}
 			next if $_ eq '';
 			if ($longline) {$_=$longline.$_;undef $longline;}
-			if (m#^[{[]#) {$next=$_;last}
+			if (m#^[{[]#) { $next=$_; $linenext=$linecount; last}
 			push @lines,$_;
 		}
 		if ($first)
-		{	if ($first=~m#^\[#) {ParseLayout(\@lines,$path)}
+		{	if ($first=~m#^\[#) {ParseLayout(\@lines,$file,$linefirst)}
 			else		{ParseSongTreeSkin(\@lines)}
 		}
-		$first=$next;
+		$first=$next; $linefirst=$linenext;
 		last unless $first;
 	}
 	close $fh;
 }
 
 sub ParseLayout
-{	my ($lines,$path)=@_;
+{	my ($lines,$file,$line)=@_;
 	my $first=shift @$lines;
 	my $name;
 	if ($first=~m/^\[([^]=]+)\](?:\s*based on (.+))?$/)
@@ -809,7 +810,10 @@
 	for my $key (qw/Name Category Title/)
 	{	$Layouts{$name}{$key}=~s/^"(.*)"$/$1/ if $Layouts{$name}{$key};	#remove quotes from layout name and category
 	}
+	my $path=$file; $path=~s#([^/]+)$##; $file=$1;
 	$Layouts{$name}{PATH}=$path;
+	$Layouts{$name}{FILE}=$file;
+	$Layouts{$name}{LINE}=$line;
 }
 
 sub ParseSongTreeSkin
@@ -858,6 +862,8 @@
 		%default= @optlist;
 	}
 	$_=::ParseOptions($_) for values %default;
+	$default{DEFAULT_OPTIONS}=1;
+	$default{Window}{DEFAULT_OPTIONS}=1;
 	return \%default;
 }
 
@@ -1802,6 +1808,9 @@
 	my (undef,undef,$monitorwidth,$monitorheight)=$screen->get_monitor_geometry($monitor)->values;
 	$w= $1*$monitorwidth/100 if $w=~m/(\d+)%/;
 	$h= $1*$monitorheight/100 if $h=~m/(\d+)%/;
+	if ($self->{options}{DEFAULT_OPTIONS}) { $monitorwidth-=40; $monitorheight-=80; } # if using default layout size, reserve some space for potential panels and decorations
+	$w=$monitorwidth if $w>$monitorwidth;
+	$h=$monitorheight if $h>$monitorheight;
 	if ($self->{fixedsize})
 	{	$w=-1 if $w<1;	# -1 => do not override default minimum size
 		$h=-1 if $h<1;
@@ -2581,7 +2590,7 @@
 }
 
 sub newbutton_cb
-{	 my $self= ::find_ancestor($_[0],__PACKAGE__);
+{	my $self= ::find_ancestor($_[0],__PACKAGE__);
 	::PopupContextMenu(\@contextmenu, { self=>$self, type=>$self->{typesubmenu}, usemenupos=>1 } );
 	1;
 }
@@ -4044,7 +4053,7 @@
 	}
 }
 sub SaveOptions
-{	my $self=shift,
+{	my $self=shift;
 	my %opt;
 	if (my $cats=$self->{cats})
 	{	$opt{collapsed}= $self->{collapsed}= join ' ', sort grep !$cats->{$_}->get_expanded, keys %$cats;

=== modified file '.pc/shimmer-layouts/gmusicbrowser_list.pm'
--- .pc/shimmer-layouts/gmusicbrowser_list.pm	2014-01-25 14:17:08 +0000
+++ .pc/shimmer-layouts/gmusicbrowser_list.pm	2014-02-15 20:02:02 +0000
@@ -311,6 +311,8 @@
 	my $watchedarray= $songlist && $songlist->{array};
 	return if !$watchedarray || ($array && $watchedarray!=$array);
 	$self->{bclear}->set_sensitive(scalar @$watchedarray);
+	$self->set_sensitive( !$songlist->{autoupdate} );
+	$self->set_visible( !$songlist->{autoupdate} );
 }
 
 sub SelectionChanged
@@ -533,8 +535,6 @@
 	}
 	$self->{filter}=$filter;
 	return if $self->{ignoreSetFilter};
-
-	#if ($self->{type} eq 'A') { $self->{array}->SetFilter($filter); return } #FIXME needs a PlayFilter with multiple levels to work correctly
 	$self->{array}->SetSortAndFilter($self->{sort},$filter);
 }
 sub Empty
@@ -560,10 +560,20 @@
 }
 sub RemoveSelected
 {	my $self=shift;
+	return if $self->{autoupdate}; #can't remove selection from an always-filtered list
 	my $songarray=$self->{array};
 	$songarray->Remove($self->GetSelectedRows);
 }
 
+sub PopupContextMenu
+{	my $self=shift;
+	#return unless @{$self->{array}}; #no context menu for empty lists
+	my @IDs=$self->GetSelectedIDs;
+	my %args=(self => $self, mode => $self->{type}, IDs => \@IDs, listIDs => $self->{array});
+	$args{allowremove}=1 unless $self->{autoupdate};
+	::PopupContextMenu(\@::SongCMenu,\%args);
+}
+
 sub MoveUpDown
 {	my ($self,$up,$max)=@_;
 	my $songarray=$self->{array};
@@ -1086,14 +1096,6 @@
 	1;
 }
 
-sub PopupContextMenu
-{	my ($self,$tv,$event)=@_;
-	#return unless @{$self->{array}}; #no context menu for empty lists
-	my @IDs=$self->GetSelectedIDs;
-	my %args=(self => $self, mode => $self->{type}, IDs => \@IDs, listIDs => $self->{array});
-	::PopupContextMenu(\@::SongCMenu,\%args );
-}
-
 sub GetCurrentRow
 {	my $self=shift;
 	my $tv=$self->child;
@@ -1556,7 +1558,7 @@
 			#$sel->select_path($path);
 			$tv->set_cursor($path);
 		}
-		$self->PopupContextMenu($tv,$event);
+		$self->PopupContextMenu;
 		return 1;
 	}
 	return 0; #let the event propagate
@@ -1739,7 +1741,7 @@
 	},
 	{ label=> _"Remove label",	stockicon => 'gtk-remove',
 		code => sub { my $gid=$_[0]{gidlist}[0]; ::RemoveLabel($_[0]{field},$gid); },
-		onlyone=> 'gidlist',	test => sub { $_[0]{field} eq 'label' },	#FIXME ? label specific
+		onlyone=> 'gidlist',	test => sub { $_[0]{field} eq 'label' && $_[0]{gidlist}[0] !=0 },	#FIXME make it generic rather than specific to field label ? #FIXME find a better way to chack if gid is special than comparing it to 0
 	},
 #	{ separator=>1 },
 	{ label => _"Options", submenu => \@MenuPageOptions, stock => 'gtk-preferences', isdefined => 'field' },
@@ -2095,7 +2097,7 @@
 }
 
 sub PopupContextMenu
-{	my ($page,$event,$hash,$menu)=@_;
+{	my ($page,$hash,$menu)=@_;
 	my $self=::find_ancestor($page,__PACKAGE__);
 	$hash->{filterpane}=$self;
 	$menu||=\@cMenu;
@@ -2103,8 +2105,7 @@
 }
 
 sub PopupOpt	#Only for FilterList #FIXME should be moved in FilterList::, and/or use a common function with FilterList::PopupContextMenu
-{	my ($but,$event)=@_;
-	my $self=::find_ancestor($but,__PACKAGE__);
+{	my $self=::find_ancestor($_[0],__PACKAGE__);
 	my $nb=$self->{notebook};
 	my $page=$nb->get_nth_page( $nb->get_current_page );
 	my $field=$page->{field}[0];
@@ -2548,13 +2549,12 @@
 }
 
 sub PopupContextMenu
-{	my ($self,undef,$event)=@_;
-	$self=::find_ancestor($self,__PACKAGE__);
+{	my $self=::find_ancestor($_[0],__PACKAGE__);
 	my ($field,$gidlist)=$self->get_selected_list;
 	my $mainfield=Songs::MainField($field);
 	my $aa= ($mainfield eq 'artist' || $mainfield eq 'album') ? $mainfield : undef; #FIXME
 	my $mode= uc(substr $self->{mode},0,1); # C => cloud, M => mosaic, L => list
-	FilterPane::PopupContextMenu($self,$event,{ self=> $self, filter => $self->get_selected_filters, field => $field, aa => $aa, gidlist =>$gidlist, mode => $mode, subfield => $field, depth =>0 });
+	FilterPane::PopupContextMenu($self,{ self=> $self, filter => $self->get_selected_filters, field => $field, aa => $aa, gidlist =>$gidlist, mode => $mode, subfield => $field, depth =>0 });
 }
 
 sub key_press_cb
@@ -2723,10 +2723,11 @@
 	FilterPane::Activate($self,$button,$filter);
 }
 sub PopupContextMenu
-{	my ($self,$tv,$event)=@_;
+{	my $self=shift;
+	my $tv=$self->{treeview};
 	my @paths=_get_path_selection($tv);
 	my @raw= map ::decode_url($_), @paths;
-	FilterPane::PopupContextMenu($self,$event,{self=>$tv, rawpathlist=> \@raw, pathlist => \@paths, filter => _MakeFolderFilter(@paths) });
+	FilterPane::PopupContextMenu($self,{self=>$tv, rawpathlist=> \@raw, pathlist => \@paths, filter => _MakeFolderFilter(@paths) });
 }
 
 sub _get_path_selection
@@ -2904,10 +2905,11 @@
 	FilterPane::Activate($self,$button,$filter);
 }
 sub PopupContextMenu
-{	my ($self,$tv,$event)=@_;
+{	my $self=$_[0];
+	my $tv=$self->{treeview};
 	my @paths=_get_path_selection($tv);
 	my @raw= map ::decode_url($_), @paths;
-	FilterPane::PopupContextMenu($self,$event,{self=>$tv, rawpathlist=> \@raw, pathlist => \@paths, filter => _MakeFolderFilter(@paths) });
+	FilterPane::PopupContextMenu($self,{self=>$tv, rawpathlist=> \@raw, pathlist => \@paths, filter => _MakeFolderFilter(@paths) });
 }
 
 sub _get_path_selection
@@ -3089,7 +3091,8 @@
 }
 
 sub PopupContextMenu
-{	my ($self,$tv,$event)=@_;
+{	my $self=shift;
+	my $tv=$self->{treeview};
 	my @rows=$tv->get_selection->get_selected_rows;
 	my $store=$tv->get_model;
 	my %sel;
@@ -3109,7 +3112,7 @@
 	else { $args{mode}=''; }
 	my $songlist=::GetSonglist($self);
 	$args{songlist}=$songlist if $songlist;
-	FilterPane::PopupContextMenu($self,$event,\%args, [@cMenu,{ separator=>1 },@FilterPane::cMenu] );
+	FilterPane::PopupContextMenu($self,\%args, [@cMenu,{ separator=>1 },@FilterPane::cMenu] );
 }
 
 sub drag_motion_cb
@@ -3383,6 +3386,7 @@
 	#return if $self->{Sel} == $key;
 	if (defined $key) { $self->{Sel}=$key; }
 	else		  { $key=$self->{Sel}; }
+	return unless defined $key;
 	my $aa=$self->{aa};
 	$self->pic_update;
 	$self->{Ltitle}->set_markup( AA::ReplaceFields($key,"<big><b>%a</b></big>",$aa,1) );
@@ -3432,6 +3436,7 @@
 sub setpic
 {	my $img=shift;
 	my $self= ::find_ancestor($img,__PACKAGE__);
+	return unless defined $self->{SelID};
 	my $file= $img->{filename}= AAPicture::GetPicture($self->{aa},$self->{Sel});
 	my $pixbuf= $file ? GMB::Picture::pixbuf($file,$img->{size}) : undef;
 	$img->set_from_pixbuf($pixbuf);
@@ -3494,7 +3499,7 @@
 );
 our @DefaultOptions=
 (	nb	=> 1,
-	fields	=> $SelectorMenu[0][1],
+	fields	=> $SelectorMenu[2][1],
 	autofilter =>1,
 );
 
@@ -3566,14 +3571,6 @@
 	$self->{$key}=$value;
 	$self->DoFilter unless $self->get_text eq '';
 }
-sub ToggleField
-{	my ($self,$field)=@_;
-	my @list= split /\|/,$self->{fields};
-	my $nb=@list;
-	@list= grep $_ ne $field, @list; #remove
-	push @list,$field if $nb==@list; #add if not removed
-	$self->ChangeOption(fields=> join '|',@list );
-}
 
 sub PopupSelectorMenu
 {	my $self=shift;
@@ -3590,9 +3587,9 @@
 	my $item1=Gtk2::MenuItem->new(_"Select search fields");
 	$item1->set_submenu( ::BuildChoiceMenu(
 					{ map { $_=>Songs::FieldName($_) } Songs::StringFields(),qw/file path year/,},
-					'reverse' =>1,
+					'reverse' =>1, return_list=>1,
 					check=> sub { [split /\|/,$self->{fields}]; },
-					code => sub { $self->ToggleField($_[1]); },
+					code => sub { $self->ChangeOption(fields=> join '|',@{$_[1]} ); },
 				) );
 	$menu->append($item1);
 	$menu->append(Gtk2::SeparatorMenuItem->new);
@@ -5451,8 +5448,7 @@
 }
 
 sub PopupOpt
-{	my ($widget,$event)=@_;
-	my $self=::find_ancestor($widget,__PACKAGE__);
+{	my $self=::find_ancestor($_[0],__PACKAGE__);
 	::PopupContextMenu(\@OptionsMenu, { self=>$self, usemenupos => 1,} );
 	return 1;
 }
@@ -6587,10 +6583,7 @@
 	{	if ($answer && !defined $depth && !vec($self->{selected},$row,1))
 		{	$self->song_selected($event,$row);
 		}
-		my @IDs=$self->GetSelectedIDs;
-		my %args=(self => $self, mode => $self->{type}, IDs => \@IDs, listIDs => $self->{array});
-		::PopupContextMenu(\@::SongCMenu,\%args );
-
+		$self->PopupContextMenu;
 		return 1;
 	}
 	else# ($but==1)

=== modified file '.pc/shimmer-layouts/plugins/fetch_cover.pm'
--- .pc/shimmer-layouts/plugins/fetch_cover.pm	2014-01-25 14:17:08 +0000
+++ .pc/shimmer-layouts/plugins/fetch_cover.pm	2014-02-15 20:02:02 +0000
@@ -389,6 +389,7 @@
 sub searchresults_cb
 {	my ($self,$result)=@_;
 	$self->{waiting}=undef;
+	warn "Getting results from $self->{url}\n" if $::Verbose;
 	unless (defined $result) { stop($self,_"connection failed."); return; }
 	my $parse= $Sites{$self->{mainfield}}{$self->{site}}[2];
 	my ($list,$nexturl)=$parse->($result,$self->{url},$self->{searchcontext});
@@ -565,5 +566,3 @@
 
 1
 
-__END__
-xml.amazon.com/onca/xml3?t=webservices-20&dev-t=%l&KeywordSearch=%s&mode=music&type=heavy&locale=us&page=1&f=xml

=== modified file 'NEWS'
--- NEWS	2014-01-25 14:17:08 +0000
+++ NEWS	2014-02-15 20:02:02 +0000
@@ -1,3 +1,14 @@
+v1.1.12
+fix not being able to remove filters from lists in playlist mode
+fix performances problems with autoupdated lists
+fix some dialogs appearing below other windows
+fix creating windows bigger than screen
+replace "Do not add songs that can't be played" option by "Ignored file extensions" option
+export plugin: fix wrong encoding of certain file names in .m3u
+export plugin: export more fields in csv files
+don't print messages in normal operation, add -verbose option
+translation updates: Chinese(Taiwan), Finnish
+
 v1.1.11
 improve search responsiveness (improve responsiveness of SimpleSearch)
 add auto-update mode that keeps browser lists sorted and filtered (on by default, can be disabled in the songlist/songtree option menu)

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-25 14:17:08 +0000
+++ debian/changelog	2014-02-15 20:02:02 +0000
@@ -1,3 +1,9 @@
+gmusicbrowser (1.1.12-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release.
+
+ -- Jackson Doak <[e-mail]>  Sun, 16 Feb 2014 06:55:42 +1100
+
 gmusicbrowser (1.1.11-1) unstable; urgency=medium
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2014-01-25 14:17:08 +0000
+++ debian/control	2014-02-15 20:02:02 +0000
@@ -1,7 +1,8 @@
 Source: gmusicbrowser
 Section: sound
 Priority: extra
-Maintainer: Debian Multimedia Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <[e-mail]>
 Uploaders:
  Antonio Radici <[e-mail]>,
  Alessio Treglia <[e-mail]>,

=== modified file 'debian/patches/shimmer-layouts'
--- debian/patches/shimmer-layouts	2014-01-25 14:17:08 +0000
+++ debian/patches/shimmer-layouts	2014-02-15 20:02:02 +0000
@@ -14,10 +14,10 @@
 
 --- a/gmbrc.default
 +++ b/gmbrc.default
-@@ -9,6 +9,16 @@
- # of the plugin found at the top of the plugin file :
+@@ -10,6 +10,16 @@
  PLUGIN_LYRICS: 1
  PLUGIN_FETCHCOVER: 1
+ PLUGIN_AUTOSAVE: 1
 +PLUGIN_ARTISTINFO: 1
 +PLUGIN_MPRIS2: 1
 +
@@ -33,7 +33,7 @@
  #Layout: Small player
 --- a/gmusicbrowser.pl
 +++ b/gmusicbrowser.pl
-@@ -497,9 +497,9 @@ our @cMenuAA=
+@@ -500,9 +500,9 @@ our @cMenuAA=
  (	{ label => _"Lock",	code => sub { ToggleLock($_[0]{lockfield}); }, check => sub { $::TogLock && $::TogLock eq $_[0]{lockfield}}, mode => 'P',
  	  test	=> sub { $_[0]{field} eq $_[0]{lockfield} || $_[0]{gid} == Songs::Get_gid($::SongID,$_[0]{lockfield}); },
  	},
@@ -105,7 +105,7 @@
  		event	=> 'Picture_artist',
  		update	=> \&Layout::AAPicture::Changed,
  		noinit	=> 1,
-@@ -1588,7 +1601,7 @@ use base 'Gtk2::Window';
+@@ -1594,7 +1607,7 @@ use base 'Gtk2::Window';
  sub new
  {	my ($class,$layout,%options)=@_;
  	my @original_args=@_;
@@ -145,7 +145,7 @@
  }
  
  ### selected functions
-@@ -1591,6 +1591,7 @@ our %Pages=
+@@ -1593,6 +1593,7 @@ our %Pages=
  our @MenuMarkupOptions=
  (	"%a",
  	"<b>%a</b>%Y\n<small>%s <small>%l</small></small>",
@@ -153,7 +153,7 @@
  	"<b>%a</b>%Y\n<small>%b</small>",
  	"<b>%a</b>%Y\n<small>%b</small>\n<small>%s <small>%l</small></small>",
  	"<b>%y %a</b>",
-@@ -1607,6 +1608,7 @@ my @mpicsize_menu=
+@@ -1609,6 +1610,7 @@ my @mpicsize_menu=
  	_("medium size")	=> 64,
  	_("big size")		=> 96,
  	_("huge size")		=> 128,
@@ -161,7 +161,7 @@
  );
  my @cloudstats_menu=
  (	_("number of songs")	=> 'count',
-@@ -3309,7 +3311,7 @@ sub new
+@@ -3312,7 +3314,7 @@ sub new
  		my $BAlblist=::NewIconButton('gmb-playlist',undef,undef,'none');
  		$BAlblist->signal_connect(button_press_event => \&AlbumListButton_press_cb);
  		$BAlblist->set_tooltip_text(_"Choose Album From this Artist");
@@ -170,7 +170,7 @@
  	}
  
  	my $drgsrc=$aa eq 'album' ? ::DRAG_ALBUM : ::DRAG_ARTIST;
-@@ -4601,6 +4603,16 @@ sub button_press_cb
+@@ -4598,6 +4600,16 @@ sub button_press_cb
  		else	{ $self->{pressed}=1; }
  		return 0;
  	}
@@ -187,7 +187,7 @@
  	if ($but==3)
  	{	my ($i,$j,$key)=$self->coord_to_index($event->get_coords);
  		if (defined $key && !exists $self->{selected}{$key})
-@@ -5526,7 +5538,7 @@ sub new
+@@ -5522,7 +5534,7 @@ sub new
  	my $default= $::Options{"DefaultOptions_$name"} || {};
  
  	%$opt=( @DefaultOptions, %$default, %$opt );
@@ -196,7 +196,7 @@
  
  	#create widgets used to draw the songtree as a treeview, would be nice to do without but it's not possible currently
  	$self->{stylewidget}=Gtk2::TreeView->new;
-@@ -5592,6 +5604,16 @@ sub new
+@@ -5588,6 +5600,16 @@ sub new
  	$self->AddColumn($_) for split / +/,$opt->{cols};
  	unless ($self->{cells}) { $self->AddColumn('title'); } #to ensure there is at least 1 column
  

=== modified file 'gmbrc.default'
--- gmbrc.default	2011-03-23 19:23:40 +0000
+++ gmbrc.default	2014-02-15 20:02:02 +0000
@@ -9,6 +9,7 @@
 # of the plugin found at the top of the plugin file :
 PLUGIN_LYRICS: 1
 PLUGIN_FETCHCOVER: 1
+PLUGIN_AUTOSAVE: 1
 PLUGIN_ARTISTINFO: 1
 PLUGIN_MPRIS2: 1
 

=== modified file 'gmusicbrowser.man'
--- gmusicbrowser.man	2012-02-08 00:33:53 +0000
+++ gmusicbrowser.man	2014-02-15 20:02:02 +0000
@@ -18,6 +18,7 @@
 [\-cfg FILE]
 [\-fifo FIFO|\-nofifo]
 [\-debug]
+[\-verbose]
 [\-layout NAME]
 [\-plugin NAME]
 [\-searchpath FOLDER]
@@ -93,8 +94,11 @@
 \fB\-dbus\-id KEY\fR
 append .KEY to the DBus service id used by gmusicbrowser (org.gmusicbrowser)
 .TP
+\fB\-verbose\fR
+print some info, like the file being played
+.TP
 \fB\-debug\fR
-print lots of useless information
+print lots of useless information, implies -verbose
 .TP
 \fB\-backtrace\fR
 print a backtrace for every warning

=== modified file 'gmusicbrowser.pl'
--- gmusicbrowser.pl	2014-01-25 14:17:08 +0000
+++ gmusicbrowser.pl	2014-02-15 20:02:02 +0000
@@ -79,8 +79,8 @@
 {
  TRUE  => 1,
  FALSE => 0,
- VERSION => '1.1011',
- VERSIONSTRING => '1.1.11',
+ VERSION => '1.1012',
+ VERSIONSTRING => '1.1.12',
  PIXPATH => $DATADIR.SLASH.'pix'.SLASH,
  PROGRAM_NAME => 'gmusicbrowser',
 # PERL510 => $^V ge 'v5.10',
@@ -151,8 +151,9 @@
 
 our %Alias_ext;	#define alternate file extensions (ie: .ogg files treated as .oga files)
 INIT {%Alias_ext=(ogg=> 'oga', m4b=>'m4a');} #needs to be in a INIT block because used in a INIT block in gmusicbrowser_tags.pm
+our @ScanExt= qw/mp3 ogg oga flac mpc ape wv m4a m4b/;
 
-our $debug;
+our ($Verbose,$debug);
 our %CmdLine;
 our ($HomeDir,$SaveFile,$FIFOFile,$ImportFile,$DBus_id);
 sub find_gmbrc_file { my @f= map $_[0].$_, '','.gz','.xz'; return wantarray ? (grep { -e $_ } @f) : first { -e $_ } @f }
@@ -185,7 +186,8 @@
 -nogst  : do not use gstreamer
 -server	: send playing song to connected icecast clent
 -port N : listen for connection on port N in icecast server mode
--debug	: print lots of mostly useless informations
+-verbose: print some info, like the file being played
+-debug	: print lots of mostly useless informations, implies -verbose
 -backtrace : print a backtrace for every warning
 -nodbus	: do not provide DBus services
 -dbus-id KEY : append .KEY to the DBus service id used by gmusicbrowser (org.gmusicbrowser)
@@ -243,7 +245,8 @@
 	elsif($arg eq '-ro')		{$CmdLine{ro}=$CmdLine{rotags}=1}
 	elsif($arg eq '-rotags')	{$CmdLine{rotags}=1}
 	elsif($arg eq '-port')		{$CmdLine{port}=shift if $ARGV[0]}
-	elsif($arg eq '-debug')		{$debug=1}
+	elsif($arg eq '-verbose')	{$Verbose=1}
+	elsif($arg eq '-debug')		{$debug=$Verbose=4}
 	elsif($arg eq '-backtrace')	{ $SIG{ __WARN__ } = \&Carp::cluck; $SIG{ __DIE__ } = \&Carp::confess; }
 	elsif($arg eq '-nofifo')	{$FIFOFile=''}
 	elsif($arg eq '-workspace')	{$CmdLine{workspace}=shift if defined $ARGV[0]} #requires Gnome2::Wnck
@@ -450,7 +453,7 @@
 $DRAGTYPES{$DRAGTYPES[$_][0]}=$_ for DRAG_FILE,DRAG_USTRING,DRAG_STRING,DRAG_ID,DRAG_ARTIST,DRAG_ALBUM,DRAG_FILTER,DRAG_MARKUP;
 
 our @submenuRemove=
-(	{ label => sub {$_[0]{mode} eq 'Q' ? _"Remove from queue" : $_[0]{mode} eq 'A' ? _"Remove from playlist" : _"Remove from list"},	code => sub { $_[0]{self}->RemoveSelected; }, mode => 'BLQA'},
+(	{ label => sub {$_[0]{mode} eq 'Q' ? _"Remove from queue" : $_[0]{mode} eq 'A' ? _"Remove from playlist" : _"Remove from list"},	code => sub { $_[0]{self}->RemoveSelected; }, mode => 'BLQA', istrue=> 'allowremove', },
 	{ label => _"Remove from library",	code => sub { SongsRemove($_[0]{IDs}); }, },
 	{ label => _"Remove from disk",		code => sub { DeleteFiles($_[0]{IDs}); },	test => sub {!$CmdLine{ro}},	stockicon => 'gtk-delete' },
 );
@@ -1192,6 +1195,8 @@
 	Rewind		=> [\&Rewind,				_"Rewind",_"Number of seconds",qr/^\d+$/],
 	Seek		=> [sub {SkipTo($_[1])},		_"Seek",_"Number of seconds",qr/^\d+$/],
 	Stop		=> [\&Stop,				_"Stop"],
+	Pause		=> [sub {Pause() if $TogPlay; },	_"Pause"],
+	Play		=> [sub {PlayPause() unless $TogPlay; },_"Play"],
 	Browser		=> [\&OpenBrowser,			_"Open Browser"],
 	OpenQueue	=> [\&EditQueue,			_"Open Queue window"],
 	OpenSearch	=> [sub { Layout::Window->new($Options{LayoutS}, uniqueid=>'Search'); },	_"Open Search window"],
@@ -1488,6 +1493,11 @@
 	return $utf8name;
 }
 
+sub get_event_window
+{	my $widget=shift;
+	$widget||= Gtk2->get_event_widget(Gtk2->get_current_event);
+	return find_ancestor($widget,'Gtk2::Window');
+}
 sub get_layout_widget
 {	find_ancestor($_[0],'Layout');
 }
@@ -2038,6 +2048,7 @@
 		$oldversion||=delete $Options{version} || VERSION;  # for version <=1.1.7
 		if ($oldversion>VERSION) { warn "Loading a gmbrc saved with a more recent version of gmusicbrowser, try upgrading gmusicbrowser if there are problems\n"; }
 		if ($oldversion<1.10091) {delete $Options{$_} for qw/Diacritic_sort gst_volume Simplehttp_CacheSize mplayer_use_replaygain/;} #cleanup old options
+		if ($oldversion<=1.1011) {delete $Options{$_} for qw/ScanPlayOnly/;} #cleanup old options
 		$Options{AutoRemoveCurrentSong}= delete $Options{TAG_auto_check_current} if $oldversion<1.1005 && exists $Options{TAG_auto_check_current};
 		$Options{PlayedMinPercent}= 100*delete $Options{PlayedPercent} if exists $Options{PlayedPercent};
 		if ($Options{ArtistSplit}) # for versions <= 1.1.5
@@ -2181,7 +2192,7 @@
 sub SaveTags	#save tags _and_ settings
 {	my $fork=shift; #if true, save in a forked process
 	HasChanged('Save');
-	if ($CmdLine{demo}) { warn "-demo option => not saving tags/settings\n"; return }
+	if ($CmdLine{demo}) { warn "-demo option => not saving tags/settings\n" if $Verbose || !$fork; return }
 
 	my $ext='';
 	my $SaveFile= $SaveFile; #do a local copy to locally remove .gz extension if present
@@ -2231,7 +2242,7 @@
 	my $error;
 	(my$fh,my$tempfile,$ext)= Open_gmbrc("$SaveFile.new.$$"."$ext",1);
 	unless ($fh) { warn "Save aborted\n"; POSIX::_exit(0) if $fork; return; }
-	warn "Writing tags in $SaveFile$ext ...\n";
+	warn "Writing tags in $SaveFile$ext ...\n" if $Verbose || !$fork;
 
 	print $fh "# gmbrc version=".VERSION." time=".time."\n"  or $error||=$!;
 
@@ -2248,7 +2259,7 @@
 	}
 	#save fields properties, like album pictures ...
 	for my $field (sort keys %$extrasub)
-	{	print $fh "\n[$field]\n$extra_subfields->{$field}\n"  or $error++;
+	{	print $fh "\n[$field]\n$extra_subfields->{$field}\n"  or $error||=$!;
 		my $h= $extrasub->{$field}->();
 		for my $key (sort keys %$h)
 		{	my $vals= $h->{$key};
@@ -2297,7 +2308,7 @@
 		unlink $_ for find_gmbrc_file($SaveFile); #make sure there is no other old gmbrc without .bak, as they could cause confusion
 	}
 	rename $tempfile,$SaveFile.$ext  or warn $!;
-	warn "Writing tags in $SaveFile$ext ... done\n";
+	warn "Writing tags in $SaveFile$ext ... done\n" if $Verbose || !$fork;
 	POSIX::_exit(0) if $fork;
 }
 
@@ -2508,7 +2519,7 @@
 	warn $error."\n";
 	return if $Options{IgnorePlayError};
 	my $dialog = Gtk2::MessageDialog->new
-		( undef, [qw/modal destroy-with-parent/],
+		( $MainWindow, [qw/modal destroy-with-parent/],
 		  'error','close','%s',
 		  $error
 		);
@@ -4075,7 +4086,7 @@
 sub PopupContextMenu
 {	my $args=$_[1];
 	my $menu=BuildMenu(@_);
-	PopupMenu($menu,nomenupos=>!$args->{usemenupos});
+	PopupMenu($menu,nomenupos=>!$args->{usemenupos},self=>$args->{self});
 }
 
 sub PopupMenu
@@ -4083,6 +4094,8 @@
 	return unless $menu->get_children;
 	$menu->show_all;
 	my $event= $args{event} || Gtk2->get_current_event;
+	my $widget= $args{self} || Gtk2->get_event_widget($event);
+	$menu->attach_to_widget($widget,undef) if $widget;
 	my $posfunction= $args{posfunction}; # usually undef
 	my $button=my $time=0;
 	if ($event)
@@ -4135,12 +4148,26 @@
 	my @order= 0..$#labels;
 	@order=sort {superlc($labels[$a]) cmp superlc($labels[$b])} @order if ref $choices eq 'HASH' || $tree;
 
+	my $selection;
 	my $smenu_callback=sub
 	 {	my $sub=$_[1];
-		$sub->( $args, $_[0]{selected} );
+		my $selected= $_[0]{selected};
+		if ($selection && $options{return_list})
+		{	$selection->{$selected} ^=1;
+			$selected= [sort grep $selection->{$_}, keys %$selection];
+		}
+		$sub->($args, $selected);
 	 };
-	my $check;
+	my ($check,$radio);
 	$check= $options{check}($args) if $options{check};
+	if (defined $check)
+	{	$selection={};
+		if (ref $check)	{ $selection->{$_}=1 for @$check; }
+		else
+		{	$radio=1;
+			$selection->{$check}=1;
+		}
+	}
 	for my $i (@order)
 	{	my $label=$labels[$i];
 		my $value=$values[$i];
@@ -4151,13 +4178,10 @@
 			$item->set_submenu($submenu);
 		}
 		else
-		{	if (defined $check)
+		{	if ($selection)
 			{	$item=Gtk2::CheckMenuItem->new_with_label($label);
-				if (ref $check)	{ $item->set_active(1) if grep $_ eq $value, @$check; }
-				else
-				{	$item->set_draw_as_radio(1);
-					$item->set_active(1) if $check eq $value;
-				}
+				$item->set_active(1) if $selection->{$value};
+				$item->set_draw_as_radio(1) if $radio;
 			}
 			$item->{selected}= $value;
 			$item->signal_connect(activate => $smenu_callback, $options{code} );
@@ -4323,7 +4347,7 @@
 {	my ($IDs,$copy)=@_;
 	my $msg=$copy	?	_"Choose directory to copy files to"
 			:	_"Choose directory to move files to";
-	my $newdir=ChooseDir($msg, Songs::Get($IDs->[0],'path').SLASH);
+	my $newdir=ChooseDir($msg, path=>Songs::Get($IDs->[0],'path').SLASH);
 	CopyMoveFiles($IDs,copy=>$copy,basedir=>$newdir) if defined $newdir;
 }
 
@@ -4406,7 +4430,8 @@
 }
 
 sub ChooseDir
-{	my ($msg,$path,$extrawidget,$remember_key,$multiple,$allowfiles) = @_;
+{	my ($msg,%opt)=@_;
+	my ($path,$extrawidget,$remember_key,$multiple,$allowfiles) = @opt{qw/path extrawidget remember_key multiple allowfiles/};
 	my $mode= $allowfiles ? 'open' : 'select-folder';
 	# there is no mode in Gtk2::FileChooserDialog that let you select both files or folders (Bug #136294), so use Gtk2::FileChooserWidget directly as it doesn't interfere with the ok button (in "open" mode pressing ok in a Gtk2::FileChooserDialog while a folder is selected go inside that folder rather than emiiting the ok response with that folder selected)
 	my $dialog=Gtk2::Dialog->new($msg,undef,[], 'gtk-ok' => 'ok', 'gtk-cancel' => 'none');
@@ -4418,6 +4443,8 @@
 	$dialog->vbox->set_spacing(5);			#
 	::SetWSize($dialog,'ChooseDir','750x580');
 
+	if (ref $allowfiles) { FileChooser_add_filters($filechooser,@$allowfiles); }
+
 	if ($remember_key)	{ $path= $Options{$remember_key}; }
 	elsif ($path)		{ $path= url_escape($path); }
 	$filechooser->set_current_folder_uri("file://".$path) if $path;
@@ -4456,6 +4483,17 @@
 #	return $path;
 #}
 
+sub FileChooser_add_filters
+{	my ($filechooser,@patterns)=@_;
+	for my $aref (@patterns)
+	{	my $filter= Gtk2::FileFilter->new;
+		if ($aref->[1])	{ $filter->add_mime_type($_)	for split / /,$aref->[1]; }
+		if ($aref->[2])	{ $filter->add_pattern($_)	for split / /,$aref->[2]; }
+		$filter->set_name($aref->[0]);
+		$filechooser->add_filter($filter);
+	}
+}
+
 sub ChooseFiles
 {	my ($text,$remember_key,@patterns)=@_;
 	$text||=_"Choose files";
@@ -4463,13 +4501,7 @@
 					'gtk-ok' => 'ok',
 					'gtk-cancel' => 'none');
 	$dialog->set_select_multiple(1);
-	for my $aref (@patterns)
-	{	my $filter= Gtk2::FileFilter->new;
-		if ($aref->[1])	{ $filter->add_mime_type($_)	for split / /,$aref->[1]; }
-		if ($aref->[2])	{ $filter->add_pattern($_)	for split / /,$aref->[2]; }
-		$filter->set_name($aref->[0]);
-		$dialog->add_filter($filter);
-	}
+	FileChooser_add_filters($dialog,@patterns);
 	if ($remember_key)
 	{	my $path= decode_url($Options{$remember_key});
 		$dialog->set_current_folder($path);
@@ -4495,18 +4527,11 @@
 					'gtk-ok' => 'ok',
 					'gtk-cancel' => 'none');
 
-	for my $aref
-	(	[_"Pictures and music files",'image/*','*.mp3 *.flac *.m4a *.m4b *.ogg *.oga' ],
+	FileChooser_add_filters($dialog,
+		[_"Pictures and music files",'image/*','*.mp3 *.flac *.m4a *.m4b *.ogg *.oga' ],
 		[_"Pictures files",'image/*'],
 		[_"All files",undef,'*'],
-	)
-	{	my $filter= Gtk2::FileFilter->new;
-		#$filter->add_mime_type('image/'.$_) for qw/jpeg gif png bmp/;
-		if ($aref->[1])	{ $filter->add_mime_type($_)	for split / /,$aref->[1]; }
-		if ($aref->[2])	{ $filter->add_pattern($_)	for split / /,$aref->[2]; }
-		$filter->set_name($aref->[0]);
-		$dialog->add_filter($filter);
-	}
+	);
 
 	my $preview=Gtk2::VBox->new;
 	my $label=Gtk2::Label->new;
@@ -4760,7 +4785,7 @@
 	return unless @$IDs;
 	my $text=(@$IDs==1)? "'".Songs::Display($IDs->[0],'file')."'" : __("%d file","%d files",scalar @$IDs);
 	my $dialog = Gtk2::MessageDialog->new
-		( undef,
+		( ::get_event_window(),
 		  'modal',
 		  'warning','cancel','%s',
 		  __x(_("About to delete {files}\nAre you sure ?"), files => $text)
@@ -5454,19 +5479,17 @@
 	return @IDs;
 }
 
-sub MakeScanRegex	#FIXME
-{	my $s;
-	if ($Options{ScanPlayOnly})
-	{	my %ext; $ext{$_}=1 for ($PlayNext_package||$Play_package)->supported_formats;
-		$ext{$_}=1 for grep $ext{$Alias_ext{$_}}, keys %Alias_ext;
-		$s=join '|',keys %ext;
-	}
-	else { $s='mp3|ogg|oga|flac|mpc|ape|wv|m4a|m4b'; } #FIXME find a better way
-	$ScanRegex=qr/\.(?:$s)$/i;
+sub MakeScanRegex
+{	my %ext; $ext{$_}=1 for @ScanExt;
+	my $ignore= $Options{ScanIgnore} || [];
+	delete $ext{$_} for @$ignore;
+	my $re=join '|', sort keys %ext;
+	warn "Scan regular expression is empty\n" unless $re;
+	$ScanRegex=qr/\.(?:$re)$/i;
 }
 
 sub ScanFolder
-{	warn "ScanFolder(@_)\n";
+{	warn "Scanning : @_\n" if $Verbose;
 	my $dir=$_[0];
 	$dir=~s#^file://##;
 	MakeScanRegex() unless $ScanRegex;
@@ -6165,47 +6188,6 @@
 }
 sub Set_replaygain { $Play_package->RG_set_options() if $Play_package->can('RG_set_options'); }
 
-sub pref_artists_update_desc
-{	my $button=shift;
-	my $hash= $button->{hash};
-	my $key=  $button->{key};
-	my $text= join '  ',map $hash->{$_}||=qq("$_"), @{ $Options{$key} };
-	$text||= $button->{empty};
-	unless ($button->{label})
-	{	my $label= $button->{label}= Gtk2::Label->new;
-		#$label->set_ellipsize('end');
-		my $hbox=Gtk2::HBox->new(0,0);
-		$hbox->pack_start($label,1,1,2);
-		$hbox->pack_start($_,0,0,2) for Gtk2::VSeparator->new, Gtk2::Arrow->new('down','none');
-		$button->add($hbox);
-	}
-	$button->{label}->set_text($text);
-}
-sub pref_artists_change_cb
-{	my $button= $_[0]{button};
-	my $key= $button->{key};
-	my $l= $Options{$key};
-	my $before=@$l;
-	@$l= grep $_ ne $_[1], @$l;
-	push @$l,$_[1] if $before==@$l;
-	@$l= sort @$l;
-	pref_artists_update_desc($button);
-	Songs::UpdateArtistsRE();
-}
-sub pref_artists_button_cb
-{	my ($button,$event)=@_;
-	my $menu=BuildChoiceMenu
-	(	$button->{hash},
-		check=> sub { $Options{$_[0]{button}{key}} },
-		code => \&pref_artists_change_cb,
-		'reverse'=>1,
-		args => {button=>$button},
-	);
-	PopupMenu($menu,event=>$event);
-	1;
-}
-
-
 sub PrefMisc
 {	#Default rating
 	my $DefRating=NewPrefSpinButton('DefaultRating',0,100, step=>10, page=>20, text=>_"Default rating : %d %", cb=> sub
@@ -6231,24 +6213,13 @@
 	my $shutentry=NewPrefEntry(Shutdown_cmd => _"Shutdown command :", tip => _"Command used when\n'turn off computer when queue empty'\nis selected", cb=> \&Update_QueueActionList);
 
 	#artist splitting
-	my $asplit_label= Gtk2::Label->new(_"Split artist names on :");
-	my $asplit=Gtk2::Button->new;
-	$asplit->set_tooltip_text(_"Used for the Artists field");
-	$asplit->{hash}= \%Artists_split;
-	$asplit->{key}= 'Artists_split_re';
-	$asplit->{empty}= _"no splitting";
-	pref_artists_update_desc($asplit);
-	$asplit->signal_connect(button_press_event=> \&pref_artists_button_cb);
-
+	my $asplit= NewPrefMultiCombo( Artists_split_re=>\%Artists_split,
+		text=>_"Split artist names on :", tip=>_"Used for the Artists field", separator=> '  ',
+		empty=>_"no splitting", cb=>\&Songs::UpdateArtistsRE );
 	#artist in title
-	my $atitle_label= Gtk2::Label->new(_"Extract guest artist from title :");
-	my $atitle=Gtk2::Button->new;
-	$atitle->set_tooltip_text(_"Used for the Artists field");
-	$atitle->{hash}= \%Artists_from_title;
-	$atitle->{key}= 'Artists_title_re';
-	$atitle->{empty}= _"ignore title";
-	pref_artists_update_desc($atitle);
-	$atitle->signal_connect(button_press_event=> \&pref_artists_button_cb);
+	my $atitle= NewPrefMultiCombo( Artists_title_re=>\%Artists_from_title,
+		text=>_"Extract guest artist from title :", tip=>_"Used for the Artists field", separator=> '  ',
+		empty=>_"ignore title", cb=>\&Songs::UpdateArtistsRE );
 
 	#date format
 	my $dateex= mktime(5,4,3,2,0,(localtime)[5]);
@@ -6278,7 +6249,7 @@
 	my $playedpercent= NewPrefSpinButton('PlayedMinPercent'	,0,100,  text=>_"Threshold to count a song as played : %d %");
 	my $playedseconds= NewPrefSpinButton('PlayedMinSeconds'	,0,99999,text=>_"or %d seconds");
 
-	my $vbox= Vpack( $checkR1,$checkR2,$checkR4, $DefRating,$ProxyCheck, [$asplit_label, $asplit],[$atitle_label, $atitle],
+	my $vbox= Vpack( $checkR1,$checkR2,$checkR4, $DefRating,$ProxyCheck, $asplit, $atitle,
 			[0,$datealign,$preview], $screensaver,$shutentry, $always_in_pl,
 			$recent_include_not_played, $volstep, $pixcache,
 			[ $playedpercent, $playedseconds ],
@@ -6442,7 +6413,7 @@
 {	my $parent=shift;
 	$parent=~s/([^$QSLASH]+)$//o;
 	my $folder=$1;
-	my $new=ChooseDir(_"Move folder to",$parent);
+	my $new=ChooseDir(_"Move folder to", path=>$parent);
 	return unless $new;
 	my $old=$parent.$folder.SLASH;
 	$new.=SLASH.$folder.SLASH;
@@ -6513,7 +6484,10 @@
 	$sw->set_policy ('automatic', 'automatic');
 	$sw->add($treeview);
 
-	my $Cscanall=NewPrefCheckButton(ScanPlayOnly => _"Do not add songs that can't be played", cb=>sub {$ScanRegex=undef});
+	my $extensions= NewPrefMultiCombo(ScanIgnore => {map {$_=>$_} @ScanExt},
+		text=>_"Ignored file extensions :", tip=>_"Files with these extensions won't be added", empty=>_"none",
+		cb=>sub {$ScanRegex=undef}, );
+
 	my $CScan=NewPrefCheckButton(StartScan => _"Search for new songs on startup");
 	my $CCheck=NewPrefCheckButton(StartCheck => _"Check for updated/deleted songs on startup");
 	my $BScan= NewIconButton('gtk-refresh',_"scan now", sub { IdleScan();	});
@@ -6557,7 +6531,7 @@
 			[$addbut,$rmdbut,'-',$reorg],
 			[$CCheck,'-',$BCheck],
 			[$CScan,'-',$BScan],
-			$Cscanall,
+			$extensions,
 			$autoremove,
 			[$lengthcheck,'-',$Blengthcheck],
 			$masterfiltercheck,
@@ -6567,7 +6541,8 @@
 }
 sub ChooseAddPath
 {	my ($addtolibrary,$allowfiles)=@_;
-	my @dirs=ChooseDir(_"Choose folder to add",undef,undef,'LastFolder_Add',1,$allowfiles);
+	$allowfiles&&= [ [_"Music files", undef, join(' ',map "*.$_", sort @ScanExt) ], [_"All files",undef,'*']  ];
+	my @dirs=ChooseDir(_"Choose folder to add", remember_key=>'LastFolder_Add', multiple=>1, allowfiles=>$allowfiles);
 	@dirs=map url_escape($_), @dirs;
 	AddPath($addtolibrary,@dirs);
 }
@@ -6605,7 +6580,7 @@
 	my $IDlist= Songs::MakeFilterFromGID($field,$gid)->filter;
 	if (my $nb=@$IDlist)
 	{	my $dialog = Gtk2::MessageDialog->new
-			( undef, #FIXME
+			( ::get_event_window(),
 			  [qw/modal destroy-with-parent/],
 			  'warning','ok-cancel',
 			  __("This label is set for %d song.","This label is set for %d songs.",$nb)."\n".
@@ -6679,7 +6654,7 @@
 			my ($label,$nb)=$store->get_value($iter);
 			if ($nb)
 			{	my $dialog = Gtk2::MessageDialog->new
-					( undef, #FIXME
+					( $treeview->get_toplevel,
 					  [qw/modal destroy-with-parent/],
 					  'warning','ok-cancel','%s',
 					  __("This label is set for %d song.","This label is set for %d songs.",$nb)."\n".
@@ -6902,7 +6877,7 @@
 		&$cb if $cb;
 	});
 	$button->signal_connect( clicked => sub
-	{	my $file= $folder? ChooseDir($text,$Options{$key}) : undef;
+	{	my $file= $folder? ChooseDir($text, path=>$Options{$key}) : undef;
 		return unless $file;
 		# could simply $entry->set_text(), but wouldn't work with filenames with broken encoding
 		SetOption( $key, url_escape($file) );
@@ -6973,15 +6948,66 @@
 	my $combo= NewPrefCombo($key => $buildlist, text => $text, sizeg1=>$sg1,sizeg2=>$sg2, tree=>1, cb => $cb, event=>'Layouts');
 	my $set_tooltip= sub	#show layout author in tooltip
 	 {	return if $_[1] && $_[1] ne $key;
-		my $author= $Layout::Layouts{$Options{$key}}{Author};
-		$author&&= _("by").' '.$author;
-		$_[0]->set_tooltip_text($author);
+		my $layoutdef= $Layout::Layouts{$Options{$key}};
+		my $tip= $layoutdef->{PATH}.$layoutdef->{FILE}.':'.$layoutdef->{LINE};
+		if (my $author= $layoutdef->{Author}) {	$tip= _("by")." $author\n$tip"; }
+		$_[0]->set_tooltip_text($tip);
 	 };
 	Watch( $combo, Option => $set_tooltip);
 	$set_tooltip->($combo);
 	return $combo;
 }
 
+sub NewPrefMultiCombo
+{	my ($key,$possible_values_hash,%opt)=@_;
+	my $sep= $opt{separator}|| ', ';
+	my $display_cb= $opt{display} || sub
+	 {	my $values= $Options{$key} || [];
+		return $opt{empty} unless @$values;
+		return join $sep,map $possible_values_hash->{$_}||=qq("$_"), @$values;
+	 };
+	$display_cb= sub {$opt{display}} if !ref $display_cb; # label in the button is a constant
+	my $button= Gtk2::Button->new;
+
+	my $label_value= Gtk2::Label->new;
+	#$label_value->set_ellipsize('end');
+	my $hbox=Gtk2::HBox->new(0,0);
+	$hbox->pack_start($label_value,1,1,2);
+	$hbox->pack_start($_,0,0,2) for Gtk2::VSeparator->new, Gtk2::Arrow->new('down','none');
+	$button->add($hbox);
+	$label_value->set_text( $display_cb->() );
+
+	my $change_cb=sub
+	 {	my $button= $_[0]{button};
+		$Options{$key}= $_[1];
+		$label_value->set_text( $display_cb->() );
+		$opt{cb}->() if $opt{cb};
+	 };
+	my $click_cb=sub
+	 {	my ($button,$event)=@_;
+		my $menu=BuildChoiceMenu
+		(	$possible_values_hash,
+			check=> sub { $Options{$key}||[] },
+			code => $change_cb,
+			'reverse'=>1, return_list=>1,
+			args => {button=>$button},
+		);
+		PopupMenu($menu,event=>$event);
+		1;
+	 };
+
+	$button->signal_connect(button_press_event=> \&$click_cb);
+	my $widget=$button;
+	if (defined $opt{text})
+	{	my $hbox0= Gtk2::HBox->new;
+		my $label= Gtk2::Label->new($opt{text});
+		$hbox0->pack_start($_, FALSE, FALSE, 2) for $label,$button;
+		$widget=$hbox0;
+	}
+	$widget->set_tooltip_text($opt{tip}) if $opt{tip};
+	return $widget;
+}
+
 sub NewIconButton
 {	my ($icon,$text,$coderef,$style,$tip)=@_;
 	my $but=Gtk2::Button->new;
@@ -8727,7 +8753,7 @@
 	$entry->signal_connect(activate=> \&GMB::FilterBox::activate);
 	$button->signal_connect( clicked => sub
 	{	my $self=$_[0]->parent;
-		my $folder= ::ChooseDir(_"Choose a folder", $self->{value});
+		my $folder= ::ChooseDir(_"Choose a folder", path=>$self->{value});
 		return unless $folder;
 		$busy=1;
 		$self->Set( ::url_escape($folder) );

=== modified file 'gmusicbrowser.spec'
--- gmusicbrowser.spec	2014-01-25 14:17:08 +0000
+++ gmusicbrowser.spec	2014-02-15 20:02:02 +0000
@@ -1,6 +1,6 @@
 Name: gmusicbrowser
 Summary: Jukebox for large collections of music files
-Version: 1.1.11
+Version: 1.1.12
 Release: 1
 License: GPL
 Group: Sound

=== modified file 'gmusicbrowser_123.pm'
--- gmusicbrowser_123.pm	2013-10-11 19:12:33 +0000
+++ gmusicbrowser_123.pm	2014-02-15 20:02:02 +0000
@@ -174,7 +174,7 @@
 		SkipTo(undef,$sec) if $sec;
 	}
 	$OUTPUTfh->blocking(0); #set non-blocking IO
-	warn "playing $file (pid=$ChildPID)\n";
+	warn "playing $file (pid=$ChildPID)\n" if $::Verbose;
 	$WatchTag= Glib::IO->add_watch(fileno($OUTPUTfh),'hup',\&_eos_cb);
 	$WatchTag2=	$RemoteMode ?
 		Glib::IO->add_watch(fileno($OUTPUTfh),'in',$RemoteMode->{watcher}) :

=== modified file 'gmusicbrowser_gstreamer-0.10.pm'
--- gmusicbrowser_gstreamer-0.10.pm	2014-01-25 14:17:08 +0000
+++ gmusicbrowser_gstreamer-0.10.pm	2014-02-15 20:02:02 +0000
@@ -316,7 +316,7 @@
 	{	$visual_window->realize unless $visual_window->window;
 		if (my $w=$visual_window->window) { $VSink->set_xwindow_id($w->XID); }
 	}
-	warn "playing $file\n";
+	warn "playing $file\n" if $::Verbose;
 	set_file($file);
 	my $newstate='playing'; $StateAfterSkip=undef;
 	if ($Skip) { $newstate='paused'; $StateAfterSkip='playing'; }

=== modified file 'gmusicbrowser_layout.pm'
--- gmusicbrowser_layout.pm	2014-01-25 14:17:08 +0000
+++ gmusicbrowser_layout.pm	2014-02-15 20:02:02 +0000
@@ -770,35 +770,36 @@
 
 sub ReadLayoutFile
 {	my $file=shift;
-	my $path=$file; $path=~s#[^/]+$##;
 	return unless -f $file;
 	open my$fh,"<:utf8",$file  or do { warn $!; return };
 	my $first;
+	my $linecount=0; my ($linefirst,$linenext);
 	while (1)
 	{	my ($next,$longline);
 		my @lines=($first);
 		while (local $_=<$fh>)
-	 	{	s#^\s+##;
+		{	$linecount++;
+			s#^\s+##;
 			next if m/^#/;
 			s#\s*[\n\r]+$##;
 			if (s#\\$##) {$longline.=$_;next}
 			next if $_ eq '';
 			if ($longline) {$_=$longline.$_;undef $longline;}
-			if (m#^[{[]#) {$next=$_;last}
+			if (m#^[{[]#) { $next=$_; $linenext=$linecount; last}
 			push @lines,$_;
 		}
 		if ($first)
-		{	if ($first=~m#^\[#) {ParseLayout(\@lines,$path)}
+		{	if ($first=~m#^\[#) {ParseLayout(\@lines,$file,$linefirst)}
 			else		{ParseSongTreeSkin(\@lines)}
 		}
-		$first=$next;
+		$first=$next; $linefirst=$linenext;
 		last unless $first;
 	}
 	close $fh;
 }
 
 sub ParseLayout
-{	my ($lines,$path)=@_;
+{	my ($lines,$file,$line)=@_;
 	my $first=shift @$lines;
 	my $name;
 	if ($first=~m/^\[([^]=]+)\](?:\s*based on (.+))?$/)
@@ -822,7 +823,10 @@
 	for my $key (qw/Name Category Title/)
 	{	$Layouts{$name}{$key}=~s/^"(.*)"$/$1/ if $Layouts{$name}{$key};	#remove quotes from layout name and category
 	}
+	my $path=$file; $path=~s#([^/]+)$##; $file=$1;
 	$Layouts{$name}{PATH}=$path;
+	$Layouts{$name}{FILE}=$file;
+	$Layouts{$name}{LINE}=$line;
 }
 
 sub ParseSongTreeSkin
@@ -871,6 +875,8 @@
 		%default= @optlist;
 	}
 	$_=::ParseOptions($_) for values %default;
+	$default{DEFAULT_OPTIONS}=1;
+	$default{Window}{DEFAULT_OPTIONS}=1;
 	return \%default;
 }
 
@@ -1815,6 +1821,9 @@
 	my (undef,undef,$monitorwidth,$monitorheight)=$screen->get_monitor_geometry($monitor)->values;
 	$w= $1*$monitorwidth/100 if $w=~m/(\d+)%/;
 	$h= $1*$monitorheight/100 if $h=~m/(\d+)%/;
+	if ($self->{options}{DEFAULT_OPTIONS}) { $monitorwidth-=40; $monitorheight-=80; } # if using default layout size, reserve some space for potential panels and decorations
+	$w=$monitorwidth if $w>$monitorwidth;
+	$h=$monitorheight if $h>$monitorheight;
 	if ($self->{fixedsize})
 	{	$w=-1 if $w<1;	# -1 => do not override default minimum size
 		$h=-1 if $h<1;
@@ -2594,7 +2603,7 @@
 }
 
 sub newbutton_cb
-{	 my $self= ::find_ancestor($_[0],__PACKAGE__);
+{	my $self= ::find_ancestor($_[0],__PACKAGE__);
 	::PopupContextMenu(\@contextmenu, { self=>$self, type=>$self->{typesubmenu}, usemenupos=>1 } );
 	1;
 }
@@ -4057,7 +4066,7 @@
 	}
 }
 sub SaveOptions
-{	my $self=shift,
+{	my $self=shift;
 	my %opt;
 	if (my $cats=$self->{cats})
 	{	$opt{collapsed}= $self->{collapsed}= join ' ', sort grep !$cats->{$_}->get_expanded, keys %$cats;

=== modified file 'gmusicbrowser_list.pm'
--- gmusicbrowser_list.pm	2014-01-25 14:17:08 +0000
+++ gmusicbrowser_list.pm	2014-02-15 20:02:02 +0000
@@ -311,6 +311,8 @@
 	my $watchedarray= $songlist && $songlist->{array};
 	return if !$watchedarray || ($array && $watchedarray!=$array);
 	$self->{bclear}->set_sensitive(scalar @$watchedarray);
+	$self->set_sensitive( !$songlist->{autoupdate} );
+	$self->set_visible( !$songlist->{autoupdate} );
 }
 
 sub SelectionChanged
@@ -533,8 +535,6 @@
 	}
 	$self->{filter}=$filter;
 	return if $self->{ignoreSetFilter};
-
-	#if ($self->{type} eq 'A') { $self->{array}->SetFilter($filter); return } #FIXME needs a PlayFilter with multiple levels to work correctly
 	$self->{array}->SetSortAndFilter($self->{sort},$filter);
 }
 sub Empty
@@ -560,10 +560,20 @@
 }
 sub RemoveSelected
 {	my $self=shift;
+	return if $self->{autoupdate}; #can't remove selection from an always-filtered list
 	my $songarray=$self->{array};
 	$songarray->Remove($self->GetSelectedRows);
 }
 
+sub PopupContextMenu
+{	my $self=shift;
+	#return unless @{$self->{array}}; #no context menu for empty lists
+	my @IDs=$self->GetSelectedIDs;
+	my %args=(self => $self, mode => $self->{type}, IDs => \@IDs, listIDs => $self->{array});
+	$args{allowremove}=1 unless $self->{autoupdate};
+	::PopupContextMenu(\@::SongCMenu,\%args);
+}
+
 sub MoveUpDown
 {	my ($self,$up,$max)=@_;
 	my $songarray=$self->{array};
@@ -1086,14 +1096,6 @@
 	1;
 }
 
-sub PopupContextMenu
-{	my ($self,$tv,$event)=@_;
-	#return unless @{$self->{array}}; #no context menu for empty lists
-	my @IDs=$self->GetSelectedIDs;
-	my %args=(self => $self, mode => $self->{type}, IDs => \@IDs, listIDs => $self->{array});
-	::PopupContextMenu(\@::SongCMenu,\%args );
-}
-
 sub GetCurrentRow
 {	my $self=shift;
 	my $tv=$self->child;
@@ -1556,7 +1558,7 @@
 			#$sel->select_path($path);
 			$tv->set_cursor($path);
 		}
-		$self->PopupContextMenu($tv,$event);
+		$self->PopupContextMenu;
 		return 1;
 	}
 	return 0; #let the event propagate
@@ -1741,7 +1743,7 @@
 	},
 	{ label=> _"Remove label",	stockicon => 'gtk-remove',
 		code => sub { my $gid=$_[0]{gidlist}[0]; ::RemoveLabel($_[0]{field},$gid); },
-		onlyone=> 'gidlist',	test => sub { $_[0]{field} eq 'label' },	#FIXME ? label specific
+		onlyone=> 'gidlist',	test => sub { $_[0]{field} eq 'label' && $_[0]{gidlist}[0] !=0 },	#FIXME make it generic rather than specific to field label ? #FIXME find a better way to chack if gid is special than comparing it to 0
 	},
 #	{ separator=>1 },
 	{ label => _"Options", submenu => \@MenuPageOptions, stock => 'gtk-preferences', isdefined => 'field' },
@@ -2097,7 +2099,7 @@
 }
 
 sub PopupContextMenu
-{	my ($page,$event,$hash,$menu)=@_;
+{	my ($page,$hash,$menu)=@_;
 	my $self=::find_ancestor($page,__PACKAGE__);
 	$hash->{filterpane}=$self;
 	$menu||=\@cMenu;
@@ -2105,8 +2107,7 @@
 }
 
 sub PopupOpt	#Only for FilterList #FIXME should be moved in FilterList::, and/or use a common function with FilterList::PopupContextMenu
-{	my ($but,$event)=@_;
-	my $self=::find_ancestor($but,__PACKAGE__);
+{	my $self=::find_ancestor($_[0],__PACKAGE__);
 	my $nb=$self->{notebook};
 	my $page=$nb->get_nth_page( $nb->get_current_page );
 	my $field=$page->{field}[0];
@@ -2550,13 +2551,12 @@
 }
 
 sub PopupContextMenu
-{	my ($self,undef,$event)=@_;
-	$self=::find_ancestor($self,__PACKAGE__);
+{	my $self=::find_ancestor($_[0],__PACKAGE__);
 	my ($field,$gidlist)=$self->get_selected_list;
 	my $mainfield=Songs::MainField($field);
 	my $aa= ($mainfield eq 'artist' || $mainfield eq 'album') ? $mainfield : undef; #FIXME
 	my $mode= uc(substr $self->{mode},0,1); # C => cloud, M => mosaic, L => list
-	FilterPane::PopupContextMenu($self,$event,{ self=> $self, filter => $self->get_selected_filters, field => $field, aa => $aa, gidlist =>$gidlist, mode => $mode, subfield => $field, depth =>0 });
+	FilterPane::PopupContextMenu($self,{ self=> $self, filter => $self->get_selected_filters, field => $field, aa => $aa, gidlist =>$gidlist, mode => $mode, subfield => $field, depth =>0 });
 }
 
 sub key_press_cb
@@ -2725,10 +2725,11 @@
 	FilterPane::Activate($self,$button,$filter);
 }
 sub PopupContextMenu
-{	my ($self,$tv,$event)=@_;
+{	my $self=shift;
+	my $tv=$self->{treeview};
 	my @paths=_get_path_selection($tv);
 	my @raw= map ::decode_url($_), @paths;
-	FilterPane::PopupContextMenu($self,$event,{self=>$tv, rawpathlist=> \@raw, pathlist => \@paths, filter => _MakeFolderFilter(@paths) });
+	FilterPane::PopupContextMenu($self,{self=>$tv, rawpathlist=> \@raw, pathlist => \@paths, filter => _MakeFolderFilter(@paths) });
 }
 
 sub _get_path_selection
@@ -2906,10 +2907,11 @@
 	FilterPane::Activate($self,$button,$filter);
 }
 sub PopupContextMenu
-{	my ($self,$tv,$event)=@_;
+{	my $self=$_[0];
+	my $tv=$self->{treeview};
 	my @paths=_get_path_selection($tv);
 	my @raw= map ::decode_url($_), @paths;
-	FilterPane::PopupContextMenu($self,$event,{self=>$tv, rawpathlist=> \@raw, pathlist => \@paths, filter => _MakeFolderFilter(@paths) });
+	FilterPane::PopupContextMenu($self,{self=>$tv, rawpathlist=> \@raw, pathlist => \@paths, filter => _MakeFolderFilter(@paths) });
 }
 
 sub _get_path_selection
@@ -3091,7 +3093,8 @@
 }
 
 sub PopupContextMenu
-{	my ($self,$tv,$event)=@_;
+{	my $self=shift;
+	my $tv=$self->{treeview};
 	my @rows=$tv->get_selection->get_selected_rows;
 	my $store=$tv->get_model;
 	my %sel;
@@ -3111,7 +3114,7 @@
 	else { $args{mode}=''; }
 	my $songlist=::GetSonglist($self);
 	$args{songlist}=$songlist if $songlist;
-	FilterPane::PopupContextMenu($self,$event,\%args, [@cMenu,{ separator=>1 },@FilterPane::cMenu] );
+	FilterPane::PopupContextMenu($self,\%args, [@cMenu,{ separator=>1 },@FilterPane::cMenu] );
 }
 
 sub drag_motion_cb
@@ -3385,6 +3388,7 @@
 	#return if $self->{Sel} == $key;
 	if (defined $key) { $self->{Sel}=$key; }
 	else		  { $key=$self->{Sel}; }
+	return unless defined $key;
 	my $aa=$self->{aa};
 	$self->pic_update;
 	$self->{Ltitle}->set_markup( AA::ReplaceFields($key,"<big><b>%a</b></big>",$aa,1) );
@@ -3434,6 +3438,7 @@
 sub setpic
 {	my $img=shift;
 	my $self= ::find_ancestor($img,__PACKAGE__);
+	return unless defined $self->{SelID};
 	my $file= $img->{filename}= AAPicture::GetPicture($self->{aa},$self->{Sel});
 	my $pixbuf= $file ? GMB::Picture::pixbuf($file,$img->{size}) : undef;
 	$img->set_from_pixbuf($pixbuf);
@@ -3496,7 +3501,7 @@
 );
 our @DefaultOptions=
 (	nb	=> 1,
-	fields	=> $SelectorMenu[0][1],
+	fields	=> $SelectorMenu[2][1],
 	autofilter =>1,
 );
 
@@ -3568,14 +3573,6 @@
 	$self->{$key}=$value;
 	$self->DoFilter unless $self->get_text eq '';
 }
-sub ToggleField
-{	my ($self,$field)=@_;
-	my @list= split /\|/,$self->{fields};
-	my $nb=@list;
-	@list= grep $_ ne $field, @list; #remove
-	push @list,$field if $nb==@list; #add if not removed
-	$self->ChangeOption(fields=> join '|',@list );
-}
 
 sub PopupSelectorMenu
 {	my $self=shift;
@@ -3592,9 +3589,9 @@
 	my $item1=Gtk2::MenuItem->new(_"Select search fields");
 	$item1->set_submenu( ::BuildChoiceMenu(
 					{ map { $_=>Songs::FieldName($_) } Songs::StringFields(),qw/file path year/,},
-					'reverse' =>1,
+					'reverse' =>1, return_list=>1,
 					check=> sub { [split /\|/,$self->{fields}]; },
-					code => sub { $self->ToggleField($_[1]); },
+					code => sub { $self->ChangeOption(fields=> join '|',@{$_[1]} ); },
 				) );
 	$menu->append($item1);
 	$menu->append(Gtk2::SeparatorMenuItem->new);
@@ -5463,8 +5460,7 @@
 }
 
 sub PopupOpt
-{	my ($widget,$event)=@_;
-	my $self=::find_ancestor($widget,__PACKAGE__);
+{	my $self=::find_ancestor($_[0],__PACKAGE__);
 	::PopupContextMenu(\@OptionsMenu, { self=>$self, usemenupos => 1,} );
 	return 1;
 }
@@ -6609,10 +6605,7 @@
 	{	if ($answer && !defined $depth && !vec($self->{selected},$row,1))
 		{	$self->song_selected($event,$row);
 		}
-		my @IDs=$self->GetSelectedIDs;
-		my %args=(self => $self, mode => $self->{type}, IDs => \@IDs, listIDs => $self->{array});
-		::PopupContextMenu(\@::SongCMenu,\%args );
-
+		$self->PopupContextMenu;
 		return 1;
 	}
 	else# ($but==1)

=== modified file 'gmusicbrowser_mplayer.pm'
--- gmusicbrowser_mplayer.pm	2013-08-27 20:31:56 +0000
+++ gmusicbrowser_mplayer.pm	2014-02-15 20:02:02 +0000
@@ -95,7 +95,7 @@
 	#SkipTo(undef,$sec) if $sec;
 
 	$OUTPUTfh->blocking(0); #set non-blocking IO
-	warn "playing $file (pid=$ChildPID)\n";
+	warn "playing $file (pid=$ChildPID)\n" if $::Verbose;
 	$WatchTag= Glib::IO->add_watch(fileno($OUTPUTfh),'hup',\&_eos_cb);
 	$WatchTag2=Glib::IO->add_watch(fileno($OUTPUTfh),'in',\&_remotemsg);
 		#Glib::Timeout->add(500,\&_UpdateTime);

=== modified file 'gmusicbrowser_songs.pm'
--- gmusicbrowser_songs.pm	2014-01-25 14:17:08 +0000
+++ gmusicbrowser_songs.pm	2014-02-15 20:02:02 +0000
@@ -3364,6 +3364,8 @@
 use base 'SongArray';
 our %Filter;
 our %Sort;
+our %needupdate;
+
 INIT
 { ::Watch(undef, SongsChanged	=> \&SongsChanged_cb);
   ::Watch(undef, SongsAdded	=> \&SongsAdded_cb);
@@ -3389,6 +3391,7 @@
 {	my $self=$_[0];
 	delete $Filter{$self};
 	delete $Sort{$self};
+	delete $needupdate{$self};
 	@list_of_AutoUpdate= grep defined, @list_of_AutoUpdate;
 	::weaken($_) for @list_of_AutoUpdate;
 	$self->SUPER::DESTROY;
@@ -3405,6 +3408,7 @@
 		@$self=@$list;
 		::HasChanged('SongArray',$self,'update',\@old);
 	}
+	else { ::HasChanged('SongArray',$self,'mode'); }
 }
 sub Sort
 {	my ($self,$sort)=@_;
@@ -3423,7 +3427,8 @@
 sub SongsAdded_cb
 {	my (undef,$IDs)=@_;
 	for my $self (grep defined, @list_of_AutoUpdate)
-	{	my $filter=$Filter{$self};
+	{	next if ($needupdate{$self}||0)>1;
+		my $filter=$Filter{$self};
 		my ($greponly)=$filter->info;
 		if ($greponly)
 		{	my $toadd=$filter->filter($IDs);
@@ -3436,12 +3441,27 @@
 			}
 		}
 		else
-		{	$self->_update_full;
+		{	$needupdate{$self}=2;
+			::IdleDo('7_autoupdate_update'.$self,6000, \&delayed_update_cb,$self);
+		}
+	}
+}
+sub delayed_update_cb
+{	my $self=shift;
+	my $need= delete $needupdate{$self};
+	return unless $need;
+	if ($need>1) { $self->_update_full }
+	else
+	{	my @old=@$self;
+		Songs::SortList($self,$Sort{$self});
+		if ("@old" ne "@$self") #only update if there was a change
+		{	::HasChanged('SongArray',$self,'update',\@old);
 		}
 	}
 }
 sub _update_full
 {	my $self=shift;
+	delete $needupdate{$self};
 	my @old=@$self;
 	my $list=$Filter{$self}->filter;
 	Songs::SortList($list,$Sort{$self});
@@ -3452,12 +3472,19 @@
 sub SongsChanged_cb
 {	my (undef,$IDs,$fields)=@_;
 	for my $self (grep defined, @list_of_AutoUpdate)
-	{	if ($Filter{$self}->changes_may_affect($IDs,$fields,$self))	#re-filter and re-sort
-		{	$self->_update_full;
-		}
-		elsif (::OneInCommon($fields,Songs::SortDepends($Sort{$self}))) #re-sort
-		{	$self->Sort($Sort{$self});
-		}
+	{	next if ($needupdate{$self}||0)>1;
+		my $delayed;
+		if ($Filter{$self}->changes_may_affect($IDs,$fields,$self))
+		{	#re-filter and re-sort
+			$needupdate{$self}=2;
+			$delayed=1;
+		}
+		elsif ($self->AreIn($IDs) && ::OneInCommon($fields,Songs::SortDepends($Sort{$self})))
+		{	#re-sort
+			$needupdate{$self}=1;
+			$delayed=1;
+		}
+		::IdleDo('7_autoupdate_update'.$self,6000, \&delayed_update_cb,$self) if $delayed;
 	}
 }
 
@@ -3498,9 +3525,9 @@
 	::QHasChanged('Sort');
 	::QHasChanged('Pos');
 }
-sub SetSortAndFilter	#FIXME could be optimized
+sub SetSortAndFilter	#FIXME could be optimized #FIXME only called from a songtree/songlist for now, and as these calls are usually not about setting the level 0 filter, it doesn't actually change the filter for now, just the list, as it needs multi-level filters to work properly
 {	my ($self,$sort,$filter)=@_;
-	$self->SetFilter($filter);
+	$self->Replace($filter->filter,filter=>$filter); #$self->SetFilter($filter); #FIXME use SetFilter once multi-level filters are implemented
 	$self->Sort($sort);
 }
 sub Replace

=== modified file 'layout_doc.html'
--- layout_doc.html	2014-01-25 14:17:08 +0000
+++ layout_doc.html	2014-02-15 20:02:02 +0000
@@ -1,813 +0,0 @@
-<h1>Layout documentation</h1>
-
-<h2>Introduction</h2>
-
-<p>Gmusicbrowser's interface is defined by layouts. Each layout define a window that contain several containers, each containing widgets. <br />
-Layouts are used in many places in gmusicbrowser : the main window, the "traytip" popup, the fullscreen mode, the search and browser windows, pages that can be inserted as a tab, desktop widgets (plugin), the titlebar overlays (plugin), as well as some internal windows (such as the queue, equalizer).</p>
-
-<p>Note that this documentation is likely incomplete, and could be improved. Don't hesitate to suggest improvements, ask for clarification, or point out missing informations.</p>
-
-<h2>Advice for testing layouts</h2>
-
-<p>Experimenting with layouts is highly encouraged. When doing so, it is recommended to launch gmusicbrowser from the command-line as some layout errors can be printed on the terminal. A good way to do that is launch gmusicbrowser with the <code>-layout</code> (or <code>-l</code>) followed by the layout identifier, this will directly open the desired layout.
-  You can then easily quit without saving by pressing ctrl-c in the terminal, an advantage of this exit method is that it always works (no matter what your layout contains) and that no setting for the layout will be saved, so that you can see it each time as a new user would. Note that the auto-save plugin might still save the options, the <code>-demo</code> option will prevent any writing of the gmbrc. You can also use a copy of your gmbrc file and use the <code>-cfg</code> option to tell gmb to use the copy.</p>
-
-<h2>Layout files</h2>
-
-<p>Layouts are defined using text files, each file can contain one or more layout. <br />
-Layout files use the <code>.layout</code> extension, they are found in 2 places:</p>
-
-<ul>
-<li>the default layouts included with gmusicbrowser are in installed <code>/usr/share/gmusicbrowser/layouts/</code></li>
-<li>custom layouts can be added by putting them in <code>~/.config/gmusicbrowser/layouts</code>, which can be either a file or a folder containing multiple <code>.layout</code> files (read in alphabetical order)</li>
-</ul>
-
-<h2>Layout syntax</h2>
-
-<p>A layout definition begins with a line containing a layout identifier enclosed in square brackets (<code>[]</code>) such as: <code>[some_layout_id]</code>.</p>
-
-<p>(Layouts files may also contain group and column definition for the SongTree widget (see the <a href="http://wiki.gmusicbrowser.org/customization/songtree">SongTree documentation</a> for details). These group and column definitions begin with lines between <code>{}</code>. The definitions include all the following lines up to the next <code>[]</code> or <code>{}</code> line, or to the end of the file.)</p>
-
-<p>layout definition syntax :</p>
-
-<pre><code>[layout_id]
-key1 = value
-key2 = value
-...
-</code></pre>
-
-<p><code>layout_id</code> is the string used to identify the layout. It can contain spaces or other special characters but it is recommended that only alphanumeric characters (<code>A-Z</code>, <code>a-z</code>, <code>0-9</code> and <code>_</code>) be used, otherwise it may harder or impossible to use the layout with some advanced features. If you want to give the layout a nice name use the <a href="#layoutname">Name</a> property explained below.</p>
-
-<p>Long lines can be be split into multiple lines by ending them with a backslash (the backslash is optional as long as the next line doesn't begin with something like <code>word=</code>). <br />
-Keys define either containers or properties, they only use simple alphanumeric characters : <code>A-Z a-z _ 0-9</code> . <br />
-Keys are unique for a layout, duplicate key definitions replace the previous one.</p>
-
-<p>If the name of the key begins with one of : HB, VB, HP, VP, MB, EB, TB, FR, NB (and some others, see below) the key is the name of a container that will contain widgets (also called layout elements or controls) or other containers. <br />
-For containers the value is a list of children (widgets and/or other containers), separated by a space and preceded by optional packing options. The widget names can be followed by a number (to have multiple widgets of the same name) and its options between parentheses.</p>
-
-<p>There must be one, and only one, container which has no parent, this container will be put in the layout window.</p>
-
-<h3>Simple examples</h3>
-
-<p>Very simple example, with 3 buttons (settings, play/pause, and open browser window) and the current song title :</p>
-
-<pre><code>[very_simple]
-Type = G
-HBox = Pref Play OpenBrowser _Title
-</code></pre>
-
-<p>Type=G (G for generic) is used to make it appear in the player layouts list in the settings dialog. The <code>_</code> before Title is used to make the Title use all the available space in the horizontal box (HBox) it is packed in. The 4 widgets are put into a HB (= horizontal box) container, so they will be placed in a line.</p>
-
-<pre><code>[simple]
-Type=G
-VBmain = MBmenu HBbuttons Title Text(markup="&lt;i&gt;by&lt;/i&gt; $artist &lt;i&gt;in&lt;/i&gt; $album")
-MBmenu = MainMenuItem
-HBbuttons= Prev Play Next
-</code></pre>
-
-<p>This layout has 3 containers, <code>VBMain</code> being the parent widget for <code>MBmenu</code> and <code>HBbuttons</code>. The <code>Title</code> widget displays the current song's title and <code>Text</code> has an option that defines what it should display, complete with <a href="http://developer.gnome.org/pango/stable/PangoMarkupFormat.html">pango markup</a> and <a href="#songvar">$-words</a>. This layout will show, vertically : a menu, buttons, title, and the text widget showing artist and album.</p>
-
-<p>Look in the layouts files (installed in <code>/usr/share/gmusicbrowser/layouts/</code>) for more examples.</p>
-
-<h2>Normal containers</h2>
-
-<p>Containers are used to organize the widgets inside the window. They accept options that must be specified in parenthesis before the child widgets list. For example :</p>
-
-<pre><code>HBname = (option1=value1,option2=value2) widget1 widget2
-</code></pre>
-
-<p>All containers accept the option <code>border</code> to specify the amount of padding around the container.</p>
-
-<h4>HB/VB : Horizontal/Vertical Boxes (based on <a href="http://developer.gnome.org/doc/API/2.0/gtk/GtkBox.html">GtkBox</a>)</h4>
-
-<p>These containers group widgets horizontally or vertically. Optional packing options are :</p>
-
-<ul>
-<li>a number : padding (in pixels)</li>
-<li>an underscore <code>_</code> : expand (the widget will use all remaining space in the container)</li>
-<li>a dash <code>-</code> : right aligned</li>
-<li><p>a dot <code>.</code> : fill (rarely needed)</p>
-
-<p>Example : <br />
-<code>HBname = 2_-widget1(opt1=val,opt2=val) -widget2 2container3</code></p>
-
-<p>Cover and ArtistPic widgets are treated specially, they ignore the expand mode, and expand until they reach a square size. For instance, in a HBox which has a height of 30, a Cover widget will use available space to expand if it has a width less than 30. <br />
-Note that the maxwidth and maxheight widgets options only work inside a HB and a VB respectively.</p></li>
-</ul>
-
-<h4>HP/VP : Horizontal/Vertical Panes (based on <a href="http://developer.gnome.org/doc/API/2.0/gtk/GtkPaned.html">GtkPaned</a>)</h4>
-
-<p>Same as HB/VB but they contain only 2 widgets <br />
-  They only have one packing option, the underscore <code>_</code>. It sets the expand propriety that tells the container that this widget should give or receive space when the container is resized. <br />
-  If both children have the expand propriety, they will both give or receive space when the container is resized.  </p>
-
-<h4>TB : Notebook (based on <a href="http://developer.gnome.org/doc/API/2.0/gtk/GtkNotebook.html">GtkNotebook</a>)  <em>(deprecated)</em></h4>
-
-<p>Each widget is in a tab, no packing options but the syntax is a bit different, each widget is preceded by the tab title. <br />
-  The title can have spaces by using quotes, for example :</p>
-
-<pre><code>TBname = title1 widget1(options) "title with spaces" widget2(options) title3 container3
-</code></pre>
-
-<h4>NB : Notebook (based on <a href="http://developer.gnome.org/doc/API/2.0/gtk/GtkNotebook.html">GtkNotebook</a>) <em>(new version)</em></h4>
-
-<p>No packing options, syntax is simply the list of children.</p>
-
-<p>A title and an optional icon is given by children options <code>tabtitle</code> and <code>tabicon</code>. For example :</p>
-
-<pre><code>NBname = widget1(tabtitle="a title",other_option=value) widget2(tabtitle="other tab",tabicon=gmb-list) widget3(tabtitle=third)
-</code></pre>
-
-<p>Tab position and rotation can be set by using <code>tabpos</code> option, which can be one of left, right, top, or bottom, optionally followed by an angle : 0, 90, 180 or 270 <br />
-  Example : <br />
-  <code>NBname = (tabpos=left90) children1 children2</code></p>
-
-<p>The <code>hidetabs=1</code> container option can be used to hide the tabs, this is meant to be used with commands that use SetFocusOn to change the visible page/child</p>
-
-<p>As this container is in fact a TabbedLists/Context with different default options, it also accept the TabbedLists/Context widget options.</p>
-
-<h4>EB : Expander (based on <a href="http://developer.gnome.org/doc/API/2.0/gtk/GtkExpander.html">GtkExpander</a>)</h4>
-
-<p>Contains only one child, that child can be shown/hidden by clicking on the expander
-  Option : <code>label</code> sets the text that will be displayed next to the expander. <br />
-  Examples :</p>
-
-<pre><code>EBname = (label="optional label") widget1`  
-EBsimple = widget2`
-</code></pre>
-
-<h4>FB : Fixed (based on <a href="http://developer.gnome.org/doc/API/2.0/gtk/GtkFixed.html">GtkFixed</a>)</h4>
-
-<p>Each widget is positioned at precise coordinates <br />
-  Syntax : <code>FBname = x1,y1 widget1 x2,y2,w2,h2 widget2 ...</code> <br />
-  The widget is positioned at the x,y coordinate. <br />
-  An optional width and height can follow the coordinates, to specify how much space the widget should use. An height or width of 0 means leave it as default. <br />
-  x,y,w,h can be relative to the width/height of the container by preceding the number with a dot (<code>.</code>) <br />
-  x,y can be relative to the right/bottom border by prefixing it with minus (<code>-</code>).</p>
-
-<h4>MB : Menu Bar</h4>
-
-<p>They can only contain MenuItem widgets or SM containers, no packing options</p>
-
-<h4>SM : Submenu</h4>
-
-<p>They can only contain MenuItem widgets or SM containers, no packing options, label is set with the <code>label</code> container option</p>
-
-<h4>BM : Button menu</h4>
-
-<p>They can only contain MenuItem widgets or SM containers, no packing options. <br />
-  Container options :</p>
-
-<ul>
-<li>label : set the button label</li>
-<li>icon : set an icon</li>
-<li>relief : (default to none) button relief</li>
-<li>size : (default to menu) size of the icon</li>
-</ul>
-
-<h4>FR : Frame (based on <a href="http://developer.gnome.org/doc/API/2.0/gtk/GtkFrame.html">GtkFrame</a>)</h4>
-
-<p>Draw a border around its child, with an optional label. (Can only contain one child) <br />
-  Container options :</p>
-
-<ul>
-<li>shadow : one of <code>none</code>, <code>in</code>, <code>out</code>, <code>etched-in</code> (default), <code>etched-out</code></li>
-<li>label   : optional text of the frame label</li>
-</ul>
-
-<h4>SB : Scrolled window (based on <a href="http://developer.gnome.org/doc/API/2.0/gtk/GtkScrolledWindow.html">GtkScrolledWindow</a>)</h4>
-
-<p>Adds scrollbars to its child. (Can only contain one child)</p>
-
-<h4>AB : Alignment (based on <a href="http://developer.gnome.org/doc/API/2.0/gtk/GtkAlignment.html">GtkAlignment</a>)</h4>
-
-<p>Controls the alignment and size of its child. (Can only contain one child) <br />
-  Container options :</p>
-
-<ul>
-<li>xalign : Horizontal position of child in available space, value between 0(left) and 1(right), default to .5 (center)</li>
-<li>yalign : Vertical position of child in available space, value between 0(top) and 1(bottom), default to .5 (center)</li>
-<li>xscale : If available horizontal space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all (default to 1)</li>
-<li>yscale : If available vertical space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all (default to 1)</li>
-</ul>
-
-<h4>WB : Event window</h4>
-
-<p>This container is used to have control over the background or mouse events on its child. (Can only contain one child)
-  Some containers and widgets (like HB/VB) do not have their own gdkwindow and thus can't control their background or mouse events. Putting them inside a WB allows working around that.
-  For example for having a window pop-up when the mouse is above a HB container, using the <code>hover_layout</code> option on the HB won't work, but putting the HB inside a WB and using the <code>hover_layout</code> option on the WB will work. It's also a way to paint the background of a HB using a custom gtk theme.</p>
-
-<h2>Special containers</h2>
-
-<p>There is also 2 special containers, widgets in these containers must belong to a normal container, and as the widget is defined elsewhere, widgets options can not be set here. These containers can be viewed as layout properties that take a list of widgets as value.</p>
-
-<h4>HSize/VSize : Size groups (see <a href="http://developer.gnome.org/doc/API/2.0/gtk/GtkSizeGroup.html">GtkSizeGroup</a>)</h4>
-
-<p>Force all widgets to have the same Horizontal/Vertical size, if the list of widgets begin with a number, the first widget Horizontal/Vertical size will be set to this number (in pixels) <br />
-  Example :</p>
-
-<pre><code>HSize0 = 20 widget1 widget2
-HSize1 = widget3 widget4
-</code></pre>
-
-<h4>VolumeScroll :</h4>
-
-<p>A unique virtual container (must be the exact name). For all widgets or containers inside, the scroll wheel will modify the volume (unless the scroll event is intercepted, like in a scrollable list). <br />
-  Example :</p>
-
-<pre><code>VBmain= Title HBbuttons TimeBar
-HBbuttons= Pref Play
-VolumeScroll= Title HBbuttons
-</code></pre>
-
-<h2>Layout properties</h2>
-
-<h4>Title</h4>
-
-<p>Set a title for the window. If not set, the window title defaults to <em>Song Title by Artist</em> (<code>%S by %a</code>) (see <a href="#songvar">%-letters and $-words</a>)  </p>
-
-<pre><code>Title = gmusicbrowser playing %S by %a from %l
-</code></pre>
-
-<h4>Type</h4>
-
-<p>A String of letters (most of the time only one letter) defining the type(s) of a layout, possible types :</p>
-
-<ul>
-<li>G Generic or player window</li>
-<li>B Browser window</li>
-<li>T Tray window</li>
-<li>F Fullscreen</li>
-<li>S Search</li>
-<li>P Page for use in TabbedLists/NB/Context</li>
-<li>O titlebar Overlay used by the titlebar plugin</li>
-<li>D Desktop widget used by the "Desktop widgets" plugin</li>
-<li><p>K for Karaoke plugin <em>(there is not yet an option to change the layout in the plugin)</em></p>
-
-<p>Layouts of type G may optionally be followed a plus sign <code>+</code> that will make the layout appear in the LayoutItem sub-menu. This should only be used by layouts that include a LayoutItem. The idea is that users must be able to switch between the different '+' layouts easily.</p>
-
-<p>Layouts work perfectly fine without a type, layouts without a type just won't be listed anywhere in the GUI. But they can for be opened with the <code>OpenCustom</code> command or with the <code>-layout</code> command-line option.</p></li>
-</ul>
-
-<h4><a id=layoutname> Name </a></h4>
-
-<p>Set the name of the layout displayed in the settings dialog. The default Name is the layout id. <br />
-  Contrary to the layout id, the Name can be changed without losing the layout's saved settings (window size, ...). <br />
-  The name can be marked as translatable by using the syntax <code>Name= _"name of the layout"</code></p>
-
-<h4>Title and Icon</h4>
-
-<p>Used to define a tab title and a tab icon if the layout is used as a page in a NB/TabbedLists/Context</p>
-
-<h4>Default <em>(mostly deprecated)</em></h4>
-
-<p>Default options used when the layout has no saved state, contains a space-separated list of keys and values, by pair, <code>widget_or_container_name widget_or_container_variable_options</code>.</p>
-
-<p>There is a special key : Window, for the window properties, see the Window layout property below.</p>
-
-<p>Example :</p>
-
-<pre><code>Default = Window size=1120x820,sticky=0 HPbig 780 FPane0 page=artist
-</code></pre>
-
-<p>This is mostly deprecated as now default options can be specified among the normal widget options, but it is still used a bit, in particular for HP/VP containers.</p>
-
-<h4>KeyBindings</h4>
-
-<p>Pairs of keys and action, example :</p>
-
-<pre><code>KeyBindings = Insert OpenSearch c-q EnqueueSelected c-Insert OpenCustom(a_layout_id)
-</code></pre>
-
-<p>Key names are as shown in the key binding tab in the settings dialog. <br />
-  Commands can be found by running gmusicbrowser with command-line option <code>-listcmd</code>.</p>
-
-<h4>DefaultFocus</h4>
-
-<p>Set which widget gets the initial focus in the window.
-  It might not work with some complex widgets though it is easy to fix, just ask me if you'd like to enable it for a widget that currently doesn't support it. <br />
-Example :</p>
-
-<pre><code>HBmain= Pref Play _Title
-DefaultFocus= Play
-</code></pre>
-
-<h4>DefaultFont and DefaultFontColor</h4>
-
-<p>Set a default font and font color for widgets that use a font or a color option.</p>
-
-<h4>SkinPath and SkinFile</h4>
-
-<p>Used to set a picture file to be used as a skin, that can be used to set a window background, see the <a href="http://wiki.gmusicbrowser.org/customization/skins">skin documentation</a>.</p>
-
-<h4>Window</h4>
-
-<p>Set some window options :</p>
-
-<ul>
-<li><p><code>pos</code> and <code>size</code> : set the default size and position of the window, format is numberxnumber, values can be relative by using a %. For example : <code>pos=0x20</code> or <code>pos=50%x20%</code>. <br />
-If a percentage is used for <code>pos</code>, the window will be centered on this position by default. This can be changed by appending a percentage relative to the size of the window. <br />
-For example <code>pos=50%-50%x0+10%</code> will put the window at  <code>x= screenwidth/2 - windowwidth/2</code> and <code>y= 0 + windowheight/10</code></p></li>
-<li><p><code>fixedsize</code>: set a fixed size for the window, -1 means the normal minimum width/height of the window. Example: <code>fixedsize=200x-1</code></p></li>
-<li><p><code>sticky</code>, <code>ontop</code>, <code>below</code> and <code>fullscreen</code> : can be set to 1 (true) ot 0 (false). Note that it only sets the default, if this window property is changed by the user it will be saved.</p></li>
-<li><p><code>insensitive</code>: if set to 1, makes the window completely insensitive to mouse or keyboard.</p></li>
-<li><p><code>transparent</code>: if set to 1, makes the window background transparent (requires Cairo perl module and a compositing window manager to work).</p></li>
-<li><p><code>shape</code>: when used with a background skin and with the transparent=1 option, it will make the window "transparent to input" where the alpha value is inferior to the shape option. Example : <code>Window = transparent=1, shape=10</code></p></li>
-<li><p><code>opacity</code>: value is a number between 0 and 1, requires a compositing window manager</p></li>
-<li><p><code>dragtomove</code>: if set to 1 the window can be moved by clicking on an empty area of the window</p></li>
-<li><p><code>uniqueid</code>: a string, default to layout id, used by the option <code>ifexist</code>. Note that this option is overridden for the usual windows (player, browser, search ...), but can be used at least with the <code>OpenCustom</code> command</p></li>
-<li><p><code>ifexist</code>: define the action to take when attempting to create a window with the same <code>uniqueid</code> as an existing window, it can be one of toggle(close existing window), present(bring the existing window to the front), replace(close the existing window and open a new window)</p></li>
-</ul>
-
-<h2>Derived layouts</h2>
-
-<p>A layout can be derived from a previously defined layout by adding <code>based on</code>, followed by the layout id of the layout it is based on:</p>
-
-<pre><code>[layout_id] based on this_other_layout_id
-</code></pre>
-
-<p>In this case the layout starts with all the key definitions of the other layout, each key can be re-defined or deleted (if nothing follows the <code>=</code>). <br />
-This method of deriving layouts is only recommended for very small variants where only one or two line changes, as it might easily break if the original layout changes.</p>
-
-<h2>Widgets</h2>
-
-<h3>Widgets options</h3>
-
-<p>Widget options are specified in the layout definition, in parentheses, after the name of the widget. Options are a list of keywords and values, separated by commas (with optional spaces). For example :</p>
-
-<pre><code>VBmain= widget1(key1=value1,key2=value2, key3=value3) widget2(anotherkey=somevalue)
-</code></pre>
-
-<p>There are 2 kind of widget options. The first one (let's call them <strong>layout-set</strong> options) are the options that can only be set in the layout definition, most of the options described in this document are of this kind. The second kind (let's call them <strong>user-set</strong> options) are the options that the user can change in the GUI and are saved when the window is closed. The layout definition can change the default value of the user-set options, but if the user has already used the layout once, the user-set options will use their last recorded value and ignore the value set in the layout definition. As mentioned earlier, you can use the <code>-demo</code> command-line option to prevent the user-set options from having a recorded value and be able to test the value set in the layout definition.</p>
-
-<p>Most of these user-set options are not documented here. To discover them you just need to use the widget in a layout and then look at the file containing the saved options (~/.config/gmusicbrowser/gmbrc) for the line containing the layout id, then for the line containing the widget name, the following lines contain the saved widget options. Some of these options may contain sub-options (for example a FilterPane has a set of sub-options for each of its page), a default for these sub-options can be set in the layout by using a slash (<code>/</code>) to separate option and sub-option. Example : <code>FilterPane(page_album/mode=mosaic)</code></p>
-
-<p>In the future, some of the layout-set options may become user-set options, as more options are exposed to the GUI.</p>
-
-<h3>Generic widget options</h3>
-
-<p>A number of options work on a lot of widgets and containers</p>
-
-<h4>size options</h4>
-
-<ul>
-<li><code>minwidth</code> and <code>minheight</code> : specify a minimum width or height, will not work on some widget</li>
-<li><code>maxwidth</code> and <code>maxheight</code> : only works if the widget is inside of a HB/VB container, specify a maximum expansion width or height</li>
-<li><code>expand_weight</code>: default to 1, used to specify a higher priority to get extra space from a HB/VB</li>
-</ul>
-
-<h4>click options</h4>
-
-<p>A lot of widgets, in particular text labels, indicators and buttons can use the option <code>click1</code> (or <code>click2</code> ...) to (re)define the action executed when the widget is clicked with mouse button 1 (or 2 ...). <br />
-Example : <code>Play(click2=OpenSongProp)</code> <br />
-Button widgets also accept the option <code>activate</code> to (re)define the action executed when the button is activated with a mouse click or keyboard</p>
-
-<h4><code>tip</code> option</h4>
-
-<p>A lot of widgets, in particular labels, indicators and buttons can use the option <code>tip</code> to define a tool-tip for the widget. The tip may contain <a href="#songvar">%-letters and $-words</a> to display informations on the current song. <br />
-Example : <code>Title(tip="last played : $lastplay")</code></p>
-
-<h4><code>cursor</code> option</h4>
-
-<p>Another common option, it is used to change the mouse cursor when it hovers over the widget. <br />
-Example : <code>Play(cursor=hand2)</code> <br />
-See <a href="http://gtk2-perl.sourceforge.net/doc/pod/Gtk2/Gdk/Cursor.html#enum_Gtk2_Gdk_Cursor">this page</a> for a list of cursor names.</p>
-
-<h4><code>hover_layout</code> option</h4>
-
-<p>Many widgets and containers can use the <code>hover_layout=ALayoutName</code> option. It causes a window using the ALayoutName layout to pop-up when the mouse hover on the widget (for more than 1000ms, or the value set by the hover_delay option, use 1000ms if set to 0). The popped-up window disappear when the mouse exit the window. <br />
-Only the widget or container that have their own gdkwindow can use this option. For the other widgets/containers, they can be placed inside a WB and use the <code>hover_layout</code> option on this EW. <br />
-The <code>hover_layout_pos</code> option can used to control the position of the popped window, see <a href="http://git.gmusicbrowser.org/commit/41b0c69b45">this commit</a> <br />
-Simple example of the <code>hover_layout</code> option to popup a big cover when the mouse hover on a Cover widget, by defining the Cover widget with this option : <code>Cover(hover_layout=CoverPopup)</code>, where CoverPopup is the the layout :</p>
-
-<pre><code>[CoverPopup]
-VBmain= Cover(minsize=800,maxsize=800,click1=CloseWindow)
-</code></pre>
-
-<p>To make the layout popup when the Cover widget is clicked rather than hovered, use this option :   <code>Cover(click1=PopupCustom(CoverPopup))</code></p>
-
-<h4><code>group</code> option</h4>
-
-<p>The <code>group</code> option is used to link a widget to a songlist (or equivalent widget) or to a song or set of songs. There are 2 type of links associated with the group option (they will be separable in the future), links to 1 song (like the current song or the last clicked song in a songlist), and the links to a set of songs (like the playlist or the content of a songlist), most widgets only use one type of links, some use both.</p>
-
-<p>If the group option is not specified, most filter-oriented widgets (like songlist and FilterPane) will use a default group, local to the window. The song-oriented widget will often default to the group Play (like the Title/Artist/... widgets) to follow the current song. <br />
-Group names that begin with an upper-case letter are global, the others are local to the window. <br />
-There are a few special predefined groups :  </p>
-
-<ul>
-<li>Play : links to the current song or the playlist  </li>
-<li>Next or NextN : link to the next song or the (N+1)th next song. The next song can be undefined, in particular when in a random weighted mode  </li>
-<li>Recent or RecentN : link to the previously played song or the (N+1)th previously played song  </li>
-</ul>
-
-<p>Examples :  </p>
-
-<ul>
-<li><p>linking 2 FilterPane a SimpleSearch and a Total widget with a SongList (if there is no other songlist-like widget in the layout, using the group option is not needed as the default group will do fine) :</p>
-
-<pre><code>VBmain= HPfilterpanes SimpleSearch(group=1) _SongList(group=1) Total(group=1)
-HPfilterpanes= FilterPane1(group=1,nb=1) FilterPane2(group=1,nb=2)
-</code></pre></li>
-<li><p>Title widget that display the next song's title :</p>
-
-<pre><code>Title2(group=Next, markup_empty="&lt;i&gt;no next song&lt;/i&gt;")
-</code></pre></li>
-<li><p>making a Text widget display the title and artist of the song selected in a SongList :</p>
-
-<pre><code>VBox= Text0(group=mygroup, markup="$title by $artist", markup_empty="&lt;i&gt;no selected song&lt;/i&gt;") _SongList(group=mygroup)
-</code></pre></li>
-</ul>
-
-<h4>Options common to the text widgets</h4>
-
-<p>The text widgets (sometimes called label widgets) include : Title, Title_by, Album, Artist, Comment, Year, Length, PlayingTime, Pos, and Text</p>
-
-<ul>
-<li>font : change the default font, the value use the <a href="http://developer.gnome.org/pango/stable/pango-Fonts.html#pango-font-description-from-string">pango font syntax</a>, for example : <code>12</code>, <code>Sans Italic 12</code>, <code>Monospace</code>. (Note that the font for a part of the string can be set in pango markup)</li>
-<li>color : set the default font color, value is an RGB color specification such as <code>#00FF00</code> or a color name such as <code>red</code>. (Note that the color for a part of the string can be set in pango markup)</li>
-<li>minsize : if set (it is set by default for Album, Artist, Comment, Title, Title_by), the label will request a minimum width (it can have more if packed with the expand option in a container), if the width is not enough to display the text, the text will scroll on mouse-over. The value of the <code>minsize</code> option is the width it will request, the unit is in pixels if followed by a <code>p</code> or in the width of the <code>X</code> character if it is only a number
-markup : can be used to re-define the text displayed, you can use <a href="#songvar">%-letters and $-words</a> (like <code>%t</code>, <code>%a</code>, ...) for current-song dependent text, and <a href="http://library.gnome.org/devel/pango/stable/PangoMarkupFormat.html">pango markup</a> (like <code>&lt;b&gt;...&lt;/b&gt;</code>)for formatting.</li>
-<li><code>markup_empty</code> : for Text/Title/Artist/... widgets, define what to display if there is no current song (or if there is no selected song in the group they are linked to). Most of time this default to an empty string, Title defaults to <code>&lt;Empty playlist&gt;</code></li>
-<li>xalign : horizontal alignement as a value between 0 (left) and 1 (right), .5 being center</li>
-<li>yalign : vertical alignement as a value between 0 (up) and 1 (bottom), .5 being center</li>
-<li>expand_max : same as the maxwidth option (specify a maximum expand width when inside a HB) but the widget will never grow wider than what is needed to display the string (replace the maxwidth value, so using the maxwidth with it will have no effect)</li>
-</ul>
-
-<h3>Text widgets</h3>
-
-<ul>
-<li>Title : Display currently playing Title</li>
-<li>Title_by : Display currently playing Title and Artist</li>
-<li>Album : Display currently playing Album</li>
-<li>Artist : Display currently playing Artist</li>
-<li>Comment : Display comment of currently playing song</li>
-<li>Year : Display year of currently playing song</li>
-<li>Length   : Display length of currently playing song</li>
-<li>Pos : Display position of currently playing song in the playlist</li>
-<li><p>Text : Display custom text (other text widgets can use these options too to change their defaults)</p>
-
-<ul>
-<li>text : label text</li>
-<li>markup : text than can include <a href="#songvar">%-letters and $-words</a> and <a href="http://library.gnome.org/devel/pango/stable/PangoMarkupFormat.html">pango markup</a></li>
-<li>ellipsize : can be none, start, middle, or end. Default is none. Note that enabling ellipsize will make the widget require very little width, so you need to either force a bigger width request (option minwidth), or pack the widget in a way that will give it additional width (such as using the expand option in a HB, provided the HB gets enough width)</li>
-</ul>
-
-<p><p>Many of these widgets are simply a Text widget with a set of default options, in particular the options : <code>markup</code>, <code>click1</code>, <code>click3</code>, <code>minsize</code>.</p></li>
-</ul></p>
-
-<h3>Buttons widgets</h3>
-
-<ul>
-<li>Next : Next button</li>
-<li>Play : Play/Pause button</li>
-<li>Prev : Previous button</li>
-<li>Stop : Stop button</li>
-<li>Quit : Quit button</li>
-<li>Repeat : Button to change repeat mode</li>
-<li>OpenContext : Button to open context window</li>
-<li>OpenBrowser : Button to open Browser window</li>
-<li>Pref : Button to open Settings window</li>
-<li>ChooseAlbum : Open a window to select an album</li>
-<li>OpenQueue : Open a queue window</li>
-<li>Fullscreen : Button to switch to/from fullscreen mode</li>
-<li>ChooseRandAlbum : Button to select an album at random, option <code>action</code> can be playlist, addplay, insertplay, queue, replacequeue, ... see action option in SongList</li>
-<li>Choose : Button to open a search window</li>
-<li>Button   : custom button (other buttons can use these options too)
-<ul>
-<li>text or label : text in the button</li>
-<li>stock : icon name, see <code>/usr/share/gmusicbrowser/pix/</code> or <a href="http://developer.gnome.org/doc/API/2.0/gtk/gtk-Stock-Items.html">Gtk2 Stock-Items</a> or <code>~/.config/gmusicbrowser/icons/</code> (without filename extension)</li>
-</ul></li>
-<li>ExtraButtons : placeholder for extra buttons provided by plugins or activated in the preferences. Options are passed to the buttons, generic button options such as size and relief should work, example: <code>HButtons= Play Stop ExtraButtons</code> or <code>HButtons= Play(size=menu) Stop(size=menu) ExtraButtons(size=menu)</code></li>
-</ul>
-
-<p>The OpenContext, OpenBrowser and OpenQueue buttons accept the option 'toggle', if true (=1) the button will close the opened window if it is already opened</p>
-
-<p>All buttons can be changed to an indicator(no button border, smaller) with the option <code>button=0</code></p>
-
-<p>Relief can be changed for buttons by using the option <code>relief=none</code> (default), <code>half</code> or <code>normal</code>.</p>
-
-<p>Size of buttons and indicators can be set by setting the option <code>size</code> to <code>menu</code>, <code>small-toolbar</code>, <code>large-toolbar</code>, <code>button</code>, <code>dialog</code>, <code>dnd</code> (the actual size depends on gtk settings)</p>
-
-<h3>Indicators widgets</h3>
-
-<ul>
-<li>Filter : Playing filter indicator</li>
-<li>Queue : Queue indicator</li>
-<li>Sort : Sort mode indicator</li>
-<li>LockAlbum : Album lock</li>
-<li>LockArtist : Artist lock</li>
-<li>LockSong : Song lock</li>
-<li>EventBox : same as Button with default option <code>button=0</code></li>
-</ul>
-
-<p>All indicators can be changed to buttons with the option <code>button=1</code>.
-Size can be changed same as buttons, see above.</p>
-
-<p>indicators (Filter Queue Sort ...) and some buttons (Play Next Prev Stop Quit ...) have a few common options:</p>
-
-<ul>
-<li><code>with_text</code>: set to 1 to activate icon-with-text mode</li>
-<li><code>text</code> : to change the default text</li>
-<li><code>ellipsize</code> : set to start/middle/end to activate ellipsize mode, better used with a minwidth option or when packed in expand mode</li>
-<li><code>markup</code> : can be used to set the pango markup that will be used to display the text, and also add text to the default text. %s is replaced by the default text. Default to <code>&lt;small&gt;%s&lt;/small&gt;</code> for widgets with <code>size=menu</code>, else to <code>%s</code></li>
-<li><code>stock</code>: option to change the default icons, see <a href="http://git.gmusicbrowser.org/commit/9287bb273a">this commit</a></li>
-</ul>
-
-<h3>Time widgets</h3>
-
-<ul>
-<li>PlayingTime : Display position of currently playing song
-<ul>
-<li>markup_stopped : markup to use when stopped (default is <code>--:--</code>)</li>
-</ul></li>
-<li>Time : displays XX:XX of XX:XX, format can be redefined with options markup and markup_empty (and initsize to request enough size from the start). %s is replaced by the current playtime, <br />
-example : <code>LabelTime(markup="%s / $length", initsize="XX:XX / -XX:XX")</code></li>
-<li>TimeSlider : Playing position slider
-<ul>
-<li>step_mode : if 1, clicking on the slider advance or or move back the position by one step, rather than jumping to the clicked position</li>
-</ul></li>
-<li>TimeBar : Playing position progress bar
-<ul>
-<li>text : specify a text to display inside the bar, it can contain %-letters and $-words, in addition these variables are available : $percent, $current, $left, $total</li>
-<li>text_empty : used instead of text when no song is selected</li>
-<li>ellipsize : used to ellipsize the text, default to <code>end</code>, can be none, start, middle, or end</li>
-<li>font : set the font</li>
-</ul></li>
-</ul>
-
-<h3>Volume widgets</h3>
-
-<ul>
-<li>VolumeIcon : Volume indicator</li>
-<li>VolumeSlider : Volume slider
-<ul>
-<li>hide : hide the value if true (=1)</li>
-<li>horizontal : vertical slider if true (=1)</li>
-<li>step_mode : if 1, clicking on the slider increase or decrease the volume by one step, rather than setting it to the corresponding value</li>
-</ul></li>
-<li>VolumeBar : Volume bar</li>
-<li>Volume : current volume as text</li>
-</ul>
-
-<h3>Other widgets related to the playing song</h3>
-
-<p>By default, all these widgets show information on the currently playing song, some allow the edition of a property of the current song. By using the <code>group</code> option (see above), these widgets should be able to follow for example the selected song in a songlist rather than the current song. Example : <code>VBexample= _SongList(group=example) Cover(group=example)</code></p>
-
-<ul>
-<li>Cover : Album cover of currently playing song
-<ul>
-<li>forceratio : 1 or 0, if 1 always request a square size, useful for tray tip windows as they can't be resized</li>
-<li>minsize : minimum size</li>
-<li>maxsize : maximum size (default is 500)</li>
-<li>default : set a default file to use if there is no cover/artist picture</li>
-<li>overlay : set an overlay which is drawn on top of the picture, format is <code>XxY:WIDTHxHEIGHT:FILE</code>, where X, Y, WIDTH and HEIGHT define a rectangle in the overlay file where the album/artist picture will be drawn</li>
-<li>reflection : enable a reflection effect below the picture, (requires Cairo perl module) The value can be 0-100, used to define the height of the reflection in percentage of the picture (the value 1 set it to the default value of 25)</li>
-<li>r<em>alpha1 and r</em>alpha2 : can be used to set the starting (default=80) and ending (default=0) transparency percentage (0-100) of the reflection</li>
-<li>r_scale : (0-100, default=90) to configure the vertical scaling of the reflection</li>
-<li>(the filename in the <code>default</code> and <code>overlay</code> option can be absolute or relative to the layout folder)</li>
-</ul></li>
-<li>ArtistPic : Artist picture of currently playing song. Same options as Cover. With multiple artists, displays only one picture unless the option <code>multiple</code> was given, which can be set to <code>v</code> (vertical) or <code>h</code> (horizontal)</li>
-<li>Stars : Display currently playing rating as a picture (default to stars), clicking on the stars change the rating
-<ul>
-<li>xalign and yalign : value between 0 and 1. Used to align the stars in the widget if the widget has more space than needed. Default to .5</li>
-</ul></li>
-<li>LabelsIcons : Icons for currently playing labels for which an icon is defined in <code>~/.config/gmusicbrowser/icons/</code> (by a .png or .svg named <code>label-</code> followed by the label name.)</li>
-<li>SongInfo : display the song properties (like the info tab of the song properties window)
-<ul>
-<li>expander: 1 or 0, defaults to 1, show expanders for each field category if 1</li>
-<li>hide<em>empty: 1 or 0, default to 1, hide empty fields if 1</li>
-<li>font : default font</li>
-<li>group : group that determine current song, defaults to Play</li>
-<li>markup</em>cat : markup for categories name, defaults to <code>&lt;u&gt;%s&lt;/u&gt;</code></li>
-<li>markup<em>field : markup for fields name, defaults to <code>&lt;small&gt;%s :&lt;/small&gt;</code></li>
-<li>markup</em>value : markup for values, defaults to <code>&lt;small&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/small&gt;</code></li>
-</ul></li>
-<li>PictureBrowser : display pictures in folder of the current album, click to change picture, many options are planned</li>
-<li>AddLabelEntry : Entry to add labels to the current song</li>
-<li>LabelToggleButtons : displays list of labels with toggle buttons to edit current song's labels
-<ul>
-<li>hide_unset: if true(=1), hide labels that not set for the song</li>
-</ul></li>
-<li>Context : Context view, in fact this widget is a TabbedLists with a few different default options, in particular <code>match=context page</code> that automatically add context pages provided by plugins, and <code>typesubmenu=C</code> that  limit the context menu to context_pages-related entries</li>
-</ul>
-
-<h4>Miscellaneous widgets</h4>
-
-<ul>
-<li>AASearch
-<ul>
-<li>aa : artist or album</li>
-<li>activate : addplay or other action, see activate option of SongList</li>
-</ul></li>
-<li>ArtistSearch : same as AASearch(aa=artists)</li>
-<li>AlbumSearch : same as AASearch(aa=album)</li>
-<li>SongSearch</li>
-<li>ConnectionsList : the active connections when in gstreamer-server mode (very rough for now, mostly for testing)</li>
-<li>Visuals : Display a sound visualisation, only with gstreamer</li>
-<li>QueueActions : combobox to change the queued action</li>
-<li>ToggleButton : Show/Hide other widget(s)
-<ul>
-<li>icon : icon name, see <code>/usr/share/gmusicbrowser/pix/</code> or <a href="http://developer.gnome.org/doc/API/2.0/gtk/gtk-Stock-Items.html">Gtk2 Stock-Items</a> or <code>~/.config/gmusicbrowser/icons/</code> (without filename extension)</li>
-<li>text : button text</li>
-<li>widget : list of widgets/containers separated by <code>|</code></li>
-<li>resize : String of <code>h</code>,<code>v</code> or <code>_</code>, one by hidden widget : shrink the window vertically (v) or horizontally (h) when each widget is hidden</li>
-<li>togglegroup : activating a ToggleButton or MenuItem with a togglegroup will deactivate all the TogButton or MenuItem of the same togglegroup</li>
-<li>size : can be <code>menu</code>, <code>small-toolbar</code>, <code>large-toolbar</code>, <code>button</code>, <code>dialog</code>, <code>dnd</code>. (the actual size depends on gtk settings)</li>
-<li>relief</li>
-</ul></li>
-<li>Filler : empty widget to add space, for use with H/VSize</li>
-<li>HSeparator : Horizontal separator</li>
-<li>VSeparator : Vertical separator</li>
-<li>PlayOrderCombo : Combo box to change play order, the option minwidth set the requested width, it defaults to 100, -1 to let it grow, but it can grow much to wide, so it's best to set a minimum width and pack it with the expand option</li>
-<li>Equalizer : Equalizer, only active with gstreamer currently
-<ul>
-<li>preamp : whether to show the preamp, default to 1</li>
-<li>labels : pango attribute used to display labels, default to <code>x-small</code></li>
-</ul></li>
-<li>Progress : widget to display progress of current operations, hidden if no operations in progress
-<ul>
-<li>compact: make it more compact, less verbose, default to 1</li>
-</ul></li>
-<li>VProgress : same as Progress, but the widget use more vertical space and less horizontal space, and the compact option is 0 (false) by default</li>
-</ul>
-
-<h4>Songlist widgets</h4>
-
-<p>When there is more than one SongList/TabbedLists/... in a layout, they must each but one be assigned a group number though the group option. The one without a group number will be the default with which other widgets interact with. <br />
-All the other widgets which interact with a SongList/TabbedLists/... accept the option 'group' to specify which one they interact with, it is only needed when the layout contain more than one SongList/TabbedLists/...</p>
-
-<ul>
-<li>QueueList : Display queue (and edit it), accept the same options as SongList</li>
-<li>PlayList : SongList in playlist mode</li>
-<li>SongList :
-<ul>
-<li>hideif : can be <code>nofilter</code> or <code>empty</code>. Other values disable this. Conditions that will make the songlist hide itself or the widgets specified by hidewidget</li>
-<li>hidewidget : List of widgets separated with <code>|</code>. When the hide conditions are met, these widgets will be hidden, by default the songlist is hidden</li>
-<li>shrinkonhide : String of <code>h</code>,<code>v</code> or <code>_</code>, one by hidden widget : shrink vertically (<code>v</code>) or horizontally (<code>h</code>) the window when hidden. When multiple widgets are hidden, a direction or no direction (<code>_</code>) can be specified for each widget by using a string of <code>h/v/_</code></li>
-<li>mode : if set to <code>playlist</code>, the songlist and the playlist are synchronized</li>
-<li>activate : Action when double-clicking on a song : <code>play</code>(play now), <code>queue</code>(enqueue), <code>queueinsert</code>(insert at the top of the queue), <code>replacequeue</code>, <code>playlist</code>(set this list as the playlist and play this song), <code>addplay</code>(add to playlist), <code>insertplay</code>(insert in playlist after current position), <code>filter_and_play</code>, <code>filter_sort_and_play</code>, or <code>properties</code>(open song property window). The action can  be followed by a command like this : <code>activate=play&amp;CloseWindow</code></li>
-<li>activateX : where X is a mouse button number, defines the action used when the button X is double-clicked</li>
-<li>headers : hide the headers if set to <code>off</code></li>
-<li>songypad : change the default number of pixels between rows</li>
-<li>no_typeahead : if 1, disable automatic searching when a letter/digit is pressed and the SongList has focus</li>
-<li>rowtip : default tip to show when the mouse is above a row, can use %-letters and $-words</li>
-<li>autoupdate ; if 1 (default) keep list sorted and filtered (ignored in playlist, queue, or static list mode). User can toggle this option, so only affect newly created songlists</li>
-</ul></li>
-<li>TabbedLists : Songlists in tabs, can contain playlist, static lists and the queue. layouts of type 'P' can be opened in TabbedLists (use the layout property key <code>stockicon</code> to set the tab icon), context pages can also be opened (the Context widget is a TabbedLists with a different set of options)
-<ul>
-<li>tablist : if 1, show the list of tabs in the tab context-menu</li>
-<li>closebuttons : if 1, display close buttons in the tab of tabs that can be closed</li>
-<li>newbutton : if 1 (default) show a "new page" button next to the tabs</li>
-<li>tabpos : select tab position (left, right, top, bottom), optionally followed by the rotation angle : 0, 90, 180 or 270, example : <code>tabpos=left90</code></li>
-<li>default_child : widget type that will be opened by default when closing the last page. default to <code>PlayList</code></li>
-<li>match : set of keywords that define which dynamic widget should be added automatically? Default to empty, which means nothing will be added automatically. The Context widget has the is option set to <code>context page</code></li>
-</ul></li>
-<li>SongTree : Very customizable Songlist replacement. (drag and dropping columns is not yet implemented). See this <a href="http://wiki.gmusicbrowser.org/customization/songtree">wiki page</a> for some documentation. Many SongList options work, including these : activate activateX headers songxpad songypad rowtip autoupdate</li>
-</ul>
-
-<h4>Widgets related to songlists</h4>
-
-<p>(filter# is a number between 0-9, 0 is meant for FilterLock, when a filter is set all filters with a higher number are reset) <br />
-All these widgets accept the option <code>group</code> to specify which SongList/TabbedLists/... they interact with, it is only needed when the layout contain more than one SongList/TabbedLists/...  </p>
-
-<ul>
-<li>AABox : Artist or Album box (name, picture and stats of selected album/artist)
-<ul>
-<li>aa : artist or album</li>
-</ul></li>
-<li>ArtistBox : same as AABox(aa=artists)</li>
-<li>AlbumBox : same as AABox(aa=album)</li>
-<li><p>EditListButtons : buttons to remove/move the selected song(s) in the songlist and clear the list</p>
-
-<ul>
-<li>small : if true(=1) hide the label of the remove and clear buttons</li>
-<li>orientation : vertical buttons if set to <code>vertical</code></li>
-</ul></li>
-<li><p>FilterBox : advanced search box (set filter#1)</p></li>
-<li>FilterLock : Lock/unlock : current songlist filter is put in filter#0
-<ul>
-<li>relief</li>
-</ul></li>
-<li>FilterPane : Filter pane
-<ul>
-<li>nb : filter#, filter number to set, the artist/album/genre/date/label/folder/... pages only show the artist/... for songs matching all filters with a lower number </li>
-<li>hidebb : hide bottom buttons if true(=1)</li>
-<li>pages : set the default list of pages, value is names of pages separated by <code>|</code>, among savedtree,artist,album,genre,date,label,folder,filesys,lastplay,added,modif,rating...</li>
-<li>activate : play, queue, queueinsert, replacequeue, insertplay, playlist, addplay or properties (see <code>activate</code> option of SongList)</li>
-<li>activateX : where X is a mouse button number, defines the action used when the button X is double-clicked</li>
-<li>searchbox : if true(=1) add a search box to artist/album,genre,label pages</li>
-<li>no_typeahead : if true(=1) disable automatic searching when a letter/digit is pressed and the FilterPane has focus</li>
-<li>hidetabs : if true(=1) tabs are hidden</li>
-<li>tabmode : value can be <code>text</code> (default), <code>icon</code> or <code>both</code>. When <code>icon</code> or <code>both</code>, it will try to use icons named <code>gmb-tab-</code> followed by the internal page name</li>
-<li>hscrollbar : show horizontal scrollbar if 1, hide it if 0</li>
-</ul></li>
-<li>PlayFilter : Button to Play current songlist filter</li>
-<li>QueueFilter : Button to Enqueue current songlist filter</li>
-<li>Refresh : Button to re-filter songlist</li>
-<li>ResetFilter : Button to reset songlist filter</li>
-<li>SimpleSearch : search entry, search title/album/artist (set filter#1), support powerful syntax (example title:sometitle and lots more, the documentation has not be written yet, see git logs for examples)
-<ul>
-<li>noselector : if set to 1 hide the selector icon, not recommended as it makes the widget much less powerful</li>
-<li>activate : can be used to set a command to run after enter is pressed</li>
-</ul></li>
-<li>Total : Total number/length/size of selected/filter/library
-<ul>
-<li>size : change text size, value can be xx-small, x-small, small, medium, large, x-large, xx-large, or see <a href="http://library.gnome.org/devel/pango/stable/PangoMarkupFormat.html">pango markup</a></li>
-<li>format : short or long (default)</li>
-<li>button : default to 1, if 0 a click-able label is used instead of a button</li>
-<li>relief : relief of the button, default to <code>none</code></li>
-</ul></li>
-</ul>
-
-<h4>MenuItem widgets (can only be put in a MB/SM)</h4>
-
-<ul>
-<li>HistItem : Filter history (set filter#1)</li>
-<li>LSortItem : Sort order for songlist</li>
-<li>MainMenuItem : main menu</li>
-<li>LayoutItem : layout menu (allows the user to switch to an other layout of type G+)</li>
-<li>MenuItem : Custom menu item
-<ul>
-<li>text : text of the menu item</li>
-<li>icon : name of the icon</li>
-<li>command : gmusicbrowser command to execute</li>
-<li>togglewidget : list of widgets/containers separated by <code>|</code></li>
-<li>resizeonly : with the togglewidget option, see the resize option of the ToggleButton</li>
-<li>togglegroup : activating a ToggleButton or MenuItem with a togglegroup will deactivate all the TogButton or MenuItem of the same togglegroup</li>
-<li>button : if set to 1 and has a submenu, the menuitem is turned into a button (same as BM)</li>
-</ul></li>
-<li>PFilterItem : playing filter menu</li>
-<li>PSortItem : playing sort order</li>
-<li>PlayItem : choose a Filter based on playing title/artist/album/filter (set filter#1) and follow playing songlist option</li>
-<li>QueueItem : queue menu</li>
-<li>SeparatorMenuItem : separator</li>
-</ul>
-
-<h3>Widget aliases</h3>
-
-<p>Some widgets have been renamed, the old names are deprecated but can be found in old layouts. <br />
-old name => new name :</p>
-
-<pre><code>Playlist    =&gt; OpenBrowser
-BContext    =&gt; OpenContext
-Date        =&gt; Year
-Label       =&gt; Text
-Vol         =&gt; VolumeIcon
-LabelVol    =&gt; Volume
-FLock       =&gt; FilterLock
-TogButton   =&gt; ToggleButton
-ProgressV   =&gt; VProgress
-FBox        =&gt; FilterBox
-Scale       =&gt; TimeSlider
-VolSlider   =&gt; VolumeSlider
-VolBar      =&gt; VolumeBar
-FPane       =&gt; FilterPane
-LabelTime   =&gt; PlayingTime
-</code></pre>
-
-<h2>Embedded layouts (experimental)</h2>
-
-<p>Layouts can be embedded inside an other layout by simply adding <code>\@id_of_embedded_layout</code> to a container (not all characters are
-supported in embedded layouts identifier) <br />
-example :</p>
-
-<pre><code>[example_layout]
-HBmain = Play Stop Pref
-VBmain = HBmain Title _@embedded_example
-
-[embedded_example]
-VBmain = Title _SongTree
-</code></pre>
-
-<h2><a id="songvar"> %-letters and $-words</a></h2>
-
-<p>Some options accept %-letters and $-words variables that are replaced by a field/property of the currently playing song.
-For example in <code>%t by %a</code>, %t is replaced by the song title and %a by the artist name. It is equivalent to <code>$title by $artist</code> <br />
-Note that %c and %f are not meant to be used for displaying.</p>
-
-<p>$-words : the word can be any of the activated field name, see the fields tab of the settings dialog.</p>
-
-<p>%-letters :</p>
-
-<pre><code>t   title
-a   artist
-l   album
-d   disc
-n   track
-y   year
-C   comment
-p   play count
-P   last play
-k   skip count
-K   last skip
-g   genres
-L   labels
-m   length
-V   version or nothing if song doesn't have a version/subtitle tag
-S   title or filename if no title
-f   filename (with path) (raw filename, may not display correctly)
-u   filename (with path) (in utf8, used for display, might not be convertible back to the real filename)
-c   cover file
-Y   album year(s)
-A   album artist or artist
-</code></pre>

=== modified file 'layouts/browser.layout'
--- layouts/browser.layout	2013-08-27 20:31:56 +0000
+++ layouts/browser.layout	2014-02-15 20:02:02 +0000
@@ -1,7 +1,7 @@
 [Browser]
 Type=B
 Name		= _"Browser"
-Default		= Window(size=1120x820) HPfp(size=180) HPbig(size=780) VPlistAA(size=645) FilterPane0(page=artist) FilterPane1(page=album)
+Default		= Window(size=1120x820) HPfp(size=150-150) HPbig(size=780-350) VPlistAA(size=645-140) FilterPane0(page=artist) FilterPane1(page=album)
 VBmain		= HBstatus 5_HPbig
 HBstatus	= SimpleSearch 10MBlist ResetFilter Refresh PlayFilter FilterLock -Total
 MBlist		= HistItem LSortItem PlayItem
@@ -14,7 +14,7 @@
 [Smaller browser]
 Type=B
 Name		= _"Smaller browser"
-Default		= Window(size=1120x820) HPfp(size=180) HPbig(size=780) VPlistAA(size=645) FilterPane0(page=artist) FilterPane1(page=album)
+Default		= Window(size=1120x820) HPfp(size=150-150) HPbig(size=800-300) VPlistAA(size=600-125) FilterPane0(page=artist) FilterPane1(page=album)
 VBmain		= HBstatus 5_HPbig
 HBstatus	= SimpleSearch 10MBlist ResetFilter Refresh PlayFilter FilterLock
 MBlist		= HistItem LSortItem PlayItem
@@ -32,14 +32,14 @@
 [3 Filter panes] based on Browser
 Type=B
 Name		= _"3 Filter panes"
-Default		= Window(size=1120x820) HPfp1(size=125) HPbig(size=750) HPfp2(size=125) VPlistAA(size=655) FilterPane0(page=savedtree) FilterPane1(page=artist) FilterPane2(page=album)
+Default		= Window(size=1120x820) HPfp(size=125-250) HPbig(size=750-450) HPfp2(size=125-125) VPlistAA(size=600-150) FilterPane0(page=savedtree) FilterPane1(page=artists) FilterPane2(page=album)
 HPfp		= _FilterPane0(nb=1) HPfp2
 HPfp2		= _FilterPane1(nb=2) FilterPane2(nb=3)
 
 [left-side filter panes]
 Type=B
 Name		= _"left-side filter panes"
-Default		= Window(size=1120x820) HPfp(size=180) HPbig(size=360) VPlistAA(size=645) FilterPane0(page=artist) FilterPane1(page=album)
+Default		= Window(size=1120x820) HPfp(size=150-150) HPbig(size=350-780) VPlistAA(size=645-140) FilterPane0(page=artist) FilterPane1(page=album)
 VBmain		= HBstatus 5_HPbig
 HBstatus	= SimpleSearch 10MBlist ResetFilter Refresh PlayFilter FilterLock -Total
 MBlist		= HistItem LSortItem PlayItem

=== modified file 'layouts/main.layout'
--- layouts/main.layout	2012-02-08 00:33:53 +0000
+++ layouts/main.layout	2014-02-15 20:02:02 +0000
@@ -9,7 +9,7 @@
  HBmenu		= _MBmenu
   MBmenu	= MainMenuItem LayoutItem PSortItem PFilterItem QueueItem
  HPmain		= VBLeft _TBRight
-  VBLeft	= 5VBplayer _TabbedLists(group=1)
+  VBLeft	= 5VBplayer _TabbedLists(group=1,pages="+PlayList +QueueList +SongInfo +PictureBrowser")
    VBplayer	= HBButtons3 HBText_Cover
     HBButtons3	= 5Sort 5Filter 5Queue 5Pos -Stars
     HBText_Cover= _VBText 5-Cover

=== modified file 'locale/cs/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/cs/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/cs/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/de/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/de/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/de/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/es/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/es/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/es/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/fi/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/fi/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/fi/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/fr/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/fr/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/fr/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/hu/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/hu/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/hu/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/it/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/it/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/it/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/ja/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/ja/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/ja/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/ko/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/ko/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/ko/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/nl/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/nl/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/nl/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/pl/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/pl/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/pl/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/pt/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/pt/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/pt/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/pt_BR/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/pt_BR/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/pt_BR/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/ru/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/ru/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/ru/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/sr/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/sr/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/sr/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/sv/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/sv/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/sv/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/zh_CN/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/zh_CN/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/zh_CN/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'locale/zh_TW/LC_MESSAGES/gmusicbrowser.mo'
Binary files locale/zh_TW/LC_MESSAGES/gmusicbrowser.mo	2014-01-25 14:17:08 +0000 and locale/zh_TW/LC_MESSAGES/gmusicbrowser.mo	2014-02-15 20:02:02 +0000 differ
=== modified file 'plugins/export.pm'
--- plugins/export.pm	2014-01-25 14:17:08 +0000
+++ plugins/export.pm	2014-02-15 20:02:02 +0000
@@ -145,11 +145,14 @@
 	my $content="#EXTM3U\n";
 	for my $ID (@$IDs)
 	{	my ($file,$length,$artist,$title)= Songs::Get($ID,qw/fullfilename length artist title/);
+		::_utf8_on($file); # for file, so it doesn't get converted in utf8
 		$content.= "\n#EXTINF:$length,$artist - $title\n$file\n";
 	}
-	open my$fh,'>',$file or warn "Error opening '$file' for writing : $!\n";
-	print $fh $content   or warn "Error writing to '$file' : $!\n";
-	close $fh;
+	{	my $fh;
+		open($fh,'>:utf8',$file) && (print $fh $content) && close($fh) && last;
+		my $res= ::Retry_Dialog($!,_"Error writing .m3u file", details=> ::__x( _"file: {filename}", filename=>$file));
+		redo if $res eq 'retry';
+	}
 }
 
 sub ToCSV
@@ -157,24 +160,31 @@
 	my $check=::NewPrefCheckButton(OPT.'toCSV_notitlerow',_"Do not add a title row");
 	my $file=::ChooseSaveFile(undef,_"Write filenames to ...",undef,'songs.csv',$check);
 	return unless defined $file;
-	my @fields=qw/file path title artist album year comment track disc length size rating modif added lastplay playcount lastskip skipcount bitrate filetype channel samprate genre label/; #FIXME PHASE1 use a dynamic list of fields
-	open my$fh,'>:utf8',$file;
-	unless ($::Options{OPT.'toCSV_notitlerow'}) #print a title row
-	{	print $fh join(',',map Songs::FieldName($_), @fields)."\n";
-	}
-	no warnings 'uninitialized';
-	for my $ID (@$IDs)
-	{	my @val;
-		push @val, Songs::Get($ID,@fields);
-		s/\x00/\t/g for @val; #for genres and labels
-		s/"/""/g for @val;
-		::_utf8_on($val[0]); # for file and path, so it doesn't get converted in utf8
-		::_utf8_on($val[1]); # FIXME find a cleaner way to do that
-		#print STDERR join(',',@val)."\n";
-		print $fh join(',',map '"'.$_.'"', @val)."\n";
-	}
-	close $fh;
-
+	my @fields= (qw/file path/,sort grep !m/^file$|^path$/, (Songs::PropertyFields())); #make sure file and path are in position 0 and 1
+
+	my $retry;
+	{	if ($retry)
+		{	my $res= ::Retry_Dialog($!,_"Error writing .csv file", details=> ::__x( _"file: {filename}", filename=>$file));
+			last unless $res eq 'retry';
+		}
+		$retry=1;
+
+		open my$fh,'>:utf8',$file  or redo;
+		unless ($::Options{OPT.'toCSV_notitlerow'}) #print a title row
+		{	print $fh join(',',map Songs::FieldName($_), @fields)."\n"  or redo;
+		}
+		for my $ID (@$IDs)
+		{	my @val;
+			push @val, Songs::Get($ID,@fields);
+			s/\x00/\t/g for @val; #for genres and labels
+			s/"/""/g for @val;
+			::_utf8_on($val[0]); # for file and path, so it doesn't get converted in utf8
+			::_utf8_on($val[1]); # FIXME find a cleaner way to do that
+			#print STDERR join(',',@val)."\n";
+			print $fh join(',',map '"'.$_.'"', @val)."\n"  or redo;
+		}
+		close $fh  or redo;
+	}
 }
 
 sub RunCommand

=== modified file 'plugins/fetch_cover.pm'
--- plugins/fetch_cover.pm	2014-01-25 14:17:08 +0000
+++ plugins/fetch_cover.pm	2014-02-15 20:02:02 +0000
@@ -391,6 +391,7 @@
 sub searchresults_cb
 {	my ($self,$result)=@_;
 	$self->{waiting}=undef;
+	warn "Getting results from $self->{url}\n" if $::Verbose;
 	unless (defined $result) { stop($self,_"connection failed."); return; }
 	my $parse= $Sites{$self->{mainfield}}{$self->{site}}[2];
 	my ($list,$nexturl)=$parse->($result,$self->{url},$self->{searchcontext});
@@ -567,5 +568,3 @@
 
 1
 
-__END__
-xml.amazon.com/onca/xml3?t=webservices-20&dev-t=%l&KeywordSearch=%s&mode=music&type=heavy&locale=us&page=1&f=xml

=== modified file 'po/cs.po'
--- po/cs.po	2014-01-25 14:17:08 +0000
+++ po/cs.po	2014-02-15 20:02:02 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: gmusicbrowser 1.1005\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2014-01-13 21:36+0100\n"
+"POT-Creation-Date: 2014-02-15 01:23+0100\n"
 "PO-Revision-Date: 2012-10-08 08:52+0100\n"
 "Last-Translator: Petr Šimáček <[e-mail]>\n"
 "Language-Team: čeština <[e-mail]>\n"
@@ -34,11 +34,11 @@
 msgid " of {length}"
 msgstr " z {length}"
 
-#: gmusicbrowser.pl:6651
+#: gmusicbrowser.pl:6626
 msgid "# songs"
 msgstr "# skladby"
 
-#: gmusicbrowser_layout.pm:1776
+#: gmusicbrowser_layout.pm:1782
 #, perl-format
 msgid "%S by %a"
 msgstr "%S od %a"
@@ -60,8 +60,8 @@
 msgstr[1] "%d Interpreti"
 msgstr[2] "%d Interpretů"
 
-#: gmusicbrowser.pl:3303 gmusicbrowser.pl:3307 gmusicbrowser.pl:5139
-#: gmusicbrowser_list.pm:1717
+#: gmusicbrowser.pl:3314 gmusicbrowser.pl:3318 gmusicbrowser.pl:5164
+#: gmusicbrowser_list.pm:1719
 #, perl-format
 msgid "%d Song"
 msgid_plural "%d Songs"
@@ -77,7 +77,7 @@
 msgstr[1] "%d nadcházející události"
 msgstr[2] "%d nadcházejících událostí"
 
-#: gmusicbrowser.pl:433 gmusicbrowser_list.pm:7997 gmusicbrowser_songs.pm:875
+#: gmusicbrowser.pl:436 gmusicbrowser_list.pm:7990 gmusicbrowser_songs.pm:875
 #, perl-format
 msgid "%d album"
 msgid_plural "%d albums"
@@ -85,7 +85,7 @@
 msgstr[1] "%d alba"
 msgstr[2] "%d alb"
 
-#: gmusicbrowser.pl:419 gmusicbrowser.pl:426 gmusicbrowser_list.pm:8008
+#: gmusicbrowser.pl:422 gmusicbrowser.pl:429 gmusicbrowser_list.pm:8001
 #: gmusicbrowser_songs.pm:848 gmusicbrowser_songs.pm:3033
 #, perl-format
 msgid "%d artist"
@@ -94,7 +94,7 @@
 msgstr[1] "%d interpreti"
 msgstr[2] "%d interpretů"
 
-#: gmusicbrowser.pl:4761
+#: gmusicbrowser.pl:4786
 #, perl-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -110,7 +110,7 @@
 msgstr[1] "%d soubory ve složce {folder}"
 msgstr[2] "%d souborů ve složce {folder}"
 
-#: gmusicbrowser.pl:5561
+#: gmusicbrowser.pl:5584
 #, perl-format
 msgid "%d folder"
 msgid_plural "%d folders"
@@ -118,7 +118,7 @@
 msgstr[1] "%d složky"
 msgstr[2] "%d složek"
 
-#: gmusicbrowser.pl:1557
+#: gmusicbrowser.pl:1567
 #, perl-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -126,8 +126,8 @@
 msgstr[1] "%d vteřiny"
 msgstr[2] "%d vteřin"
 
-#: gmusicbrowser.pl:413 gmusicbrowser.pl:421 gmusicbrowser.pl:6389
-#: gmusicbrowser.pl:6595 gmusicbrowser.pl:8270 gmusicbrowser_layout.pm:238
+#: gmusicbrowser.pl:416 gmusicbrowser.pl:424 gmusicbrowser.pl:6360
+#: gmusicbrowser.pl:6570 gmusicbrowser.pl:8296 gmusicbrowser_layout.pm:238
 #: gmusicbrowser_list.pm:248 gmusicbrowser_songs.pm:3027
 #: plugins/audioscrobbler.pm:173
 #, perl-format
@@ -137,7 +137,7 @@
 msgstr[1] "%d skladby"
 msgstr[2] "%d skladeb"
 
-#: gmusicbrowser.pl:5560
+#: gmusicbrowser.pl:5583
 #, perl-format
 msgid "%d song added"
 msgid_plural "%d songs added"
@@ -145,7 +145,7 @@
 msgstr[1] "%d skladby přidány"
 msgstr[2] "%d skladeb přidáno"
 
-#: gmusicbrowser.pl:3312 gmusicbrowser_layout.pm:234
+#: gmusicbrowser.pl:3323 gmusicbrowser_layout.pm:234
 #: gmusicbrowser_layout.pm:237
 #, perl-format
 msgid "%d song in queue"
@@ -181,12 +181,12 @@
 msgid "%t by %a (%m)"
 msgstr "%S od %a"
 
-#: gmusicbrowser.pl:4655
+#: gmusicbrowser.pl:4680
 #, perl-brace-format
 msgid "'{file}' exists. Overwrite ?"
 msgstr "'{file}' existuje. Přepsat ?"
 
-#: gmusicbrowser.pl:6548
+#: gmusicbrowser.pl:6522
 #, perl-format
 msgid "(%d song excluded)"
 msgid_plural "(%d songs excluded)"
@@ -194,7 +194,7 @@
 msgstr[1] "(%d skladby vyjmuty)"
 msgstr[2] "(%d skladeb vyjmuto)"
 
-#: gmusicbrowser.pl:3135
+#: gmusicbrowser.pl:3146
 msgid "(case insensitive)"
 msgstr "(nedostupné)"
 
@@ -211,11 +211,15 @@
 msgid "(see http://www.last.fm)"
 msgstr "(navštivte http://www.last.fm)"
 
-#: gmusicbrowser.pl:6150 gmusicbrowser_gstreamer-0.10.pm:508
+#: gmusicbrowser.pl:6173 gmusicbrowser_gstreamer-0.10.pm:508
 msgid "(unstable)"
 msgstr "(nestabilní)"
 
-#: gmusicbrowser.pl:6273
+#: gmusicbrowser.pl:6544
+msgid ", sort @ScanExt) ], [_"
+msgstr ""
+
+#: gmusicbrowser.pl:6244
 msgid ""
 "- When selecting a song, the playlist filter will be reset if the song is "
 "not in it\n"
@@ -226,7 +230,7 @@
 "- Pokud bude stávající skladba odstraněna z playlistu, bude přeskočeno na "
 "další skladbu"
 
-#: gmusicbrowser.pl:8410
+#: gmusicbrowser.pl:8436
 msgid "0 chance"
 msgstr "0 možností"
 
@@ -234,7 +238,7 @@
 msgid "0 means 'show all'"
 msgstr "0 znamená 'zobrazit vše'"
 
-#: gmusicbrowser.pl:8408
+#: gmusicbrowser.pl:8434
 #, perl-brace-format
 msgid "1 chance in {probability}"
 msgstr "1 možnost v {probability}"
@@ -247,15 +251,15 @@
 msgid "32x32 PNG file icon"
 msgstr "soubor s ikonou 32x32 PNG"
 
-#: gmusicbrowser.pl:1807
+#: gmusicbrowser.pl:1817
 msgid "50 Last Added"
 msgstr "50 naposled přidaných"
 
-#: gmusicbrowser.pl:1806
+#: gmusicbrowser.pl:1816
 msgid "50 Last Played"
 msgstr "50 naposled přehrávaných"
 
-#: gmusicbrowser.pl:1805
+#: gmusicbrowser.pl:1815
 msgid "50 Most Played"
 msgstr "50 nejpřehrávanějších"
 
@@ -264,7 +268,7 @@
 msgid "<Unknown>"
 msgstr "<Unknown>"
 
-#: gmusicbrowser.pl:417
+#: gmusicbrowser.pl:420
 #, perl-format
 msgid ""
 "<b>%t</b>\n"
@@ -280,12 +284,12 @@
 msgid "<big><big>by %a</big></big>"
 msgstr "<big><big>od %a</big></big>"
 
-#: gmusicbrowser_list.pm:721 plugins/notify.pm:24
+#: gmusicbrowser_list.pm:731 plugins/notify.pm:24
 #, perl-format
 msgid "<i>by</i> %a\\n<i>from</i> %l"
 msgstr "<i>od</i> %a\\n<i>z</i> %l"
 
-#: gmusicbrowser_layout.pm:4317
+#: gmusicbrowser_layout.pm:4326
 msgid "Abort"
 msgstr "Zrušit"
 
@@ -302,7 +306,7 @@
 msgid "About"
 msgstr "O aplikaci"
 
-#: gmusicbrowser.pl:4766
+#: gmusicbrowser.pl:4791
 #, perl-brace-format
 msgid ""
 "About to delete {files}\n"
@@ -311,7 +315,7 @@
 "Odstraňování {files}\n"
 "Odstranit?"
 
-#: gmusicbrowser.pl:1557
+#: gmusicbrowser.pl:1567
 msgid "About to turn off the computer in :"
 msgstr "Vypnout počítač za :"
 
@@ -319,7 +323,7 @@
 msgid "Actions are not supported by current notification daemon"
 msgstr "Akce není podporována stávajícím notifikačním démonem"
 
-#: gmusicbrowser.pl:7643 gmusicbrowser.pl:7927 gmusicbrowser.pl:8148
+#: gmusicbrowser.pl:7669 gmusicbrowser.pl:7953 gmusicbrowser.pl:8174
 #: gmusicbrowser_tags.pm:1323 plugins/desktopwidget.pm:36
 msgid "Add"
 msgstr "Přidat"
@@ -343,29 +347,29 @@
 msgid "Add a filter"
 msgstr "Přidat filtr"
 
-#: gmusicbrowser.pl:6326
+#: gmusicbrowser.pl:6297
 msgid "Add a fullscreen button"
 msgstr "Přidat tlačítko celoobrazovkového režimu"
 
-#: gmusicbrowser.pl:6326
+#: gmusicbrowser.pl:6297
 msgid "Add a fullscreen button to layouts that can accept extra buttons"
 msgstr ""
 "Přidat tlačítko celoobrazovkového režimu do vzhledů, které akceptují extra "
 "tlačítka"
 
-#: gmusicbrowser_list.pm:7560
+#: gmusicbrowser_list.pm:7553
 msgid "Add a group"
 msgstr "Přidat skupinu"
 
-#: gmusicbrowser.pl:1250
+#: gmusicbrowser.pl:1255
 msgid "Add a label to the current song"
 msgstr "Přidat štítek stávající skladbě"
 
-#: gmusicbrowser.pl:1243
+#: gmusicbrowser.pl:1248
 msgid "Add a list of files/folders to the playlist"
 msgstr "Přidat seznam souborů/složek do playlistu"
 
-#: gmusicbrowser_list.pm:8054
+#: gmusicbrowser_list.pm:8047
 msgid "Add a radio"
 msgstr "Přidat rádio"
 
@@ -373,11 +377,11 @@
 msgid "Add files or folders"
 msgstr "Přidat soubory a složky"
 
-#: gmusicbrowser.pl:1246
+#: gmusicbrowser.pl:1251
 msgid "Add files/folders to library"
 msgstr "Přidat soubory/složky do knihovny"
 
-#: gmusicbrowser.pl:6494
+#: gmusicbrowser.pl:6465
 msgid "Add folder"
 msgstr "Přidat složku"
 
@@ -387,31 +391,31 @@
 msgid "Add folder ..."
 msgstr "Přidat složku ..."
 
-#: gmusicbrowser.pl:6697
+#: gmusicbrowser.pl:6672
 msgid "Add label"
 msgstr "Přidat štítek"
 
-#: gmusicbrowser.pl:7644
+#: gmusicbrowser.pl:7670
 msgid "Add multiple condition"
 msgstr "Přidat vícenásobnou podmínku"
 
-#: gmusicbrowser.pl:5199
+#: gmusicbrowser.pl:5224
 msgid "Add new label"
 msgstr "Přidat nový štítek"
 
-#: gmusicbrowser_list.pm:8124
+#: gmusicbrowser_list.pm:8117
 msgid "Add new radio"
 msgstr "Přidat nové rádio"
 
-#: gmusicbrowser.pl:8150
+#: gmusicbrowser.pl:8176
 msgid "Add rule : "
 msgstr "Přidat pravidlo :"
 
-#: gmusicbrowser.pl:5843
+#: gmusicbrowser.pl:5866
 msgid "Add shorcut key"
 msgstr "Přidat klávesovou zkratku"
 
-#: gmusicbrowser_list.pm:1964
+#: gmusicbrowser_list.pm:1966
 msgid "Add tab"
 msgstr "Přidat záložku"
 
@@ -419,7 +423,7 @@
 msgid "Add to existing values"
 msgstr "Přidat do stávajících hodnot"
 
-#: gmusicbrowser.pl:474
+#: gmusicbrowser.pl:477
 msgid "Add to list"
 msgstr "Přidat do seznamu"
 
@@ -440,15 +444,15 @@
 msgid "Added"
 msgstr "Přidáno"
 
-#: gmusicbrowser.pl:1809
+#: gmusicbrowser.pl:1819
 msgid "Added Today"
 msgstr "Přidáno dnes"
 
-#: gmusicbrowser_list.pm:8113
+#: gmusicbrowser_list.pm:8106
 msgid "Adding a radio"
 msgstr "Přidávání rádia"
 
-#: gmusicbrowser.pl:6258
+#: gmusicbrowser.pl:6229
 msgid ""
 "Additionally this format can be used :\n"
 " default number1 format1 number2 format2 ...\n"
@@ -466,7 +470,7 @@
 "Přidat položku do kontextového menu interpreta/alba, která umožní hledat "
 "googlem obrázek/přebal a uložit jej."
 
-#: gmusicbrowser_layout.pm:1550
+#: gmusicbrowser_layout.pm:1556
 msgid "Adds labels to the current song"
 msgstr "Přidat štítky stávající skladbě"
 
@@ -474,19 +478,19 @@
 msgid "Adds menu entries to song contextual menu"
 msgstr "Přidat položky do kontextového menu skladby"
 
-#: gmusicbrowser.pl:5252
+#: gmusicbrowser.pl:5277
 msgid "Advanced"
 msgstr ""
 
-#: gmusicbrowser_list.pm:3616
+#: gmusicbrowser_list.pm:3613
 msgid "Advanced Search ..."
 msgstr "Rozšířené vyhledávání ..."
 
-#: gmusicbrowser.pl:5252 gmusicbrowser_tags.pm:1493
+#: gmusicbrowser.pl:5277 gmusicbrowser_tags.pm:1493
 msgid "Advanced Tag Editing"
 msgstr "Rozšířená editace popisků"
 
-#: gmusicbrowser.pl:996 gmusicbrowser_songs.pm:868 gmusicbrowser_tags.pm:1614
+#: gmusicbrowser.pl:999 gmusicbrowser_songs.pm:868 gmusicbrowser_tags.pm:1614
 #: gmusicbrowser_tags.pm:1652 gmusicbrowser_tags.pm:1667
 #: gmusicbrowser_tags.pm:1685 gmusicbrowser_tags.pm:1692
 #: gmusicbrowser_tags.pm:1938 plugins/albuminfo.pm:63
@@ -521,7 +525,7 @@
 msgid "Album gain"
 msgstr "Zisk alba"
 
-#: gmusicbrowser.pl:6151
+#: gmusicbrowser.pl:6174
 msgid "Album mode"
 msgstr "Režim alba"
 
@@ -529,11 +533,11 @@
 msgid "Album peak"
 msgstr "Vrchol alba"
 
-#: gmusicbrowser_list.pm:815 gmusicbrowser_songs.pm:891
+#: gmusicbrowser_list.pm:825 gmusicbrowser_songs.pm:891
 msgid "Album picture"
 msgstr "Obrázek alba"
 
-#: gmusicbrowser_list.pm:838
+#: gmusicbrowser_list.pm:848
 msgid "Album picture & info"
 msgstr "Obrázek alba & info"
 
@@ -549,7 +553,7 @@
 msgid "Album shuffle"
 msgstr "Zamíchané album"
 
-#: gmusicbrowser.pl:995
+#: gmusicbrowser.pl:998
 msgid "Album with picture"
 msgstr "Album s obrázkem"
 
@@ -580,12 +584,12 @@
 msgid "Albums"
 msgstr "Alba"
 
-#: gmusicbrowser_songs.pm:2372 gmusicbrowser_songs.pm:4739
+#: gmusicbrowser_songs.pm:2372 gmusicbrowser_songs.pm:4766
 #: layouts/makeitlooklike.layout:314
 msgid "All"
 msgstr "Vše"
 
-#: gmusicbrowser_songs.pm:4728
+#: gmusicbrowser_songs.pm:4755
 msgid "All Songs"
 msgstr "Všechny skladby"
 
@@ -597,7 +601,7 @@
 msgid "All artists"
 msgstr "Všichni interpreti"
 
-#: gmusicbrowser.pl:4501
+#: gmusicbrowser.pl:4533
 msgid "All files"
 msgstr "Všechny soubory"
 
@@ -613,12 +617,12 @@
 msgid "All moods"
 msgstr "Všechny nálady"
 
-#: gmusicbrowser.pl:7781 gmusicbrowser.pl:7876 gmusicbrowser_songs.pm:4744
+#: gmusicbrowser.pl:7807 gmusicbrowser.pl:7902 gmusicbrowser_songs.pm:4771
 msgid "All of :"
 msgstr "Vše z :"
 
-#: gmusicbrowser.pl:9343 gmusicbrowser_layout.pm:1477
-#: gmusicbrowser_songs.pm:4063
+#: gmusicbrowser.pl:9369 gmusicbrowser_layout.pm:1483
+#: gmusicbrowser_songs.pm:4090
 msgid "All songs"
 msgstr "Všechny skladby"
 
@@ -651,16 +655,16 @@
 msgstr "Ovládat gmusicbrowser přes DBus za použití standardu MPRIS v2.0"
 
 #. Alt key
-#: gmusicbrowser.pl:1044
+#: gmusicbrowser.pl:1047
 msgctxt "Keyboard"
 msgid "Alt"
 msgstr "Alt"
 
-#: gmusicbrowser.pl:6272
+#: gmusicbrowser.pl:6243
 msgid "Amount of volume changed by the mouse wheel"
 msgstr "Velikost kroku změny hlasitosti kolečkem myši"
 
-#: gmusicbrowser.pl:6089
+#: gmusicbrowser.pl:6112
 msgid ""
 "Analyse and add replaygain tags for all songs that don't have replaygain "
 "tags, or incoherent album replaygain tags"
@@ -668,11 +672,11 @@
 "Analýzovat a přidat replaygain tagy pro všechny písně, které nemají "
 "replaygain značky, nebo nesoudržné replaygain značky alba "
 
-#: gmusicbrowser.pl:7781 gmusicbrowser.pl:7877 gmusicbrowser_songs.pm:4744
+#: gmusicbrowser.pl:7807 gmusicbrowser.pl:7903 gmusicbrowser_songs.pm:4771
 msgid "Any of :"
 msgstr "Cokoliv z :"
 
-#: gmusicbrowser.pl:460
+#: gmusicbrowser.pl:463
 msgid "Append"
 msgstr "Přidat"
 
@@ -680,7 +684,7 @@
 msgid "Append (only if not already present)"
 msgstr "Přidat (pouze pokud již neexistuje)"
 
-#: gmusicbrowser_list.pm:1706
+#: gmusicbrowser_list.pm:1708
 msgid "Append to playlist"
 msgstr "Přidat do playlistu"
 
@@ -688,12 +692,12 @@
 msgid "Application"
 msgstr "Aplikace"
 
-#: gmusicbrowser.pl:6612
+#: gmusicbrowser.pl:6587
 #, perl-brace-format
 msgid "Are you sure you want to delete the '{label}' label ?"
 msgstr "Určitě odstranit štítek '{label}' ?"
 
-#: gmusicbrowser.pl:5881
+#: gmusicbrowser.pl:5904
 msgid "Arguments"
 msgstr "Argumenty"
 
@@ -708,7 +712,7 @@
 msgid "Artist"
 msgstr "Interpret"
 
-#: gmusicbrowser.pl:994
+#: gmusicbrowser.pl:997
 msgid "Artist & album"
 msgstr "Interpret & album"
 
@@ -724,7 +728,7 @@
 msgid "Artist URL"
 msgstr "URL interpreta"
 
-#: gmusicbrowser_list.pm:823 gmusicbrowser_songs.pm:900
+#: gmusicbrowser_list.pm:833 gmusicbrowser_songs.pm:900
 msgid "Artist picture"
 msgstr "Obrázek interpreta"
 
@@ -737,11 +741,11 @@
 msgid "Artist playcount:"
 msgstr "Počet přehrání interpreta"
 
-#: gmusicbrowser.pl:1012
+#: gmusicbrowser.pl:1015
 msgid "Artist,Album,Disc,Track"
 msgstr "Interpret,album,disk,stopa"
 
-#: gmusicbrowser.pl:1013
+#: gmusicbrowser.pl:1016
 msgid "Artist,Date,Album,Disc,Track"
 msgstr "Interpret,rok,album,disk,stopa"
 
@@ -765,7 +769,7 @@
 msgid "Artists"
 msgstr "Interpreti"
 
-#: gmusicbrowser.pl:7992
+#: gmusicbrowser.pl:8018
 msgid "Ascending order"
 msgstr "Vzrůstající"
 
@@ -773,7 +777,7 @@
 msgid "Ask confirmation only if file already exists"
 msgstr "Potvrzovat pouze pokud soubor již existuje"
 
-#: gmusicbrowser.pl:5724
+#: gmusicbrowser.pl:5747
 msgid "Audio"
 msgstr "Audio"
 
@@ -801,11 +805,11 @@
 msgid "Auto fill up to"
 msgstr "Automaticky vyplnit k"
 
-#: gmusicbrowser_list.pm:3492
+#: gmusicbrowser_list.pm:3497
 msgid "Auto filter"
 msgstr "Automatický filter"
 
-#: gmusicbrowser.pl:394
+#: gmusicbrowser.pl:397
 msgid "Auto-fill queue"
 msgstr "Automaticky vyplnit frontu"
 
@@ -829,11 +833,11 @@
 msgid "Auto-scroll"
 msgstr "Automatický posun"
 
-#: gmusicbrowser_list.pm:1732
+#: gmusicbrowser_list.pm:1734
 msgid "Auto-select Pictures"
 msgstr "Automatický výběr obrázků"
 
-#: gmusicbrowser.pl:6529
+#: gmusicbrowser.pl:6503
 msgid "Automatically remove current song if not found"
 msgstr "Automaticky odstranit stávající skladbu, pokud nebyla nalezena"
 
@@ -845,7 +849,7 @@
 msgid "Autosave plugin"
 msgstr "Zásuvný modul automatického ukládání"
 
-#: gmusicbrowser.pl:7948
+#: gmusicbrowser.pl:7974
 msgid "Available"
 msgstr "Dostupné"
 
@@ -861,7 +865,7 @@
 msgid "Bad session"
 msgstr "Chyba sezení"
 
-#: gmusicbrowser.pl:4932
+#: gmusicbrowser.pl:4957
 msgid "Base Folder :"
 msgstr "Základní složka :"
 
@@ -869,11 +873,11 @@
 msgid "Basic fields"
 msgstr "Základní pole"
 
-#: gmusicbrowser_list.pm:5269
+#: gmusicbrowser_list.pm:5266
 msgid "Begin with"
 msgstr "Začít s"
 
-#: gmusicbrowser_list.pm:1660
+#: gmusicbrowser_list.pm:1662
 msgid "Below"
 msgstr "Níže"
 
@@ -901,7 +905,7 @@
 msgid "Browser views"
 msgstr "Zobrazení prohlížeče"
 
-#: gmusicbrowser.pl:6313
+#: gmusicbrowser.pl:6284
 msgid "Browser window layout :"
 msgstr "Styl prohlížeče"
 
@@ -917,7 +921,7 @@
 msgid "Buttons, Song & Cover"
 msgstr "Tlačítka, skladba & přebal"
 
-#: gmusicbrowser.pl:1239
+#: gmusicbrowser.pl:1244
 msgid "Can be relative by using + or -"
 msgstr "Při použití + nebo - může být relativní"
 
@@ -933,7 +937,7 @@
 "Nelze změnit hlasitost. Při použití tohoto audio backendu je vyžadován "
 "amixer (obsažen v alsa-utils)."
 
-#: gmusicbrowser.pl:4313
+#: gmusicbrowser.pl:4337
 #, perl-brace-format
 msgid "Can't create folder: {path}"
 msgstr ""
@@ -951,7 +955,7 @@
 msgid "Can't read file or invalid file"
 msgstr "Soubor nelze číst nebo je poškozený"
 
-#: gmusicbrowser.pl:4968
+#: gmusicbrowser.pl:4993
 #, perl-brace-format
 msgid "Can't write in base folder '{folder}'."
 msgstr "Nelze zapisovat do základní složky '{folder}'."
@@ -964,15 +968,15 @@
 msgid "Capitalize each word"
 msgstr "Všechna slova psát s vekými písmeny"
 
-#: gmusicbrowser.pl:7988
+#: gmusicbrowser.pl:8014
 msgid "Case insensitive"
 msgstr "Nedostupná položka"
 
-#: gmusicbrowser.pl:7988 gmusicbrowser.pl:8597 gmusicbrowser_list.pm:3487
+#: gmusicbrowser.pl:8014 gmusicbrowser.pl:8623 gmusicbrowser_list.pm:3492
 msgid "Case sensitive"
 msgstr "Dostupná položka"
 
-#: gmusicbrowser_list.pm:5268
+#: gmusicbrowser_list.pm:5265
 msgid "Case-sensitive"
 msgstr "Dostupná položka"
 
@@ -988,7 +992,7 @@
 msgid "Centered on"
 msgstr "Zarovnáno na"
 
-#: gmusicbrowser.pl:1211
+#: gmusicbrowser.pl:1216
 msgid "Change Display"
 msgstr "Změnit zobrazení"
 
@@ -1013,15 +1017,15 @@
 msgid "Check Collection"
 msgstr "Zkontrolovat kolekci"
 
-#: gmusicbrowser.pl:6518
+#: gmusicbrowser.pl:6492
 msgid "Check for updated/deleted songs on startup"
 msgstr "Kontrolovat přidané/smazané skladby při startu"
 
-#: gmusicbrowser_list.pm:1726
+#: gmusicbrowser_list.pm:1728
 msgid "Check for updated/removed songs"
 msgstr "Zkontrolovat přidané/smazané skladby"
 
-#: gmusicbrowser.pl:6531
+#: gmusicbrowser.pl:6505
 msgid "Check real length of mp3"
 msgstr "Zkontrolovat skutečnou délku mp3 souboru"
 
@@ -1029,15 +1033,15 @@
 msgid "Check your audio settings"
 msgstr "Zkontrolovat nastavení zvuku"
 
-#: gmusicbrowser.pl:936
+#: gmusicbrowser.pl:939
 msgid "Checking length/bitrate"
 msgstr "Kontrolovat délku/datový tok"
 
-#: gmusicbrowser.pl:934
+#: gmusicbrowser.pl:937
 msgid "Checking songs"
 msgstr "Kontrolovat skladby"
 
-#: gmusicbrowser_list.pm:3311
+#: gmusicbrowser_list.pm:3314
 msgid "Choose Album From this Artist"
 msgstr "Vybrat album tohoto interpreta"
 
@@ -1045,7 +1049,7 @@
 msgid "Choose Artist/Album/Song"
 msgstr "Vybrat interpreta/album/skladbu"
 
-#: gmusicbrowser.pl:4492
+#: gmusicbrowser.pl:4524
 msgid "Choose Picture"
 msgstr "Vybrat obrázek"
 
@@ -1053,23 +1057,23 @@
 msgid "Choose Random Album"
 msgstr "Vybrat náhodné album"
 
-#: gmusicbrowser.pl:8730
+#: gmusicbrowser.pl:8756
 msgid "Choose a folder"
 msgstr "Vyberte složku"
 
-#: gmusicbrowser.pl:4324
+#: gmusicbrowser.pl:4348
 msgid "Choose directory to copy files to"
 msgstr "Vybrat adresář pro kopírování souborů"
 
-#: gmusicbrowser.pl:4325
+#: gmusicbrowser.pl:4349
 msgid "Choose directory to move files to"
 msgstr "Vybrat adresář pro přesunutí souborů"
 
-#: gmusicbrowser.pl:4461
+#: gmusicbrowser.pl:4499
 msgid "Choose files"
 msgstr "Vybrat soubory"
 
-#: gmusicbrowser.pl:6570
+#: gmusicbrowser.pl:6545
 msgid "Choose folder to add"
 msgstr "Vybrat složku pro přidání"
 
@@ -1086,32 +1090,32 @@
 msgid "Choose icon for label {name}"
 msgstr "Vybrat ikonu pro štítek {name}"
 
-#: gmusicbrowser_layout.pm:2670
+#: gmusicbrowser_layout.pm:2679
 msgid "Choose page to open"
 msgstr "Vybrat stránku k otevření"
 
-#: gmusicbrowser.pl:3377
+#: gmusicbrowser.pl:3388
 #, perl-format
 msgid "Choose picture for '%s'"
 msgstr "Vybrat obrázek pro '%s'"
 
-#: gmusicbrowser.pl:5403
+#: gmusicbrowser.pl:5428
 msgid "Choose playlist files to import"
 msgstr "Vybrat soubory s playlisty k importu"
 
-#: gmusicbrowser.pl:7929 gmusicbrowser_list.pm:289
+#: gmusicbrowser.pl:7955 gmusicbrowser_list.pm:289
 msgid "Clear"
 msgstr "Smazat"
 
-#: gmusicbrowser.pl:1220
+#: gmusicbrowser.pl:1225
 msgid "Clear playlist"
 msgstr "Vyčistit seznam skladeb"
 
-#: gmusicbrowser.pl:1254
+#: gmusicbrowser.pl:1259
 msgid "Clear playlist filter"
 msgstr "Vyčistit filtr seznamu skladeb"
 
-#: gmusicbrowser.pl:1219 gmusicbrowser_layout.pm:33
+#: gmusicbrowser.pl:1224 gmusicbrowser_layout.pm:33
 msgid "Clear queue"
 msgstr "Smazat frontu"
 
@@ -1131,12 +1135,12 @@
 msgid "Client banned, contact gmusicbrowser's developer"
 msgstr "Zakázaný klient, kontaktujte vývojáře gmusicbrowser"
 
-#: gmusicbrowser_layout.pm:2392 gmusicbrowser_list.pm:3991
-#: gmusicbrowser_list.pm:4058
+#: gmusicbrowser_layout.pm:2401 gmusicbrowser_list.pm:3988
+#: gmusicbrowser_list.pm:4055
 msgid "Close"
 msgstr "Zavřít"
 
-#: gmusicbrowser.pl:1201
+#: gmusicbrowser.pl:1206
 msgid "Close Window"
 msgstr "Zavřít okno"
 
@@ -1145,7 +1149,7 @@
 msgid "Close a filter"
 msgstr "Vybrat filtr"
 
-#: gmusicbrowser.pl:6299
+#: gmusicbrowser.pl:6270
 msgid "Close to tray"
 msgstr "Zavřít do oznamovací oblasti"
 
@@ -1153,7 +1157,7 @@
 msgid "Collection"
 msgstr "Kolekce"
 
-#: gmusicbrowser.pl:5770 gmusicbrowser.pl:5880 gmusicbrowser_123.pm:291
+#: gmusicbrowser.pl:5793 gmusicbrowser.pl:5903 gmusicbrowser_123.pm:291
 msgid "Command"
 msgstr "Příkaz"
 
@@ -1165,7 +1169,7 @@
 msgid "Command used :"
 msgstr "Použitý příkaz :"
 
-#: gmusicbrowser.pl:6231
+#: gmusicbrowser.pl:6213
 msgid ""
 "Command used when\n"
 "'turn off computer when queue empty'\n"
@@ -1206,7 +1210,7 @@
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: gmusicbrowser.pl:6221
+#: gmusicbrowser.pl:6203
 msgid "Connect through a proxy"
 msgstr "Připojit přes proxy"
 
@@ -1231,11 +1235,11 @@
 msgid "Conz Glimm (different controls)"
 msgstr "Conz Glimm (různé ovládací prvky)"
 
-#: gmusicbrowser.pl:482
+#: gmusicbrowser.pl:485
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: gmusicbrowser.pl:4335
+#: gmusicbrowser.pl:4359
 msgid "Copy failed"
 msgstr "Kopírování selhalo"
 
@@ -1255,7 +1259,7 @@
 msgid "Copy to portable player"
 msgstr "Kopírovat do přenosného přehrávače"
 
-#: gmusicbrowser.pl:4337
+#: gmusicbrowser.pl:4361
 #, perl-format
 msgid "Copying file"
 msgid_plural "Copying %d files"
@@ -1271,17 +1275,17 @@
 msgid "Cover Size : "
 msgstr "Velikost přebalu:"
 
-#: gmusicbrowser.pl:6349
+#: gmusicbrowser.pl:6320
 msgid "Create ID3v2 tags as ID3v2.4"
 msgstr "Vytvořit ID3v2 popisky jako ID3v2.4"
 
 #. Ctrl key
-#: gmusicbrowser.pl:1043
+#: gmusicbrowser.pl:1046
 msgctxt "Keyboard"
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: gmusicbrowser.pl:6273
+#: gmusicbrowser.pl:6244
 msgid "Current song must always be in the playlist"
 msgstr "Stávající skladba vždy musí být v playlistu"
 
@@ -1317,16 +1321,16 @@
 msgid "Custom pipeline"
 msgstr "Vlastní pipeline"
 
-#: gmusicbrowser_layout.pm:1435 gmusicbrowser_layout.pm:1462
-#: gmusicbrowser_layout.pm:1491 gmusicbrowser_list.pm:91
+#: gmusicbrowser_layout.pm:1441 gmusicbrowser_layout.pm:1468
+#: gmusicbrowser_layout.pm:1497 gmusicbrowser_list.pm:91
 msgid "Custom..."
 msgstr "Obecné..."
 
-#: gmusicbrowser.pl:1009 gmusicbrowser_tags.pm:1617 gmusicbrowser_tags.pm:1655
+#: gmusicbrowser.pl:1012 gmusicbrowser_tags.pm:1617 gmusicbrowser_tags.pm:1655
 msgid "Date"
 msgstr "Rok"
 
-#: gmusicbrowser.pl:6259
+#: gmusicbrowser.pl:6230
 msgid "Date format :"
 msgstr "Formát data:"
 
@@ -1338,7 +1342,7 @@
 msgid "Debut Album"
 msgstr "Uvedení alba"
 
-#: gmusicbrowser.pl:1222
+#: gmusicbrowser.pl:1227
 msgid "Decrease Volume"
 msgstr "Snížit hlasitost"
 
@@ -1354,7 +1358,7 @@
 msgid "Default fullscreen"
 msgstr "Výchozí celá obrazovka"
 
-#: gmusicbrowser.pl:6211
+#: gmusicbrowser.pl:6193
 #, perl-format
 msgid "Default rating : %d %"
 msgstr "Výchozí hodnocení : %d %"
@@ -1367,7 +1371,7 @@
 msgid "Default text font"
 msgstr "Výchozí font textu"
 
-#: gmusicbrowser.pl:6301
+#: gmusicbrowser.pl:6272
 #, perl-format
 msgid "Delay before showing tray tip popup on mouse over : %d ms"
 msgstr ""
@@ -1378,19 +1382,19 @@
 msgid "Delete"
 msgstr "Odstranit"
 
-#: gmusicbrowser.pl:1213
+#: gmusicbrowser.pl:1218
 msgid "Delete Selected Songs"
 msgstr "Odstranit vybrané skladby"
 
-#: gmusicbrowser_layout.pm:2390
+#: gmusicbrowser_layout.pm:2399
 msgid "Delete list"
 msgstr "Odstranit seznam"
 
-#: gmusicbrowser.pl:4777
+#: gmusicbrowser.pl:4802
 msgid "Deletion failed"
 msgstr ""
 
-#: gmusicbrowser.pl:7992
+#: gmusicbrowser.pl:8018
 msgid "Descending order"
 msgstr "Sestupné pořadí"
 
@@ -1412,12 +1416,12 @@
 msgid "Desktop widgets plugin"
 msgstr "Zásuvný modul pomůcek"
 
-#: gmusicbrowser.pl:4390
+#: gmusicbrowser.pl:4414
 #, perl-brace-format
 msgid "Destination: {file}"
 msgstr ""
 
-#: gmusicbrowser.pl:6228
+#: gmusicbrowser.pl:6210
 msgid "Disable screensaver when fullscreen and playing"
 msgstr "Při celoobrazovkovém režimu vypnout spořič obrazovky"
 
@@ -1438,11 +1442,11 @@
 msgid "Disc name"
 msgstr "Název disku"
 
-#: gmusicbrowser.pl:1211
+#: gmusicbrowser.pl:1216
 msgid "Display (:1 or host:0 for example)"
 msgstr "Zobrazit (:1 nebo host:0 pro příklad)"
 
-#: gmusicbrowser.pl:505
+#: gmusicbrowser.pl:508
 msgid "Display Songs"
 msgstr "Zobrazit skladby"
 
@@ -1459,28 +1463,24 @@
 msgid "Display synchronized lyrics of the current song"
 msgstr "Zobrazovat texty v souladu se stávající skladbou"
 
-#: gmusicbrowser.pl:6297
+#: gmusicbrowser.pl:6268
 #, perl-format
 msgid "Display tray tip for %d ms"
 msgstr "Zobrazit vyskakovací okno oznamovací oblasti po %d ms"
 
-#: plugins/export.pm:157
+#: plugins/export.pm:160
 msgid "Do not add a title row"
 msgstr "Nepřidávat titulkovou řádku"
 
-#: gmusicbrowser.pl:6516
-msgid "Do not add songs that can't be played"
-msgstr "Nepřidávat skladby, které nelze přehrát"
-
-#: gmusicbrowser.pl:6355
+#: gmusicbrowser.pl:6326
 msgid "Do not create an id3v1 tag in mp3 files"
 msgstr "Nevytvářet ID3v1 popisek u souborů mp3"
 
-#: gmusicbrowser.pl:6351
+#: gmusicbrowser.pl:6322
 msgid "Do not unsynchronise id3v2 tags"
 msgstr "Nechat synchronizované ID3v2 popisky"
 
-#: gmusicbrowser.pl:6354
+#: gmusicbrowser.pl:6325
 msgid "Do not write the tags"
 msgstr "Nezapisovat popisky"
 
@@ -1505,24 +1505,24 @@
 msgid "Download"
 msgstr "Stáhnout"
 
-#: gmusicbrowser.pl:6384
+#: gmusicbrowser.pl:6355
 msgid "Drag and drop songs here to replace the selection."
 msgstr "Přetáhněte songy sem pro nahrazení výběru"
 
-#: gmusicbrowser.pl:5263 layouts/makeitlooklike.layout:50
+#: gmusicbrowser.pl:5288 layouts/makeitlooklike.layout:50
 #: layouts/makeitlooklike.layout:235 layouts/makeitlooklike.layout:340
 msgid "Edit"
 msgstr "Upravit"
 
-#: gmusicbrowser.pl:1204
+#: gmusicbrowser.pl:1209
 msgid "Edit Current Song Properties"
 msgstr "Upravit vlastnosti stávající skladby"
 
-#: gmusicbrowser.pl:475
+#: gmusicbrowser.pl:478
 msgid "Edit Labels"
 msgstr "Upravit štítky"
 
-#: gmusicbrowser.pl:491 gmusicbrowser.pl:4730
+#: gmusicbrowser.pl:494 gmusicbrowser.pl:4755
 msgid "Edit Lyrics"
 msgstr "Upravit texty"
 
@@ -1530,11 +1530,11 @@
 msgid "Edit Lyrics ..."
 msgstr "Upravit texty ..."
 
-#: gmusicbrowser.pl:5223
+#: gmusicbrowser.pl:5248
 msgid "Edit Multiple Songs Properties"
 msgstr "Upravit mnohočetné vlastnosti skladeb"
 
-#: gmusicbrowser.pl:476
+#: gmusicbrowser.pl:479
 msgid "Edit Rating"
 msgstr "Upravit hodnocení"
 
@@ -1546,7 +1546,7 @@
 msgid "Edit auto-fill formats ..."
 msgstr "Upravit formáty automatického vyplňování ..."
 
-#: gmusicbrowser_list.pm:2944
+#: gmusicbrowser_list.pm:2946
 msgid "Edit filter"
 msgstr "Upravit filter"
 
@@ -1554,7 +1554,7 @@
 msgid "Edit filter..."
 msgstr "Upravit filtr"
 
-#: gmusicbrowser_list.pm:6757
+#: gmusicbrowser_list.pm:6750
 msgid "Edit grouping ..."
 msgstr "Upravit seskupení ..."
 
@@ -1562,7 +1562,7 @@
 msgid "Edit in the last.fm wiki"
 msgstr "Upravit v last.fm wiki"
 
-#: gmusicbrowser_list.pm:2952
+#: gmusicbrowser_list.pm:2954
 msgid "Edit list"
 msgstr "Upravit seznam"
 
@@ -1570,24 +1570,24 @@
 msgid "Edit mode"
 msgstr "Režim úprav"
 
-#: gmusicbrowser_layout.pm:1404
+#: gmusicbrowser_layout.pm:1410
 msgid "Edit ordered modes ..."
 msgstr "Upravit režimy pořadí"
 
-#: gmusicbrowser_layout.pm:1388
+#: gmusicbrowser_layout.pm:1394
 msgid "Edit random modes ..."
 msgstr "Upravit náhodné režimy"
 
-#: gmusicbrowser_list.pm:710 gmusicbrowser_list.pm:854
-#: gmusicbrowser_list.pm:6769
+#: gmusicbrowser_list.pm:720 gmusicbrowser_list.pm:864
+#: gmusicbrowser_list.pm:6762
 msgid "Edit row tip"
 msgstr "Upravit řádek Tip"
 
-#: gmusicbrowser.pl:1205
+#: gmusicbrowser.pl:1210
 msgid "Edit selected song properties"
 msgstr "Upravit vlastnosti vybrané skladby"
 
-#: gmusicbrowser.pl:9347 gmusicbrowser_layout.pm:39
+#: gmusicbrowser.pl:9373 gmusicbrowser_layout.pm:39
 msgid "Edit..."
 msgstr "Upravit..."
 
@@ -1595,11 +1595,11 @@
 msgid "Editable in song properties dialog"
 msgstr "Je možno upravit v dialogu vlastností skladby"
 
-#: gmusicbrowser.pl:3282 gmusicbrowser.pl:3289
+#: gmusicbrowser.pl:3293 gmusicbrowser.pl:3300
 msgid "Editing list : "
 msgstr "Úprava seznamu :"
 
-#: gmusicbrowser.pl:1441
+#: gmusicbrowser.pl:1446
 msgid "Editing tags"
 msgstr "Úprava popisků"
 
@@ -1627,40 +1627,40 @@
 msgid "Encoder"
 msgstr "Enkodér"
 
-#: gmusicbrowser.pl:6353
+#: gmusicbrowser.pl:6324
 msgid "Encoding used for id3v1 tags :"
 msgstr "Kódování použité pro ID3v1 popisky :"
 
-#: gmusicbrowser_list.pm:1709 gmusicbrowser_list.pm:3989
-#: gmusicbrowser_list.pm:4056
+#: gmusicbrowser_list.pm:1711 gmusicbrowser_list.pm:3986
+#: gmusicbrowser_list.pm:4053
 msgid "Enqueue"
 msgstr "Přidat do fronty"
 
-#: gmusicbrowser.pl:1218
+#: gmusicbrowser.pl:1223
 msgid "Enqueue Action"
 msgstr "Možnosti přidání do fronty"
 
-#: gmusicbrowser.pl:472
+#: gmusicbrowser.pl:475
 msgid "Enqueue Displayed"
 msgstr "Přidat do fronty zobrazené"
 
-#: gmusicbrowser.pl:470
+#: gmusicbrowser.pl:473
 msgid "Enqueue Selected"
 msgstr "Přidat do fronty vybrané"
 
-#: gmusicbrowser.pl:1215
+#: gmusicbrowser.pl:1220
 msgid "Enqueue Selected Songs"
 msgstr "Přidat do fronty vybrané skladby"
 
-#: gmusicbrowser.pl:1217
+#: gmusicbrowser.pl:1222
 msgid "Enqueue Songs from Current Album"
 msgstr "Přidat do fronty skladby ze stávajícího alba"
 
-#: gmusicbrowser.pl:1216
+#: gmusicbrowser.pl:1221
 msgid "Enqueue Songs from Current Artist"
 msgstr "Přidat do fronty skladby stávajícího interpreta"
 
-#: gmusicbrowser.pl:1245
+#: gmusicbrowser.pl:1250
 msgid "Enqueue a list of files/folders"
 msgstr "Přidat do fronty seznam souborů/složek"
 
@@ -1683,15 +1683,15 @@
 msgid "Equalizer"
 msgstr "Ekvalizér"
 
-#: gmusicbrowser.pl:5937
+#: gmusicbrowser.pl:5960
 msgid "Error :"
 msgstr "Chyba :"
 
-#: gmusicbrowser.pl:4314
+#: gmusicbrowser.pl:4338
 msgid "Error creating folder"
 msgstr ""
 
-#: gmusicbrowser.pl:2516
+#: gmusicbrowser.pl:2527
 msgid "Error details"
 msgstr "Podrobnosti o chybě"
 
@@ -1730,7 +1730,7 @@
 "Chyba ukládání textů do '{file}' :\n"
 "{error}"
 
-#: plugins/fetch_cover.pm:556
+#: plugins/fetch_cover.pm:557
 msgid "Error saving picture"
 msgstr ""
 
@@ -1755,11 +1755,19 @@
 msgid "Error while writing tag"
 msgstr ""
 
-#: plugins/fetch_cover.pm:556
+#: plugins/fetch_cover.pm:557
 #, perl-brace-format
 msgid "Error writing '{file}'"
 msgstr "Chyba zápisu do '{file}'"
 
+#: plugins/export.pm:167
+msgid "Error writing .csv file"
+msgstr ""
+
+#: plugins/export.pm:153
+msgid "Error writing .m3u file"
+msgstr ""
+
 #: gmusicbrowser_tags.pm:289
 msgid "Error writing lyrics"
 msgstr ""
@@ -1809,11 +1817,11 @@
 msgid "Extra fields"
 msgstr "Extra pole"
 
-#: gmusicbrowser.pl:6155
+#: gmusicbrowser.pl:6178
 msgid "Extra gain"
 msgstr "Extra zisk"
 
-#: gmusicbrowser.pl:6244
+#: gmusicbrowser.pl:6221
 msgid "Extract guest artist from title :"
 msgstr "Vyčlenit hostujícího interpreta z názvu :"
 
@@ -1830,7 +1838,7 @@
 msgid "Fade-out then stop"
 msgstr "Slábnout, pak zastavit"
 
-#: gmusicbrowser.pl:4779
+#: gmusicbrowser.pl:4804
 #, perl-brace-format
 msgid "Failed to delete '{file}'"
 msgstr ""
@@ -1847,7 +1855,7 @@
 msgid "Field type"
 msgstr "Typ pole"
 
-#: gmusicbrowser.pl:5727 gmusicbrowser_list.pm:5272
+#: gmusicbrowser.pl:5750 gmusicbrowser_list.pm:5269
 msgid "Fields"
 msgstr "Pole"
 
@@ -1893,12 +1901,16 @@
 msgid "Files"
 msgstr "Soubory"
 
-#: gmusicbrowser_list.pm:1588
+#: gmusicbrowser.pl:6488
+msgid "Files with these extensions won't be added"
+msgstr ""
+
+#: gmusicbrowser_list.pm:1590
 msgid "Filesystem"
 msgstr "Souborový systém"
 
-#: gmusicbrowser.pl:503 gmusicbrowser.pl:505 gmusicbrowser_list.pm:125
-#: gmusicbrowser_list.pm:1584 layouts/contrib.layout:335
+#: gmusicbrowser.pl:506 gmusicbrowser.pl:508 gmusicbrowser_list.pm:125
+#: gmusicbrowser_list.pm:1586 layouts/contrib.layout:335
 #: layouts/contrib.layout:534
 msgid "Filter"
 msgstr "Filtr"
@@ -1907,7 +1919,7 @@
 msgid "Filter : "
 msgstr "Filtr : "
 
-#: gmusicbrowser.pl:7456
+#: gmusicbrowser.pl:7482
 msgid "Filter edition"
 msgstr "Editace filtru"
 
@@ -1923,15 +1935,15 @@
 msgid "Filter on playing Song"
 msgstr "Filtr na přehrávanou skladbu"
 
-#: gmusicbrowser_list.pm:3298
+#: gmusicbrowser_list.pm:3301
 msgid "Filter on this album"
 msgstr "Filtr na toto album"
 
-#: gmusicbrowser_list.pm:3298
+#: gmusicbrowser_list.pm:3301
 msgid "Filter on this artist"
 msgstr "Filtr na tohoto interpreta"
 
-#: gmusicbrowser_list.pm:5298
+#: gmusicbrowser_list.pm:5295
 msgid "Find :"
 msgstr "Nalézt :"
 
@@ -1939,25 +1951,25 @@
 msgid "Find a unique filename if file already exists"
 msgstr "Pokud soubor již existuje, najít jedinečný název"
 
-#: gmusicbrowser.pl:479
+#: gmusicbrowser.pl:482
 msgid "Find songs in same albums"
 msgstr "Najít skladby na stejných albech"
 
-#: gmusicbrowser.pl:478
+#: gmusicbrowser.pl:481
 msgid "Find songs with same artists"
 msgstr "Najít skladby stejných interpretů"
 
-#: gmusicbrowser.pl:477
+#: gmusicbrowser.pl:480
 msgid "Find songs with the same names"
 msgstr "Najít skladby stejných názvů"
 
-#: gmusicbrowser.pl:997 gmusicbrowser_list.pm:781 gmusicbrowser_list.pm:1587
+#: gmusicbrowser.pl:1000 gmusicbrowser_list.pm:791 gmusicbrowser_list.pm:1589
 #: gmusicbrowser_songs.pm:803 layouts/contrib.layout:337
 #: layouts/songtree.layout:91
 msgid "Folder"
 msgstr "Složka"
 
-#: gmusicbrowser_list.pm:781 layouts/songtree.layout:90
+#: gmusicbrowser_list.pm:791 layouts/songtree.layout:90
 msgid "Folder (right-aligned)"
 msgstr "Složka (zarovnáno vpravo)"
 
@@ -1965,20 +1977,20 @@
 msgid "Folder format :"
 msgstr "Formát složky :"
 
-#: gmusicbrowser.pl:4933
+#: gmusicbrowser.pl:4958
 msgid "Folder pattern :"
 msgstr "Vzor složky :"
 
-#: gmusicbrowser.pl:6479 gmusicbrowser.pl:6521
+#: gmusicbrowser.pl:6450 gmusicbrowser.pl:6495
 msgid "Folders to search for new songs"
 msgstr "Nové skladby hledat ve složkách"
 
-#: gmusicbrowser_layout.pm:4165 gmusicbrowser_list.pm:17
-#: gmusicbrowser_list.pm:859 gmusicbrowser_list.pm:6774
+#: gmusicbrowser_layout.pm:4174 gmusicbrowser_list.pm:17
+#: gmusicbrowser_list.pm:869 gmusicbrowser_list.pm:6767
 msgid "Follow playing song"
 msgstr "Následovat přehrávanou skladbu"
 
-#: gmusicbrowser_layout.pm:4165
+#: gmusicbrowser_layout.pm:4174
 msgid "Follow selected song"
 msgstr "Následovat vybranou skladbu"
 
@@ -1986,7 +1998,7 @@
 msgid "Font size"
 msgstr "Velikost písma"
 
-#: gmusicbrowser.pl:1191
+#: gmusicbrowser.pl:1194
 msgid "Forward"
 msgstr "Vpřed"
 
@@ -1998,18 +2010,18 @@
 msgid "Friday"
 msgstr "Pátek"
 
-#: gmusicbrowser.pl:4994
+#: gmusicbrowser.pl:5019
 #, perl-brace-format
 msgid ""
 "From: {oldname}\n"
 "To: {newname}"
 msgstr ""
 
-#: gmusicbrowser.pl:6315
+#: gmusicbrowser.pl:6286
 msgid "Full screen layout :"
 msgstr "Celoobrazovkové rozložení :"
 
-#: gmusicbrowser.pl:522 gmusicbrowser_layout.pm:637
+#: gmusicbrowser.pl:525 gmusicbrowser_layout.pm:637
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
@@ -2017,11 +2029,11 @@
 msgid "Fullscreen simple"
 msgstr "Jednoduchá celá obrazovka"
 
-#: gmusicbrowser.pl:6059
+#: gmusicbrowser.pl:6082
 msgid "GStreamer module not loaded."
 msgstr "Modul GStreamer není zaveden"
 
-#: gmusicbrowser.pl:6156
+#: gmusicbrowser.pl:6179
 msgid "Gain for songs missing replaygain tags"
 msgstr "Výtěžek skladeb bez popisků replaygain"
 
@@ -2044,7 +2056,7 @@
 msgid "Genre - Artist"
 msgstr "Žánr - Album"
 
-#: gmusicbrowser_songs.pm:4947
+#: gmusicbrowser_songs.pm:4974
 msgid "Genre is set"
 msgstr "Žánr je nastaven"
 
@@ -2068,11 +2080,11 @@
 msgid "Go to Playing Track"
 msgstr "Přejít na přehrávanou skladbu"
 
-#: gmusicbrowser_list.pm:862 gmusicbrowser_list.pm:6777
+#: gmusicbrowser_list.pm:872 gmusicbrowser_list.pm:6770
 msgid "Go to playing song"
 msgstr "Přejít na přehrávanou skladbu"
 
-#: gmusicbrowser_list.pm:7592
+#: gmusicbrowser_list.pm:7585
 msgid "Group by :"
 msgstr "Seskupit s :"
 
@@ -2088,7 +2100,7 @@
 msgid "Handshake failed : "
 msgstr "Selhání spojení :"
 
-#: gmusicbrowser.pl:6152
+#: gmusicbrowser.pl:6175
 msgid "Hard limiter"
 msgstr "Tvrdá omezení"
 
@@ -2097,7 +2109,7 @@
 msgid "Help"
 msgstr "Pomoc"
 
-#: gmusicbrowser.pl:521 gmusicbrowser.pl:1208
+#: gmusicbrowser.pl:524 gmusicbrowser.pl:1213
 msgid "Hide"
 msgstr "Skrýt"
 
@@ -2105,7 +2117,7 @@
 msgid "Hide Artist/Album bar"
 msgstr "Skrýt lištu Umělec/Album"
 
-#: gmusicbrowser_list.pm:5271
+#: gmusicbrowser_list.pm:5268
 msgid "Hide non-matching"
 msgstr "Skrýt, které se neshodují"
 
@@ -2113,7 +2125,7 @@
 msgid "Hide toolbar"
 msgstr "Skrýt lištu nástrojů"
 
-#: gmusicbrowser.pl:6329
+#: gmusicbrowser.pl:6300
 msgid "Icon theme :"
 msgstr "Téma ikon :"
 
@@ -2121,11 +2133,15 @@
 msgid "Identifier in file tag"
 msgstr "Identifikátor v popisku souboru"
 
-#: gmusicbrowser.pl:6102
+#: gmusicbrowser.pl:6125
 msgid "Ignore playback errors"
 msgstr "Ignorovat chyby přehrávání"
 
-#: gmusicbrowser_list.pm:2958
+#: gmusicbrowser.pl:6488
+msgid "Ignored file extensions :"
+msgstr ""
+
+#: gmusicbrowser_list.pm:2960
 msgid "Import list"
 msgstr "Seznam importů"
 
@@ -2141,7 +2157,7 @@
 msgid "Include Styles in Genres"
 msgstr "Zahrnout Styly a Žánry"
 
-#: gmusicbrowser.pl:1221
+#: gmusicbrowser.pl:1226
 msgid "Increase Volume"
 msgstr "Zvýšit hlasitost"
 
@@ -2149,7 +2165,7 @@
 msgid "Increase volume"
 msgstr "Zesílit hlasitost"
 
-#: gmusicbrowser.pl:5264 gmusicbrowser_tags.pm:1683 layouts/pages.layout:40
+#: gmusicbrowser.pl:5289 gmusicbrowser_tags.pm:1683 layouts/pages.layout:40
 #: layouts/shimmer.layout:75
 msgid "Info"
 msgstr "Info"
@@ -2166,11 +2182,11 @@
 msgid "Insensitive, Song & Cover"
 msgstr "Nedostupné, skladba & přebal"
 
-#: gmusicbrowser.pl:1214
+#: gmusicbrowser.pl:1219
 msgid "Insert Selected Songs at the top of the queue"
 msgstr "Vložit vybrané skladby na začátek fronty"
 
-#: gmusicbrowser.pl:1244
+#: gmusicbrowser.pl:1249
 msgid "Insert a list of files/folders at the start of the playlist"
 msgstr "Vložit seznam souborů/složek na začátek playlistu"
 
@@ -2182,7 +2198,7 @@
 msgid "Invalid regular expression"
 msgstr "Chybný výraz"
 
-#: gmusicbrowser.pl:8567
+#: gmusicbrowser.pl:8593
 msgid "Invert filter"
 msgstr "Obrátit filtr"
 
@@ -2199,7 +2215,7 @@
 msgid "Justified"
 msgstr "Do bloku"
 
-#: gmusicbrowser.pl:807
+#: gmusicbrowser.pl:810
 msgid "KB"
 msgstr "KB"
 
@@ -2211,15 +2227,15 @@
 msgid "Karaoke plugin"
 msgstr "Zásuvný modul karaoke"
 
-#: gmusicbrowser_list.pm:856 gmusicbrowser_list.pm:6771
+#: gmusicbrowser_list.pm:866 gmusicbrowser_list.pm:6764
 msgid "Keep list filtered and sorted"
 msgstr ""
 
-#: gmusicbrowser.pl:5767 gmusicbrowser.pl:5879
+#: gmusicbrowser.pl:5790 gmusicbrowser.pl:5902
 msgid "Key"
 msgstr "Klávesa"
 
-#: gmusicbrowser.pl:5729
+#: gmusicbrowser.pl:5752
 msgid "Keys"
 msgstr "Klávesy"
 
@@ -2227,12 +2243,12 @@
 msgid "Keywords"
 msgstr "Klíčová slova"
 
-#: gmusicbrowser.pl:1250 gmusicbrowser.pl:1251 gmusicbrowser.pl:1252
-#: gmusicbrowser.pl:6646
+#: gmusicbrowser.pl:1255 gmusicbrowser.pl:1256 gmusicbrowser.pl:1257
+#: gmusicbrowser.pl:6621
 msgid "Label"
 msgstr "Štítek"
 
-#: gmusicbrowser_songs.pm:4942
+#: gmusicbrowser_songs.pm:4969
 msgid "Label is set"
 msgstr "Štítek je nastaven"
 
@@ -2240,11 +2256,11 @@
 msgid "Label/Publisher"
 msgstr "Značka/vydavatel"
 
-#: gmusicbrowser.pl:5723 gmusicbrowser_songs.pm:1007
+#: gmusicbrowser.pl:5746 gmusicbrowser_songs.pm:1007
 msgid "Labels"
 msgstr "Štítky"
 
-#: gmusicbrowser_list.pm:808 layouts/songtree.layout:51
+#: gmusicbrowser_list.pm:818 layouts/songtree.layout:51
 msgid "Labels' icons"
 msgstr "Ikony štítků"
 
@@ -2260,7 +2276,7 @@
 msgid "Languages"
 msgstr "Jazyky"
 
-#: gmusicbrowser.pl:1011 gmusicbrowser_list.pm:720 gmusicbrowser_songs.pm:1089
+#: gmusicbrowser.pl:1014 gmusicbrowser_list.pm:730 gmusicbrowser_songs.pm:1089
 msgid "Last played"
 msgstr "Naposled přehrávané"
 
@@ -2280,7 +2296,7 @@
 msgid "Layout :"
 msgstr "Rozložení :"
 
-#: gmusicbrowser.pl:5725
+#: gmusicbrowser.pl:5748
 msgid "Layouts"
 msgstr "Vzhled"
 
@@ -2300,7 +2316,7 @@
 msgid "Length"
 msgstr "Délka"
 
-#: gmusicbrowser.pl:5722 gmusicbrowser_list.pm:126 layouts/contrib.layout:227
+#: gmusicbrowser.pl:5745 gmusicbrowser_list.pm:126 layouts/contrib.layout:227
 #: layouts/contrib.layout:302 layouts/contrib.layout:319
 #: layouts/contrib.layout:587 layouts/contrib.layout:592
 #: layouts/contrib.layout:733 layouts/contrib.layout:741
@@ -2312,7 +2328,7 @@
 msgid "Library : "
 msgstr "Knihovna :"
 
-#: gmusicbrowser_list.pm:449
+#: gmusicbrowser_list.pm:451
 msgid ""
 "Library empty.\n"
 "\n"
@@ -2322,7 +2338,7 @@
 "\n"
 "Použijte dialog nastavení pro přidání hudby."
 
-#: gmusicbrowser.pl:6547
+#: gmusicbrowser.pl:6521
 #, perl-format
 msgid "Library size : %d song"
 msgid_plural "Library size : %d songs"
@@ -2339,16 +2355,16 @@
 msgid "Limit similar artists to the first : "
 msgstr "Nejprve stanovte limit podobnosti umělce"
 
-#: gmusicbrowser_list.pm:1585 layouts/contrib.layout:336
+#: gmusicbrowser_list.pm:1587 layouts/contrib.layout:336
 #: layouts/contrib.layout:535
 msgid "List"
 msgstr "Seznam"
 
-#: gmusicbrowser_list.pm:419
+#: gmusicbrowser_list.pm:421
 msgid "List empty"
 msgstr "Seznam je prázdný"
 
-#: gmusicbrowser_layout.pm:1392 gmusicbrowser_layout.pm:1458
+#: gmusicbrowser_layout.pm:1398 gmusicbrowser_layout.pm:1464
 msgid "List order"
 msgstr "Pořadí seznamu"
 
@@ -2372,7 +2388,7 @@
 msgid "Lists, Library & Context"
 msgstr "Seznamy, knihovna & kontext"
 
-#: gmusicbrowser_list.pm:3488
+#: gmusicbrowser_list.pm:3493
 msgid "Literal search"
 msgstr "Písmenné vyhledávání"
 
@@ -2401,15 +2417,15 @@
 msgid "Loading..."
 msgstr "Načítání..."
 
-#: gmusicbrowser.pl:497
+#: gmusicbrowser.pl:500
 msgid "Lock"
 msgstr "Zamknout"
 
-#: gmusicbrowser.pl:518
+#: gmusicbrowser.pl:521
 msgid "Lock Album"
 msgstr "Zamčené album"
 
-#: gmusicbrowser.pl:517
+#: gmusicbrowser.pl:520
 msgid "Lock Artist"
 msgstr "Zamčený interpret"
 
@@ -2438,11 +2454,11 @@
 msgid "Lookup at allmusic.com"
 msgstr "Vyhledávání na allmusic.com"
 
-#: gmusicbrowser.pl:500
+#: gmusicbrowser.pl:503
 msgid "Lookup in AMG"
 msgstr "Vyhledat na AMG"
 
-#: gmusicbrowser.pl:492
+#: gmusicbrowser.pl:495
 msgid "Lookup in google"
 msgstr "Vyhledat googlem"
 
@@ -2490,7 +2506,7 @@
 msgid "Lyrics file name format"
 msgstr "Formát názvu souboru textu"
 
-#: gmusicbrowser.pl:4722
+#: gmusicbrowser.pl:4747
 msgid "Lyrics for "
 msgstr "Text pro"
 
@@ -2502,7 +2518,7 @@
 msgid "Lyrics source"
 msgstr "Zdroj textů"
 
-#: gmusicbrowser.pl:808
+#: gmusicbrowser.pl:811
 msgid "MB"
 msgstr "MB"
 
@@ -2554,11 +2570,11 @@
 "Umožnit ovládání multimediálními klávesami Gnome Další/Předchozí/Přehrát/"
 "Zastavit"
 
-#: gmusicbrowser.pl:481
+#: gmusicbrowser.pl:484
 msgid "Mass Rename"
 msgstr "Hromadně přejmenovat"
 
-#: gmusicbrowser.pl:4867
+#: gmusicbrowser.pl:4892
 msgid "Mass Renaming"
 msgstr "Hromadné přejmenování"
 
@@ -2590,7 +2606,7 @@
 msgid "Minimum size"
 msgstr "Minimální velikost"
 
-#: gmusicbrowser.pl:5726
+#: gmusicbrowser.pl:5749
 msgid "Misc."
 msgstr "Různé"
 
@@ -2622,23 +2638,23 @@
 msgid "Mosaic View"
 msgstr "Pohled Mozaika"
 
-#: gmusicbrowser.pl:484
+#: gmusicbrowser.pl:487
 msgid "Move"
 msgstr "Přesunout"
 
-#: gmusicbrowser.pl:4938
+#: gmusicbrowser.pl:4963
 msgid "Move Files to :"
 msgstr "Přesunout soubory do :"
 
-#: gmusicbrowser.pl:4336
+#: gmusicbrowser.pl:4360
 msgid "Move failed"
 msgstr "Přesouvání selhalo"
 
-#: gmusicbrowser.pl:6445
+#: gmusicbrowser.pl:6416
 msgid "Move folder to"
 msgstr "Přesunout složku do"
 
-#: gmusicbrowser.pl:4338
+#: gmusicbrowser.pl:4362
 #, perl-format
 msgid "Moving file"
 msgid_plural "Moving %d files"
@@ -2650,7 +2666,11 @@
 msgid "Music"
 msgstr "Hudba"
 
-#: gmusicbrowser.pl:1223
+#: gmusicbrowser.pl:6544
+msgid "Music files"
+msgstr ""
+
+#: gmusicbrowser.pl:1228
 msgid "Mute/Unmute"
 msgstr "Ztlumit/zrušit ztlumení"
 
@@ -2658,7 +2678,7 @@
 msgid "Name"
 msgstr "Název"
 
-#: gmusicbrowser.pl:1199 gmusicbrowser.pl:1200 gmusicbrowser.pl:1202
+#: gmusicbrowser.pl:1204 gmusicbrowser.pl:1205 gmusicbrowser.pl:1207
 msgid "Name of layout"
 msgstr "Název rozložení"
 
@@ -2666,7 +2686,7 @@
 msgid "Name under which the command will appear in the menu"
 msgstr "Název pod kterým se příkaz bude objevovat v menu"
 
-#: gmusicbrowser.pl:6530
+#: gmusicbrowser.pl:6504
 msgid "Never"
 msgstr "Nikdy"
 
@@ -2678,38 +2698,38 @@
 msgid "New custom field"
 msgstr "Nové uživatelské pole"
 
-#: gmusicbrowser_list.pm:2943
+#: gmusicbrowser_list.pm:2945
 msgid "New filter"
 msgstr "Nový filtr"
 
-#: gmusicbrowser_layout.pm:2377
+#: gmusicbrowser_layout.pm:2386
 msgid "New list"
 msgstr "Nový seznam"
 
-#: gmusicbrowser.pl:4902
+#: gmusicbrowser.pl:4927
 msgid "New name"
 msgstr "Nový název"
 
-#: gmusicbrowser.pl:515 gmusicbrowser.pl:2805 gmusicbrowser_layout.pm:85
-#: gmusicbrowser_list.pm:5294 plugins/notify.pm:93
+#: gmusicbrowser.pl:518 gmusicbrowser.pl:2816 gmusicbrowser_layout.pm:85
+#: gmusicbrowser_list.pm:5291 plugins/notify.pm:93
 #: layouts/makeitlooklike.layout:269 layouts/makeitlooklike.layout:353
 #: layouts/makeitlooklike.layout:427
 msgid "Next"
 msgstr "Další"
 
-#: gmusicbrowser.pl:1186
+#: gmusicbrowser.pl:1189
 msgid "Next Album"
 msgstr "Další album"
 
-#: gmusicbrowser.pl:1187
+#: gmusicbrowser.pl:1190
 msgid "Next Artist"
 msgstr "Další interpret"
 
-#: gmusicbrowser.pl:1188 gmusicbrowser_layout.pm:84 layouts/contrib.layout:220
+#: gmusicbrowser.pl:1191 gmusicbrowser_layout.pm:84 layouts/contrib.layout:220
 msgid "Next Song"
 msgstr "Další"
 
-#: gmusicbrowser.pl:1184
+#: gmusicbrowser.pl:1187
 msgid "Next Song In Playlist"
 msgstr "Další skladba v playlistu"
 
@@ -2717,7 +2737,7 @@
 msgid "No connections"
 msgstr "Není spojení"
 
-#: gmusicbrowser.pl:3354
+#: gmusicbrowser.pl:3365
 msgid "No file browser found."
 msgstr "Prohlížeč souborů nenalezen."
 
@@ -2753,11 +2773,11 @@
 msgid "No review written."
 msgstr "Nebyly napsány žádné recenze"
 
-#: gmusicbrowser_songs.pm:4069
+#: gmusicbrowser_songs.pm:4096
 msgid "No songs"
 msgstr "Žádné skladby"
 
-#: gmusicbrowser_list.pm:421 gmusicbrowser_list.pm:422
+#: gmusicbrowser_list.pm:423 gmusicbrowser_list.pm:424
 msgid "No songs found"
 msgstr "Žádné skladby nenalezeny"
 
@@ -2773,11 +2793,11 @@