ui sound

git-svn-id: http://svn.net-core.org/repos/t-engine4@3722 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/ui/Base.lua

@@ -41,6 +41,10 @@ _M.font_bold_h = _M.font_bold:lineSkip()
 _M.ui = "stone"
 _M.defaultui = "stone"
 
+sounds = {
+	button = "ui/subtle_button_sound",
+}
+
 _M.ui_conf = {
 	stone = {
 		frame_shadow = {x=15, y=15, a=0.5},
@@ -162,3 +166,9 @@ end
 
 function _M:positioned(x, y)
 end
+
+function _M:sound(name)
+	if game.playSound and sounds[name] then
+		game:playSound(sounds[name])
+	end
+end

game/engines/default/engine/ui/Button.lua

@@ -53,8 +53,8 @@ function _M:generate()
 	self.font:setStyle("normal")
 
 	-- Add UI controls
-	self.mouse:registerZone(0, 0, self.w+6, self.h+6, function(button, x, y, xrel, yrel, bx, by, event) if button == "left" and event == "button" then self.fct() end end)
-	self.key:addBind("ACCEPT", function() self.fct() end)
+	self.mouse:registerZone(0, 0, self.w+6, self.h+6, function(button, x, y, xrel, yrel, bx, by, event) if button == "left" and event == "button" then self:sound("button") self.fct() end end)
+	self.key:addBind("ACCEPT", function() self:sound("button") self.fct() end)
 
 	self.rw, self.rh = w, h
 	self.frame = self:makeFrame("ui/button", self.w, self.h)

game/engines/default/engine/ui/Checkbox.lua

@@ -65,6 +65,7 @@ end
 
 function _M:select()
 	self.checked = not self.checked
+	self:sound("button")
 	if self.on_change then self.on_change(self.checked) end
 end
 

game/engines/default/engine/ui/Dropdown.lua

@@ -60,6 +60,7 @@ end
 function _M:positioned(x, y, sx, sy)
 	self.c_list = List.new{width=self.w, list=self.list, select=self.on_select, display_prop=self.display_prop, scrollbar=self.scrollbar, nb_items=self.nb_items, fct=function()
 		game:unregisterDialog(self.popup)
+		self:sound("button")
 		self.fct(self.c_list.list[self.c_list.sel])
 	end}
 	self.popup = Dialog.new(nil, self.w, self.c_list.h, sx, sy + self.h, nil, nil, false, "simple")
@@ -69,6 +70,7 @@ function _M:positioned(x, y, sx, sy)
 	self.popup.key:addBind("EXIT", function()
 		game:unregisterDialog(self.popup)
 		self.c_list.sel = self.previous
+		self:sound("button")
 		self.fct(self.c_list.list[self.c_list.sel])
 	end)
 end

game/engines/default/engine/ui/ImageList.lua

@@ -135,6 +135,7 @@ end
 
 function _M:onUse(button)
 	local item = self.dlist[self.sel_j] and self.dlist[self.sel_j][self.sel_i]
+	self:sound("button")
 	if item then self.fct(item) end
 end
 

game/engines/default/engine/ui/List.lua

@@ -147,6 +147,7 @@ end
 function _M:onUse(...)
 	local item = self.list[self.sel]
 	if not item then return end
+	self:sound("button")
 	if item.fct then item:fct(item, self.sel, ...)
 	else self.fct(item, self.sel, ...) end
 end

game/engines/default/engine/ui/ListColumns.lua

@@ -250,6 +250,7 @@ end
 function _M:onUse(...)
 	local item = self.list[self.sel]
 	if not item then return end
+	self:sound("button")
 	if item.fct then item:fct(item, self.sel, ...)
 	else self.fct(item, self.sel, ...) end
 end

game/engines/default/engine/ui/Tab.lua

@@ -64,7 +64,10 @@ function _M:generate()
 
 	self.frame_sel = self:makeFrame("ui/button_sel", self.w, self.h)
 
-	self.key:addBind("ACCEPT", function() self.fct(self.selected) end)
+	self.key:addBind("ACCEPT", function()
+		self:sound("button")
+		self.fct(self.selected)
+	end)
 	self.key:addCommands{
 		_SPACE = function() self:select() end,
 	}

game/engines/default/engine/ui/TreeList.lua

@@ -295,6 +295,7 @@ end
 function _M:onUse(...)
 	local item = self.list[self.sel]
 	if not item then return end
+	self:sound("button")
 	if item.fct then item.fct(item, self.sel, ...)
 	else self.fct(item, self.sel, ...) end
 end

game/engines/default/engine/ui/VariableList.lua

@@ -92,6 +92,7 @@ end
 function _M:onUse()
 	local item = self.list[self.sel]
 	if not item then return end
+	self:sound("button")
 	if item.fct then item:fct()
 	else self.fct(item, self.sel) end
 end