From 705af2ea73b8128e16dd809345306428716b51ac Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Thu, 24 Dec 2020 21:52:58 -0600 Subject: [PATCH] Clean ZAZFavorites --- files/ZAZFavorites_v0.6.0.oxt | Bin 78232 -> 78113 bytes source/ZAZFavorites.py | 42 ---------------------------------- source/pythonpath/main.py | 30 ++++++++++++++++++++++-- 3 files changed, 28 insertions(+), 44 deletions(-) diff --git a/files/ZAZFavorites_v0.6.0.oxt b/files/ZAZFavorites_v0.6.0.oxt index 02d86f87df9112c442272e5c3018ef51af221d6a..cbad9e75c05adc78bb662eb72a4a4f53d575314e 100644 GIT binary patch delta 2338 zcmZuz2{hDeAD;hMix^{CEFm$%m?1Hgu|!#mbd4(wVJuV3SjIAzhD_2ZD(O!~aZ_$r zxVD%m4bin^lqEG3S)(i&vgZE#&i&5!edm1dIq!MS`JLzYKJWWJ=e*CGJtA80NmR9dF|#;6ZzfX=h}R|b>;-e zf}=A+vWs~v^KfiYrs`7SgCS`Zj!)QQ3|j72!6;8Ixt$c?Bv)L;QVe4&k!a(h0NLeB=x9-A~Fsu6-xP0H8 zleXg~#;qb+9X{yR{p^V3gh3JP4=t* zRhz`NUFsNKioi)%YBDupud_zWRi%1D}uG|5QGauR>kmTd8&-h~NEGxt-Gj9|=oZi-4 zV?q2ndbrome=~gAzQ+Z%)03DTzvY&1Kg%sDyk5W1>1(=YM=CjNl(&HdeDk zHR9X4d1ql3Nq)+TQW2`TMJu z1~x?t6Ou4HzE6_{ZS=PUly!{`lNF^T5wgd1a?sn~ z5J8u3aZeQ5x*pGbo=^?MRpeQ}MrsP|FKv@TXqbZ;6W`{QS9v>~&z`%}!HR9{Wn;<) z4;SNXnR`#@Rfn+*<4ENLL5&!n_OYM?2UqsQ%`bgxe%IW}4;)Q(IoLMD&mqPO6XVqx zZuvdol}J;I!cn=;3^R41f>`$H{pVUEN;t1w!~Nt5YgZ?z@g|CL%i7Bva*j)*zlSfE z<7~IbvFpZMas`SH5A&`iQ+=%Fe^^Tx73Xy`b^MN8FCW-a0!Mp?jj8`46mz$$PO^8L zso-8SQ>Zb{evmDHKMz04!8 zJ0K!fl=CC|`CWUF^NeuDs;|J9)tgo-ImF?G1J!5rGzE0^>61{X=Qk%N_wv(F9 zDVnOHTJNqnUKx+dLz)@8x}DdSG# z%ip)&Goo91kERW0rKF_~wKBy;l=am^rM0ir46rUpO)hZ>@u^~8GE^*H$5$e!J}al> zUwtB9YK5&HYo*r{DDNBBtWH|Sw>+P^`L>GLpOEHbvM~3_pNm?VjSC=^`fuKTp!Tqs z+B=+Op_o1yGqb00r!6`5dyK&7q!gAr@H_RJl%_oc z;d61$SyCjv#-=Jefo`MXY@a>(^-@<#a-9GXw$J>&GS%O5VNr>uMff&b`+WJDvRVJ1 zb=={O`9}z+sr_bUmRV=B-G@hD_h-8jSH$sTM)Z0*-BA1Vz5oY7u8&aKOVxy-$O-E2 zavaw9!z@69xp!*~jJYDrO}1NQr-cu@tcM`V?g{^l+DJ6Gfptvk#-CTHQRItUF^yH8 zZ68C5%Zz_}$}D-o4X*g2@~qtW{rb=Z={fUdEYiDvq$3epLLU!9|tyJ~7> zy#P1rkO?~D{=QtYBw>O$5Nf=Tg3GBIDD#poxHy>XV8KrqAv`N8wrC6y^md1<(VAAz z;w_5GmwgM$Iv0C&JGV9@;f}pJWMqEVx~dOH+w|^1o7JtnslMl_lw394FFyPcxeGsN zF7BOARlUf3J>M`f_mp$QE&97_{KruFW2WBd2DjB)B58UJzboe*x;?v+Y5IAUGwR!W*ake3B*p$>7R3mhW!>ujT_9;K3ox*9JVH zPzKj^fYT6o=mJy-{?Y~T0PhwCFq8S;pavZ<01hI=Vu0OnYq88=@m*j!2GD^|Yyk%` z00AB-3o7dYyCKR!2;d}n&_fTfhEK+Uck}>dwf~m_P!RlU6egWN55Cs})S%|IpUo@D znO9f}pdl8}0e%6!umAyw1UXp15nibT=3xO9@GcHOf(kf55k9&bOu|8xIxJLaQv(oE z|5^43n23X#dep&JIKUR3t??6gfmnS&4wACehqikf^wI|otASbo%sC){;^&WZp!r5% zWBejr9052=5DWlm XNXEecI?-DlkYWI6i`(cz-yYcCB{3f@ delta 2650 zcmZuz2{hDe8=t=!Lxh_dOSYjjjA6zuTZ9IUES0697&kjJ)*{1@eUFj98>K<`BV+ojmx~Y>7ik_j^h!+@MQt4JFKA<~9Lks&o*v6x3NIVlT5_vAdEjt*L5lW< z@!Vu|4%O2ke|-N@jBM&`2=84OLNyC#byLtA``|VwS)W4Bm8HM?PLIS{}$KT9lT?W)4orC z@2X5+_Prw%L&Yij-igJUZI+1kMS*tH%!{f?iHd1bae(vgksCTXU9yUQOdp+#_+b0u zc<)X7XVD|KKQ87zNn)7VS&0q`+8m@r0@~?2+Gjw10b!W*Oa-qj*DJJvOxUv_s`miWIOs48?={!7v`7zTlysUz_U z33GeF7a<=&zkj>X0p4Ix)4=ug2ty#E++GNd3iqW_g2~~&_#m<$h1(A8&aTu6U1aQL zwZ{P8qpUJT*~S#eK`;U%E^n2AHfM<^nG);!vi2C~g)YM1xl7l$H-;&bN?#ET16|^} zR+?!>qd9#XOQi-KrDIInCQ{ymM~@pmd25T(N6e%x_t)J@e@#Gm?{HNmlnrd;JRiYt zI;;B8n%zfzA&;QQ(5}K^*-{v|jP^Rn-S|rjru5!Xj7uw&DxIcQjZL0Ur9r~bV z7>TGP-m_3%$!8HwgRAq&dt@?(Y;)ozXe2Npj`Pw2`up=d)Rn?UFZ!2{$rwwg7W8}) zT~hORVo)OI!-?TGbtB0~C>@p@ZLIxk;7(UPuY!jG6-~tE+b)-5Jxc~9mgr28fN|-i z8gc2|s!B2E4O4@mWK*vYC!u5e?2`APU`o&PiJ7zH%cA==c;nKWVH(+gov8MDe>Fj# zK2`FhCZhH~L*10#!2V)_vWt^R-ie@B!dkBJ1JHK%^@S*eu?;8eq@#_PNoNP3@a!xj z+0tcG!R$Y}wPQC8Jt1~E3+L#!UbxTjK}Q-jjvO;MfZX%A;Zj;&wg_rOWev_BolJ=J z9k*UWS9oNT?b|0?`^LBC%c%nyTE#l*&BgkZ-xRAZ9-u!CbGa#DDx~*ki^AkdhJXt- z@6FCPff}4LYqi#ias6J`a;+QF|yK4mFTu&bZ zamfmEGcUcGkssejH{nL_c2;1l-rQ_`6Z{&VjFerI+hf!s?~}3+BvC2u7Wy!)NN};b z3}AkRYJNG~n0BYz+vp5E#Jbo|%RI7|{a)gx+x$6|kKgRyW(bDT2s~vhcQa{Q5thOw z=2m`aBo=z9dMeUzA(#FzDNUq@ogma&B>hCDUw~bXySFBA{06*3z@1MyCI#N7*R;EU z1yZdaT9cWDn4p|{^J;AeE<{Ncrv}cq2a7t&Y2|h9N-9eD{I-=oWc3Ll@p|&X%ZPlr zXLnHQgh4ONg%}PPa%&|lPQx;X6Vp5io$gf+?nU>$n~@GEbDdq=cfC9JU5n>F zYE#j9SAVd5Pt*oBh?gSe-C1Vey11@g@KxYEmCtLf`hHuFLH?qqL5>Zz6 z+xDc$Y>PvLF>!@{>J@rCTe)hOade8zB4>yOUHsPRx87cIY<4xO+hmp&pY}0Gt6`O_ zGkOfI<5o&rTg6_xqG^2>ju+$zvzWh|3bJ(<^mQw&hC9IJReowg_Ic8!G3(1;XYPbe zESs}z*t67MbufPMUN|}*0$FL{fk@OL6OWbx1eOmPVDoS-1_QWq=L9fG1#lB0a8Gva7IRFIY02KHF z2dF^X4FBhy{{CX_J$`*xTP(P$4q)J|Sb*#M EFPn^T&Hw-a diff --git a/source/ZAZFavorites.py b/source/ZAZFavorites.py index 6908aac..7b3c34d 100644 --- a/source/ZAZFavorites.py +++ b/source/ZAZFavorites.py @@ -18,48 +18,6 @@ class ZAZFavorites(unohelper.Base, XJobExecutor): main.run(args, __file__) return - def _create_dialog(self): - columns = ( - {'Title': _('File Name'), 'MaxWidth': 120}, - {'Title': 'X', 'HorizontalAlign': 1, 'Resizeable': False, 'ColumnWidth': 10}, - {'Title': '', 'Resizeable': False, 'ColumnWidth': 0}, - ) - args = { - 'Type': 'Grid', - 'Name': 'grid', - 'Width': 140, - 'Height': 110, - 'ShowRowHeader': True, - 'Columns': columns - } - dlg.add_control(args) - dlg.grid.set_column_image(1, app.join(self.IMAGES, 'delete.png')) - paths = app.get_config('paths', []) - for path in paths: - p, filename, n, e = app.get_info_path(path) - dlg.grid.add_row((filename, '', path)) - dlg.grid.set_cell_tooltip(0, dlg.grid.rows-1, p) - dlg.events.paths = paths - - args = { - 'Type': 'Button', - 'Name': 'button_save', - 'Label': _('~Save'), - 'ImageURL': app.join(self.IMAGES, 'save.png'), - 'ImagePosition': 1, - 'Width': 60, - 'Height': 15, - } - dlg.add_control(args) - - dlg.button_add.center() - dlg.grid.move(dlg.button_add) - dlg.grid.center() - dlg.button_save.move(dlg.grid) - dlg.button_save.center() - - return dlg - g_ImplementationHelper = unohelper.ImplementationHelper() g_ImplementationHelper.addImplementation(ZAZFavorites, ID_EXTENSION, SERVICE) diff --git a/source/pythonpath/main.py b/source/pythonpath/main.py index 7bc9c73..d32b56e 100644 --- a/source/pythonpath/main.py +++ b/source/pythonpath/main.py @@ -94,6 +94,15 @@ class Controllers(object): def _config(): dlg = _create_dialog() + + # ~ dlg.grid.set_column_image(1, app.join(self.IMAGES, 'delete.png')) + # ~ paths = app.get_config('paths', []) + # ~ for path in paths: + # ~ p, filename, n, e = app.get_info_path(path) + # ~ dlg.grid.add_row((filename, '', path)) + # ~ dlg.grid.set_cell_tooltip(0, dlg.grid.rows-1, p) + # ~ dlg.events.paths = paths + dlg.open() return @@ -105,7 +114,7 @@ def _create_dialog(): 'Name': 'dialog', 'Title': TITLE, 'Width': 160, - 'Height': 160, + 'Height': 170, } dlg = app.create_dialog(args) dlg.id = ID_EXTENSION @@ -123,6 +132,21 @@ def _create_dialog(): } dlg.add_control(args) + columns = ( + {'Title': _('File Name'), 'MaxWidth': 120}, + {'Title': 'X', 'HorizontalAlign': 1, 'Resizeable': False, 'ColumnWidth': 10}, + {'Title': '', 'Resizeable': False, 'ColumnWidth': 0}, + ) + args = { + 'Type': 'Grid', + 'Name': 'grid', + 'Width': 140, + 'Height': 110, + 'ShowRowHeader': True, + } + grid = dlg.add_control(args) + grid.columns = columns + args = { 'Type': 'Button', 'Name': 'button_save', @@ -135,7 +159,9 @@ def _create_dialog(): dlg.add_control(args) dlg.button_add.center() - dlg.button_save.move(dlg.button_add) + dlg.grid.move(dlg.button_add) + dlg.button_save.move(dlg.grid) + dlg.grid.center() dlg.button_save.center() return dlg