zik 0.16.2 → 0.17.0

data/ChangeLog

@@ -1,3 +1,25 @@
+###Version 0.17.0
+Use new icons picture. Thanks J. Kaiden for the artwork.
+Add choices for theme in preferences window.
+Tray icon: add a option to hide ZiK on close.
+Hotkeys: add hide/show ZiK.
+Do not freeze browser when editing playlist (close bug #28638).
+Multi and single sessions were switched in preferences dialog.
+Choice between multi and single sessions is applied immediately.
+Fix a bug in hotkeys module that prevents multi-sessions.
+Fix a bug that can prevent loading previous browser view.
+Brainz module: fix a in error handling (thanks Merle from forum.ubuntu-fr.org for the report).
+Show the info dialog only the first time playlist is edited.
+Restore position when showing main window.
+Add scrollbars for the assistant.
+
+Support only "zik" command to launch ZiK (nor ZiK or ZiK.rb).
+Drop support of old version of rghk (< 0.2)
+Start to implement XDG base directory specification for user directories.
+
+translation:
+ update french.
+
 ###Version 0.16.2
 Fix a bug : ZiK crash when showing an error before main window is defined.
 Fix a bug: ZiK crash when loading a module failed.

data/Makefile.in

@@ -1,5 +1,5 @@
 NAME=ZiK
-VERSION=0.16.2
+VERSION=0.17.0
 
 SHELL=/bin/sh
 RUBY=/usr/bin/ruby
@@ -31,6 +31,8 @@ HTMLFILES=$(wildcard $(SRCDIR)/doc/html/*.html)
 HTMLFILESPIX=$(wildcard $(SRCDIR)/doc/html/pix/*.png)
 HTMLFILESCSS=$(wildcard $(SRCDIR)/doc/html/styles/*.css)
 HTMLLANGUAGES=fr
+THEMEDIR=$(DATADIR)/$(NAME)/theme
+THEMES=dark ligth
 GUIDIR=$(DATADIR)/$(NAME)/gui
 GUIFILES=$(wildcard $(SRCDIR)/gui/*.rb)
 PIXDIR=$(DATADIR)/$(NAME)/pix
@@ -70,22 +72,27 @@ check-depend: dependencies
 test: zik
 	$(RUBY) -c zik
 
-install: install-exec install-link install-data install-desktop install-module install-doc install-local
+install: install-exec install-data install-desktop install-module install-doc install-local
 
 install-exec: zik
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
 	$(INSTALL_PROGRAM) $(SRCDIR)/zik $(DESTDIR)$(BINDIR)/zik
 
-install-link:
-	ln --symbolic $(BINDIR)/zik $(DESTDIR)$(BINDIR)/ZiK
-
-install-data:
+install-data: install-theme
 	$(INSTALL_DIR) $(DESTDIR)$(GUIDIR) $(DESTDIR)$(PIXDIR) $(DESTDIR)$(PIXDIR)/assistant $(DESTDIR)$(PLAYLISTDIR) $(DESTDIR)$(PLAYERDIR)
 	$(INSTALL_DATA) $(GUIFILES) $(DESTDIR)$(GUIDIR)
 	$(INSTALL_DATA) $(PIXFILES) $(DESTDIR)$(PIXDIR)
 	$(INSTALL_DATA) $(PLAYLISTFILES) $(DESTDIR)$(PLAYLISTDIR)
 	$(INSTALL_DATA) $(PLAYERFILES) $(DESTDIR)$(PLAYERDIR)
 
+install-theme:
+	$(INSTALL_DIR) $(DESTDIR)$(THEMEDIR)
+	for theme in $(THEMES); do \
+	$(INSTALL_DIR) $(DESTDIR)$(THEMEDIR)/$$theme; \
+#	echo $(SRCDIR)/theme/$theme/*; \
+	$(INSTALL_DATA) $(SRCDIR)/theme/$$theme/* $(DESTDIR)$(THEMEDIR)/$$theme; \
+	done
+
 install-desktop:
 	$(INSTALL_DIR) $(DESTDIR)$(DESKTOPDIR)
 	$(INSTALL_DESKTOP) $(DESTDIR)$(DESKTOPDIR) $(SRCDIR)/zik.desktop
@@ -148,18 +155,18 @@ install-local:
 	$(INSTALL_DATA) $(SRCDIR)/locale/$$lang/LC_MESSAGES/ZiK.mo $(DESTDIR)$(LOCALEDIR)/$$lang/LC_MESSAGES; \
 	done
 	
-uninstall: uninstall-exec uninstall-link uninstall-data uninstall-desktop uninstall-module uninstall-doc uninstall-local
+uninstall: uninstall-exec uninstall-data uninstall-desktop uninstall-module uninstall-doc uninstall-local
 
 uninstall-exec:
 	rm -f $(DESTDIR)$(BINDIR)/zik
-
-uninstall-link:
-	rm -f $(DESTDIR)$(BINDIR)/ZiK
 	
-uninstall-data:
+uninstall-data: uninstall-theme
 	rm -rf $(DESTDIR)$(GUIDIR) $(DESTDIR)$(PIXDIR) $(DESTDIR)$(PLAYLISTDIR) $(DESTDIR)$(PLAYERDIR)
 	rmdir $(DESTDIR)$(DATADIR)/$(NAME) --ignore-fail-on-non-empty
 
+uninstall-theme:
+	rm -rf $(DESTDIR)$(THEMEDIR)
+
 uninstall-desktop:
 	rm -f $(DESTDIR)$(DESKTOPDIR)/zik.desktop
 	$(UPDATE_MIME)

data/README

@@ -20,6 +20,10 @@ gst-plugins-ugly http://gstreamer.freedesktop.org/
 For other format suppport (ie: mp3,wav), check gstreamer plug-ins:
 gst-plugins-*	http://gstreamer.freedesktop.org/
 
+For modules:
+cover -> ruby-mp3info http://rubyforge.org/projects/ruby-mp3info/
+notify -> ruby-libnotify http://ruby-libnotify.rubyforge.org/
+hotkeys -> rghk http://zik.rubyforge.org/rghk/
 
 You can use check the dependencies by running (after running the configure script):
 		make check-depend

data/ZiK.rb

@@ -101,6 +101,7 @@ end
 
 Data_dir=File.dirname(__FILE__)
 Pix_dir=File.join(Data_dir,'pix')
+Theme_dir=File.join(Data_dir, 'theme')
 Doc_dir=File.join(Data_dir,'doc')
 Locale_dir=File.join(Data_dir,'locale')
 
@@ -111,18 +112,38 @@ require File.join(Data_dir, 'gui/error')
 estock=ErrorsStock.new
 
 ErrorInfo.new("Hi! This is #{$name} (#{Version}). Enjoy your music.")
-ErrorWarning.new("ZiK is deprecated. You should call ZiK by zik") if __FILE__=~/ZiK$/
 
 #Global configuration
 $border=5
 
 #Configuration
 require File.join(Data_dir, 'gui/config')
-User_dir=File.join(ENV['HOME'],'.ZiK') unless (defined? User_dir)
+if (defined? User_dir)
+	Cache_dir=File.join('User_dir', 'cache')
+	Runtime_dir=File.join('User_dir', 'runtime')
+else
+	User_dir= ENV['XDG_CONFIG_HOME'] ? File.join(ENV['XDG_CONFIG_HOME'], 'ZiK') :
+		File.join(ENV['HOME'], '.config', 'ZiK')
+	unless File.exist?(User_dir)#Check for deprecated location of User_dir
+		old_user_dir=File.join(ENV['HOME'],'.ZiK')
+		File.rename(old_user_dir, User_dir) if File.directory?(old_user_dir)
+	end
+	Cache_dir= ENV['XDG_CACHE_HOME'] ? File.join(ENV['XDG_CACHE_HOME'], 'ZiK') :
+		File.join(ENV['HOME'], '.cache', 'ZiK')
+	if ENV['XDG_RUNTIME_DIR']
+		Runtime_dir=File.join(ENV['XDG_RUNTIME_DIR'], 'ZiK')
+	else
+		require 'tempfile'
+		Runtime_dir=File.join(Dir.tmpdir, 'ZiK-'+ENV['USER'])
+		ErrorWarning.new("XDG_RUNTIME_DIR is not set. #{Runtime_dir} is used instead.")
+	end
+end
 unless File.exist?(User_dir)
 	Dir.mkdir(User_dir)
 	config_new=true
 end
+Dir.mkdir(Cache_dir) unless File.exist?(Cache_dir)
+Dir.mkdir(Runtime_dir, 0700) unless File.exist?(Runtime_dir)
 if File.directory?(User_dir)
 	configuration_file=File.join(User_dir,'ZiKrc')
 	config=Configuration.new(configuration_file)
@@ -137,26 +158,23 @@ config['view']=view if view
 
 #Socket (client part)
 module ZiKSocket
-	Address=File.join(User_dir, 'socket')
+	Address=File.join(Runtime_dir, 'socket')
 end
-if config['socket']
-	require 'socket'
+if File.socket?(ZiKSocket::Address)
 	require File.join(Data_dir, 'gui/socket')
-	if File.socket?(ZiKSocket::Address)
-		begin
-			client=ZiKSocket::Client.new
-			ErrorInfo.new(_("Multisession : server already exists."))
-			playfiles.each{|file|
-				file=File.join(Dir.pwd, file) unless file =~ /^\//#absolute path
-				p client.command("add #{file}")
-			}
-			client.command("show")
-			client.close
-			exit 0
-		rescue Errno::ECONNREFUSED
-			ErrorError.new(_("Multissession: socket exists but server does not respond."))
-			File.delete(ZiKSocket::Address)
-		end
+	begin
+		client=ZiKSocket::Client.new
+		ErrorInfo.new(_("Multisession : server already exists."))
+		playfiles.each{|file|
+			file=File.join(Dir.pwd, file) unless file =~ /^\//#absolute path
+			p client.command("add #{file}")
+		}
+		client.command("show")
+		client.close
+		exit 0
+	rescue Errno::ECONNREFUSED
+		ErrorError.new(_("Multissession: socket exists but server does not respond."))
+		File.delete(ZiKSocket::Address)
 	end
 end
 
@@ -310,7 +328,8 @@ module ZiKSocket
 	end
 end
 if config['socket']
-	ErrorError.new(_("Multisession: server not started."), true) if ZiKSocket.start_server(gui, config, playlist).status.nil?#Except raise in thread used to start server.
+	require File.join(Data_dir, 'gui/socket')
+	ZiKSocket.start_server(gui, config, playlist)
 end
 
 #Modules
@@ -372,6 +391,11 @@ ensure
 	cdplayer.stop if $cd
 	radioplayer.stop if $radio
 	ZiKSocket.clean
+	begin
+		Dir.rmdir(Runtime_dir) if File.directory?(Runtime_dir)
+	rescue Errno::ENOTEMPTY
+		ErrorError.new("Cannot delete #{Runtime_dir}.")
+	end
 end
 
 ErrorInfo.new("Bye.")

data/doc/ChangeLog

@@ -1,3 +1,25 @@
+###Version 0.17.0
+Use new icons picture. Thanks J. Kaiden for the artwork.
+Add choices for theme in preferences window.
+Tray icon: add a option to hide ZiK on close.
+Hotkeys: add hide/show ZiK.
+Do not freeze browser when editing playlist (close bug #28638).
+Multi and single sessions were switched in preferences dialog.
+Choice between multi and single sessions is applied immediately.
+Fix a bug in hotkeys module that prevents multi-sessions.
+Fix a bug that can prevent loading previous browser view.
+Brainz module: fix a in error handling (thanks Merle from forum.ubuntu-fr.org for the report).
+Show the info dialog only the first time playlist is edited.
+Restore position when showing main window.
+Add scrollbars for the assistant.
+
+Support only "zik" command to launch ZiK (nor ZiK or ZiK.rb).
+Drop support of old version of rghk (< 0.2)
+Start to implement XDG base directory specification for user directories.
+
+translation:
+ update french.
+
 ###Version 0.16.2
 Fix a bug : ZiK crash when showing an error before main window is defined.
 Fix a bug: ZiK crash when loading a module failed.

data/gui/assistant.rb

@@ -23,6 +23,8 @@ class Assistant < Gtk::Assistant
 	def initialize(config, zik=nil)
 		@config=config; @zik=zik
 		super()
+		self.title=$name
+		self.set_default_size(800, 800)
 		signal_connect('delete_event'){quit}
 		signal_connect('cancel'){quit}
 		signal_connect('close'){close}
@@ -53,11 +55,14 @@ class Assistant < Gtk::Assistant
 		vbox1.border_width=$border
 		vbox1.pack_start(label1)
 		vbox1.pack_start(icapture, false)
-		append_page(vbox1)
-		set_page_header_image(vbox1, Gdk::Pixbuf.new(File.join(Pix_dir, 'ZiK3.png'), 128, 64))
-		set_page_title(vbox1, _("Main window (2/6)"))
-		set_page_type(vbox1, Gtk::Assistant::PAGE_CONTENT)
-		set_page_complete(vbox1, true)
+		w1=Gtk::ScrolledWindow.new
+		w1.set_policy(Gtk::POLICY_AUTOMATIC,Gtk::POLICY_AUTOMATIC)
+		w1.add_with_viewport(vbox1)
+		append_page(w1)
+		set_page_header_image(w1, Gdk::Pixbuf.new(File.join(Pix_dir, 'ZiK3.png'), 128, 64))
+		set_page_title(w1, _("Main window (2/6)"))
+		set_page_type(w1, Gtk::Assistant::PAGE_CONTENT)
+		set_page_complete(w1, true)
 
 #*********************Page 2******************************
 #Directories
@@ -78,24 +83,34 @@ Please select at least one Diretory.')
 		vbox2.pack_start(@dirbox, false)
 		vbox2.pack_start(@extbox, false)
 		vbox2.pack_start(label2, false)
-		append_page(vbox2)
-		set_page_header_image(vbox2, Gdk::Pixbuf.new(File.join(Pix_dir, 'ZiK3.png'), 128, 64))
-		set_page_title(vbox2, _("Configuration (3/6)"))
-		set_page_type(vbox2, Gtk::Assistant::PAGE_CONTENT)
-		set_page_complete(vbox2, true)
+		w2=Gtk::ScrolledWindow.new
+		w2.set_policy(Gtk::POLICY_AUTOMATIC,Gtk::POLICY_AUTOMATIC)
+		w2.add_with_viewport(vbox2)
+		append_page(w2)
+		set_page_header_image(w2, Gdk::Pixbuf.new(File.join(Pix_dir, 'ZiK3.png'), 128, 64))
+		set_page_title(w2, _("Configuration (3/6)"))
+		set_page_type(w2, Gtk::Assistant::PAGE_CONTENT)
+		set_page_complete(w2, true)
 
 #*********************Page 3******************************
 		label3=Gtk::Label.new(_(
 "ZiK uses GStreamer to play audio files. GStreamer supports a lot of formats."+" "+
 "The number of supported formats depends on which gstreamer plug-ins are installed"+" "+
+"If gstreamer plug-ins are missing ZiK will try to install them."+" "+
 "If you cannot play a file you should check which plug-ins are not installed."+" "+
-"More informations on http://zik.rubyforge.org/wiki/wiki.pl?Supported_Formats"))
+"More informations on "))
 		label3.wrap=true
-		append_page(label3)
-		set_page_header_image(label3, Gdk::Pixbuf.new(File.join(Pix_dir, 'ZiK3.png'), 128, 64))
-		set_page_title(label3, _("GStreamer (4/5)"))
-		set_page_type(label3, Gtk::Assistant::PAGE_CONTENT)
-		set_page_complete(label3, true)
+		b3=Gtk::LinkButton.new(_('http://zik.rubyforge.org/wiki/wiki.pl?Supported_Formats'))
+		vbox3=Gtk::VBox.new
+		vbox3.spacing=$border
+		vbox3.border_width=$border
+		vbox3.pack_start(label3, false)
+		vbox3.pack_start(b3, false)
+		append_page(vbox3)
+		set_page_header_image(vbox3, Gdk::Pixbuf.new(File.join(Pix_dir, 'ZiK3.png'), 128, 64))
+		set_page_title(vbox3, _("GStreamer (4/5)"))
+		set_page_type(vbox3, Gtk::Assistant::PAGE_CONTENT)
+		set_page_complete(vbox3, true)
 
 #*********************Page 4******************************
 		label4=Gtk::Label.new(_(

data/gui/common.rb

@@ -37,7 +37,8 @@ end
 
 module Pack
 private
-def hpack(array)
+def hpack(*a)#Accept both forms: hpack([1, 2, 3]) and hpack(1, 2, 3)
+	array=*a
 	hbox=Gtk::HBox.new
 	hbox.border_width=$border
 	hbox.spacing=$border
@@ -46,7 +47,8 @@ def hpack(array)
 		hbox.pack_start(el, expand)}
 	hbox
 end
-def vpack(array)
+def vpack(*a)
+	array=*a
 	vbox=Gtk::VBox.new
 	vbox.border_width=$border
 	vbox.spacing=$border

data/gui/config.rb

@@ -30,7 +30,7 @@ class Configuration < Hash
 			'play_on_start'=>false, 'current_song'=>0, 'volume'=>1.0, 'shuffle'=>false, 'repeat'=>false,
 			'sort_by_track'=>false,
 			'x'=>0, 'y'=>0, 'width'=>500, 'height'=>500, 'view'=>'all', 'paned_position'=>250,
-			'playing_color'=>'Pink', 'compact'=>false,
+			'playing_color'=>'Pink', 'theme'=>'dark', 'compact'=>false,
 			'directory'=>',', 'extension'=>'wav,flac,ogg,mp3,wma,xspf,m3u,pls',
 			'sort_directories_first'=>true, 'sort_case_sensitive'=>true, 'refresh_on_start'=>true,
 			'search_in_path'=>true, 'search_in_title'=>false, 'search_in_artist'=>false,

data/gui/gui.rb

@@ -114,7 +114,7 @@ class Gui < Gtk::Window
 		@find2_it=Gtk::ImageMenuItem.new(Gtk::Stock::FIND)
 		@find2_it.signal_connect('activate'){search}
 		@edit_it=Gtk::ImageMenuItem.new(Gtk::Stock::EDIT)
-		@edit_it.signal_connect('activate'){list_edit}
+		@edit_it.signal_connect('activate'){GLib::Idle.add{list_edit}}#GLib::Idle.add closes bug #28638
 		@bsave=Gtk::ImageMenuItem.new(Gtk::Stock::SAVE)
 		@separator_it2=Gtk::SeparatorMenuItem.new
 		@bsave.signal_connect('activate'){list_save}
@@ -132,10 +132,7 @@ class Gui < Gtk::Window
 		}
 		
 		@playlist_menu=Gtk::Menu.new
-#Do not show @edit_it. See bug 28638
-#Fixme
-#		[@add_it, @rm_it, @clear_it, @find2_it, @edit_it, @bsave, @separator_it2, @bexport,
-		[@add_it, @rm_it, @clear_it, @find2_it, @bsave, @separator_it2, @bexport,
+		[@add_it, @rm_it, @clear_it, @find2_it, @edit_it, @bsave, @separator_it2, @bexport,
 			@separator_it3, @preference_it3].each{|it| @playlist_menu.append(it)}
 
 #Radio menu
@@ -472,35 +469,14 @@ class Gui < Gtk::Window
 		
 #*********************Player zone******************************
 #View selection
-	#@icon_theme=Gtk::IconTheme.default
-		#@idir=@icon_theme.load_icon('gtk-directory', Gtk::IconSize::BUTTON, Gtk::IconTheme::LOOKUP_FORCE_SVG)
 		@viewstore=Gtk::ListStore.new(Gdk::Pixbuf)
-		['sound_directory.svg','sound.svg','gtk-directory.svg','player_play.svg'].each{|image|
-			child=@viewstore.append
-			child[0]=Gdk::Pixbuf.new(File.join(Pix_dir, image), 24, 24)
-		}
-		if $cd
-			child=@viewstore.append
-			child[0]=Gdk::Pixbuf.new(File.join(Pix_dir, 'media-cdrom.svg'), 24, 24)
-		end
-		if $radio
-			child=@viewstore.append
-			child[0]=Gdk::Pixbuf.new(File.join(Pix_dir, 'network-wireless.svg'), 24, 24)
-		end
 		@renderer3=Gtk::CellRendererPixbuf.new
 		@selectview=Gtk::ComboBox.new(false)
 		@selectview.model=@viewstore
 		@selectview.pack_start(@renderer3,false)
 		@selectview.set_attributes(@renderer3, :pixbuf => 0)
+		change_theme
 		
-		case @config['view']
-			when 'playlist' then @selectview.active=View::PLAYLIST
-			when 'browser' then @selectview.active=View::BROWSER
-			when 'player' then @selectview.active=View::COMPACT
-			when 'cd' then  @selectview.active=View::CD
-			when 'radio' then  @selectview.active=View::RADIO
-			else @selectview.active=View::ALL
-		end
 		@selectview.signal_connect('changed'){change_view}
 #Song title
 		@song_title=Gtk::Label.new
@@ -619,7 +595,7 @@ class Gui < Gtk::Window
 		@vbox.pack_start(@button_container, false, false)
 		
 		super()
-		self.signal_connect("delete_event") {quit; false}
+		self.delete_event_connect
 		self.title=$name
 		@icon_Z=Gdk::Pixbuf.new(File.join(Pix_dir,'ZiK.svg'))
 		self.icon=(@icon_Z)
@@ -635,6 +611,45 @@ class Gui < Gtk::Window
 		self.show
 	end
 
+	def change_theme
+		#@icon_theme=Gtk::IconTheme.default
+		#@idir=@icon_theme.load_icon('gtk-directory', Gtk::IconSize::BUTTON, Gtk::IconTheme::LOOKUP_FORCE_SVG)
+		theme=File.join(Theme_dir, @config['theme'])
+		begin
+			@viewstore.clear
+			%w(all.png playlist.png browser.png compact.png).each{|image|
+				child=@viewstore.append
+				child[0]=Gdk::Pixbuf.new(File.join(theme, image), 24, 24)
+			}
+			if $cd
+				child=@viewstore.append
+				child[0]=Gdk::Pixbuf.new(File.join(theme, 'cd.png'), 24, 24)
+			end
+			if $radio
+				child=@viewstore.append
+				child[0]=Gdk::Pixbuf.new(File.join(theme, 'radio.png'), 24, 24)
+			end
+
+			case @config['view']
+			when 'playlist' then @selectview.active=View::PLAYLIST
+			when 'browser' then @selectview.active=View::BROWSER
+			when 'player' then @selectview.active=View::COMPACT
+			when 'cd' then  @selectview.active=View::CD
+			when 'radio' then  @selectview.active=View::RADIO
+			else @selectview.active=View::ALL
+			end
+		rescue => e
+			ErrorError.new("Cannot find #{@config['theme']} theme.")
+			tmp=File.join(Theme_dir, @config.default['theme'])
+			if theme==tmp
+				raise e
+			else
+				theme=tmp
+				retry
+			end
+		end
+	end
+
 private
 	
 	def change_view
@@ -698,6 +713,15 @@ private
 	end
 
 public
+
+	def delete_event_connect(&block)
+		self.signal_handler_disconnect(@id_delete_event) if defined?(@id_delete_event)
+		if block
+			@id_delete_event=self.signal_connect("delete_event", &block)
+		else
+			@id_delete_event=self.signal_connect("delete_event"){quit; false}
+		end
+	end
 	
 	def quit
 		pos=self.position;@config['x']=pos[0];@config['y']=pos[1]
@@ -706,7 +730,19 @@ public
 		
 		Gtk.main_quit
 	end
-	
+
+	alias :super_hide :hide
+	def hide
+		@config['x'], @config['y']=self.position
+		super_hide
+	end
+
+	alias :super_show :show
+	def show
+		self.move(@config['x'],@config['y'])
+		super_show
+	end
+
 	def play(player_wanted=@active_view)
 		case player_wanted
 		when 'default'
@@ -961,9 +997,9 @@ public
 		ErrorInfo.new('Refreshing tree view...')
 		self.cursor=Gdk::Cursor::WATCH
 
-		backup=File.join(User_dir,'tree')
+		backup=File.join(Cache_dir,'tree')
 		unless File.exist?(backup)
-			Dir.mkdir(backup) if $saveconfig
+			Dir.mkdir(backup) if $write_config
 		end
 		BrowseSearchWindow.refresh
 		@treestore.clear
@@ -983,7 +1019,7 @@ public
 					files=[]
 					Find.find(directory){|f| files.push(f) if f=~rexp}
 					@config['sort_case_sensitive'] ? files.sort! : files=files.sort_by{|f| f.downcase}
-					if $saveconfig
+					if $write_config
 						if @config['refresh_on_start']
 							#Delete list
 							ff=Dir.glob(File.join(backup,'*'))
@@ -1310,10 +1346,13 @@ _("An error occured while exporting songs.\nUnknown queued object type (#{o.clas
 		@table.attach(bok, 7, 8, 8, 9, Gtk::SHRINK, Gtk::SHRINK)
 		@bedit.sensitive=false
 		@wlist.hide
-		dialog=Gtk::MessageDialog.new(self, Gtk::Dialog::MODAL, Gtk::MessageDialog::INFO,
-			Gtk::MessageDialog::BUTTONS_CLOSE,
-			_("Do not forget to validate your changes after editing the playlist."))
-		dialog.run; dialog.destroy
+		unless defined?(@list_edit_dialog)
+			@list_edit_dialog=true
+			dialog=Gtk::MessageDialog.new(self, Gtk::Dialog::MODAL, Gtk::MessageDialog::INFO,
+				Gtk::MessageDialog::BUTTONS_CLOSE,
+				_("Do not forget to validate your changes after editing the playlist."))
+			dialog.run; dialog.destroy
+		end
 	end
 
 if $radio
@@ -1373,10 +1412,10 @@ end
 			Mod.all.each{|mod| authors.push("  "+mod.title+": "+mod.author)}
 		end
 		Gtk::AboutDialog.show(self, {:name=>$name, :version=>Version, :program_name=>$name,
-			:copyright=>'Copyright 2007-2010 Vincent Carmona', :comments=>_('Audio player'),
+			:copyright=>'Copyright 2007-2011 Vincent Carmona', :comments=>_('Audio player'),
 			:website=>'http://zik.rubyforge.org/', :license=>copying,
 			:authors=>authors,
-			:artists=>["Jakub Steiner", "Lapo Calamandrei", "Andreas Nilsson", "Rodney Dawes", "Vincent Carmona"],
+			:artists=>["Justin Kaiden"],
 			:translator_credits=>"Français: Vincent Carmona\n",
 			:logo=>Gdk::Pixbuf.new(File.join(Pix_dir,'ZiK3.png'))})
 	end