From a2ff6433bad9c37420997fe9d681a7ff8a3b00c9 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 2 Dec 2009 10:59:54 +0000 Subject: [PATCH] Build Dynamic Icons for SlideController --- openlp/core/lib/__init__.py | 18 +++++++++++++++++- openlp/core/lib/mediamanageritem.py | 2 +- openlp/core/ui/slidecontroller.py | 9 ++++----- resources/images/openlp-2.qrc | 15 +-------------- resources/images/page_1.png | Bin 409 -> 0 bytes resources/images/page_10.png | Bin 357 -> 0 bytes resources/images/page_11.png | Bin 357 -> 0 bytes resources/images/page_12.png | Bin 357 -> 0 bytes resources/images/page_2.png | Bin 396 -> 0 bytes resources/images/page_3.png | Bin 388 -> 0 bytes resources/images/page_4.png | Bin 390 -> 0 bytes resources/images/page_5.png | Bin 400 -> 0 bytes resources/images/page_6.png | Bin 357 -> 0 bytes resources/images/page_7.png | Bin 357 -> 0 bytes resources/images/page_8.png | Bin 357 -> 0 bytes resources/images/page_9.png | Bin 357 -> 0 bytes resources/images/page_bridge.png | Bin 406 -> 0 bytes resources/images/page_chorus.png | Bin 402 -> 0 bytes 18 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 resources/images/page_1.png delete mode 100644 resources/images/page_10.png delete mode 100644 resources/images/page_11.png delete mode 100644 resources/images/page_12.png delete mode 100644 resources/images/page_2.png delete mode 100644 resources/images/page_3.png delete mode 100644 resources/images/page_4.png delete mode 100644 resources/images/page_5.png delete mode 100644 resources/images/page_6.png delete mode 100644 resources/images/page_7.png delete mode 100644 resources/images/page_8.png delete mode 100644 resources/images/page_9.png delete mode 100644 resources/images/page_bridge.png delete mode 100644 resources/images/page_chorus.png diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 0a183e4b3..d6e4b6911 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -105,9 +105,25 @@ def build_icon(icon): ButtonIcon.addPixmap( QtGui.QPixmap(icon), QtGui.QIcon.Normal, QtGui.QIcon.Off) else: - if len(icon) < 5: + if len(icon) > 2: ButtonIcon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)), QtGui.QIcon.Normal, QtGui.QIcon.Off) + else: + #lets build a Icon from text + pmap = QtGui.QPixmap(u':/pages/slide.png') + painter = QtGui.QPainter(pmap) + painter.setPen(QtGui.QColor(QtGui.QColor.black)) + font = QtGui.QFont() + font.setFamily(u'Arial') + font.setBold(True) + font.setPointSize(12) + painter.setFont(font) + metrics = QtGui.QFontMetrics(font) + painter.drawText(5, 3 + metrics.ascent(), icon) + painter.end() + ButtonIcon.addPixmap( + pmap, QtGui.QIcon.Normal, QtGui.QIcon.Off) + elif type(icon) is QtGui.QImage: ButtonIcon = QtGui.QIcon() ButtonIcon.addPixmap( diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index d9b078e9e..b85eb30e7 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -269,7 +269,7 @@ class MediaManagerItem(QtGui.QWidget): if self.hasEditIcon: self.ListView.addAction( contextMenuAction( - self.ListView, u':%s_new.png' % self.IconPath, + self.ListView, u':/%s_new.png' % self.IconPath, u'%s %s' % (self.trUtf8('&Edit'), self.PluginNameVisible), self.onEditClick)) self.ListView.addAction(contextMenuSeparator(self.ListView)) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index ac6a759a8..04c923901 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -173,7 +173,7 @@ class SlideController(QtGui.QWidget): self.trUtf8('Move to live'), self.onGoLive) self.Toolbar.addToolbarSeparator(u'Close Separator') self.Toolbar.addToolbarButton( - u'Edit Song', u':songs/song_edit.png', + u'Edit Song', u':/songs/song_edit.png', self.trUtf8('Edit and re-preview Song'), self.onEditSong) if isLive: self.Toolbar.addToolbarSeparator(u'Loop Separator') @@ -210,16 +210,16 @@ class SlideController(QtGui.QWidget): if isLive: self.Songbar = OpenLPToolbar(self) self.Songbar.addToolbarButton( - u'Bridge:1', u':/pages/page_bridge.png', + u'Bridge:1', u'B', self.trUtf8('Bridge'), self.onSongBarHandler) self.Songbar.addToolbarButton( - u'Chorus:1', u':/pages/page_chorus.png', + u'Chorus:1', u'C', self.trUtf8('Chorus'), self.onSongBarHandler) for verse in range(1, 12): self.Songbar.addToolbarButton( - unicode(u'Verse:%s'% verse), u':/pages/page_%s.png' % verse, + unicode(u'Verse:%s'% verse), u'%s' % verse, unicode(self.trUtf8('Verse %s'))% verse, self.onSongBarHandler) self.ControllerLayout.addWidget(self.Songbar) @@ -488,7 +488,6 @@ class SlideController(QtGui.QWidget): if self.isLive: self.serviceItem.request_audit() log.debug(u'displayServiceManagerItems End') - print self.slideList #Screen event methods def onSlideSelectedFirst(self): diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index c9d81cf89..244a70d29 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -126,19 +126,6 @@ theme_import.png - page_chorus.png - page_bridge.png - page_1.png - page_2.png - page_3.png - page_4.png - page_5.png - page_6.png - page_7.png - page_8.png - page_9.png - page_10.png - page_11.png - page_12.png + slide.png diff --git a/resources/images/page_1.png b/resources/images/page_1.png deleted file mode 100644 index 091ab47f0cbe0dd6547842ea615d7063b91a0d86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 409 zcmV;K0cQS*P)jl|gQUFc3xmjER&WBu>&*7P)nlsE3H6id9bnLP>>f z+(ihCjb%!z_OFbG|2&>C1{id?eBif|43dHCwQ|Oom!Mge;c(cGyi5k~_b=@CZ*XoM zlnAJ*Pk$l#ptS}O!CH&5EEj=wT@TqRXsuJ=4$KUqex4Elxs|4AK*KyUL+dUDHegm@ z7GRp%(6%iApePD3^El6}ptawdSt*oK==KiGT02cThuxT& z%yJqpf{igCqKApRlb8e(5yE5YfxE7oOwPet3nk*4%_a(#-YEFlfTu~;QOY?t11FpJ zY#K$%AQg*`4Ikt!%N)<}CknkDSSf#dYZQ9_3!JWP8ti+68o!=#=>0QrmI}_kKKUG6 z+6&;|xUIPHL$3$U^DU0Y(@TGlJm1EH=kxnI+5+Pn3&43lk)U3&00000NkvXXu0mjf Dzy`Af diff --git a/resources/images/page_10.png b/resources/images/page_10.png deleted file mode 100644 index a4b2f7491a6f9df0cfb8fd9c178eea67df938afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85md&fiUBq^AjY1g6t)pzOL*y**JLA#CjRON&;}dR!5?U!&f@c)}4A-*fAE z4K_>3C~`h|)1-P(=h_1nO@~j17}HkTbqO#%yUE`Ep+F>lL-{fOhf{<+oF)}(cNF=C z7xa9TYulc;cYoV;uJFUVTiq`4PH$WtGy9rW^;W;|vjsPQhZ~q5SaUW)I&IB=R{Q+B yVfG&P-xpZyF}tf!yZ`sk4;3}HYi2$>rf$R#%egY(^KGDq89ZJ6T-G@yGywn!|B%f9 diff --git a/resources/images/page_11.png b/resources/images/page_11.png deleted file mode 100644 index a4b2f7491a6f9df0cfb8fd9c178eea67df938afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85md&fiUBq^AjY1g6t)pzOL*y**JLA#CjRON&;}dR!5?U!&f@c)}4A-*fAE z4K_>3C~`h|)1-P(=h_1nO@~j17}HkTbqO#%yUE`Ep+F>lL-{fOhf{<+oF)}(cNF=C z7xa9TYulc;cYoV;uJFUVTiq`4PH$WtGy9rW^;W;|vjsPQhZ~q5SaUW)I&IB=R{Q+B yVfG&P-xpZyF}tf!yZ`sk4;3}HYi2$>rf$R#%egY(^KGDq89ZJ6T-G@yGywn!|B%f9 diff --git a/resources/images/page_12.png b/resources/images/page_12.png deleted file mode 100644 index a4b2f7491a6f9df0cfb8fd9c178eea67df938afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85md&fiUBq^AjY1g6t)pzOL*y**JLA#CjRON&;}dR!5?U!&f@c)}4A-*fAE z4K_>3C~`h|)1-P(=h_1nO@~j17}HkTbqO#%yUE`Ep+F>lL-{fOhf{<+oF)}(cNF=C z7xa9TYulc;cYoV;uJFUVTiq`4PH$WtGy9rW^;W;|vjsPQhZ~q5SaUW)I&IB=R{Q+B yVfG&P-xpZyF}tf!yZ`sk4;3}HYi2$>rf$R#%egY(^KGDq89ZJ6T-G@yGywn!|B%f9 diff --git a/resources/images/page_2.png b/resources/images/page_2.png deleted file mode 100644 index c4661947f3994cc4e832d88badb0f853385f9c06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmV;70dxL|P)jmCJ5}Fc3xW%or*5hA-)gMgBT!)Q^awidDY^vT%iY zbP-;50EblVtPG=jn8yWxJ}#F}{5IwcnkTN;ysPW_C8$yg$743~)I4eJH?r&vUAGTP z1myXb|DgGWa}Gp=rfHC-X%tu#MPIGJIkyF_z|0_OqtLP}L3Hn&nc-Zu1+Kv?VD7=> zt-uSu-KH}Oobz|{FbWYt+xFmo*w$KTtzoSN0BB<%BBM?uItmA+6qNFALu);@JXJZJ zqu`j;*1$ycp!L92bzeZ!G+wJiBuTOeo@*Du!vaE4topfj5j-qyu+f$)D9DWqUjj2f zw*TyF7;3$KMB*b@i%|Pt;Psit!M@f5KjVhA2(^C(R$EB`>y``L5&;Kx+wsK@wI0}* q15T&+m;NBe9F~*k^T$3~gz*DcH*+)BCo!G?0000jl}m1eFc60S85<>H!%4bgky}TNdWa~hSoI`ylY%j1 zQ63&+$u&jq3gP*pjvC3PUXzguJeBXLRr3G81_Ml zfU5eC2e}(#42THUS`~!QpTiqg*0Rf>Wa=(_hv^ zw9*Q2+kQ8|S}RhWEX%SW*wqHXQv-ZaDtcEN1W!#Pf6M}7=fC4OT!5L^=>u4gUEm;J zEAmk)U4oeT+W!K_KjAc3Y6bWw(-1RX`)6Ri<=nd6c7nZe+i~OjS^>`UBhKg7r~V*$ iehfP=m$!Yi1mgh+RBSS*!=_aL0000jl}m1eKn#X|d!|anhLd!~BDanj^$<~1vFb@+lY)74 z!9(L=U;>qD3CV-?fB2;V80~)l!e7m0kQ;bB^1f-BLr`liE|+ZPSvUB6{vgZV(f9kH zL_nT@>kqjH5djgQZCj*i8U+?bF=lHZB3s}Z%nYI~3N6bLL__7w43T;Z+<@7Dc?1(- ztuM^%_y!_+Hj7pmW6*W+jEynMkF-Kyt%bGf^=wsD;dDAJG7f>+J;YXR=%vj5^bpZP zt5U1$VE}F0s!{;}M0j)h?Plz1gWzcZzGyA`kTwXOhBmFylxfH(Z(ICbl}&DgFc5{`%s5iQCMW4Ci`+VD)I&s3#i}PE3#c&0 zSr8-JF}9%UNEU|Y_xWcA0A6vsedDj;GsqY2_u3A_unDS^!ufofdCC{N?iZ)i2drHO zB?9XDC!EN?(OQFuV2r`>cq{^&rg^Papta6{doVMI#v=6bcz|fyIWt4+KF~P?4`3EB zdyk2djhVeB(0a&$HADm=5)A6v7O)mw+s=JA&b7i(XegziRPY#w!(ra?ydtk(1eZ!} z2~0$9-T>V9Qv!@J5RvKX>AT%73HH57uuFh5#b@opTKfi$lNW%;aVj%cMoW>>oi_<) zPOlKDiK5pt_6A^)aC<4h(nPVBbK;sPfb(aY2Z!DO9A|n>#NK}ctDKmuhHc=e+*W+? uv*lJ*dt5G`oBkkGwNH!J>(@G3f$;?ReRwgT@Ldi70000;}dR!5?U!&f@c)}4A-*fAE z4K_>3C~`h|)1-P(=h_1nO@~j17}HkTbqO#%yUE`Ep+F>lL-{fOhf{<+oF)}(cNF=C z7xa9TYulc;cYoV;uJFUVTiq`4PH$WtGy9rW^;W;|vjsPQhZ~q5SaUW)I&IB=R{Q+B yVfG&P-xpZyF}tf!yZ`sk4;3}HYi2$>rf$R#%egY(^KGDq89ZJ6T-G@yGywn!|B%f9 diff --git a/resources/images/page_7.png b/resources/images/page_7.png deleted file mode 100644 index a4b2f7491a6f9df0cfb8fd9c178eea67df938afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85md&fiUBq^AjY1g6t)pzOL*y**JLA#CjRON&;}dR!5?U!&f@c)}4A-*fAE z4K_>3C~`h|)1-P(=h_1nO@~j17}HkTbqO#%yUE`Ep+F>lL-{fOhf{<+oF)}(cNF=C z7xa9TYulc;cYoV;uJFUVTiq`4PH$WtGy9rW^;W;|vjsPQhZ~q5SaUW)I&IB=R{Q+B yVfG&P-xpZyF}tf!yZ`sk4;3}HYi2$>rf$R#%egY(^KGDq89ZJ6T-G@yGywn!|B%f9 diff --git a/resources/images/page_8.png b/resources/images/page_8.png deleted file mode 100644 index a4b2f7491a6f9df0cfb8fd9c178eea67df938afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85md&fiUBq^AjY1g6t)pzOL*y**JLA#CjRON&;}dR!5?U!&f@c)}4A-*fAE z4K_>3C~`h|)1-P(=h_1nO@~j17}HkTbqO#%yUE`Ep+F>lL-{fOhf{<+oF)}(cNF=C z7xa9TYulc;cYoV;uJFUVTiq`4PH$WtGy9rW^;W;|vjsPQhZ~q5SaUW)I&IB=R{Q+B yVfG&P-xpZyF}tf!yZ`sk4;3}HYi2$>rf$R#%egY(^KGDq89ZJ6T-G@yGywn!|B%f9 diff --git a/resources/images/page_9.png b/resources/images/page_9.png deleted file mode 100644 index a4b2f7491a6f9df0cfb8fd9c178eea67df938afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85md&fiUBq^AjY1g6t)pzOL*y**JLA#CjRON&;}dR!5?U!&f@c)}4A-*fAE z4K_>3C~`h|)1-P(=h_1nO@~j17}HkTbqO#%yUE`Ep+F>lL-{fOhf{<+oF)}(cNF=C z7xa9TYulc;cYoV;uJFUVTiq`4PH$WtGy9rW^;W;|vjsPQhZ~q5SaUW)I&IB=R{Q+B yVfG&P-xpZyF}tf!yZ`sk4;3}HYi2$>rf$R#%egY(^KGDq89ZJ6T-G@yGywn!|B%f9 diff --git a/resources/images/page_bridge.png b/resources/images/page_bridge.png deleted file mode 100644 index 7d81a4a711b9d1d735167921f7086fa5ca604bdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P)bmCtI!Fbu{&Nj{WZ))(0+hrV@L*+Y~va@vbDCD0Mu z@eY|Y+j0Jm2@FX-^ph;f4)9~w>j(a7A%jBUcB`B*W*1Z`h101Vcq$a1&o7kaE1cT~ zB?7AIGY%BKXstm+u-4+`c$|gR_j{17Kx-Z89D`dhGl=>fJ?a{8Zdi}H?!N&bqG2&J zv~K4zHeePocYRc5G)?oH1@pwSKO{$Yd!(O=Mh(EZAB*$||)`TLc?p zhMH{w6A{uejlgZ&Mou}fD3#T`Zx-wu5Q2%QAJo8H*C7o#+dSViKW^l+N={51CicyO znUg8-z$D|`(M)}#9f?ddD>x+CKpEe4;Du~gfOFMbXQ^)lo}1exOMU+htmedAlXilG zk=c0Lr{flZi{gOu`EA!9q$mz~@p5_JMq6Nf13+to!pMG#@&Et;07*qoM6N<$f~cgd A#Q*>R diff --git a/resources/images/page_chorus.png b/resources/images/page_chorus.png deleted file mode 100644 index 80c3a6d53633b9d437eed59c5e46e115180714f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmV;D0d4+?P)jl}&EKFc5{`%w&PG$w|6m!L3nI4}nm{suv*$kt%jF zEU3ZbBu+!6J}Ju2)B8M{u^iw>`~4^Ws+d8saX1{+d;b!&C<<&g>j$rh&8GRrdi@5~ zWl$pEc>J;p#V^h|5D~hrLseDx#Dwb8DXLcBoHIUKa0_Mz5m~4zpo(){<6PH(Dv0QD zF*BTNa}|3q3z&NYy<9H$D)?E4eHJ)pXESJph@kK9;O2S-ng${=Xhr-@WY~&PaMyK% zs#3+?EZBSh=-Co55h2~C2Hdu-35EMuE7C