From 968e7d45c5df3d8022b04d70a823c23770dfb736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Tue, 10 Sep 2019 18:43:08 +0200 Subject: [PATCH] assets/images/logo[12].bmp: updated. libroar/RoarWindowAbout.py: switch to wx.FlexGridSizer(). assets/text/TODO: updated. --- assets/images/logo1.bmp | Bin 49206 -> 65674 bytes assets/images/logo2.bmp | Bin 35894 -> 47754 bytes assets/text/TODO | 8 +++----- libroar/RoarWindowAbout.py | 11 +++++------ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/assets/images/logo1.bmp b/assets/images/logo1.bmp index 60aa99badd3f8dc0b8958abd2c2dac80dc2ab446..451356da8e876074e749035edde42da4cbe1a16e 100644 GIT binary patch literal 65674 zcmeI5J#XGN5XY5v?C390c4t0y{N)&^kz*;HL*LEv8`mTZ**|7@x*vY;aP zAF7{Te{X0W;Je@V4O?GO%qfcmu~4PJe<8&eQY`ov0%DKFnraiC@ci|s(d@<=)UDS0w=kdMC?@&E-%H;mt#ofbTd3=8%Mh2tK zjEIsZTRs0NZ3+BojbokmfBjh3KdSr2wx0*>o7x7&yFRCQFTHr+zh3@_%jf#r4RIYG zPbjW$9031y@~1KXM>FP+*}iKVKkldxIQ04e@LwnY+nbkQ+ov}0tvPPbpX!Up=3xB= z_^*#Y+5RorzF^6@`oh!)e7~eVpdBy3zx%GF^wo6z*!JAG{w-l2$B=w{?FRdX>*7Du zkB9K5IC9(o|8?;nn#YCmm-9yOUl;!&KQ5F%#p8Y>_^*e*wvH3SpRXH%|9bexFb<6i z{@~B|iY(y>pDF1^j*@w2ua5h4G90%DMr#LehfEi0f1&Yc-lp#HF`r)Msisr*26^A0 zF?Kqj^WQ(oo?5@SpU$+`qM!|WbmYYA>I+Mb+#dR}x$sN9DnONpOrtgC)wYC|8o3konG$M4cR=uKZU<6bF2KdIX<87PYH7- zmayEX3C-j5xqkI^E}m%)(C+hwgyp^>=Pz|pU0of0Dyu#t=2JmVo)YO;SMpV?^_4o% zu0!;##gVqC#dXg#Cf2iM{3qLY+^dJX z`t#Fy6n|~}m-4~>^|oQ$nSga_s?F)4rAN+ORQa_I4l(V!) zEibb7j}O%6w`0EV9)HfmWB$LC5B9IO2d-OdxTN(z@Yi`u{aBfolx}77zu-B3-|sN( zNpC$%dt1BbYr11BEzgO+rMwdPYyPVA&xfx2^Un4?H#uLm=zA=U z)gH(49eQppkLxc+XFQ!XEXq61|F^*3Ivx-49lLKWkFygzI{u%u8J^A>7UgYK^^$cwp{NKNs*X&R{^VxLFJ=p)ingquGZXW>q@9IO?q1TQw=q$$8eQ~|@_Q{q( z7WDrM_x~DW?$^eI`@UgoN3y)ReDFE);WEa^z|&d75#{-8I_6%-{v{7<{du|wS&FiM zs|-AyH5{R{7}mbH;6E_`p`uV3{2s_}h1A7j@S_}Ye6-csMN%_#$CF6OW$`F*Y~v#jIEKA!jw z^{XZFr~1w%!yfs|IiBlNeZSvPD*w4;*du@9&3!y~?eh&wZl>ztv>eD}TPm zqphoGx?5`eC-!vAA;VtzI~|UlOXfdTclTVA0sPzjHK#9r)^xYD{quTiVNHgW@ppbe z?Ag3;r06F}o;oYjzG1AcwirJNtI)L}-iBmY_}nA@E%+N7C-@r`w~=JvzY&l|F~Hxb zxQ!$O|BZk&iUIyc#cd?n$h>-Z-;n!bS~zAeQp+dwSwwjoK{!ba@Smi<)h7o3)gzoF z0QgT*-|7>C|LPG=5&--ssc-d(!GHA#7ZD(M-2nSIi||QZDEOz=aM}5Tf7yIe*ADzs zYq;$E!M|)iscQ%RsWn`7{@`CWpVYNe*9|hi|C?G?3ESJ<;yV3jTea?CB2p?}>Jttifvo;+wCyQV_dT4S;{CWb)Jt{PXC!)Kb8|R5E$$ z1^#*TTxu!cUn-eA^#cDqdM>pTb!~wAeB#~EQsqIt;xqvMar)X?Z1CS2(Kva)KTcm; biw*u;BN`_U_{ZsMYq7z9YeXSW4h{Sd9hjU% literal 49206 zcmeI4EmIyz5XbjEL(FN^)hSd26?HC^I{ADBQuh(!&csCFQPFtJnm9a`Dm)&)*T=F= z&umZ6FmJmL{3#&4^U~A(o8H-;d6xY3_s3tu)7MA({RjR0`~36U@H_*2MSs0nXoeqMan+^kv){z}wTC2U78_=CSfVA~?ZKls1I z0G_`MpTb!Gm0Rs4_F9o2ho4@~8NGCq(r3fu^eK)UX%YBuJ8|F-{*g^F)}NwB1J-}* z4#WCm(P>`?{&g9T$y=C(yv*x3Gn5(NVVbhPzfIFP+_G904%fG9oqT*0HEBq9vo7AK zwsga~@LxkVO2D7vvpoKP+)bCm&0%^_fm7{|Gpc=*wcuZo|9JlJ^@0co*Dh+{twP{m zi$5*f+H3ewu=>({y!qf4IBndj$Ne@TcIvqTm-` znXo6&E%5D}Zh_}D>J9K$0S5d^J(grXiGoMf=;h7S8`vpt&VRkC82qV9u2kU9(KN6smI$DLgX%%K;jvmr_VLLR3Ci3Xw@Erzfd?)VZYhQixK zC;j`JQM)aZ4}_y zGM*o%Yr7fMdPx-c8^q-9$!JDZ>HNJNH251}(|5b+{AoCOPl3O|pH6S&0jAONRs5ye z{qt8-O_{)_%LYKTN}isn4Y=^+VWI@_@Ia4%;3r~SB~MV9zw}~w@|hH-`|c*CO787t zm+{Lb|4g?*x}eHTAW@KkYIONLO~cK_$?f^+&2X6RjFxkiR15wFuEh19f`2AI++Kga zKQk20RqFaL0|xOwgG$MNXyqR$^L$!)P9G@?CH__x8p?mbUyWNCt7-#^`A@gB>?|KL zx|dweLMZyLkSZsg9djr5^Y70XQ%I^AV-|otTJ*jC{rWpM~h= zG_+93(%m7jEXW}r_goJC+s+R76Msr3hw+T=sl;7X%9JJQ1pj$UJ1^sjyQ(Pvbe-TY zcT%*yl^K4NbErYOPVgsIr#G~d{r@nBj~7B<6U)gD~idKH~c zIb5nLSqi~_3B}X{`7r1}&4PLv$ay6d{1+_XAAjLzUdpikEHUHUO4Zl-kV5bW|G-+W z6=VGmynmRN=4pt{vW36;sO1bfD!A6xKPe5ZHtTXWHEI&KOc$a$P1af^_^03ze z*=JnZI@Rpgz1dSwU<@0)D%&Jy7pYQeSJ>cG*>)EEoykn*FJHFtqHDh7w?Vq`uVvD) z#6P_^XuJo`ZxwdqPxD^Iq+{W4ytgL*T(>9xDkdEZe|q2P!_CFv@nXIHe7L{kKUD0= zzlur6!k@6Kug+5Nf1tluT;`=G|0*VJ$e;IvZUz`U)$~x$H-a}Qs?K(=L}r`B*kwxQ zBq!}JR932CyynQIh6>j!fU2_{f3hLZB-PFK$ej^XR;pplUp{K7aQy^SbvEUnXOils zL#O?P%1Ski`IEq@<}7TJzF!z9(s_Q;(PR932Cwu7=()d~I%_l%3=lOlEc>`ei8k%CMM)j55I z&J2I|)&=~xoe}T{|6z3Z>8YR8Y)h`r=!pM19CNjRe=fN?{lLEt$4o7O3{W{K<(8`8 zF5s{3o~JX@=RI{}#|r@#c4srB5Y@RSkeRlyzfotor79G5&(oRd^Pak~9?PQWXlj=jqJ!c~9Ng@j`%w-PsH&M0M^7WTq|bZ`4_CsS1VN^K@qV ze5BpXodQlZo6jovH%Dv^0RASP=9S>z9I-h7_?vi|SAu_Y#O46tZ{lfP$tk)_^;^9E z(AtqB)ervLP8|4y|F#6S9Ubux{@W7Rc67x5w*2+c%}s%P?NjfL(n12@UkI?UJNOp@ zEbI>cg#Zh?gMT5w!tUT-2(Yj__!j~!>#lAJIPH`l%9o9U-Z}yB*SYj61^-^8^>M&o a=hCYb{Ckns#{qwxORrM!??w8(kMkeGV=adO diff --git a/assets/images/logo2.bmp b/assets/images/logo2.bmp index ee0aea0ceb5ba282e6b1a0c3436bd3402747c210..4086b866ae17ff73acbcb18cb706de478009ce98 100644 GIT binary patch literal 47754 zcmeI5v2xom3_#g-?C2lp`3pSzGG*y`=+ZlnUHt=HJ9N&JugOqe#~uX?QVvE_o!{{ax?G>4Xw=^U_sZ1UV^+_$|!_iM49i97&ClA`W(?GI=c2C$*FhM?ZaZct*s*u2d$Eh5DqH^5N*Gj}Fg> zIM|iSXTZ^hohf9Iy@udU{@-W$3lHlOZjm0(?=&g zqGAT?uIs4f&i8TKoiF}*#zW`RH*k2sGZoYl?eGbWf z&~EVz?T-JoGv+krZg=Qbdtf;okDzTV#u)Q_<`Bc@K88>EcsL*P1Nb_~zw~uup3i)? zKW6(la9{Z{d){~Jqc7;XFy?v8!N+Id;{$$}Wo#dO{cd-u!RXXfCKFrUXcb!u)i z#Tg&Rb17rqGY2L!m|qg}63jJs-U8@T5B(^plzO@;>R`*tC9vm_GgeQEnT`TBdg9HU0dQV=N!L`DW8CmY#d}w;K0W{JeHN z2Okft-R7xVJua&;ZzZ1B%v(T~gB;=ER+dw=y z$M9GkKAyYZQhp9L+dTC3U3#|Og07d`>mjt`%v*vE4O@uikR!&5hVg|lB+f^cp9eX% zJ>Ns7SQztsR#Pl=_$h^-T&vTi6o#Qg^9&)?pv$Q^~%ooqVyk9Hn*9Z9G3ow_|r!_$sYWqn|@;mdqoh^=V~(%{@_jUt?}_BJDm}V|?c4@6XQ@=j@c%j2*Ax zFK;bl%(g4)v(^<$<-awr8v09ZPxLe96W>`R*d?#=L_cG0%rCxMt`Qrqm67mQ^YaOR zEoE=aRpor<=jP`pA1J+^HTAot*b<(%Tlx3o41aS{daUGJ8uLD$8}rNWH?Uun_*Ljr z$~Dz5$fj(uJ(c!tPBd}vt;8AUIL2HlbIP@d+cNkF_7{<+Z`IbQw$zg%1`aK@#A?M2M-7*hMCc53REvM+Tk zVS_QBSf5C7O&!Z%9@xjW?C}dQTWE%w!lEzh8Ramo%DEH&`04L zYuf??X&Yi3DRt80Z9yM}Z>((#45V#{air8qkGBPV6uz;xEijO_A;ytXCq3R4^ilZ6 z+P1(z+J+cMN}cq0ThK@08*AGF18Ey#94U3u<8477g|AdwOcCgb7L+~ wKwhKyxiOa~Ag|H<+?dM~kk@E_Zp`Hg$ZIq|H|FvLn+a literal 35894 zcmeI3J$BnL41m=$c;7u!BgbPjpmrA?{7n}etm3R>@I00NL@giJs0=QJ-MY!MuaH+%#Yu_A& z4{w2LrBS|d3Rg=2H;m(I)Va9&YNb)WaSB&U05^=|YSg*7`f8<7zHtgyO8_^F<7(8o zxcX|PQND2sS4#jljN@w5xw!gjrBS|d3Rg=2H;m(I)Va9&YNb)WaSB&U05^=|YSg*7 z`f8<7zHtgyL4fK&+xL|3Yu`8BrRh5B+uknj>AZW}VEKZd#9UnG1ClSnWq0ql-MQ^= zCZ0SwEM}^&Sou zKy&E(&H38iuPUZi&IN*H1Hqy>tUR|85Hhb92$^SJTR9iYTjjQ!un4Z1i`zR~9J)mB zackz{j;1;VH?5D*Yv$t4zAg((qGt5Sk9CCoc6 z3skZaE~sxDVSX-&cY|a1v9`#*EJ_O9WTQ2xPKwr}3uCZ8cixG)=+@MeF2+R-keOM) zny7&t19r(qx1<;sHKFR(5Yvx!N^@-c6S2Hij55=e;i50VETbt|CKt*wx(t`tg{%dO z$pvbgjMg$-U?ZdNeJ!^qvwSX-1{C8mc}XQeXM5^lZfs95#CWgZg%3?`(~EJL9WRdw zW&gH49(Vhu?cc-x`;Jx`FP!lOf@LJq98ZV0z0dQoywdSy_Iv~_PLbf1rlm1b7S!-;y=FJQNSb3(XOv#zT-Oq6XBFNxyC0}{DotJv3*pd0Tg z>EBO#P7p5S7v}2;6J-g#Q9UIkUhw7@F2cprWsni`87(mM%nXtwcwF2l_l`weDY-*A`f@d7m8jpQ}3jrVf_1n~S*;Nf!hbX0P$ z_!Y8^4{`}SN;poU;|tJyHkVerkCMKQnSLY!J9)+jxs24^r*a`! z^cSF$w>H1RvHgbU1wLQD9)&dHr?^^b;~C$LF8aJKXD}IHpkv@q>mv9MQ$9&>3|D|7Uc^apzBGYL?uB^G)v=c~}MY35|R*~s6 zAy?MiY}yGV%p%z=E33$Knvg4NZZ_=%5@wNXmX%dxI!(xxH8-1f0tvH7Hp|K?GMy&m z%9@)^JAs5*B%5Vr6`4*Ga%IiUrky~-ERxN#vWiTn3AwW7X46g}k+jHa9b-}wE;vBp uB3y6+xK!drxZnhEslUfJ-G_gbPk!mC}E*bVWD- diff --git a/assets/text/TODO b/assets/text/TODO index 66c5e25..e45546e 100644 --- a/assets/text/TODO +++ b/assets/text/TODO @@ -13,10 +13,8 @@ c) text (edit, Unicode sets) 11) GUI: a) Settings panel - b) revisit About panel - c) {de,in}crease cell size - d) switch from wxPython to GTK - e) {copy,cut,insert from,paste} - f) {fix,reduce} flickering when viewRect > (0, 0) + b) switch from wxPython to GTK + c) {fix,reduce} flickering when viewRect > (0, 0) + d) {copy,cut,insert from,paste}, {de,in}crease cell size vim:ff=dos tw=0 diff --git a/libroar/RoarWindowAbout.py b/libroar/RoarWindowAbout.py index 420cbe5..b7b5ff2 100644 --- a/libroar/RoarWindowAbout.py +++ b/libroar/RoarWindowAbout.py @@ -17,24 +17,23 @@ class RoarWindowAbout(wx.Dialog): # __init__(self, parent, minSize=(320, 300), title="About roar") def __init__(self, parent, minSize=(320, 300), title="About roar"): super().__init__(parent, size=minSize, title=title) - self.panel, self.sizer, self.sizerH = wx.Panel(self), wx.BoxSizer(wx.VERTICAL), [wx.BoxSizer(wx.HORIZONTAL), wx.BoxSizer(wx.HORIZONTAL), wx.BoxSizer(wx.HORIZONTAL)] + self.panel, self.sizer, self.sizerV = wx.Panel(self), wx.FlexGridSizer(2, 2, 4, 4), wx.BoxSizer(wx.VERTICAL) logoPathNames = glob(os.path.join("assets", "images", "logo*.bmp")) logoPathName = logoPathNames[random.randint(0, len(logoPathNames) - 1)] self.logo = wx.StaticBitmap(self.panel, -1, wx.Bitmap(logoPathName)) - self.sizerH[0].Add(self.logo, 0, wx.ALL | wx.CENTER, 4) self.title = wx.StaticText(self.panel, label="roar -- mIRC art editor for Windows && Linux\nGit revision __ROAR_RELEASE_GIT_SHORT_REV__\nhttps://www.github.com/lalbornoz/roar/\nCopyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz ", style=wx.ALIGN_CENTER) self.title.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, underline=False)) - self.sizerH[1].Add(self.title, 0, wx.ALL | wx.CENTER, 3) - labelsText = ["&roar!", "&ROAR!", "&roaaaaaaar!", "&ROAROARAOR", "_&ROAR_"] labelText = labelsText[random.randint(0, len(labelsText) - 1)] self.buttonRoar = wx.Button(self.panel, label=labelText) self.buttonRoar.Bind(wx.EVT_BUTTON, self.onButtonRoar) - self.sizerH[2].Add(self.buttonRoar, 0, wx.ALL | wx.CENTER, 2) + self.sizerV.AddMany(((self.title, 0, wx.ALL | wx.CENTER, 4), (self.buttonRoar, 0, wx.ALL | wx.CENTER, 4),)) - [self.sizer.Add(sizer, 0, wx.CENTER) for sizer in self.sizerH] + self.sizer.AddMany(( + (self.logo, 0, wx.ALL | wx.CENTER, 4), + (self.sizerV, 0, wx.ALL | wx.CENTER, 3),)) self.panel.SetSizerAndFit(self.sizer) self.SetClientSize(self.sizer.ComputeFittingClientSize(self)); self.Center(); self.SetTitle(title)