Used "title_or_file" tag in search and queue

.gitattributes

@@ -0,0 +1,7 @@
+# Solve file changes showing up on *.po files with changed version headers.
+# Then add to .git/config:
+#
+# [diff "podiff"]
+#    textconv = /usr/local/bin/strippocomments
+*.po diff=podiff
+

.gitignore

@@ -4,3 +4,11 @@ locale/
 po/gmusicbrowser.pot
 nytprof*
 t/samples/
+/debian/.debhelper/
+/debian/files
+/debian/gmusicbrowser.debhelper.log
+/debian/gmusicbrowser.postinst.debhelper
+/debian/gmusicbrowser.postrm.debhelper
+/debian/gmusicbrowser.substvars
+/debian/gmusicbrowser/
+/layout_doc.html

debian/compat

@@ -1 +1 @@
-5
+7

gmusicbrowser.pl

@@ -693,7 +693,7 @@ BEGIN
 	  code  => sub { SearchSame($_[0]{field},$_[0]); },
 	  foreach=>sub { 'field', Songs::FieldList(true=>'samemenu',); },				mode => 'B',	notempty => 'IDs' },
 	{ label => _"Rename file",	code => sub { DialogRename(	@{ $_[0]{IDs} }); },	onlyone => 'IDs',	test => sub {!$CmdLine{ro}}, },
-	{ label => _"Mass Rename",	code => sub { DialogMassRename(	@{ $_[0]{IDs} }); },	onlymany=> 'IDs',	test => sub {!$CmdLine{ro}}, },
+	{ label => _"Mass Rename",	code => sub { DialogMassRename(	@{ $_[0]{IDs} }); },	notempty=> 'IDs',	test => sub {!$CmdLine{ro}}, },
 	{ label => _"Copy",	code => sub { CopyMoveFilesDialog($_[0]{IDs},TRUE); },
 		notempty => 'IDs',	stockicon => 'gtk-copy', notmode => 'P' },
 	{ label => _"Move",	code => sub { CopyMoveFilesDialog($_[0]{IDs},FALSE); },

gmusicbrowser_list.pm

@@ -781,8 +781,8 @@ INIT
 	},
 	titleaa =>
 	{	menu => _('Title - Artist - Album'), title => _('Song'),
-		value => sub { ::ReplaceFieldsAndEsc($_[2],"<b>%t</b>%V\n<small><i>%a</i> - %l</small>"); },
-		attrib => 'markup', type => 'Glib::String', depend => 'title version artist album',
+		value => sub { ::ReplaceFieldsAndEsc($_[2],"<b>%S</b>%V\n<small><i>%a</i> - %l</small>"); },
+		attrib => 'markup', type => 'Glib::String', depend => 'title_or_file version artist album',
 		sort => 'title:i',	noncomp => 'boldrow',		width => 200,
 	},
 	playandqueue =>
@@ -1489,7 +1489,7 @@ sub search_equal_func
 	my $nref= $iter->user_data;
 	my $ID= $self->{array}[$$nref];
 	#my $r; for (qw/title album artist/) { $r=index uc(Songs::Display($ID,$_)), $string; last if $r==0 } return $r;
-	index uc(Songs::Display($ID,'title')), uc($string);
+	index uc(Songs::Display($ID,'title_or_file')), $string;
 }
 
 sub rowremove
@@ -3155,7 +3155,7 @@ sub UpdatePlayingFilters
 	my @list=(	playfilter	=> _"Playing Filter",
 			'f=artists'	=> _"Playing Artist",
 			'f=album'	=> _"Playing Album",
-			'f=title'	=> _"Playing Title",
+			'f=title_or_file'	=> _"Playing Title",
 		 );
 	while (@list)
 	{	my $id=shift @list;
@@ -4119,7 +4119,7 @@ sub EntryChanged_cb
 	my $text=$entry->get_text;
 	my $self= $entry->GET_ancestor;
 	if (!$force && 2>length $text) { $self->{songlist}->Empty }
-	else { $self->{songlist}->SetFilter( Filter->new('title:si:'.$text) ); }
+	else { $self->{songlist}->SetFilter( Filter->new('title_or_file:si:'.$text) ); }
 }
 
 package AASearch;

gmusicbrowser_songs.pm

@@ -913,6 +913,16 @@ our %timespan_menu=
 	category=>'file',
 	alias	=> 'modified',
  },
+ moddate =>
+ {
+        name => 'MOD DATE',
+	width => 20,
+	type => 'virtual',
+	flags => 'cgs',
+	depend => 'modif',
+	sortgroup => 'album',
+	get	=> 'sprintf("%d%s%03d%03d", #modif->get# / (60*60*24), #album->get#, 1000-#disc->get#, 1000-#track->get#)'
+ },
  size	=>
  {	name => _"Size",	width => 80,	flags => 'fgarscp_',		#32bits => 4G max
 	type => 'size',

layouts/songtree.layout

@@ -59,7 +59,7 @@ title = _"Song"
 hreq=text:h
 width=200
 sort= title:i
-text : text(markup='<b>'.pesc($title).'</b>'.pesc($version_or_empty).'\n<small><i>'.pesc($artist).'</i> - '.pesc($album).'</small>',pad=2)
+text : text(markup='<b>'.pesc($title_or_file).'</b>'.pesc($version_or_empty).'\n<small><i>'.pesc($artist).'</i> - '.pesc($album).'</small>',pad=2)
 
 {Column titleandicon}
 title = _"Title & icon"