From 65210bc029062944569e616c662b1683021565e9 Mon Sep 17 00:00:00 2001 From: bjschuma Date: Mon, 29 Jun 2009 04:13:15 +0000 Subject: [PATCH] Track/Album/Artist displayed git-svn-id: file:///home/anna/Desktop/ocarina-legacy/mithos/ocarina@37 1daee41c-8060-4895-b1f0-2197c00d777a --- trunk/images/next.png | Bin 1148 -> 1845 bytes trunk/images/pause.png | Bin 667 -> 894 bytes trunk/images/play.png | Bin 956 -> 1546 bytes trunk/images/stop.png | Bin 505 -> 740 bytes trunk/src/GuiObjects/__init__.py | 2 +- trunk/src/GuiObjects/infoView.py | 44 ++++++++++++++++++++++++++++++ trunk/src/GuiObjects/plistView.py | 24 +++++++++++++--- trunk/src/song.py | 3 +- trunk/src/window.py | 4 ++- 9 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 trunk/src/GuiObjects/infoView.py diff --git a/trunk/images/next.png b/trunk/images/next.png index 58be8152ae1464d9df6f6f51aed6072fcb4edbf7..e13146f0348f0728598ed8b0c670d230ce4eec9b 100644 GIT binary patch literal 1845 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 DRl*yX diff --git a/trunk/images/play.png b/trunk/images/play.png index 73e4889b6ca9e0925a6f176344c6b6246151ab7d..787c6f6dc0e6b851b28fcca8b38630041e956fce 100644 GIT binary patch delta 1541 zcmV+g2KxED2Z{`k7k?NK1^@s6u;<~s00006VoOIv|NsC0|NjYC_uK#g010qNS#tmY z07w7;07w8v$!k6U000Sga6xAP000;O000;Ocub|H000GNNkl>rc~e6vv;o z>$RW5Fd7Ypf&!f`8jVJy(Nqe)7le&qe;hzjQEhEq-M)SI z@7rv4yVcs!L4VVgl{8&ZkxC_#95*w=vMkH83INYTFG+t4z>XcecGcAM_TIWRJUlW& z5EMmGBuUdO8;h}QSC_+4R#sYyAoKHcbK!6}oXuvlxqc`>zZGET&YGIu-p+FGO0V4$eZ&VquXB7dVX5($Ur<`x!M7OtZpDU$mQ z0PXEgvkM6DPg~Pz*ufmC1-=It_pzq|<@`fZcAh+3g5&`0$}aM~>h)MH!70RaFHg z*WK-KI2_xy@%*PxtE+2k@883YqNrA@)oQiEXMdCB9|oXlnx<)!$!fJ)EtbAM1%T%T zf#(6hFcd{m08kW)1V!OJg21X~GMP*|4S=$#tE;Q3wr|I<)>ejTX(5PsJdsEwyk4!A zBnhIe&1^0%wpeCoAxJ!Kx7+P@yDUSWPQ&B-I{>_1uh;7>C{U{j0>@9DQ~;C;qbQ1E zSbr|@uRVf5lx$X#L=k{gisO>W-1CNp`ufI39QXOWUZ2lsoSmJUo0(x4k|ar;uC7k6 zCrOH$nlhP8CX-2$LZMJ76w37;%?IFexm+%nBte1XOp!{?!%8b&5MYPWX$UHcq9}?0 zNRlK;5&%3e2&q&q&StY(Z8iW}TU%QX9)Hwm;JWqo27|$%(^;)BkIhn2ECYb!IIdO$pw((LIvoI!NHiLW05CWh2n-H# z9Luh+udO|KQd(M4Qc`mEY(+&yMRoO?H*k$Fcik2N%FD~k%gZI{*|X=*pFYi10Dr^a z@tNBL8>OUxAP9n>C`=s30T2Y97X$#VU%zqV+BJ@Q`SR7Psi{cBWHK5}rh$R3uFlS$ zp2v^jIi*VotA z-=EVmO#J7Ey}SV522-oGS^&n!Cnm$IV0ifE&5@DGNf;fE z!-Ri)WcVcjvJAk(hmRfwgQ7SxGCDds%JX`?UQd!2E?l{C=~5tY`?lF^Hk-|{7)+Ss zes#h>3_uVBq0zj4Juz|b-hRYHCdhHrNJO5L3!r00000NkvXXu0mjf8erQL delta 947 zcmV;k15Esi47>-B7k?561^@s6LF^u$00001b5ch_0Itp)=>Px#24YJ`L;(K){{a7> zy{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXQ40XQ_{Kfl}n00TTpL_t(I z%dOPQZyQw<2Jr9Px#O`te#BHH_JpR%ICc}tQ?!zkRIE}NH-CVT@=!|KC5sXk6)J2h z7D!0EB2fv!hC&KWkoY4KUP1^_*pW(sR;dFq>4VsK?3p{B8MCmlMD2#sa-<_&%`ASJ z@18jl+AE#S9eOSr>FO#J3RM6CfQvgUsl&5f`wu+!Swf4?r1z!=s}=K7u~>8gSOC2L z1$f}0eJ4IVyMLgB!)m%%Djx0IvzxB0=ku=Xq6yt4@Zi1^volAyt|wXUiJY%oDesR) z!n0kwqMP~kjbbx0aaX|9B<{FNy^srMGQOTQR~L4P|9LL1=s`|lYV-uwLD000mO zHOGdq1+;`lPe1jH9FB&E%9Zl5zP|gcKW=RQ$~k9&KtKo~>N^7IbUGG~_smUAPIF6G zkQf7#7#L$90%|oIuIplW=zeJ;cUUPKMkb&tlim0BT;`mYHBGB)nr0UYh0Z`Glj-s) z@(WXw(|=sp0*pyujJ2AG;Cc?KW(7oqvC)I_NMSnq!YfBEh(>>#dmh%|J4l z^sZiSd>#V>F$P8iA_Ax>*XxjF9|Ha$HVd0LJ%4}NEdIIu_3qx@R|W@%F9I-b2@DJj zc;9~aO&tIv&Kq~ojERUq#30KugeCCa`|p}R{CHtA7LA=cI(z&p##m{5eEc8N)CQzd zsn$ARM9u6aNRkAZ%K(7om1X;r^BgTYcNm9jgHX&cbr-`@f}&jS%b zmVYJqWFOXkUi0SX-x87}oj>;M@i(&B>=qGKcly!V07X$+XT})RU~mln;H&sVM`dU{Ts{a|4kK$(bYx4Z0a0o3uu zmn+V~xpP)1q`v<4oAV!acXyYF$o#MCx-280DE^<8K3!U!ojLMaE|>fLcH`(&e*pwd VGfylL<^uo#002ovPDHLkV1i@1u_pik diff --git a/trunk/images/stop.png b/trunk/images/stop.png index f48c81fe8d9494941230dd54abe55195a9a832f9..1b2515e4d1e1b51150346072bd5f311ec9e8268b 100644 GIT binary patch delta 729 zcmV;~0w(?W1LOse7k?NK1^@s6u;<~s00006VoOIv|NsC0|NjYC_uK#g010qNS#tmY z07w7;07w8v$!k6U000Sga6xAP000;O000;Ocub|H0006(Nklqlt!J?ZW^Ix33e<93~8S(ar= zRaI40m4O73BuSE_OR*)2P-{&gilQir*3Vl7?i(1Q-&-0Y} z_?S$l)3!wjA%s!@0EC42Qv{`y+WatX^7Sp)w-b1Kn}1ARUo~Nb0A{oKd^Q7EEQDAr zG)*bB)r8yiGL5cZ%CC24i697qATZcMWm%SG*#^{o4}dYo7y}T}T1o*Z)yhyx2x9=0 zQc5WRW0W$cE$0B7Gd37(FPJd}^rh+s)Gfq0W1IsBK?otb#$PMF{MHre`d6V_Xtx62 z9AxcLOMeA8=X@{#5JCtc)(J|vN?gh=aVfQb6~-^|Y6~r)2U}ZtDV0K~TiKSlUSZrN zjpEH z=Q#iX03v!+SaefwW^{L9a%BJjc-kv3FW1Y=%Pvk%EJ)SMFG>dhHrNJO5L3!r00000 LNkvXXu0mjfNa{)m delta 492 zcmVPx#24YJ`L;(K){{a7> zy{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXQ40XZ4J`_kwD00DVPL_t(I z%e_?1O2a@9{$_SJjkQf_L;o;{1z*IQAl^iZuP5RwsQ5A(i+_l>iU_uu@sK8sQtevM zxn#3hzQ36)@W(|Pe*3P}7o-oMwE@8^fJt@3t~wQl;nvad;T5wPc}o|a++5!tOs7+< zB^VBe%4~Kn&M)Dd^CCDMpX{_+E%74gbUJ0050g7&B6*&)I^o@94*)P23^YyC^#r|M zPf7?P5c%~xj(=nMy2q;ycDr5OWF)K3e{>K{qmkq-Brr1!GYnf;V_}VhwHD4gI2#~vwNJvl z9K>;~#gGIpKxPb3sD@UYmu3nUK zwJJ~nlyh*FWy(pC_&I1a8l{q`8F`Osy 10: selrow = i - 10 row = i break - #self.tree.scroll_to_cell(selrow,None,True,0,0) - self.tree.set_cursor(self.data.curSong,None,False) + print selrow,row + self.tree.scroll_to_cell(selrow,None,True,0,0) + treesel = self.tree.get_selection() + treesel.select_path(row) + #model = self.tree.get_model() + #selrow = 0 + #row = 0 + #for i in range(len(model)): + #if i > 10: + # selrow = self.trackList[i - 10][0] + # if model[i][0] == self.data.curSong: + # row = i + # break + #print model[i][0],self.data.curSong,row + #print self.tree[row][0],self.data.curSong + #self.tree.scroll_to_cell(row,None,False,0,0) + #model.set_cursor(row,None,False) diff --git a/trunk/src/song.py b/trunk/src/song.py index 4fa71116..32c717fa 100644 --- a/trunk/src/song.py +++ b/trunk/src/song.py @@ -12,10 +12,11 @@ class Song(): self.quit=exitFunc # initialize player pipeline self.next = None + self.info = None self.player = gst.Pipeline("player") self.bin = gst.element_factory_make("playbin",None) self.player.add(self.bin) - + # initialize bus bus = self.player.get_bus() bus.add_signal_watch() diff --git a/trunk/src/window.py b/trunk/src/window.py index 6345ad3a..1a3d389c 100644 --- a/trunk/src/window.py +++ b/trunk/src/window.py @@ -10,6 +10,7 @@ from GuiObjects.menuItem import MenuItem from GuiObjects.libView import LibView from GuiObjects.plistView import PlistView from GuiObjects.controlPanel import ControlPanel +from GuiObjects.infoView import InfoView class Window(gtk.Window): @@ -183,8 +184,9 @@ class Window(gtk.Window): rightPane=gtk.VBox(False,0) + infoview = InfoView(self.data) + rightPane.pack_start(infoview,False,False,0) self.plistview = PlistView(self.data) - self.plistview.show() rightPane.add(self.plistview) self.makeBottomRow(rightPane) rightPane.show()