From e35d6b9371a05b2727f620f16a291da0c07de2f5 Mon Sep 17 00:00:00 2001 From: Sebastian Wehling-Benatelli Date: Thu, 2 Apr 2015 18:36:21 +0200 Subject: [PATCH] bugfix: modified icon management and corrected usage of references --- QtPyLoT.py | 33 +++++++++++++++++++++++---------- resources.qrc => icons.qrc | 1 + icons/filter.png | Bin 0 -> 4700 bytes icons_rc.py | 21 +++++++++++++++++++++ pylot/core/util/widgets.py | 6 +++++- qrc_resources.py | 21 --------------------- 6 files changed, 50 insertions(+), 32 deletions(-) rename resources.qrc => icons.qrc (88%) create mode 100644 icons/filter.png create mode 100644 icons_rc.py delete mode 100644 qrc_resources.py diff --git a/QtPyLoT.py b/QtPyLoT.py index 909cf8fc..24d55da8 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -29,7 +29,7 @@ from PySide.QtCore import QCoreApplication, QSettings, Signal, QFile, \ QFileInfo, Qt from PySide.QtGui import QMainWindow, QInputDialog, QIcon, QFileDialog, \ QWidget, QHBoxLayout, QStyle, QKeySequence, QLabel, QFrame, QAction, \ - QDialog, QErrorMessage, QApplication + QDialog, QErrorMessage, QApplication, QPixmap from obspy.core import UTCDateTime from pylot.core.read import Data, FilterOptions @@ -38,12 +38,11 @@ from pylot.core.util import _getVersionString, FILTERDEFAULTS, fnConstructor, \ NewEventDlg, createEvent, MPLWidget, PropertiesDlg, HelpForm, \ DatastructureError, createAction, getLogin, createCreationInfo, PickDlg from pylot.core.util.structure import DATASTRUCTURE -import qrc_resources +import icons_rc # Version information __version__ = _getVersionString() - class MainWindow(QMainWindow): closing = Signal() @@ -101,8 +100,11 @@ class MainWindow(QMainWindow): except: self.startTime = UTCDateTime() + pylot_icon = QIcon() + pylot_icon.addPixmap(QPixmap(':/icons/pylot.ico')) + self.setWindowTitle("PyLoT - do seismic processing the python way") - self.setWindowIcon(QIcon(":/icon.ico")) + self.setWindowIcon(pylot_icon) xlab = self.startTime.strftime('seconds since %Y/%m/%d %H:%M:%S (%Z)') @@ -123,7 +125,15 @@ class MainWindow(QMainWindow): saveIcon = self.style().standardIcon(QStyle.SP_DriveHDIcon) helpIcon = self.style().standardIcon(QStyle.SP_DialogHelpButton) newIcon = self.style().standardIcon(QStyle.SP_FileIcon) - pickIcon = QIcon(':/pick.png') + + # create resource icons + p_icon = QIcon() + p_icon.addPixmap(QPixmap(':/icons/picon.png')) + s_icon = QIcon() + s_icon.addPixmap(QPixmap(':/icons/sicon.png')) + print_icon = QIcon() + print_icon.addPixmap(QPixmap(':/icons/printer.png')) + newEventAction = self.createAction(self, "&New event ...", self.createNewEvent, QKeySequence.New, newIcon, @@ -163,14 +173,14 @@ class MainWindow(QMainWindow): "Alt+F", QIcon(None), """Adjust filter parameters.""") self.selectPAction = self.createAction(self, "&P", self.alterPhase, "Alt+P", - QIcon(":/picon.png"), + p_icon, "Toggle P phase.", True) self.selectSAction = self.createAction(self, "&S", self.alterPhase, "Alt+S", - QIcon(":/sicon.png"), + s_icon, "Toggle S phase", True) printAction = self.createAction(self, "&Print event ...", self.printEvent, QKeySequence.Print, - QIcon(":/printer.png"), + print_icon, "Print waveform overview.") helpAction = self.createAction(self, "&Help ...", self.helpHelp, QKeySequence.HelpContents, helpIcon, @@ -517,13 +527,16 @@ class MainWindow(QMainWindow): def main(): # create the Qt application - pylot_app = QApplication(sys.argv[0]) + pylot_app = QApplication(sys.argv) + + app_icon = QIcon() + app_icon.addPixmap(QPixmap(':/icons/pick.png')) # set Application Information pylot_app.setOrganizationName("Ruhr-University Bochum / MAGS2") pylot_app.setOrganizationDomain("rub.de") pylot_app.setApplicationName("PyLoT") - pylot_app.setWindowIcon(QIcon(":/icon.ico")) + pylot_app.setWindowIcon(app_icon) # create the main window pylot_form = MainWindow() diff --git a/resources.qrc b/icons.qrc similarity index 88% rename from resources.qrc rename to icons.qrc index c15c7560..7ec95b9c 100644 --- a/resources.qrc +++ b/icons.qrc @@ -5,6 +5,7 @@ icons/picon.png icons/sicon.png icons/pick.png + icons/filter.png help/index.html diff --git a/icons/filter.png b/icons/filter.png new file mode 100644 index 0000000000000000000000000000000000000000..1098d3ac27a2c86136b60e2fb5e1b5e49bac6dfe GIT binary patch literal 4700 zcmV-i5~J;jP)M&dkV5~%`nA9 zp6m5>1-k<=FG23{%*8BM{QWQH!(07m5a6@VJ|h#q{d5G1SpH9JSZ7ER5|D9g{jAr-aJ;Y~&=JVXcG9PQ!j&04#Veav3 z;WL^%v&H?ijqp1B*dyWl=rzyd*F0W#={47NAVGs;FThVG7k>GJ^}~k`?|Tl-c98U; zhaM)xu(B|~6X~I0V!+^<=?u+{REpIBA!yw+hzXNw7zV2&vS7k8%(ltfaI#H$O=G{; z84|HN+{bfKXDR%RPM?Fn3!kkU{5pRJ&bA8!>v}#NOplj6tc&)bj`xIZE>NQ9O82_h z#_qv3&u7ncr03!NuDIWC@=p2rLBBkH4JI70!>!d=yIrBVUD}+0M`d9S9*;}}3_tho zQ(AgBYr@RFc;qno?&uIuzQL$X*QH#dYE5sTda{N3!+Y!7<|8Wz#44E!(TE`#IH6d3{p@c!bz=p{|zF5M#qm)Tu>&w>`P^O zPmAlEYU}RtcY2=BIT+-6lly~y;rMCvKF%sAr={1?+5)aXjP|BbSN7Jy22%||-?(f- zcS;9cDvARr4$!X03e6Lgt1c8lI(ZK90Zo0k2JMjJCCoubpi+*SVWOR1YbWuDn18h0Wp$s{J=U%` zz(I8vN6!Irh>@tB`c4gvZQ|FefSnq3o}kw40Y{+Pw`&kjXD(u_yN&@GEH&DxA3-xT z?oWUm?(q%e60Gh+-GjOZbswLJiPwc0=t*WDdj4EJ^d=g-t~Z#0UY+-i)R}GdUcq|v zEi?m#cM#fJn1S9FFJI_o^kkDzDtiv&03N4!uU2D}Z&w-Ds8wh`e7ls3i~}sbIDrm` z1?rnt&{N>PfQ4J{JwG2A2N)O_KqvL2MVy6d(H}?Za;jD8hD8q`Bkpa2LAut`ts8j% zBzLa3t~c{2ZV4=rZM}(vNS?d8Kuq)CO{14@s~fmQaEQB+gX=`-Ev*AaK{*HpG5x^> zPKyMWa?3fJn3L^>^V>pzk&#jIwE52~(24Q?cq3$`mIn4~aC3!*^H@$oUp;jP2X$uN zXxjFPO`I+vj2^VIF3$bvz~jvaf^ zG|el;%`&kpi(!<-aLParAf-Gbm`D~J5_NeZSyYcrs1Zz*A#$2@id^_y6Wz*?Q};5q znI^GJi?u@;-Om=bSr)BhZdoZvCP}4IbRugto7gpn)NC8dHBxi1j5$ykmf@P?u!Ipg z$8m{+kvWp^&(BLco}ZEcNw_|Zp{d*K{JX$53cDQmWja-Ypz!14{f znF!d51od@!vb8{W2>O{cSNk>j(NC@D1@H?brogsndX&eExfQsq6J&z_I z?qktAcs|~T7K!h%Xx&ciUkVA!ti9!gH?n@NuWNvyf_RXlRjbu(WFnwYSSK?xCqFJ% zDigw>uz;;0GqRZAp#t1mqb7y29V8j5x`dFxJ^ZXtXH%W0U^tmlt)hK;+kOn4rl!+ zt_Tkp4P?>_$B!R>yqy(6Z99UX!?P(a|9wL0ls7$)^sy-%Wp11$FhTi8D*UJ2ym=%%wKrng+=6gk-LI{olXI@FXN(% z&}{06r&0moB7%z(Tz&@}VHwB#(4j+QbaXU21Q08o-u?A&)*+h&nN%>jA3#ADB6pzs z3}i9|9P784ZL*ejqB*08X6cNY8y!B0LOA@XaJS!D;F+Yye<Y?7^y{NtmBFhB%fkjOonGsS}-kU$@o+OoGk5EX+d% z`-e33U077^cjNgTQ34y&g^RDRm&@fzLU++P)bAd00-vZ2sjXx_)18p=(Yb^UpGu`N zF*|pDeY^3Fg%a49KvtomGBr4mVeVc9dxl|<`#6R$`Agk;M^~4Gp~6zFR6>LxWRPMvf;MmR1&RuUsXt7fQ8v)G2qlT{M&^%PII~dHQG47E&cW(A*x8K#1 zMWLlqX#(U~fyLEDa7A%~W?Da6W$hJk%={L5RxEUY-FEQpciu%$;RI^5x;iLgTfpe& z08l?_{FmQ+YrPlm?3xnTn9iO(w*<0n8ubB3=mLQ8f&vb_y>Hue<13EQsncf`d)1Gg z?h62=@G5YCYbi_ZNNa?FfiwnrQ0cq67s4V@E(+ZbfK59M**K_#<28(J^QBv21raU? zNjl}DM-JAZ*j4oyQZD1Cqs%QSFt2le!wJvY0) zpE2zl5g-7N;3j$s?P`Us&b4b&^e~y8Lh-+Z%(tsH)rD~HA8g zk1L6$jRVRBaCuiIox*$;CVw%ienh%C6p-L*rBcpTD1C1?y<89YTt|CvX=q1w0@}$iXoMO}5bmH+4=$-Ity#fsN_h?A&^(RGO+*Duqh9 z!YRbzyK4I%DMEYSWgbw6Qa^h7rcR$ZyWWX0>~{`8-hAtA8abqgOC)&F2wFY3xC8&| zr8h1w#iCD9DS?gY^yxG6K>f3oGU@|WYA0jrS5ILxPamF@0Oi?}Cuin6Id*-|0VJgm z6{4)mcfTYF47O2bfhv7*(ns3W0Xhv}6Qg33GfnH!R60$!f*~d0)-a83DeE7~7hBLU z!UtS!8J#_Gvuk2^Mi456I8e1(m4=TKA^UZWdiqf5BMJd_hF4!Zxl}Hfr`PhUq+BVJ zYPAx`(zxmbVk4;NXSG_TsZuEs{4X&1OR+@GxF~^*>DaMj*WnFU%A1>g>k!g>T+~Uf zfP#Cyn`4zY4j=#q?!@M1abb0JC7`Id#SG*%eYkC0cr?qUBI+{>_#a{|o}zXHwQ_9m z@+6p0%V-|<3((KH_ zec1QdE2#ZIQ5RpoL_LLtwR~_^PAn-OKjl-isi%+knIszlx~A0lTb}>wtFK)L%D;B! z&TV3YE+8n*i-;2lYlQB9goOIZ=EgTzzlMG7s?v8*l)y$=ck1++qcGUHJeY@Z1KX}( z93zK)?1kL#lnxL(PvB0^#eH&+mInuiMn^_R*}+gii76}96aRor`N(;gby6Xv%}rGL zCi>1v)o&fUw&}|?ClbAg>a=!m;3|b ztbbg?i0`SwJMq2w{0d#^41HQ8eF*X904p3H53G`F*q5Fv zeR0_r&}~25PR~a!u)4ZB?)m=sV~>5G>H{gZ(2{iea0+o&aJ9;O5Gx>pz~;|kANqOa zVk|kpZU^-Ig^M(DxR%cs*4BDw8I;Q)-Zkd1>q6TGf7T-w{0P*Ai z{@xMnl~;asb#rqw`}ybpCe;qc3S_$6Lr;sEO8T zK=!}!%{TNNz4r7S=xE?x^#Sz7-&|e}WOloL0l`U-`qAu6g4|Cm0&uv}jaWgcv`L?x zw82V*5-7tjoUjUN*(&Fl)&!jfPTA5;FeFoc4D1?QUVny4$w>J1jRP{h_m7VeS!dS zJ4`x>hg-)}3FMD;+OglIzIBRn9fbhBQUW=}Iq^ClAa4Chya>Q`c&a}KS_g1ce-sCZ z){;;hAPTdHKi7#F#W{)t^vM2?6~*~6>(4>b0hASRz;%Ea*xkM_izLMXdaMLGsy_!& z3Dk8Kqrzj=aW7splrO~)xEA2XPzOk-Q_151228wVSp>g3yjhCR>0oiR0>%dJOQ0DD zFf=qw*W%qjHcD1j*Y>}%m+UVZSRX|s{Chv~;Q+`bAADdeS`N_F=$NLF;o)x)4gM%{ zf^rvj`|K6IbLfHCAizK-6TJ@5b*&gCe+ZBOPvJ_X(tFq51E<37DPOE2603A{8|~F^^25`dkfI)!;{L38ym~Vj{kgqzyDX)NNoKGZ7PAu<^YHcU){Zf z#p!nbYsxfYJ6?(90Js}Soa})hb_tKz;a5M<; z$tRzZd#m}_ih;j;n0?AL&2joiH7)zYBR}f-5ij3<;C_k(Pkgwxli|8em2Z?4PAr!Z zoNu$(h+p0y`S*`Ug8&Np9~1&81W*W|5I})K00jyG6et8xpb$WTLI4E{0Td_%P@oV% eLE_>60t^5tGhZa2hdEpT0000