From f344cd4f33267acae059c8bd9eb34c8d30e4cb3b Mon Sep 17 00:00:00 2001
From: noisymime <noisymime@baaa0088-b137-0410-8772-f9fc1f435b5f>
Date: Sat, 1 Sep 2007 23:28:47 +0000
Subject: [PATCH] Added ellipsis support on menu items

---
 Menu.py     |   6 +++++-
 Menu.pyc    | Bin 11542 -> 11730 bytes
 MenuMgr.py  |   5 ++++-
 MenuMgr.pyc | Bin 7150 -> 7313 bytes
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Menu.py b/Menu.py
index aff65d2..04e9f1b 100644
--- a/Menu.py
+++ b/Menu.py
@@ -1,6 +1,7 @@
 import clutter
 import pygtk
 import gtk
+import pango
 import time
 from ReflectionTexture import Texture_Reflection
 
@@ -285,7 +286,10 @@ class ListItem (clutter.Label):
         self.currentOpacity = 255
         self.menu = menu
         self.data = itemLabel #By default the items data is simply its label
-        
+        #The width is the length of the selector bar minus its offset
+        width = menu.getMenuMgr().get_selector_bar().get_width() + menu.getMenuMgr().get_selector_bar().get_x_offset()
+        self.set_width(width)
+        self.set_ellipsize(pango.ELLIPSIZE_END)
         #Text is actually scaled down in 'regular' position so that it doesn't get jaggies when zoomed in
         self.set_scale(self.zoomLevel, self.zoomLevel)
         self.currentZoom = 0        
diff --git a/Menu.pyc b/Menu.pyc
index f5997da76fdcf48e52801d67a6f23277f701b930..be955df33aacfd5544ffdd9163cb3141d656263d 100644
GIT binary patch
delta 889
zcmZ9JT}TvB6vxk*ot>T8b#3!&)zw|y)J#S210<1<Yz@myXZyf4Sj5@Y!KGbtBF*uu
zt%nGbxYR>s6!jp1U`!7^76?gDK~Yf8LHJfe&vwsf`_LTbckln4Kj+T5b1(L3Bw%fO
z-4lPl^^U>bqwuwxzf<O&Kt~V4qzEw)GyqM2NhhQvh)IB&1Cl%?!gYWwz;Mh3niCQL
zx(rDKP0AIN7dMw3=&{PgP60#K8L1nwmECncz%JGzU&AAuZS1E!gx%I*<pW|5lRfwG
z6npA<j)Qh_DKCmqdnbFNc+R@uZABcmmh($R)U4HlfQZc6C~+cgTJQW@h##$&WnB*Z
z!G2e)qMN;GC}eAuS@g1&;CqzWPH;1y#&q(xhel1YFQN4X1l>u)=mj<liRORFB1-z_
zBrv(J7)%MW2uPv?3_s|lIbCL3%J-NR>^tMecmOm9%(=kil<jf_Wy}r-kc)a%f+>O#
z%xNF!Av##Evi)N25E1lh_Nyv{VdkrTbzU9d)2QtnMjpp_!iZ1D)5+vi!Z2uHzQ(WU
znlWK`_f#U4(lb-~)r3Kpkr}->p0;a|{{FtfXkRQ6j|?1Ro7E$zu$pjKA(!2OMZzZz
z79;Q3#8ZGi+=r!Dj9wlAt`rKPnJb@Qt%sjsV4m9y4@WvPI;I;lQ6rI2m$+6JSh{8d
z+gN*T9Ov2h%A@RSZ2=BhTeWpUzU`oq)EN#|SO3<z$Tw%%cKsTr`M+&rpAVhJOYA_y
z3SK6SkL(^Djb5C#>(h<LahAPqEN`Z7P;U_Ygp-6@ghj$b!V2Lr;R%zQdOP>ij3r!4
u$U{(qJVd2jaqLFDo2+!(yEiy9ZcM7TDL2cqO-n^SzRkmb;S&mX!2K8HRl{fi

delta 721
zcmX|;T}TvB6vxk*otd3+KUmhy)ty?|m0dPdA}fSS5+lRP#F3!%VGGxfL9-QyWX*`!
zie4o0lzmtaL1Y9`aeL?`C<yE&DIX%}NqP!;vgfjMM{zFqH}`zq`#<+C_s#WMVl`Az
zp8DF}4;!Ds|5lz8#amW$vjQV3jB3!U0Tz5P2vAVrDnJ?FbgvEt4F&)lKMW!i^v!_r
z`p!)sR)~zcPr;-(qqidNqR0Mu+)pdP-BdKXu*F;bF}m@fIBYH<woxqb0FTqlz;o>K
zf-}J$w0U(MPm1AC6XGc`AFfuhU%ZK0D$a^8RT|==_!j?#xFp`!9Pr^!`n&ZRn)Gzr
z90sW+`5FBbsQna{ZD~9Y$<|V|Qv2#M3y;DyvvPxF#cPsX`517wmvoqB`n~WL>0whQ
z$)YNlR>6&L+7WQ7<+V69Ub+fpTu)TNNyq>e0D5vNpMSzxV^Uu#fEEp<-qMA19~!ir
zPSd}1haN+gn5E9T1p35S-4nD*obCn~=Zk0i9k<lu4is$`0rnI%W<KIhTFvCKMB_#q
z-Ofg_Q!He&O5DrXBWq2@#DJThbPDb;{m3n97unNI3)^2PBS;^NrrCOpX6ldP7=5pQ
zq>Ot$yzlM!dq+rdJqI;59O;;p@)Rxy%!QctsKhx5snh0r1v@TrOyZh^Jk7o<aZh4i
z;vv0jXx|%=yH&BRBM-&2%%rKB3DdVea#Fb+WVrJ6ilrfU#J)i-jaQ;!wu87nB1+{N
GRQv~tougd<

diff --git a/MenuMgr.py b/MenuMgr.py
index 4a7e01e..182fa97 100644
--- a/MenuMgr.py
+++ b/MenuMgr.py
@@ -148,13 +148,14 @@ class MenuMgr:
         
 class MenuSelector(clutter.Texture):
     x_offset = -50
+    width = 400
 
     def __init__ (self, menuMgr):
         clutter.Texture.__init__ (self)
         self.menuMgr = menuMgr
         pixbuf = gtk.gdk.pixbuf_new_from_file("ui/active_bar.png")
         self.set_pixbuf(pixbuf)
-        self.set_width(400)
+        self.set_width(self.width)
         
         pixbuf = gtk.gdk.pixbuf_new_from_file("ui/spinner1.gif")
         self.spinner = clutter.Texture()
@@ -231,4 +232,6 @@ class MenuSelector(clutter.Texture):
         
     def get_x_offset(self):
         return self.x_offset
+    def get_width(self):
+        return self.width
         
diff --git a/MenuMgr.pyc b/MenuMgr.pyc
index 14fe58a840bff869364bde103b4ebd662ec64151..8b121995bbd825df3eb22d05e9ca107c0291a814 100644
GIT binary patch
delta 484
zcmXYtJxc>Y5Qb+icZqvR@b1V#lIsK^NE#6pV<F;4VPUbcFd~TNR8CX`6A+ArXeB7h
zVBsIIQc!}uAXwUKVP_$tg<xx(39`(y^X|Ot%<k9V*-)bSowk>Mo^KPUjyDeg%K&o-
zA=7{m>B=b$gdK3m+J;cIlO*VJ!Dest)M~Y&Qv|3QEMpw9k8x}tk>!p~H`t`$00C<z
zL>5GG2o2GD2GqEQZ~(xj1zQ-|5GA0|HsHTbiUWC`av?@%Zk}#jA5-+`uA3J3p`y2y
zxsZk)1JFT*9;VT0-gq^{OX|+N#@D%`H%R$Y)*7dGH0#gc7GW@K`K<4opZ=ne+!PnT
z1$31v*#K9lo~@_!lAQeCfI*4+a}GYxWR9>(FS)W)=lUDRw#fj@(TUZAtF+%aLDzW)
z-|5%v!zI?^)4Irx5An)30TxnBtp#&}RYAL-D_O5V2G%mA-VsPQy(=ivaWF!|ft}5;
Wj3X~YrB$a&s+j6hrZT7!oc{r~)?O?C

delta 467
zcmXYt!An~~5XNU-@{(>s$a^6v#`IJWgF<W$MQRTrNDsEw!|F+pkoaD7HBH60vC^iL
z;=!w7D0uYJKS0vEP<kvq^i(`}@=z!g^en^~^sv9(Z)WzJVFu6s&nAc0nbhRz@6+Uw
zmwpWZA;2m^F!=Xs%={XSM(Yj-V|?VE=Mx=L(XW3B95_Hg8wcZpNk9-2{m}snU=R)f
z`Tz|jGzv@-`gb4hbxJBQ09Y=^*>oxLnLRVpT(@Q~Y_yuYm7VT}IYMrjy-P(qrrQm7
ztCbDYE@PVh_#IlxZRL+;s2l^(LxnlaU}pF;XA!?rJ%5qd=8W#pMB$}t`1y@&VFlmP
zN$I&;V0|`J51Y>98>!-Mpj(1z!4$(jU__y9MCN^{LmG_reCu-ToeAuwzBfN9&Cz1f
z!|$|KBy7=DaoOcXz$Gn=KgBkE&c2`@<6iBrn8_vq%PFSTf>l9VAY0H?fsCqUKD{px
gGyQ>{JgU)oDV6tFCNSZsjLNFCimAscPB*15w+Ap~MF0Q*