From a4b17061a5ff43e7fd66e230242ab1a12d8e9482 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Fri, 15 Mar 2013 21:05:44 -0400
Subject: [PATCH] add page counting in touchmenu & bug fix for sub_item_table

---
 frontend/ui/widget/touchmenu.lua          |  16 +++++++++++++---
 resources/icons/appbar.chevron.up.png     | Bin 0 -> 776 bytes
 resources/icons/src/appbar.chevron.up.svg |   5 +++++
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 resources/icons/appbar.chevron.up.png
 create mode 100644 resources/icons/src/appbar.chevron.up.svg

diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua
index 7d6607ac3..b1b2059eb 100644
--- a/frontend/ui/widget/touchmenu.lua
+++ b/frontend/ui/widget/touchmenu.lua
@@ -159,7 +159,7 @@ TouchMenu widget
 TouchMenu = InputContainer:new{
 	tab_item_table = {},
 	-- for returnning in multi-level menus
-	item_table_stack = {},
+	item_table_stack = nil,
 	item_table = nil,
 	--@TODO replace getDPI call    (houqp)
 	item_height = scaleByDPI(50),
@@ -215,15 +215,20 @@ function TouchMenu:init()
 		align = "left",
 	}
 
+	self.footer_page = TextWidget:new{
+		face = Font:getFace("ffont", 20),
+		text = "",
+	}
 	self.footer = HorizontalGroup:new{
 		IconButton:new{
 			invert = true,
-			icon_file = "resources/icons/appbar.chevron.left.png",
+			icon_file = "resources/icons/appbar.chevron.up.png",
 			show_parent = self.show_parent,
 			callback = function()
 				self:backToUpperMenu()
 			end,
-		}
+		},
+		self.footer_page,
 	}
 
 	self[1] = FrameContainer:new{
@@ -305,6 +310,7 @@ function TouchMenu:updateItems()
 
 	table.insert(self.item_group, VerticalSpan:new{width = scaleByDPI(2)})
 	table.insert(self.item_group, self.footer)
+	self.footer_page.text = "Page "..self.page.."/"..self.page_num
 	-- FIXME: this is a dirty hack to clear previous menus
 	-- refert to issue #664
 	UIManager.repaint_all = true
@@ -312,6 +318,10 @@ end
 
 function TouchMenu:switchMenuTab(tab_num)
 	if self.cur_tab ~= tab_num then
+		-- it's like getting a new menu everytime we switch tab!
+		self.page = 1
+		-- clear item table stack
+		self.item_table_stack = {}
 		self.cur_tab = tab_num
 		self.item_table = self.tab_item_table[tab_num]
 		self:updateItems()
diff --git a/resources/icons/appbar.chevron.up.png b/resources/icons/appbar.chevron.up.png
new file mode 100644
index 0000000000000000000000000000000000000000..75d0ff26228e23906c63dda60fe30dfa4ae3d496
GIT binary patch
literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-2)H+HV0z0jK}~00+mTb
zK~!ko?b*LeI$<0K@Xy`pb>$C;BnZ?%%teJDXz(v+6CA^qHXFprr7fJCTm&U>Q$ZI&
zxKINTTEx}CtsoNHB5b<!-DLFT>-T%7dH#Us1E1|a&%IxqJn%en06-gDJZ*R}00S@p
z126ysFu=6>{QRU)C`8$8R$l>hsL^PIa5xMi0?+fv=kw6377iGX$GEz>0ug<;AP6Xz
z%bNj+#bSSipR_27kY#zj0XH`{Q^QYsXJ-ekR%<;0$z<}s;U{giTG8or)(eoyWWaHp
zCIAt^X0xH&?XCwPpU;EmdClP`y}!SYUaz-WK&e!MAP6&upR~i_z~kfNY5=k<Llnii
z!%y1ncB9|#FBi~mw_&wfRm0isc1_5WlM}qXy)6gO>2x%O_j<h;3<jvxYS`Z1R(<~T
z^c3&!@A?9|-7ai4n`#)J&xhC7*YCMjs|B;!tU4D61TY*9^#MFRJ;C8{sD|)(Ja~C|
z`D^~}?hcY9sm=$3K`4r{SU|tuhuiH|eYwl!!t?X<Ki8>Nt1udks_UGepJOx{Ee?>)
zW`7<2=a<;p+EQI_+E<)b3po!Q9v)J&*(AH&uKMiR*%=iI1u_^6>v5ntI5?n2qd`um
zQ}awH6rx-%M?BB37O=OsN3~jwj*gCIp1ruZpxfJ9;y7+KfZg3)y1&0Czu!Oi%P%i4
zDV0hsA7HUqNS0+fK0f~SPaqnNQX-Mi_e}hA7c!YlczAeN_{r+}`g*QiXeNLpNvPNB
zx*gEt@wk2fqtS>;r2;)`JRTzwiOdAhv>6)=1}YYd6buG+z2f0Gj?(EgDT<<fM$3O>
zA0HoNGMSck+omWA0U%Kn7Xx5-qYS_R48Q;kzyJ&|y}kgjK?6V%4R#R#0000<MNUMn
GLSTY>UR!kl

literal 0
HcmV?d00001

diff --git a/resources/icons/src/appbar.chevron.up.svg b/resources/icons/src/appbar.chevron.up.svg
new file mode 100644
index 000000000..ddfbf8418
--- /dev/null
+++ b/resources/icons/src/appbar.chevron.up.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="76" height="76" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00" xml:space="preserve">
+	<path fill="#000000" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 37.8516,35.625L 34.6849,38.7917L 23.6016,50.2708L 23.6016,39.9792L 37.8516,24.9375L 52.1016,39.9792L 52.1016,50.2708L 41.0182,38.7917L 37.8516,35.625 Z "/>
+</svg>