From 5803f74701e3ffd1c549bfb671cde1a6d63b5ef2 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Tue, 2 Nov 2010 20:49:48 -0400 Subject: [PATCH] Button improvements Changed the size of the random icon, and made the top row icons slightly larger. --- images/d20.xcf | Bin 4939 -> 4927 bytes images/random.png | Bin 2103 -> 1176 bytes ocarina/button.py | 17 +++++++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/images/d20.xcf b/images/d20.xcf index d333a27ca868d5e9f27fb8003afad00d38d24f88..4bc18c53be64b19e00a3022403c8cdf65dd3de37 100644 GIT binary patch delta 165 zcmX@DwqH#wJu|mJp&~g=AuTf}l>rEJKzO543L|Sf0|TezF;3y3j! z2V*cJ(_|hdbyX7(9|+We7^D{{&*T9T00O8OQ^e*7rk8A!Jvn25nwD{@s~&^M!xVrt Qao$1|<9xOG6K5nR0KZ-sjsO4v delta 174 zcmdn5c3Mp-Ju|mJp&~g=q0GR*kO2tPfmjE`00KrJX4xo~!pJ(Afq_$Yay_F8CmTo% zh;L4I;|ykGn9RYXu4)0~g8)n~P@c&LA_Nm-irE~(^pcH*2`D_-k~0CQa~7w%>LpZF SAd@+tp^9;S+x(0(k`n;sdl+N@ diff --git a/images/random.png b/images/random.png index 37b8523dfd779e0bf478650cbb4a23fd421a1462..034ba118d07ab7b112e008b0acb797794786e393 100644 GIT binary patch delta 1141 zcmV-*1d98&5SR%eiBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPw43I729 z0RN!9r<0LDB7Z6s7@{N9000CSNklkq081yewn2!9X@ZMrTP zXhTFj@P6Mt{lUR-ncZ6N?b-9}d7jVv`8=N=Z-^ZSqJJYMh*&OJbIRqiO>av8SL<;x z)_wM0?UbiKD^8?sbjq}RCn4Xo2>GUkdEGmtZFEY6IPqVIjnV?@(>Po&q z${8mIj}&0BZ)Zb8XSFq_Tmr_Jh_xn5ONL{IJ7s+}?Yr`YDc;Q=chlz1BN0LGK?k8n zlOjFeNq>f8hg)m1v^~hZugJW z6n#TjDlA&Hne1K7j#PW8oS)p;By^@1ROJMwCY0H&h*Z!eBw)6`k5NB`j6`M(6cqr& z?I#I(9?tViqA@Ovj9mP(8_1g_midi+guGLaeSatDdB|}4NdV%s@c@MU9srgWzKO<= z$ZNUZ@zv#W;*>CPdLx%UTmv9fQI6dBl-vp$;DT^n6~mmz#Go zxPL!w0%qbm+Ia?BaSgWO8b&+M0N@X5Ioq>^?d!kit)j14x%eg%Lmhx6m9hPZchSkPXcvYn#ircg6sTo5Q0;ew-FyNFfx=ZG$1=XPG= zP-Q)L-3t&xkl)ygdt?w(=4wI#FMmQ&o+z8kQthR`CuP|qfvI~+%8NxYsH$Xqpbd?2 zL1gl`9_4mVa|Yo0Cp~USFQ{_NZ*PEUUjhILy6Gpi@lQZWEJEL~Y*X!SYfdTQfETqY zh;zfY0G#e9BN$er(&!oMZpPKx^eM0>Rz2S1YHiYY?JGQ{HkhQ8fRG3wkv0l=2gmb{T1?De}%N>RZ5_N{}KD6BPRR>5Z8SMNbYr}00000NkvXX Hu0mjfTFxId delta 2075 zcmV+$2;}#e3AYd-iBL{Q4GJ0x0000DNk~Le0000d0000i2nGNE0On+&_K_hL2{{0J z0JOo{k*twGB7Ykx@sL>H000NKNklIKPICz|{ID z7PanPPg%Sf=5*M!6(9y|go?P&q8?iWA_xWrMwG8dOx{hgXu8YRkf)cTo-MT&Rdpb( z_23+HuYb*}^o*)!v8LNBb`_iso>a-;(#4>bAD4M|YQ)+Z)vTLUje57LT2M_MwKkX>Q%M&PvI@kJCo@x8EUY}6TZpVySF=6~fKOB3e2tJ~TL*G+SmWY$1q7He+E zqUnsS{P7D=+Xg;{uo25jYpC8`f!c^4PFc&cos~opF0P_jN+R%^sF_{GqHRCoyIWVY zv3!a9jt7}`b!RO0$yNA)CG!w5egU6fJ|o-Oyi_1W5mZlEN7b%Mpbas3fjIJjDZ5fRR9e^JvFCQfY~P&~&kCWr@@gjc_w1`;H`BG znY_d;>+fZ+{x`-X-!aBL2fv=--1Z6p=@T<{xw*E>no{uCLR171MZMv8n@;Bpf_UNu zMY+(py4!jxF}VJPGs4c?rt&&v@xz0^?0>d$51mrgF^lcIBD`O_I2&^=+XPe*5eGZ1 z{vzRe$D_}CBk?AjOIr7DWYENljH}~oTsbfbD*W_2t9bd%l|HTwVn9{A%X72UMrh>p zNHZA~Wn>_!4pFF~YAvn%H&XEUBL4Q<4WUXT@089(5wFfz#Y;P?(5NkACrC|B-+!e5 zx7|M_v+MaK4T!+j!?Qbdg$rciV$){w$1ecmp0ytM8G|N#-!X;zo*2jCn(1q)YIvp7 zggM_(9k68zzuE{)9sqMbS&;VqKHrd1VOF3I6}De`_~y*GB3DZOdk2; z7tnfOQ^@LgLn|685V5R$W<4U1m*@6r3@qKX49(Hu0QJjvPvGk5eL=Zvn@gGb;2zXk zSBh-Jv&Hp}-Bc_kok)cG4kRgMQ4+J(hGteHn&tp_mM%BfF`#I6PI9>S9gjT6hX;QVS|(Bnf-2R!D_A~x9m^YD zN^GWZI_lf}^WC>IhT`^T$C1g75r6;6(R%t9PEU0kIdxNQ0GL_Ne_lFi11lR} z2!KD>yOzO|Dg)~s>l{h_6n|IKsXzK8A~s0?k+30GCA^kNT#Gf+9lQ0CY5|5dzg`GL zZvODGrfM^-a!TiHs+&!A*by`TIQc7XyYJ~_UWi?t6OXEv+sDo2V$+t4Hpc9$rd*xs zqT9Pw-4DJv@?ox>eJ8b0R!py++RIn&c`AUJRoKX!!iL0{TIP?d*+R!51K5j05 zKeRR5-iNi@f`G@M+q*StPjOnO1wmB;vtpp^fqm3Amm*@AQ`|`1(W#V=+ryToG7#ap zk~%NoHWdcxh5#QtvBnw~M>)*N_4CJaC{DT7zdt^6fLljD78uxhY+`V=(?SiJsH!;i zaO(^xn$4xd+jGiaGJhDwS>1YIQ((koHMkAb^7%Up`Q*LkOom-M`wn0F<|9E0(ypF% z-(KEqc?z|W*F+aru2oNJ^?;&TTsr)Q-;jb@E;emuV99*cwq@e2U4@9pymU$O$(40= zWPOcPfxQ?5JC2kh#&1wv3F}`toy#qC40vc}Qis)f zBbKNe)K&#iJ~!lEuAe{7EyKoU3c1rUi%1^(PM73#D(*WC$0zuE>Nn(r-#Sf<0bMy- zA1aJUUb_h=_kVam`xT51-SDS>eHVaRhTb3g`=oX9?T|5@&J=De$m?*X_~=9+(C=$wf^sYBTb*PWal7`dQo4e~-Lvm<;dA)_)M6706zD{Rg_KaITYhG~fUL002ovPDHLk FV1m*!1rh)N diff --git a/ocarina/button.py b/ocarina/button.py index a6a14173..ddebfcc8 100644 --- a/ocarina/button.py +++ b/ocarina/button.py @@ -1,16 +1,17 @@ # Bryan Schumaker (8/26/2010) import ocarina +import image LS = ocarina.libsaria gtk = ocarina.gtk prefs = LS.prefs class Button(gtk.Button): - def __init__(self, stock, func=None, show=True): + def __init__(self, stock, size=gtk.ICON_SIZE_MENU, func=None, show=True): gtk.Button.__init__(self) self.func = func - img = gtk.image_new_from_stock(stock, gtk.ICON_SIZE_MENU) + img = gtk.image_new_from_stock(stock, size) img.show() self.add(img) self.set_relief(gtk.RELIEF_NONE) @@ -78,15 +79,19 @@ class RewindButton(Button): class OpenButton(Button): def __init__(self): - Button.__init__(self, gtk.STOCK_OPEN) + Button.__init__(self, gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON) def clicked(self, button): from ocarina import fsselect fsselect.run_chooser2(LS.data.universal_open) -class RandomButton(gtk.CheckButton): +class RandomButton(gtk.ToggleButton): def __init__(self): - gtk.CheckButton.__init__(self, "Random") + gtk.ToggleButton.__init__(self) + img = gtk.image_new_from_file("images/random.png") + img.show() + self.add(img) self.set_active(prefs["random"]) + self.set_relief(gtk.RELIEF_NONE) self.connect("toggled", self.toggle) self.show() @@ -128,7 +133,7 @@ class VolumeButton(gtk.VolumeButton): def resize(self): image = self.get_children()[0] icon = image.get_icon_name()[0] - image.set_from_icon_name(icon, gtk.ICON_SIZE_MENU) + image.set_from_icon_name(icon, gtk.ICON_SIZE_BUTTON) def changed(self, widget, value): LS.music.set_volume(value)