From d56a9a3f7a957d1baf6db9303c6fed1d39f31b2d Mon Sep 17 00:00:00 2001
From: Taka <taka@vm-linux-dev>
Date: Sat, 28 Nov 2020 11:10:37 +1100
Subject: [PATCH] Added icons to the File menu.

---
 vasl_templates/main_window.py                  |  17 +++++++++--------
 .../webapp/static/images/menu/exit.png         | Bin 0 -> 895 bytes
 .../webapp/static/images/menu/info.png         | Bin 772 -> 980 bytes
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 vasl_templates/webapp/static/images/menu/exit.png

diff --git a/vasl_templates/main_window.py b/vasl_templates/main_window.py
index 7d4f453..cb76e30 100644
--- a/vasl_templates/main_window.py
+++ b/vasl_templates/main_window.py
@@ -62,25 +62,26 @@ class MainWindow( QWidget ):
         # initialize the main window
         self.setWindowTitle( APP_NAME )
         if IS_FROZEN:
-            dname = os.path.join( sys._MEIPASS, "vasl_templates/webapp" ) #pylint: disable=no-member,protected-access
+            base_dir = os.path.join( sys._MEIPASS, "vasl_templates/webapp" ) #pylint: disable=no-member,protected-access
         else:
-            dname = os.path.join( os.path.split(__file__)[0], "webapp" )
+            base_dir = os.path.join( os.path.split(__file__)[0], "webapp" )
         self.setWindowIcon( QIcon(
-            os.path.join( dname, "static/images/app.ico" )
+            os.path.join( base_dir, "static/images/app.ico" )
         ) )
 
         # create the menu
         menu_bar = QMenuBar( self )
         file_menu = menu_bar.addMenu( "&File" )
-        def add_action( caption, handler ):
+        def add_action( caption, icon, handler ):
             """Add a menu action."""
-            action = QAction( caption, self )
+            icon = QIcon( os.path.join( base_dir, "static/images/menu", icon ) if icon else None )
+            action = QAction( icon, caption, self )
             action.triggered.connect( handler )
             file_menu.addAction( action )
-        add_action( "&Settings", self.on_settings )
-        add_action( "&About", self.on_about )
+        add_action( "&Settings", "settings.png", self.on_settings )
+        add_action( "&About", "info.png", self.on_about )
         file_menu.addSeparator()
-        add_action( "E&xit", self.on_exit )
+        add_action( "E&xit", "exit.png", self.on_exit )
 
         # set the window geometry
         if disable_browser:
diff --git a/vasl_templates/webapp/static/images/menu/exit.png b/vasl_templates/webapp/static/images/menu/exit.png
new file mode 100644
index 0000000000000000000000000000000000000000..96a80b6f67bb45b4f87160c5123c57cefdb752a1
GIT binary patch
literal 895
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#3AYRbr;^5=3+ur`t`Q}Ur6n2pMGPy~o$&w)@st3CTvCgZi!uvJGV}8oggF(J
zf#O^sap(Mk%A(Blj1q=5{Aa9yqI_V{qSQo?QiYPt+*AhB@BExV8BUN)aDG}zd16s2
zLu|o+kaBLY;hDwBIf+1}MGV^yZ0QFIbAW`y6N~aP^U@g(NIz=_im^lVmlh?bGJO5t
z{2HdrIX^cyHLrx>+nH(mfnsbRWg(d*IjIaQ-d$2>U|{m{ba4!^=v_KF&?7id;`smc
z?{`YC?|7VNSkqC&EY4l!spR&mxx?Rl&59+{9rr$Y@a;{P^-Y%#7uy#cI3Xv+eDdDZ
zrkCD7R7|+0@nt(tFr2tFXZM@Dd+Wu`b7$E8sJATG_y6bTTKj#6J2=t>&!=rZm||p^
zJL_4c5>qk{gM-V1Ip(3EwWbCJ8*c2%Ke<WA;Mjrmw6tU0M<3ZTsBhb}d9yG_tCRO4
z4I#mUX`2}xem~h7b(XQg#8>+5t5?4?J%eN!R$YD7dh+B+|F2bdJza9@>f&zSyZ0@7
z*0-2ROWdkkyp|@hH@tiIPTtnm_P%T2k;I0@`}hB!tKzx4Ng?9(>(|cN+1cf%o_>0o
zVe-pm+EXrug7(7~SA?x*IN%a^<len`*_D+)*JaL<+kbz)vQl<pV&a+*tysnbMl;X+
zbx~UQV%NV5k3ar-wlv7I%xZ3iVMJu4<lNb_tC=6<XSpXyOG`U%jL6AMN_w<y?d2Oe
zX8eAYcld7Jy0y#F)bwjld6-M!8kw@<D2|^s`}8+Pyit8`!pFy_$5fFOInC2Wroq)E
z%xbQjwg}gDh5!SJm`kO9Coa<Xz3uTz28Gi_sVON>-hTM-p*_c}T6zBY_|Q<(mtU*u
z85i8Ucd!3r#h*r?QicPT&wUwg+_|&oT87CJv974K&mv-DYu^;@EaN?Vfw}R3`S#nk
zvYjrE%69)<z^g37w_kty>BKpEI?ufRS~qv@+`W1nObv^9bEJ!Q-dP%=_4SZJPq$0S
zyNW;o7U$5b*K2EQ=l^$|Jol^lt$+EJvGoky*FRpFZ}MjrFr6`Yy85}Sb4q9e04TzN
As{jB1

literal 0
HcmV?d00001

diff --git a/vasl_templates/webapp/static/images/menu/info.png b/vasl_templates/webapp/static/images/menu/info.png
index 6e88ea619712f5ab2a7cc9302b4333bcd3bbf415..a63f3c739963f2f2b70eee1f91f8bfab50ebe63b 100644
GIT binary patch
delta 739
zcmV<90v!E>2Gj?TD;^HS000ie0hKEb8vp<R2XskIMF->y8y77zH(H#xkxABn0-s4l
zK~y-6rIX!D(@_}5zvrB}xu!z>vYh$SoHNU%3q+`kpCojr23~ig7KwKeB=i?VMM7Q)
zCMFUgUIeW{jP8X(vRbH(@$)6re3>uI?RU=3?{u*_-@5C8!-41d@;#q(p63vy6#ge{
z#}j#uf<kYgt-G%AR(okhwT}>gVDryX)R>w4u=Mleuo0WxJgg^&2}(RoEgkosk2N;>
z-Gv1XFh;>B0c8}4JriH2qieCxZ+gc^o=u!EaC@3sy82#+s=aOpV+4#5Tq$>eQiAA;
z#C~pS+DLEA2JgRo@^Bac=stE^=hLyW3uhf%q`|p_5EAv3cKFNlAkq?loM%>pztYCe
z>-}AKdjh#Ps1CGud%RU{E+nWVU`#<ug3y;;FiK#WR)!#3yINOOv_M-QX_|H?V^Dvy
zjevr43Cai@0Ipvy1R(&W1k0OANJ+9L3eJ2xc0@t5uIr@~08STQtl=UJGmDur)0kV_
zL%@3q^&ThEX$dZ}*U0XFLOHaWnwkn509cmFp02<ofs_ghtEpUfIG0d3AYhC@N{c$3
zPL~Y;_I6f&adEMXW{XTJ5FE6Z3kjvN226oU0;*Ex*49>>0>H-7RA?_Lj$#UVgdkVr
z67j7B&J~#Rkx0a#05Ja}^eUOyUfUN!S?JJ<a|W$9&OljK&Uh|=YFM>yJ`oOw*C_xP
zvAKA{c-OnVy(2i6NTnnqv0c0kFJt`E3TBK1Qf6j8W}}NruN9M{BSV8HM)|?x7hUVL
zvEQCwRAkSy<;IvX0wL1a*jTk%{BrW!<olk1fr0NQ3;>|ByQjf>?RMYqxV?ENNi_h}
z<q&4MCg(4em=mKqBSVA1U~u`LpJ_idO{2Q5m->9Z3YW{}ipS&eNF-u}!{PPg+Q0Zi
VXh$%AvW5Tv002ovPDHLkV1mtBSqT6D

delta 529
zcmV+s0`C3P2ZRQYD;^gT000*f0cW4mQUCw|2XskIMF->y8VMXLOmFH;kxABn0nbT9
zK~y-6rIO8R6Hyq3pZPhNX_zKy5Q?=zBU&m26<jH}5h{2E?s63_%-TgZ?p?WZqZc5E
zJKf|48nLm6RP)#Plb^|CW_mK83rRF2tpUI7cX;0SeD7<B2>&zYSxc{66|Y=9Q^7dR
z!Q)C#u4e*%8X4Zz$2{B17)v{UD8BJ!JEIX>k+VkJ+c;tGWoMz%9N_+2k*itFm%u{V
zii{EhQQX~9Ja`?=L1q9qUj$On13IC}_sC>x&0{^6=j%Y|geGfF!i}c~Gmz;GwqJ>C
z#v=e63pQ3Xmoo_fhkX-&?9h%Z06z5+j*2N`>cA^kC4E$*5tuYbCdUDPG)6YJE_mFz
z=+TK?4*NoTs2N0>OIediI`+iML051c8`l)NSTsVY)O~Ija@4vZeQhBEpQD7RJtY12
z4gAus5vnX*ZPSVsT}f!g3Y{2OTGQ7S%}CLT6_Fp}_)YxM?w>CJ$iwr-%8w5KgeML;
zTeF#S$-4%&A-F2~{jS$&WK`Ojc4Dqb>F0?6xH{ol9@d>Pm1Bc%h7I)^!K0m-LM?3K
zxhFM|!WB{}h+{~lV6gvwYWtsnNvx~Gh_s{m*b`dC)rD0)6#z`5TBN)bV43*^PhH!`
T56(Aa00000NkvXXu0mjfXvOYg