From 396ca108b9d073f3446eeada2276cd428e60f486 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Thu, 17 Mar 2022 23:38:09 -0400
Subject: [PATCH] New dialog icons (from Remix Icon)

---
 data/images/dialog/remix/error.gif    | Bin 0 -> 578 bytes
 data/images/dialog/remix/error.png    | Bin 0 -> 877 bytes
 data/images/dialog/remix/info.gif     | Bin 0 -> 476 bytes
 data/images/dialog/remix/info.png     | Bin 0 -> 835 bytes
 data/images/dialog/remix/info.txt     |   1 +
 data/images/dialog/remix/question.gif | Bin 0 -> 478 bytes
 data/images/dialog/remix/question.png | Bin 0 -> 750 bytes
 data/images/dialog/remix/warning.gif  | Bin 0 -> 474 bytes
 data/images/dialog/remix/warning.png  | Bin 0 -> 858 bytes
 pysollib/app.py                       |  11 ++++++-----
 10 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 data/images/dialog/remix/error.gif
 create mode 100644 data/images/dialog/remix/error.png
 create mode 100644 data/images/dialog/remix/info.gif
 create mode 100644 data/images/dialog/remix/info.png
 create mode 100644 data/images/dialog/remix/info.txt
 create mode 100644 data/images/dialog/remix/question.gif
 create mode 100644 data/images/dialog/remix/question.png
 create mode 100644 data/images/dialog/remix/warning.gif
 create mode 100644 data/images/dialog/remix/warning.png

diff --git a/data/images/dialog/remix/error.gif b/data/images/dialog/remix/error.gif
new file mode 100644
index 0000000000000000000000000000000000000000..631de3d3f7aa3e83dd2659941b87fc6798e5f761
GIT binary patch
literal 578
zcmZ?wbhEHbG+;1bC}3bv{K>+|z+l0k!vF*zvDW_y3IAPO{%dIb=i&KZQ}f@z;6DSy
ze;u9wDk}f$>;Fqg{1*`T9~1LGJNti5&VO_B|NZ^{fB*g;67t{4=|2a@|MvF(K=Aze
z|BQ_P$;tm8KKyTQ|35YL|C1;G-@pG~Q1IWu;lGj5e@V&zVq*W()Boq^|9|%E|GRhp
zb94V|YyVG7{Qu_7|CcZSXJ-DlvHAb%)&J?!|65!Cuc-LX!t#Ih>i_)w|5a80D=2^*
zj192;cbHS)p(E9QVoA}-9IN>kR+M;&GBGtBbP!+&ncvcs=%d%q-;y7ckT+Y9(=_nm
zy4j*dcMhFX*Wbre+myl+%-h_-#uwDt8Q9zF&p)A)-*3u9pX!>VvbkmTUM#f&f<mQ2
zf&#Ufp2B4!qGDp=61kF6n+0a)Nqfx^+$^>%b>$(!`FZ<mB*YJGO_q^8Bqv|%$<TCc
z^RnBAm)8n;FgD*4Jb33pt%8SQ$Js+yt~IlJD0P1L)T#WfQ{~(huQ%E49nGB;oBb9z
zOi7BdEIF(oBz)wZ$F>3?)fvI*?lP0?w2IEIGGjZ+m8cUH<9+D3>#-!E*bjl57)4qp
zem-SVVaUxkH{Qx{%83WY&Bu<It;{&{;IbAc>msAKJ0h~u9fW=QX89btb^Ma*I^%^6
zYn7i~xM9@2gvBa*LBLe01m~4MJvsg56mx`b?uc%2h_mCE^~qF;@d&T3xkH7_nH?J+
MAD{4(jgi3`0D8LrV*mgE

literal 0
HcmV?d00001

diff --git a/data/images/dialog/remix/error.png b/data/images/dialog/remix/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..40e1835af031bda27b10ac61481ae57b0cd89b53
GIT binary patch
literal 877
zcmV-z1CsoSP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0|H4zK~!i%?U}u6
z6hRoqPr2gC6c$&c5Ry_bolX7(3yTzD7eXK*M1q}=5Fy2tDHKv#Sf;VC6ETH_O%RD7
zXk*~G<HC^>EG$yIJ`cVd=H}kn@4IvH9{4fI?fbQ}v$MN1wV7u6&virF!jf8T9?gAl
z5Ag2@s_k$J-XQT0w9^%eZh`~w2}nlH0DYSpZgN7>1+WLc0;{+zd<W0KqJ|%@kmv#E
z0;`xJFeZoKc!b~$unPvjDxeG)n>iYqwj3c~9lQco(s96CbxmJP2*jR$p@ApKb5Q(B
zAP6t1m0%L=Y8m;20K8$Xz>_53jSWXml^>lz(}FcDXjvn=sja0)fKSzFi#4#8^uihQ
z37c)YTw1b!x5#4q7uIr1%S#rF`G~gy*&H5<TwRH*tk}n0XhU22SjWR0XnDzk@jK7i
zrqK{-wd7jeuE@rQZA;eHM9$CE7~)CH&Dpl2oM?IRg5kX97=}ZEz3D1+C8C~p#s9Mn
zr{wn~7(Mo!;$e@o=Uw?%Vtrkt-PVJu!9ZkZXE;_ePqoajVD!>+N+#61{5|fN6)T=&
zEi)__z4e^Z5h}F2;>mk0Gb|XLdQR!FhLfv&!^Y)I%M1%f9nUEnp_3?HJn3nf*NS@*
z=M&R}6nCsFAw~Wn#M!3P(JnW1c`35JZTqI<i<TJ{j4FQ<SAH6O;yJ~$x;p%NK>0T;
zhfTk)2UWeE$mZs7tYr4I%&=gz=sAU1UQXY;p)0`{zHOL0T4uapc;Y$Q@I{O-WRa4l
z%B?MtiwiY|j*di{P1|;q4<OyF3B#7-7*D+}a(tYATt`=eKJ>M0Y%;x0^MmHM;~WnQ
z$ubmZo2~d?Alnio9QK_6(`H}GN-sF^X8u<`>hrCe!m+x`Dv=PNx(izrf>e8HkwT#A
zF78G`z-W2>C$N&1!FZO}T_JciH#l4&QJGsz-vFOEli6Z&g{09YU!D`;-dN#HzB0F2
z*@F+kUBGqB+uBlnz-?8wpTTP+PX4-@X{MPHRIB{~YK38%a_!Qo00000NkvXXu0mjf
Da%PwW

literal 0
HcmV?d00001

diff --git a/data/images/dialog/remix/info.gif b/data/images/dialog/remix/info.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9c0d20426ae0952f29a24f0c8478325af7752a86
GIT binary patch
literal 476
zcmZ?wbhEHbG+;1bC}3bv{K>+|z@W{b!vF*zvDSp1|1K5(HIo1H`2Vk2@ZTWwKZE;!
zowWZd3IFRC|CfmPFA(%UrsIG1l>a$X{+s9h2Lh+^|MtcI*?s;qdHhf5{~yu*-@Ep|
zQTBhy$p2zt|3$<88)p62PW$gw{ok?le{%2tu-5-9p8xGj|63RQubB5=HSs@x;Qx@8
z{|=@972^JbTtWe0`*~n$frpM%|A{3<Cv&XkUszG%CCbFqbkIS7A!L3_Q=*SvKYvSp
zP(t2pK~B@ahwEmGe!6<-oVxx#p4z4qo?zbQ4mQ4^&d$KzUVr`xo&0{C0y72rd~!Nw
z&F*0GX6aqfo9QXIY*w$3m++J+B3_#|d5UhEBIY5!Yl5JM#DwL&>>iRw*7izyl&qOK
zLE1y+)Wu#|54md#JLNqT?o3ehd^FKh>B8L(FXdOgDqgDZJ6C$D%{bkx=KJ${v!B}E
zP024W9kA->n>De><KYa~ASO+nkf%r1+ZW9XJT%$8L*3<%m5}0xi+oJgO1%p_7CLoz
TiD(3!n&Y{7neR+T1_o;Y<U+U{

literal 0
HcmV?d00001

diff --git a/data/images/dialog/remix/info.png b/data/images/dialog/remix/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..926c180d468a7c2f39676183292995792c4dc2a0
GIT binary patch
literal 835
zcmV-J1HAl+P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0@z7JK~!i%?U}!8
z6hRcn->l+UT8KnQA!w1tABb=u7}97+h@fC0A&o^U?X<8k;2)r9VX(Bxft?2iO|DV=
zfkdznf=yDS5Dc0^J2_;>@7sNB?wH-Z-P^t0Io%J;zIiX%oA=$Fo!OnCii-anB{n-#
zdX!w6L9LE5+EJLV9pw{RU8WVa#ec|3HUZOm1W8{f?InK74<=?EtvAV`MS7vOC6=20
z1Wf6pNPHGGE@NJ-e>Rat0~cY5R@J7&5|duQ1$_x;Jw|QB59G!+M9fo5EsLLs<N_x2
ze%eR3aK=q|2mD~}{Dg@6)TVp%TK$$-EXf2+=)Fk(3I2OdB7=pyQ=6_q#2<-7;)sog
zuY8Rj7M482ZPn<3*LDwj3*c@;7-@><hO`|^d>8T`*k|IEgQkmd4|en&;Gt5{ZSl%O
z(H$?B2%-h}<2=u*eW6#nO9twaODN$2CiQ6?BTp)US;@&DT!5m>IA)z;^JGkNGKlIz
zXT{osOXsB4g*ghH*JmK>9cnc{U=1$v8mE`)z4#vH9oXYtecO^}91N-BQV%c%XgV%6
z8#y61AnX}9EY?O2i47Q-fE?$6U37s021FtO=|6Ic!^ka6z&Eir@?C6zDL@aq0K4zN
z53vEJ0EfOv%|_P62ABd|;;Fjlw`eIi^hRm{rht}O!?WJ?zF`F#Io0W{cmZM00P{ht
zJvj7=?kZQjfN%jWHF4bV9V^(t9e6JFF2V(HH`3G)uY5R{RrOK4E~01MNqr2*C6vCu
zi*sTPWiD#n^dDYUVOpw*A6O8tc)0Bzi@osz7+z>4TJ)Vlc_eMelI+cMs26t`{-HL_
zLjZTDUw&{P@bdbC*H(h$ne^}eL%YGzNxoZ5JV`Z>36J#!Y%z7RyUBM2URoi%H}({r
zxP(o<FnHqAbQKAmgguDJ5frw}4$2l<+kxQEs5jA7j924|ii)%l{RM%_!p$t<9a;bY
N002ovPDHLkV1f%0b=Lp@

literal 0
HcmV?d00001

diff --git a/data/images/dialog/remix/info.txt b/data/images/dialog/remix/info.txt
new file mode 100644
index 00000000..2031affb
--- /dev/null
+++ b/data/images/dialog/remix/info.txt
@@ -0,0 +1 @@
+Icons by remixicon.com
\ No newline at end of file
diff --git a/data/images/dialog/remix/question.gif b/data/images/dialog/remix/question.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e3d71f65af86fbc2c8c2da32e8a60260a3162986
GIT binary patch
literal 478
zcmZ?wbhEHbG+;1bC}3bv{K>+|z@X2d!vF*zu~v&6Um2Eu4mkMDYyVf4WuFs{{n-8d
z_w7%A?|=T2a^kzln$I@7zW)FJ|Mic*4tu_R{{8Rw-~SxTKR^HaH{!_m_A5VBHh$6A
z{H5l?kNOMWyRZFx|Ko4-<)0;Ie;$7IJLK>;fmNTs|NdWa_D99}pC?}ZHr@X1<FEg*
zN54J(`fu~&-yVCvnr#23w&{!O-fzOIKO1fP3UU>RfbI8z=>;A-QvD~E6rIemntx$M
ziPzew^??ovr{7lXe_)`X$uax<3r3-{dF9vN{gBjKU;Xl%%{*TX2|f-sPOhTrbZ&N@
zu5Mnw!nQ<i{_ZI}0;#zZ;str9P8AZI>7FY*MMP9gT%cQGkz1~$RF`zDOt<Vh*FsS_
z`B<)Qj-4)*G4kCChn<f`D|WM;ayrT-v${*^qJG&t9%YrAx2LMA<;_Z;sxH^RxU`E`
zLww)s^=HbSeNFqGIOW@$qCcfy8W|%_#LF~&E_tZ!k)LSU%y*HaXGdz%5fL%*RUS-f
qtYRAR5j89~RS$YhVvL&8v+3wjuW8cpPKKJBmz|w$;m*d$U=08av(+d7

literal 0
HcmV?d00001

diff --git a/data/images/dialog/remix/question.png b/data/images/dialog/remix/question.png
new file mode 100644
index 0000000000000000000000000000000000000000..84587b8101c3931ccc470e8b4fab9ee73ba4a6ba
GIT binary patch
literal 750
zcmV<K0ulX*P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0)t6JK~!i%?Uqew
z6HySy|GP;{)I>ol6j5lgf;|WYd&ofq!IP&z@sfHFJbNf85~Q~t1Q7(09ux|e76d^l
z^#iKlAqR^eSTG>!p-MreQ9|2T(rogamyF4pq#xP5bvLp<c-fivUY7aqo0(mBczAd?
zipJL}cQXC(`EHOEEl;?H7tq8-#CIjxFQN0bir;sce%%(lBnp89+ZE~s2*lWOA=)W6
zD%1;TGduxKQ{ROqmIYgu@Y5a7bOkWj?L*g2oqT~$D*|^v8+fo_Af4llRvC=^6|+(S
z$M)(Ni-yn>X?(EhToI>}IXwSf;28_l2vC+nGWf?Qwyzt!q$8+fhW5nv`*@~xln4mX
zUG5(bAuRJ}6a2Jyv_Dw-j|!CBCU(GIdb(z=q;fbkl|}D#7Q=Hn7)4$nI(O)})az%j
zHIxWAx<^Nb^7{`X@79o*%a@Ax{gS{)Dv!k5HC`=qa-SLjN{hHBtf7y@JpEcgCeM>h
zM-W&X2(t&wuN2TdwaQ)-*j2<5`NZ#isSjRaP9aHWNKGLt6|fO!4+hvOlS~_IwTA5i
zWa?ZvybV|T$T0EjTg{PJL}?9}5%Fri*D||k;QZ@6UjDT3LbJ05w!#wC$IXuxgKxk;
z6|nG2;N0vg#^==pFR@*K{QjAyk2v`<JMu7F>QXAPtp;qv=^9XtZ31K$G7r1(PQYo}
zUVztyoW>L2H0>ooh$n1SXd?mID`>@Q>{MvB3w@w*ojSp2*>#>~PGANo4!J3K$yNp2
zrn92pcRym^HEbr}2aRC_!b6BhQspUku~7}Yp=HYV@HqRfWStYBir0++w+G*t$>m!Z
g6Cw6IJpONh-!^BrxxuI-J^%m!07*qoM6N<$f^7^+<NyEw

literal 0
HcmV?d00001

diff --git a/data/images/dialog/remix/warning.gif b/data/images/dialog/remix/warning.gif
new file mode 100644
index 0000000000000000000000000000000000000000..711c3904f972fbf16412f6eb60aefaa486b68a36
GIT binary patch
literal 474
zcmZ?wbhEHbG+;1bC}3bv{K>+|z@WvT!vF*zvDW{q68_J2`QM}QzlP`k&YJ)I2LH<#
z{`czq@6!0+sq%kU{r@J3|8)ZYSH%2Zm;HZ3&i_f~|AAnJ)BoxA|EoCumoxoeo$`Na
z#Q%BT|0fvzZ<hSuDE7Za@_(=P{~3<|S112p6867><^NRc|Jy76cdGuMV*bC5|Nr8U
z|I;1*w=000K^b8C?l85$Lr1Fr#FC<uIac#8tSIpkWnyYN=peulGQXuM(MPYJza?KN
zF>kgomuca{b+g5bL=T@+H{Qov+myl^%-7t(#vjz#8Q9zFFEF7~z^_wqreL2>PRFd-
z9UR^)y$gCXJ%yId>J|19Su?X&)N8`>i5_Cx*Y=8gNbK3%E94=0XkjP2ht!D)(jGGB
zdM~&i-*mD=_P~_8Y;qp*_ogU#KAzyE_<W9s@Qq$2FXi{0D?L?a>}^)@{du_A&uh)*
z;72D9SoQNwn^@$raFJ#spV+FTM|b2cOLjdxseD9OsZOR-KtMsGaqk2-zXcu(Rav`)
QHIh%w@!XttMuEW^00!K-lmGw#

literal 0
HcmV?d00001

diff --git a/data/images/dialog/remix/warning.png b/data/images/dialog/remix/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..085f87c980ea5538d5f5516a0471793b451aa867
GIT binary patch
literal 858
zcmV-g1Eu_lP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0`EygK~!i%?U_Aj
z6hRcn|8rOv(^v$FkV4SH#t*a*)F{}RfP#gDG#061=SNZ)Na@Fk76wb3JFv@v=@lV}
zf`t%lk|Kp*KnpGWD9nxjnRzU^?CkBwU3T}#{b2XKH^<Jr|IW<L%`W=%+2ts)9i#7J
zgl3F2o}o4V2(-1Pl`lNIL*pYVSW@?~Zhz~Ljs)mC7-lllOlpkbNmrVf6}H|$6AS7Q
zHl!>ynFKKL!@P2WiBHfTmEx?d@u>4g)YvP=Pep1094c36p7R*C1>IwVH)M*vu_SRK
z5)07t*o$Ad%`0v(-0w=e&JT)sj6qb@JpM{qTM`Li@_X<HFIf4c6zwbuH4NYeMf{VJ
zNGf6@kvso1x8x0`t>1WJ+m0btfDD^yiSp#8Z99gxLr5m<qKgVbW4ztOj_d*ZsMMI1
zut@INTq1}bLgqQ|R@H1g(5**SOb#ZO2)qKQ_!RGc<VCr|Tx?Dr{5?>?RjTfEh3y_D
z7n73*zknvridP;qM#XC(BtXyNG!>Um05Ga&a9;d?a1S(bj_23~qyQ?uUhoZ}V`9t5
zaj^kD0SCpF4~+xj1@x8x)$0O~L_nrJT5*I0XnYl~jC>Ot5W3&|2WtNLU3O9Fc&#4d
zlK2+i9LW5JAO}J{;F|-V#VaE#VgtegDp=+@b}w288gIo5@IG@m58lvRbWujO?*V2y
ze!MMXA1-jC-;~(mn*&DHJMqec;soB7yumME6AhkMT~G>EIecD;--1_ws^UFO-9@FK
z&d28m@mq)-nA{f}q3Rls?EB(wpm;MCCZpb)ww+l${aVGqZfmfDISKQJZO6UrZ7aYs
zh$<^ukSI@{*|uXy^l<L!m%9dA(Ez4oIQ?{`JA!$=K4;oWlDr}H^4PN<IJVN|PfTXP
zG@qF2xqM>U3Wd0je84q|Nh@THt-mbfBcBhu@NMEcYdk?QL$rrjJmh}Gcb2WQ%-Byn
k8eHu|e~tU}>5~@VKfR&FBAe(lp#T5?07*qoM6N<$f_Y_$ZU6uP

literal 0
HcmV?d00001

diff --git a/pysollib/app.py b/pysollib/app.py
index 8c84b27d..5a00740c 100644
--- a/pysollib/app.py
+++ b/pysollib/app.py
@@ -59,7 +59,7 @@ from pysollib.resource import Music, MusicManager
 from pysollib.resource import Sample, SampleManager
 from pysollib.resource import Tile, TileManager
 from pysollib.settings import DEBUG
-from pysollib.settings import PACKAGE, VERSION_TUPLE, WIN_SYSTEM
+from pysollib.settings import PACKAGE, VERSION_TUPLE  # , WIN_SYSTEM
 from pysollib.settings import TOOLKIT
 from pysollib.util import IMAGE_EXTENSIONS
 from pysollib.winsystems import TkSettings
@@ -509,10 +509,11 @@ class Application:
                   "joker11_100_774",
                   "joker10_100",):
             self.gimages.logos.append(self.dataloader.findImage(f, dirname))
-        if WIN_SYSTEM == 'win32':
-            dirname = os.path.join('images', 'dialog', 'default')
-        else:
-            dirname = os.path.join('images', 'dialog', 'bluecurve')
+        # if WIN_SYSTEM == 'win32':
+        #     dirname = os.path.join('images', 'dialog', 'default')
+        # else:
+        #     dirname = os.path.join('images', 'dialog', 'bluecurve')
+        dirname = os.path.join('images', 'dialog', 'remix')
         for f in ('error', 'info', 'question', 'warning'):
             fn = self.dataloader.findImage(f, dirname)
             im = loadImage(fn)