zik 0.16.2 → 0.17.0

data/gui/preference.rb

@@ -196,7 +196,7 @@ class Preference_window < Gtk::Window
 	@@exist=false
 	
 	def Preference_window.show(parent, playlist, config, page=:default, cdlist=nil, cdplayer=nil, cdgui=nil)
-		pages={:default=>0, :browse=>0, :playlist=>1, :player=>2, :cd=>3}
+		pages={:default=>0, :global=>0, :browse=>1, :playlist=>2, :player=>3, :cd=>4}
 		if @@exist
 			@@window.hide; @@window.show
 		else
@@ -218,6 +218,33 @@ class Preference_window < Gtk::Window
 	def initialize(parent, playlist, config, cdlist,  cdplayer, cdgui)
 		@@exist=true
 		
+#*********************Global page******************************
+#theme
+		themes=Dir.glob(File.join(Theme_dir, '*/')).map{|d| d.split('/')[-1]}
+		#Add user themes-> themes.uniq! + priority to user themes (to be tested: themes.reverse!.uniq!)
+		@theme_combo=Gtk::ComboBox.new
+		themes.each_with_index{|theme, i|
+			@theme_combo.append_text(theme)
+			@theme_combo.active=i if config['theme']==theme
+		}
+
+		theme_frame=Gtk::Frame.new(_("Theme"))
+		theme_frame.border_width=$border
+		theme_frame.add(@theme_combo)
+
+
+#session
+		@bsocket1=Gtk::RadioButton.new(_("Single"))
+		@bsocket2=Gtk::RadioButton.new(@bsocket1, _("Multi"))
+		config['socket'] ? @bsocket1.active=true :  @bsocket2.active=true
+
+		@socket_frame=Gtk::Frame.new(_("Session"))
+		@socket_frame.border_width=$border
+		@socket_frame.add(hpack([@bsocket1, @bsocket2]))
+
+#Main
+		@global_box=vpack(theme_frame, @socket_frame)
+
 #*********************Browser page******************************
 #Directories
 		@dirbox=DirBox.new(self)
@@ -280,14 +307,6 @@ class Preference_window < Gtk::Window
 		@wbrowser.add_with_viewport(@browser_box)
 		
 #*********************Playlist page*****************************
-#session
-		@bsocket1=Gtk::RadioButton.new(_("Single"))
-		@bsocket2=Gtk::RadioButton.new(@bsocket1, _("Multi"))
-		config['socket'] ? @bsocket2.active=true :  @bsocket1.active=true
-
-		@socket_frame=Gtk::Frame.new(_("Session"))
-		@socket_frame.border_width=$border
-		@socket_frame.add(hpack([@bsocket1, @bsocket2]))
 #format
 		@format_selector=FormatSelector.new(config['name_format'])
 		@format_label=Gtk::Label.new(_('Format used to display songs\' name. Set all to None if you want to use file name.'))
@@ -335,8 +354,11 @@ class Preference_window < Gtk::Window
 		@relative_frame.add(vpack([@brelative, @relative_label]))
 
 #main
-		@playlist_box=vpack([@socket_frame, @format_frame, @color_frame, @compact_frame,
+		@playlist_box=vpack([@format_frame, @color_frame, @compact_frame,
 			@sort2_frame, @relative_frame])
+		@wplaylist=Gtk::ScrolledWindow.new
+		@wplaylist.set_policy(Gtk::POLICY_AUTOMATIC,Gtk::POLICY_AUTOMATIC)
+		@wplaylist.add_with_viewport(@playlist_box)
 
 #*********************Player page*******************************
 		@bplay=Gtk::CheckButton.new(_('Play on start'))
@@ -401,8 +423,9 @@ class Preference_window < Gtk::Window
 #*********************Main window*******************************
 		@notebook=Gtk::Notebook.new
 		@notebook.tab_pos=Gtk::POS_LEFT
+		@notebook.append_page(@global_box, Gtk::Label.new(_('Global')))
 		@notebook.append_page(@wbrowser, Gtk::Label.new(_('Browser')))
-		@notebook.append_page(@playlist_box, Gtk::Label.new(_('Playlist')))
+		@notebook.append_page(@wplaylist, Gtk::Label.new(_('Playlist')))
 		@notebook.append_page(@player_box, Gtk::Label.new(_('Player')))
 		@notebook.append_page(@cd_box, Gtk::Label.new(_('Cd')))
 		@notebook.append_page(@wmodule, Gtk::Label.new(_('Modules'))) if $module
@@ -412,20 +435,33 @@ class Preference_window < Gtk::Window
 		@bok=Gtk::Button.new(Gtk::Stock::OK)
 		@bok.signal_connect('clicked'){
 			oldconfig={}; oldconfig.merge!(config)
-			config.merge!({'directory'=>@dirbox.sdirectory, 'extension'=>@extbox.sext,
+			h={'directory'=>@dirbox.sdirectory, 'extension'=>@extbox.sext,
 				'sort_directories_first'=>@bsortdir.active?, 'sort_case_sensitive'=>@bsortcase.active?, 'refresh_on_start'=>@brefresh.active?,
 				'search_in_path'=>@bpath.active?, 'search_in_title'=>@btitle.active?,
 				'search_in_artist'=>@bartist.active?, 'search_in_album'=>@balbum.active?, 'search_in_genre'=>@bgenre.active?,
-				'socket'=>@bsocket2.active?,
+				'theme'=>@theme_combo.active_text,
 				'name_format'=>@format_selector.format, 'relative_playlist'=>@brelative.active?,
 				'compact'=>@bcompact.active?,
 				'sort_by_track'=>@bsorttrack.active?, 'playing_color'=>@color_entry.text,
 				'play_on_start'=>@bplay.active?, 'shuffle'=>@bshuffle.active?, 'repeat'=>@brepeat.active?,
-				'cd_device'=>@device_entry.text, 'cd_web'=>@bweb.active?})
+				'cd_device'=>@device_entry.text, 'cd_web'=>@bweb.active?}
+			h['theme']=@theme_combo.active_text if @theme_combo.active_text
+			config.merge!(h)
 			if $module
 				config['module']=''
 				@module_hbuttons.each_pair{|key, value| config['module']+=key+',' if value.active?}
 			end
+			unless  oldconfig['theme']==config['theme']
+				parent.change_theme
+			end
+			unless oldconfig['socket']==config['socket']
+					if config['socket']
+						require File.join(Data_dir, 'gui/socket')
+						ZiKSocket.start_server(parent, config, playlist)
+					else
+						ZiKSocket.clean
+					end
+			end
 			begin
 				Gdk::Color.parse(config['playing_color'])
 			rescue
@@ -480,6 +516,7 @@ class Preference_window < Gtk::Window
 		self.skip_taskbar_hint=true
 		self.skip_pager_hint=true
 		self.title=_('Preferences')
+		self.set_default_size(800, 800)
 		self.icon=Gdk::Pixbuf.new(File.join(Pix_dir,'ZiK.svg'))
 		
 		self.signal_connect("delete_event") {quit;true}

data/gui/socket.rb

@@ -19,6 +19,8 @@ This file is part of ZiK.
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 =end
 
+require 'socket'
+
 module ZiKSocket
 #Address and clean function are defined in ZiK.rb
 Welcome_message="Hi! This is #{$name} through unix socket."
@@ -33,7 +35,9 @@ class CloseServer < Exception; end
 end
 
 def ZiKSocket.start_server(gui, config, playlist)
-	Thread.new{ZiKSocket::Server.new(gui, config, playlist)}
+	ErrorError.new(_("Single session: server not started."), true) if Thread.new{
+		ZiKSocket::Server.new(gui, config, playlist)
+	}.status.nil?#Except raise in thread used to start server.
 end
 
 class Server

data/mod/brainz.rb

@@ -41,7 +41,10 @@ module Brainz
 				require File.join(@dir, 'brainz', 'dialogs')
 				require File.join(@dir, 'brainz', 'widget')
 				@widget=Widget.new(zik)
-				pack(@widget, true, false)
+				vbox=Gtk::VBox.new
+				vbox.show
+				vbox.pack_start(@widget, false, false)
+				pack(vbox, true, false)
 				it=Gtk::MenuItem.new("Brainz")
 				it.signal_connect('activate'){
 					s=zik.list_selection.selected_rows

data/mod/brainz/functions.rb

@@ -39,16 +39,16 @@ def Brainz.tag(zik, zikSong)
 		begin
 			puids=song.puids
 			raise PuidsError.new if puids.nil?
-			ModErrorInfo.new(self, "get puids: #{puids.join(', ')}.")
+			ModErrorInfo.new(Brainz.mod, "get puids: #{puids.join(', ')}.")
 			song.get_tag
 			TagDialog.new(zik, song)
 		rescue PuidsParseError
-			ModErrorError.new(self, _("Cannot retrieve song id (parse error)."), true)
+			ModErrorError.new(Brainz.mod, _("Cannot retrieve song id (parse error)."), true)
 		rescue PuidsError
-			ModErrorError.new(self,  _("Cannot retrieve song id."), true)
+			ModErrorError.new(Brainz.mod,  _("Cannot retrieve song id."), true)
 		end
 	else
-		ModErrorError.new(self, _("Only files are supported."), true)
+		ModErrorError.new(Brainz.mod, _("Only files are supported."), true)
 	end
 	zik.cursor=Gdk::Cursor::ARROW
 end

data/mod/hotkeys.rb

@@ -44,29 +44,22 @@ module Hotkeys
 
 	def @m.load
 		unless @loaded
-#Some deprecated code to be cleaned
-#Since 0.2.0 rghk is required using the 'globalhotkeys' string
-			rghk='globalhotkeys'
 			begin
-				require rghk
+				require 'globalhotkeys'
 				@rghk=true
 
 				@kb_prev||=GlobalHotKeys::KeyBinder.new
 				@kb_stop||=GlobalHotKeys::KeyBinder.new
 				@kb_play||=GlobalHotKeys::KeyBinder.new
 				@kb_next||=GlobalHotKeys::KeyBinder.new
+				@kb_hide||=GlobalHotKeys::KeyBinder.new
 				reload(true)
 
 				ModErrorInfo.new(self, "module loaded.")
 				@loaded=true
 			rescue LoadError
-				if rghk=='globalhotkeys'
-					 rghk='rghk'
-					 retry
-				else
 					ModErrorLoadError.new(self, _("Cannot find rghk. Please install it."))
 					@loaded=false
-				end
 			end
 		else
 			false
@@ -99,6 +92,8 @@ module Hotkeys
 			save_key(@wconfig.eplay.text, :play_key)
 			save_mask([@wconfig.bcnext, @wconfig.bsnext, @wconfig.banext], :next_mask)
 			save_key(@wconfig.enext.text, :next_key)
+			save_mask([@wconfig.bchide, @wconfig.bshide, @wconfig.bahide], :hide_mask)
+			save_key(@wconfig.ehide.text, :hide_key)
 			reload
 		end
 	end
@@ -111,11 +106,23 @@ private
 
 	def @m.reload(force=false)
 		if @loaded||force
-			[@kb_prev, @kb_stop, @kb_play, @kb_next].each{|kb| kb.unbind}
-			@kb_prev.bind(Gdk::Keyval.from_name(@config[:prev_key]), @config[:prev_mask]){@zik.previous_song}
-			@kb_stop.bind(Gdk::Keyval.from_name(@config[:stop_key]), @config[:stop_mask]){@zik.stop}
-			@kb_play.bind(Gdk::Keyval.from_name(@config[:play_key]), @config[:play_mask]){@zik.playpause}
-			@kb_next.bind(Gdk::Keyval.from_name(@config[:next_key]), @config[:next_mask]){@zik.next_song}
+			[@kb_prev, @kb_stop, @kb_play, @kb_next, @kb_hide].each{|kb| kb.unbind}
+			begin
+				@kb_prev.bind(Gdk::Keyval.from_name(@config[:prev_key]),
+					@config[:prev_mask]){@zik.previous_song}
+				@kb_stop.bind(Gdk::Keyval.from_name(@config[:stop_key]),
+					@config[:stop_mask]){@zik.stop}
+				@kb_play.bind(Gdk::Keyval.from_name(@config[:play_key]),
+					@config[:play_mask]){@zik.playpause}
+				@kb_next.bind(Gdk::Keyval.from_name(@config[:next_key]),
+					@config[:next_mask]){@zik.next_song}
+				@kb_hide.bind(Gdk::Keyval.from_name(@config[:hide_key]),
+					@config[:hide_mask]){@zik.visible? ? @zik.hide : @zik.show}
+			rescue GlobalHotKeys::XlibError
+				mess=_("Cannot bind these keys.")
+				ModErrorError.new(self, mess, true,
+					mess+_( "They must already used by another programm."))
+			end
 		end
 	end
 

data/mod/hotkeys/config.rb

@@ -24,8 +24,9 @@ module Hotkeys
 class Configuration < Hash
 	def initialize(dir)
 		@file=File.join(dir,'hotkeysrc')
-		default={:prev_mask=>0, :prev_key=>"F9", :stop_mask=>0, :stop_key=>"F10", :play_mask=>0, :play_key=>"F11",
-			:next_mask=>0, :next_key=>"F12"}
+		default={:prev_mask=>0, :prev_key=>"F9", :stop_mask=>0, :stop_key=>"F10",
+			:play_mask=>0, :play_key=>"F11", :next_mask=>0, :next_key=>"F12",
+			:hide_mask=>0, :hide_key=>"F8"}
 		super
 		self.merge!(default)
 		if File.exist?(@file)
@@ -79,6 +80,7 @@ private
 		self[:stop_mask]=self[:stop_mask].to_i
 		self[:play_mask]=self[:play_mask].to_i
 		self[:next_mask]=self[:next_mask].to_i
+		self[:hide_mask]=self[:hide_mask].to_i
 	end
 end
 end

data/mod/hotkeys/configwidget.rb

@@ -22,8 +22,8 @@ This file is part of ZiK.
 
 module Hotkeys
 class ConfigWidget < Gtk::Table
-	attr_reader :eprev, :estop, :eplay, :enext, :bcprev, :bsprev, :baprev, :bcstop, :bsstop, :bastop,
-		:bcplay, :bsplay, :baplay, :bcnext, :bsnext, :banext
+	attr_reader :eprev, :estop, :eplay, :enext, :ehide, :bcprev, :bsprev, :baprev, :bcstop, :bsstop, :bastop,
+		:bcplay, :bsplay, :baplay, :bcnext, :bsnext, :banext, :bchide, :bshide, :bahide
 
 	def initialize(config)
 		@lprev=Gtk::Label.new(_("Previous:\t"))
@@ -66,7 +66,17 @@ class ConfigWidget < Gtk::Table
 		@enext=Gtk::Entry.new
 		@enext.text=config[:next_key]
 
-		super(4, 5)
+		@lhide=Gtk::Label.new(_("Hide/show:\t"))
+		@bchide=Gtk::CheckButton.new('Ctrl')
+		@bchide.active=config[:hide_mask]&GlobalHotKeys::Modifier::CONTROL_MASK==GlobalHotKeys::Modifier::CONTROL_MASK
+		@bshide=Gtk::CheckButton.new('Shift')
+		@bshide.active=config[:hide_mask]&GlobalHotKeys::Modifier::SHIFT_MASK==GlobalHotKeys::Modifier::SHIFT_MASK
+		@bahide=Gtk::CheckButton.new('Alt')
+		@bahide.active=config[:hide_mask]&GlobalHotKeys::Modifier::MOD1_MASK==GlobalHotKeys::Modifier::MOD1_MASK
+		@ehide=Gtk::Entry.new
+		@ehide.text=config[:hide_key]
+
+		super(5, 5)
 		#self.column_spacings=$border
 		self.attach(@lprev, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, $border)
 		self.attach(@bcprev, 1, 2, 0, 1)
@@ -88,6 +98,11 @@ class ConfigWidget < Gtk::Table
 		self.attach(@bsnext, 2, 3, 3, 4)
 		self.attach(@banext, 3, 4, 3, 4)
 		self.attach(@enext, 4, 5, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, $border)
+		self.attach(@lhide, 0, 1, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, $border)
+		self.attach(@bchide, 1, 2, 4, 5)
+		self.attach(@bshide, 2, 3, 4, 5)
+		self.attach(@bahide, 3, 4, 4, 5)
+		self.attach(@ehide, 4, 5, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, $border)
 	end
 end
 end

data/mod/trayicon.rb

@@ -45,6 +45,7 @@ module Trayicon
 				end
 			}
 			@zik.signal_connect('stop'){@tray.tooltip='ZiK' if @loaded}
+			reload
 			ModErrorInfo.new(self, "module loaded.")
 			@loaded=true
 		else
@@ -56,7 +57,8 @@ module Trayicon
 		if @loaded
 			#@tray.destroy #No method to destroy an Gtk::StatusIcon.
 			@tray.visible=false
-			ModErrorInfo.new(self, ModErrorINFO, "module unloaded.")
+			@zik.delete_event_connect
+			ModErrorInfo.new(self, "module unloaded.")
 			@loaded=false
 			true
 		else
@@ -71,6 +73,8 @@ module Trayicon
 	def @m.saveconfig
 		if @loaded
 			@config[:scroll_event]=@wconfig.bscroll.active?
+			@config[:hide]=@wconfig.bhide.active?
+			reload
 			true
 		else
 			false
@@ -80,4 +84,14 @@ module Trayicon
 	def @m.quit
 		@config.save if @config
 	end
+
+private
+
+	def @m.reload
+		if @config[:hide]
+			@zik.delete_event_connect{@zik.hide; true}
+		else
+			@zik.delete_event_connect
+		end
+	end
 end

data/mod/trayicon/config.rb

@@ -24,7 +24,7 @@ module Trayicon
 class Configuration < Hash
 	def initialize(dir)
 		@file=File.join(dir,'trayiconrc')
-		default={:scroll_event=>false}
+		default={:scroll_event=>false, :hide=>false}
 		super
 		self.merge!(default)
 		if File.exist?(@file)
@@ -74,6 +74,7 @@ class Configuration < Hash
 private
 	def str2value
 		self[:scroll_event]=="true" ? self[:scroll_event]=true : self[:scroll_event]=false
+		self[:hide]=="true" ? self[:hide]=true : self[:hide]=false
 	end
 end
 end

data/mod/trayicon/configwidget.rb

@@ -21,15 +21,22 @@ This file is part of ZiK.
 =end
 
 module Trayicon
-class ConfigWidget < Gtk::Frame
-	attr_reader :bscroll
+class ConfigWidget < Gtk::VBox
+	attr_reader :bscroll, :bhide
 
 	def initialize(config)
 		@bscroll=Gtk::CheckButton.new(_("Check to add interactions with third button mouse.\ndown : next song.\nup : previous song.\nCtrl+down : decrease volume.\nCtrl+up : increase volume."))
 		@bscroll.active=config[:scroll_event]
+		@fscroll=Gtk::Frame.new(_('Scroll actions'))
+		@fscroll.add(@bscroll)
 
-		super(_('Scroll actions'))
-		self.add(@bscroll)
+		@bhide=Gtk::CheckButton.new(_("Hide ZiK on close"))
+		@bhide.active=config[:hide]
+
+		super()
+		self.spacing=$border
+		self.pack_start(@fscroll, false)
+		self.pack_start(@bhide, false)
 	end
 end
 end

data/player/cdplayer.rb

@@ -95,11 +95,11 @@ class Player
 	private
 	
 	def got_bus_message(message)
-		case message.type
-			when Gst::Message::ERROR
+		case message
+			when Gst::MessageError
 				ErrorError.new(_("Gstreamer error."), true)
 				stop
-			when Gst::Message::EOS
+			when Gst::MessageEos
 				@gui.next_song#Use Dbus to propagate message instead of :gui ???
 		end
 		true#Without this line only the first message is processed

data/player/player.rb

@@ -97,10 +97,10 @@ private
 		Gst::InstallPlugins
 		def got_bus_message(message)
 			case message
-				when Gst::Message::ERROR
+				when Gst::MessageError
 					ErrorError.new(_("Gstreamer error."), true)
 					@gui.next_song_on_error
-				when Gst::Message::EOS
+				when Gst::MessageEos
 					@gui.next_song#Use Dbus to propagate message instead of :gui  or a SIGNAL???
 				when Gst::MissingMessage
 					ErrorInfo.new("Missing plugins.")
@@ -119,11 +119,11 @@ private
 		end
 	rescue NameError
 		def got_bus_message(message)
-			case message.type
-				when Gst::Message::ERROR
+			case message
+				when Gst::MessageError
 					ErrorError.new(_("Gstreamer error."), true)
 					@gui.next_song_on_error
-				when Gst::Message::EOS
+				when Gst::MessageEos
 					@gui.next_song#Use Dbus to propagate message instead of :gui  or a SIGNAL???
 			end
 			true#Without this line only the first message is processed

data/player/radioplayer.rb

@@ -63,12 +63,12 @@ private
 	begin
 		Gst::InstallPlugins
 		def got_bus_message(message)
-			case message.type
-				when Gst::Message::ERROR
+			case message
+				when Gst::MessageError
 					ErrorError.new(_('Gstreamer error'), true)
 					stop
 					next_stream
-				when Gst::Message::EOS
+				when Gst::MessageEos
 					@gui.next_song#Use Dbus to propagate message instead of :gui ???
 				when Gst::MissingMessage
 					ErrorInfo.new("Missing plugins.")
@@ -88,12 +88,12 @@ private
 		end
 	rescue NameError
 		def got_bus_message(message)
-			case message.type
-				when Gst::Message::ERROR
+			case message
+				when Gst::MessageError
 					ErrorError.new(_('Gstreamer error'), true)
 					stop
 					next_stream
-				when Gst::Message::EOS
+				when Gst::MessageEos
 					@gui.next_song#Use Dbus to propagate message instead of :gui ???
 			end
 			true#Without this line only the first message is processed