From 65c1011d5b91a7cfa6e656583a5c07fe8e841154 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Thu, 8 Jan 2009 16:18:02 +0000 Subject: [PATCH 1/5] restore Stephen's extra conditional, since it does make sense --- terminatorlib/terminatorterm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terminatorlib/terminatorterm.py b/terminatorlib/terminatorterm.py index 08be0b75..b355822a 100755 --- a/terminatorlib/terminatorterm.py +++ b/terminatorlib/terminatorterm.py @@ -320,7 +320,7 @@ text/plain if txt[0:7] == "file://": txt = "'%s'" % txt[7:] for term in self.terminator.term_list: - if term == self or term._group == self._group: + if term == self or (self.group != None and term._group == self._group): term._vte.feed_child(txt) return From 533e85e2a7915603a340cbe84129d97cc31632d4 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Sat, 10 Jan 2009 00:45:41 +0000 Subject: [PATCH 2/5] and actually get it right this time --- terminatorlib/terminatorterm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terminatorlib/terminatorterm.py b/terminatorlib/terminatorterm.py index b355822a..d3b1ee8d 100755 --- a/terminatorlib/terminatorterm.py +++ b/terminatorlib/terminatorterm.py @@ -320,7 +320,7 @@ text/plain if txt[0:7] == "file://": txt = "'%s'" % txt[7:] for term in self.terminator.term_list: - if term == self or (self.group != None and term._group == self._group): + if term == self or (term._group != None and term._group == self._group): term._vte.feed_child(txt) return From dec20d4069ea797ef430f8706ef1f1ade5a871f5 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Sat, 10 Jan 2009 01:55:46 +0000 Subject: [PATCH 3/5] Loop around tabs when using next_tab or prev_tab keyboard shortcuts. Closes LP #315494 --- terminatorlib/terminator.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py index 457690fa..ee260656 100755 --- a/terminatorlib/terminator.py +++ b/terminatorlib/terminator.py @@ -1098,7 +1098,12 @@ class Terminator: def previous_tab(self, term): notebook = self.get_first_parent_notebook(term) if notebook: - notebook.prev_page() + cur = notebook.get_current_page() + pages = notebook.get_n_pages() + if cur == 0: + notebook.set_current_page(pages - 1) + else: + notebook.prev_page() # This seems to be required in some versions of (py)gtk. # Without it, the selection changes, but the displayed page doesn't change # Seen in gtk-2.12.11 and pygtk-2.12.1 at least. @@ -1107,7 +1112,12 @@ class Terminator: def next_tab(self, term): notebook = self.get_first_parent_notebook(term) if notebook: - notebook.next_page() + cur = notebook.get_current_page() + pages = notebook.get_n_pages() + if cur == pages - 1: + notebook.set_current_page(0) + else: + notebook.next_page() notebook.set_current_page(notebook.get_current_page()) def move_tab(self, term, direction): From 2795dafc6d34fdb7ff25dd4925e46dcd0e61152d Mon Sep 17 00:00:00 2001 From: Cory Kontros Date: Tue, 13 Jan 2009 15:52:07 -0500 Subject: [PATCH 4/5] Fixed blurry icons by creating them at the proper size. Added 32px size. --- data/icons/16x16/apps/terminator.png | Bin 779 -> 620 bytes data/icons/22x22/apps/terminator.png | Bin 1110 -> 1073 bytes data/icons/24x24/apps/terminator.png | Bin 1193 -> 1102 bytes data/icons/32x32/apps/terminator.png | Bin 0 -> 1740 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/icons/32x32/apps/terminator.png diff --git a/data/icons/16x16/apps/terminator.png b/data/icons/16x16/apps/terminator.png index 9c649a403174575ee6489004c310e67ec79ffe1e..43cbecff33f505fd529451dedf2bdd72a30c7d27 100644 GIT binary patch delta 595 zcmV-Z0<8Uu2J8foB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru*#Qj{107}SBAfsK0qjXcK~y-)eUrg!6G0Tlf4d3M zKrhyVV5rdc5Yc+e$xF{dwStO*TIr!+K?Hm5zn~QLlGKwI1%IIjLGV&NMLgsZDb>cp zMkH-=kX_T#COb1b9(Fd_Y-}G4^Sw83-uvdgc~+~ntKYtR!`9Xhv<}c(qcs3%145fI z8hz^GC2rrkgZ2F7Gu`!lX0BW%bK)eRq3=5&L7@2CZnLwy!>7;drG{5z7XkpOBtSesK*4qUnN7A{=5`xLDeA^wDK!{CYfWW)o5I=}m8B(o z$3X#Ipa%Rges+}51h9Jn0?ipAV0oEBsl?@Ckqq!F?0*ZRu@ycc!6489?}4dmmFapN zMn-rIs8|>57#?~;)cfhxResOUvjSxPbJ^|%NE8uZ9r(DgKw$I_jYj`)f1lZWKE@zO z6cG>xN5EPN##A0x2a@2!s#_DUnj(3m@0@7$2X&YBn3X^r}d+)imRr7-KV? hNoJE1lia&I$3I*N4t4+l delta 755 zcmVLlRIx*We|p+ zIeXT-d+asFi3pLEwG(V3sFFxg5Ghh1(a=&*A;Axzpr+t=Kz~6IDGd^JnkWiJmI5(E zT#_iZgdDFOld#fW&N<(AF5e7=7lQ%?5^pn?;+@MoBWA|`LHy-c*I$3-?AkSu9{fdS z25O2a7>cP)VT37fyLaA?mrkGgG*sc@ozFfeDk}_#rX&I&f&e0NaF2J^*U>yjOtGL0LLiyzGB+L)>Hw;s%8h=X-i7nDUw&yZ z1_)-%AzZrhCd1obBcaAb*%o2p#RXQDPLus|A55XHxIIbnbw!qE7Hd!}ib%&}wr}2~ z+goP5{fIKpIj95sg8|GYG#d?m`)&*Mo>3Jjs*)_rEPoCmU?Mp081?rV?LGz#m4dy2{BcWpsFW+`$Hr7ak{SvG<;`ESZFWPZAEMasm8q zMi+SD)PE@so<2R6HdUnzHFYf(6~4fg1^eSMTi=KJ4|6^X1G8L4**3##xq@K7#i?{)osx zqUh-Ap2K2QS~%xM4<0`JLI8R7wY96uE4_E4s8Ro;^uNGN`SIS*KRr1(yd{6W lvxvlI_MZquBm%_D!XNE~alY|m4yynF002ovPDHLkV1ly0T;l)$ diff --git a/data/icons/22x22/apps/terminator.png b/data/icons/22x22/apps/terminator.png index d5319a6b826afd0f5e517c81864696c5a4e6d9ca..1838029813cd11374cc395b23b937d8c51ba903f 100644 GIT binary patch delta 992 zcmV<610Vd>2(bu|I|~ih000fw0YWI7c#%dZf38VHK~y-6wUte19aR*^e|Kg~(tPw) zNI^x>)G~|J_d*DWNF#)B%6tDo5`rGv@$Amy>|J@Wt9q@e^quEL=N1BStXy?MGU<2CeJ*#lfoCqJRR-pNr_A`t-~ zief~Bd@X~C3D#OIvR2AknzGhPDe^X*c8(t!!tdQjnzmR=Q?gb{Yh?w=+Qdmhe<#lY zNJK(eBr!pR=C8jH-MU5JzJ27EFXI;%aT>_;98|e`_ACRtp2zLk&FbmX$nDz{?KTAv zM=@Euy%`)O2_Xbl7Z-6$OW2hwSW#dipjzIb%Aa#{=y%_izIQrch5!O2NkY2|4xzLn zi4#PG)wBhwrGKh84Omdpl@&s3e~o(@dYiGELj{gvN4uS2W+V~>4N4NnWL|iC;ad5o z0n9KFRD@9VzJ35&?G1cSoUgzlc=5zZj0NGfzAc#ds7TKSfS)SJiw^+@;M2-Z36-@X z0q;w2Q54k1$JstL#cEN|P^AepfedH^J7#7WIdFgm(5Pn3uHqy{D{vwre-uThd<-CS zj^fT88XHu(3JTDPB9@nzX>OQxJx-E@EbCN?y-*YdaS|iIrE}-F*J$v<^fZ0DcG0Yq zW!3uX)F}qX#u%HPrZYU;Q!N0_5qgS)(8)VQaf}D<1NZB7=IixMUbd?GK5*gu`JTTH z(8>y69jvMpzQ6&s;bAUTe_zgnQSB3MK6DCO2M4jB>tHh@1mWt!0v~?yIWGFUU*>v5 zg-81yL!{IiM=@8gEif{&wcKuIw!E~w^z@d2LB5}zMOFU+36U8`FZ{sC@t3%9^AEN? zzKv}oHEOjQs)loJ*&RM|@U17FeCoZ)1Cs-zqoafnP}N>m4TP{UNuD3j780t%R?agz-=S O0000XAk$f73}sK~y-6wUteb6h#!re?8MX!_LBf z&LRrvvWo6*0*OHnO2XMAXA^G7oug6XK@$^=Cq2qVvnF2j00-m6Xo4Xq5hh4bS-xa} zo!!})p6QwHs;+v^L-($%=!Jxrbl&S%RsX!N`d6T;JPru~zWDOg6XRo(Z`W$I=l^Sy zf2ty)hzKfz*A3g_RZ%Z^5sf;XKX2c;_5OSBey|dJzWCYL3;P$YPE1Vg$};ze@hPfM zDwVjl^vC@le*Atetkp(NPE1Vg`u*Z1E`R+^o`OO^UZNlf2yz2}QlTI8mjI~@v2gS# zGc&Wh8sisFhSlouY(T)((`UHWXmDtHe;QOlq|i!$(iH_2MhhP*1gfBls&cX2W_a5$ z^%KXbRI9V$W;P-`wS5P#A3H{JT2_gjIL4;quFj5=grG*6sjZ0*`E_i{W?st1V zymur?f-#0rMF4QBIBPIbM0cf$i+g$0#novq@$%f6_F; z7^9(g9ssXO((iNYyKkA8pQkpnkJc~eacK%7#NN}3B6cn>Q=gxs>>PicIgRi4L6w15 zGLe5G&U`)z0$6M5#eKTx&Z8m(MVg4G>xC>$Xs$N7d*SE2aj>Z^;86xif^&}0IfwHO z2Smnjq1#1OP*Jp~uQP@#t##6Vf1h@+6>!6D1J(=appW;S&=`ZUmQ01%T5k4Y5J5!n z){w?AHc4m}Aj`THa6<-wRnH(9;JhO=)?kexbB=13aUg*8m3yf7`MBl7%VkwYM@N}c zC5_`PzyWa9E1B0E*m*5kYcM7yQ%JIm!*85mdSQV`l?aG{ZV{1ItGxEse>>Fn?4?`y zyTzWgh&W9RszS-68O9hqN}|eFpMJt}Yn{pG_LG#$^nf0a0I_o{e*6(V@7b|u@8(*s z0QQh`h$L@F+HG#HtwFs`dFS*NU{e6A3aYB1 zH5OwGqR><2hQf{OOZ;2nf1=z=C`*k?53P4pi->bVDw=1Rnt7VJ!>=OF0Rcf!5KTck z(+@#ybS@{OCx?a@+p`;00hF-Q>D~fjz1*N7|X=!8fPcR8L8D63WvyC zhWA2dvz4$Dbv|sh*N@Ncdv-GFM(6{Kr3KFxbt~+Ay$|U481<2bE;n7jjD+1#_dxnZlUBqn>v40L`4-9K~y#BbmB(i@~P|B zZk!8Ll^_VV0Xu3c+Dbv(dEj!-y?5sP=l}0{=fZz%2H?Ge zZw~{ni|8xHP*zn$6cH&#?rV3gvU28E_PqBv=jz`38Efr3A0Pg-6#;lJ`!_wj`M~(@ zeS@XaFsjnUzJH4;s-UW?20+}5%SVqNIWRX@NrAVb{P#Mw`~A(2OcATT6Z#?k3%{C}lCpwR#kj0$++%gdKRg%_WH z0hv7w)`AG?1?Ma;RVoBgNZLse$yEpdoOAgi2yxDlwi4L8msYb$(u`@vF|B4ymbU4% zQ|$0CcIPhQxJfIHNt!Xur6pX_CX6CFY1+H3C7O@Bdz8^?|@wB=FEjxm;x9Kl_?M%HeV0bvl5wA*(E2%-q@Jnnm0k9r|qTEaJ5 z+!Ws{;_mDVfFLxq+exo%a|YfaUWmew#5!JEn19bJBQIgpIm9`9v3GJ!@S>Kmy(H}# z0OzpI5=J5F9WM{8L#;)e>&XM~OA+j;I{8xR39a)wUMj;M3bNo0r>vgtIPBO4%3ymVvq!?e%%uw38m93MLbVf#c zEL_n){A~=pqmyFRUce8RN}|k*%Aahwe*+sv%aqGyL=}_AZQHi@UbcFDnRCCNYpcki6*2&L zzgk^%UwrlXepP+oU%kP`+z^q2zz6(q_hNqoZo`VfhE1=s00000NkvXXu0mjf$wvB1 delta 1173 zcmV;G1Zw-v2&oB>B!2{RLP=Bz2nYy#2xN!=000SaNLh0L00!&;00!&<9(6c10000P zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$UCP_p=R7i=nmdkHdRTPK6 zeeSuvx23IhAg_Un(FqDB6s;YQn2t=q0pku#)I^lTXhL*iqJRH~IFN`$F~Nbv2@in| zR9?kMl+XcBD_H2g_v~}eIs5FrmV^7CKw+R^B|Ceawbxm{_1X`ksys@Hd(6IX_e{lc zJPlNqQ&d$X2tfiOa)%GPL>34lA7p5dfpA96J2t&rd!1%!_e#p#I-|Ra85U zv|7#l?71`N-hX`K?N`j#-+Vc>dDFzfMx$B3cw&ZZaq+I-qA0=`gE6MhKTK8|8)M~$ z7f{F!e7}EN9LMo=H6Ey6Jbr@jKHp8A=b#;r?#$Xx6RMcbM=y7G>D7jYc;~ZEd3xgI z!Ad2bj)95-?S)&U*0OKsd$`M&kw0$P1ivm8h2r0VD)uaEKMJPSH*+X_}IzDQ#=XQcF9vw3CGTrp-ia*3z~XYdbor zO=+hoq4ana@*>9-1#$496R9zHA81_oll=HkRH_4r5BPT4_bwH|$5pNzIDn)UgTZGR z<>GBZ(tjc}o0Kg}5GBuZiqa8#?|aoGgusotIclS$jILXUHk+j9&!gS8OeD|};kGIx zt5*@#2WedRgLHl#00Vd+sF3G5&N1irLRcFPuQSDq{x{S*~Bs!Hsfqbwa>1rIDFElzx~8@o&ab6~7qXZG|- zW@l!Qd)9khB!H35YUG^5IY&^%14j=Zh84q1Zr#T7laqIOm;;v<7C3h35YLT|GqH6W zqpR2SBe6>Wqze!iu2bY7O6V%h-Mqov!G9m_D`3%`EpY7Asbvf8=^Rbk11Jke=^Rum z3=R)-(pnxwy{l=S2VYWyBO?UUJ)^o21m_BJBTVnyfe|G#1`|a@#(=rE)9Q}?s3?~&U77i9_V=T}Uq)3i##DgEfXC_V ntN%lTbo!wIw9KP^w)_i!ofoCPBMy%&00000NkvXXu0mjfOb#g4 diff --git a/data/icons/32x32/apps/terminator.png b/data/icons/32x32/apps/terminator.png new file mode 100644 index 0000000000000000000000000000000000000000..977bed702b827a95cf13d8f58631130e03d349ec GIT binary patch literal 1740 zcmV;-1~d7IP)(bN1Qm?7i22{nuLioNZK<&rYmeOd z`R$_{Hf%EW+I8*!U!o`~imKq8b3; z{5cjE7e7@1OJ!(ii1iyb@z8@0kNoAYFFXfq&OyJtas4Jc+nnLh{u=Yqc8Zrq6L`VjpQ@f~NNc ze|pVUR55@l^~G&qoGMg}A>Z|VZrM6cT$9KvmDpZvkK{`|bt%#Go?m_K>og3gC{_g( zg`zd8Ac9fhH=^8Q3_J4-I-TOZV6+$a{x}uoiFe;6Pl;}~ON@aSBQZvn0Z_n+FuQII zqxXD?*3=};f4>hZpo$j8`(Q4_#QC8d_sC=T>GMqg^GzhAf*An>RYg%2C1I=~cuxp{ z5DEaw@_5^nXe@RaYArI>>QGr|VN{X6cOr=NXwFp_^A+kHN43==TWBNBmtOb4_U7d= zVr+)7&j zU1(zZ;VANBSd=v?WVJf0zIq?hZqq(+fD8K$Tux4)0@%#rz3&;1z0GPFfRcd}7(vhz zAHvkJG70;X_QNsj6DLusM(CbAOZVxC9zy`t>~a|cEtjzU5IA2}NDqK2DJ5){K}xK; z)MhNp%2=8!DnUvHs`K-#n3-X$aKx}&`u)5}^58w*dvqxP5y5*;W-U&Hzr{c%vD`xY zluJxGOMM;+0M2=`%;Hp7t%*9RG>!@qJigr`I@hyO%Q+en zE3M_W%v@o75XhuU1ptq8t{2i}3Iykp8uXd$3we!(_FinsanotaV>rB8iN8c_4a`>1Tpjg1n;r7_k%RP zeiM@u`}tt+UK#^bF7>Vg+&olaw6TikpL`N&waW2>EG+FON%VK%e2@VTymjm-Lk4!< zwUh04-3`E-ul=2~)6>fqZHL5E^gRE^-?4f{gKvEM2>?EP?+E)Q_AUd`Eph-rl3Xss z5F(<24<4KK7^t~O6*zwIFvkxbE*BZhfefgoL_I*K+vLSx{IYyEd=(b@0FtEgi=BrU zN(QXW2nJ@WIhAV_b>FLyn6s9lZ291;O?68cNGX;2UIn zhwBa{%Q9*sBgjG%xdK435ycq!&Qnie^BiN$6~9`>+yE`t06RZ7gNP7Qf+b1lW}7pt zY^>s=)2C>6Zp`~@$qz2HsJ;F=&wlF>E;vt0iAG~3#wdB7qrGoW4lLS~;(>P#AJQE= zzR23O>prn@0RPG>RAy!|3XR4}wr>3#<6AaUsZ{V=7JiZ+r`@30|-E~egdDq4+^fENAUSnnOp<{T$a zo$Q`H^PeA2?A`ye0rLAExc7mzYj1wWSaU~~W%+eo1P0HPH*&^QRTYtQXHK8peemsf zUIpfis$z_(0XJD|R}7B~H>@=d%%^^8?JRaGAp`+Bz(wG^=_4;PJO^q({J2Fvp;UkX ic-7tyf%&YD=l=s_^?V%!g)wXZ0000 Date: Tue, 13 Jan 2009 16:17:01 -0500 Subject: [PATCH 5/5] Fixed slight issue with the scalable icon. Edited setup.py to see 32px icon. Added 'update-menus' to postinst to fix LP #316829. --- data/icons/scalable/apps/terminator.svg | 55 +++++-------------------- debian/terminator.postinst | 1 + setup.py | 1 + 3 files changed, 12 insertions(+), 45 deletions(-) diff --git a/data/icons/scalable/apps/terminator.svg b/data/icons/scalable/apps/terminator.svg index f85b606c..d4039cc6 100644 --- a/data/icons/scalable/apps/terminator.svg +++ b/data/icons/scalable/apps/terminator.svg @@ -13,22 +13,14 @@ height="48px" id="svg1306" sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/apps" - sodipodi:docname="utilities-terminal.svg" + inkscape:version="0.46+devel" + sodipodi:docname="terminator.svg" inkscape:export-filename="/home/andreas/projekt/bild/tango/terminal4.png" inkscape:export-xdpi="240.00000" inkscape:export-ydpi="240.00000" inkscape:output_extension="org.inkscape.output.svg.inkscape"> - - - - - - @@ -311,26 +281,21 @@ image/svg+xml - Terminal - 2005-10-15 + + - Andreas Nilsson + - - terminal - emulator - term - command line - + + rdf:resource="" /> - Jakub Steiner + diff --git a/debian/terminator.postinst b/debian/terminator.postinst index 53e10bcb..530bfe13 100755 --- a/debian/terminator.postinst +++ b/debian/terminator.postinst @@ -2,6 +2,7 @@ gtk-update-icon-cache -q -f /usr/share/icons/hicolor/ pycentral pkginstall terminator +update-menus #DEBHELPER# diff --git a/setup.py b/setup.py index 6222bc6f..73216be1 100755 --- a/setup.py +++ b/setup.py @@ -160,6 +160,7 @@ setup(name='Terminator', ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')), ('share/icons/hicolor/22x22/apps', glob.glob('data/icons/22x22/apps/*.png')), ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/24x24/apps/*.png')), + ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/32x32/apps/*.png')), ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/48x48/apps/*.png')), ('share/icons/hicolor/16x16/actions', glob.glob('data/icons/16x16/actions/*.png')), ],