From 084b25779b4adc4abe5085d80eb7b8f1dcee77e4 Mon Sep 17 00:00:00 2001
From: Huy Pham <42948410+hpham@users.noreply.github.com>
Date: Wed, 15 Jan 2020 15:23:49 -0800
Subject: [PATCH] differentiate sessions dialog's between start gui vs open
 from menu, add delete button to sessions dialog, remove fix width in
 TMenubutton for dark theme

---
 daemon/core/gui/coreclient.py           |   3 +-
 daemon/core/gui/data/icons/cancel.png   | Bin 0 -> 1322 bytes
 daemon/core/gui/data/icons/delete.png   | Bin 0 -> 387 bytes
 daemon/core/gui/data/icons/shutdown.png | Bin 0 -> 1546 bytes
 daemon/core/gui/dialogs/sessions.py     |  45 +++++++++++++++++++++---
 daemon/core/gui/images.py               |   3 ++
 daemon/core/gui/themes.py               |   4 +--
 7 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 daemon/core/gui/data/icons/cancel.png
 create mode 100644 daemon/core/gui/data/icons/delete.png
 create mode 100644 daemon/core/gui/data/icons/shutdown.png

diff --git a/daemon/core/gui/coreclient.py b/daemon/core/gui/coreclient.py
index 23f7adc0..e367608a 100644
--- a/daemon/core/gui/coreclient.py
+++ b/daemon/core/gui/coreclient.py
@@ -415,9 +415,8 @@ class CoreClient:
             if len(sessions) == 0:
                 self.create_new_session()
             else:
-                dialog = SessionsDialog(self.app, self.app)
+                dialog = SessionsDialog(self.app, self.app, True)
                 dialog.show()
-
             response = self.client.get_service_defaults(self.session_id)
             self.default_services = {
                 x.node_type: set(x.services) for x in response.defaults
diff --git a/daemon/core/gui/data/icons/cancel.png b/daemon/core/gui/data/icons/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d95ba0ce40155f397a587da9463123509c9fac7
GIT binary patch
literal 1322
zcmV+_1=aeAP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x1m8(SK~!jg?U_w%R8<tmf9JgilTKSDs0&iig$tlfP0T=v2}tP_A{Y~0
zG#Jsu1q%s~xWOo27OddMLX8x~g)2xPxX>U*#STqfkhaVU`Am#aP!|dqJ4`b$?;aOS
z`Z4cK=f0T%7xce8_uO;-|93ymz4yU1rg3jWY7s=cy4=xgzqTo?KqaA~3lQd@G!(LA
zQ2r2=i-@L0BvrR`a7el_)#k2BKz7yQdB(^_lox@fh~2NCa?mmK#`_1aRLY?u0VAs)
ze~6o2k037tGb>GAz)clC*Sx>uzW(&zQ9DN#km+oD0p(+0cGSLQa8;2_jeUcMqja(s
zpozqc%q(}m!20Oi?4fX=;U9mqq|>)-{H+A&Gl}?(toH@z>gwoOLinb>&hL_A>1;Vy
zr<{W(5;N{9c>rb2jjZ>TcD0mUUu6YkX1V+CD)}*JXXbkSN9DYxoI;u8;&mVgYey<N
z6n(z2Z}>>5_L2hrO}0JYzy;vJJHpH!*NpGaFSW&%oI--`;r}NOFxz##U8NdB1!UWo
z%q<itJBWkR+-mLaG`E73U4COwbp2>&;^EL(VMgQWCTuILIK;MWr|!eg@H)${b#Hl+
zx(^Nz+qxTE*D3`t(>LCRu!evD?Z!b_XBD<U-dpuFI1aJbc1|h6Tb?Ag^(}B+ycH{n
zy}rv{gy>7!)fI3K2pIjbZ3!^fCZ@Bn1uyy31cO6t%MQHul|l0DE62!>*`Dmcncr;1
zA7~oA`b#3fq1d3X!ZxBgcZS^C+rjt8jjl^<>+VS-;Vn-Rd!y)U8$<5B-I#M{Y|~*J
z=_s~&0Vh}#<%E|XNCDf4ZR;5)SeQ-#+`1X~@)$$z-CgASzKxIxL?ti+0j`;3+fP7C
zq{!T!4wFOxr~w6>2?Jdr`9i=m4SmCpO|*pVLUSsJOnx90oKE7@kUW3{xP=L5s4)7t
z2orKsRIQRc0FA{4`)XnfDYb%hinhuTCLmL3u(5sK2?;CZ>x2bHiVa}`{;VYO#3D5Y
z)ydPzqS#Fh4R8yq1DB$P4JB_3xp%tB^=zBGu&WRu$i-q?K!5|MqXaEUzOZ0Jcc%(P
zs0O(O1c*q=HlWko8YJ)g<o4{GwA<tdQsnl&85FT)N2F7%hz7U?1k^1Z90D%e1T^Q*
zPTm#^$Af(TiGXju|3qLU@&hT%g|k-Vf#2fGhSSBy;0SbMP&s53QVqHHd&qx(+^R@T
zoKE?ZC&=yH8D2BOlN}0siVWSDv+Yaf8drZN!kxfb*kXM!bDCQ*=g;0gYS<y?sQYL<
zb?Wy(>QX&MI@>-G<rUiucM>A(tN&qWb68u+N^D$r8xZ-e@($ptpZBBPi2?5a?$k9!
zLRH^QsIp<IN8c&WLXCZchZPRgo|YX1?QKjA9i7Uj>|w59_9Gh=zN{TBYaEaJ^{<w5
zvVYtib&sN~sh*b=zOIk^Yishj3n0hR+4}4LvnqUAJ-0Hs(B67K{+tc@+x`(Tl3cu2
zkbTtp)lT_KVPm;DUyR5Xn#R82BL)@-vLDDr?H_`i2>bjQ?t-Y~q1vB(9ZxhF%qB$F
z0rMhuzYKcNQLi_w!rG!XzgfF+Mh6xxGLCeJN<z{3AWe+luQR|EflI2K7SU9E*>JiR
gzged-je8yc0S7nSp}o%sl>h($07*qoM6N<$f=vT~fdBvi

literal 0
HcmV?d00001

diff --git a/daemon/core/gui/data/icons/delete.png b/daemon/core/gui/data/icons/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..01b498d4cb54e3e1f71db21b1ef0408faf28dbda
GIT binary patch
literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^CLqkg1|*MGNWTVBY)RhkE)4%caKYZ?lNlHoEj(Qu
zLoyoQ&hqs;6d>Z(e{2EI+*b?UxvCso`a(%&hiGiWA*neFmCYH7osJk<WGYWtUb}Sq
zKIu<$pZMMS{(0`cFMd%Q7W4NsSZ?TAV`;#W$5TAx1A|VdxaM`E_`|HWvrew@j@>@T
z_JsD?)UK*b%jyY|vlq%W@>r~2p(DTBuKZfjH{D%1_D|Ow`?LDMALH8{`|mJaKG3!@
zn~SGR@RLUHl_%>jxHo36j(sD%>0!Yft)u%UOb|HBQM%LU-mZK5XY#+3oiw3b<;h&(
zX46x#%kPNJzPJA9!MPJ!_9!d9_c&oK^r;UE^VhEjb0rqO-@Cly`RXi(o(szz1+=v`
zAK|c-X4&}YWYWao2hCsV`+FMuS_KZMewY{W?2y;81<ZGt^A9Xy?R4FDUDnj^8N2C4
Wo<~`nf3$$1%HZkh=d#Wzp$P!F@UM3O

literal 0
HcmV?d00001

diff --git a/daemon/core/gui/data/icons/shutdown.png b/daemon/core/gui/data/icons/shutdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..532f2cb9762971efd01089debdf87bad56ec812b
GIT binary patch
literal 1546
zcmV+l2KD)gP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x1;0r|K~!jg?O97~R8<)M{(EMo?F@xd3j_-!JPM_d6dXDY1d^6E8c3TU
zaVQE^7EJ^x3pZ}mq$b9N8#U63iI2oUlu#E2WhJH21k#pKh*&6vRG?^twzQpLY9IIh
zE~Z-U<J?E5x}o3h{O5ms|2>cYoO6L$%;NC|&4d$<M#ad$tq23<U<xyFAqb1Xm@^qA
z0mkpd)CJ-g5w&D(ZEL3nXz9jID}m(GB}+Ap4ui2DK)y%wUN9Y3G&BZV+j^(VVOj~q
zcWhjMG2hz+IshOr-QbfLW5Q=Vp}sk{HP+|V*mDAj%E${~d<Y=dtE~h28C0Krw(Tn~
zMy?a!aM+*75lsZtdFSRH417FiP(4Di*ti>gR|#-+IQTH>YX*2ndh}d^a3++cM(K1c
z>7=SSDR4OK|6j=i0AuIFr0*M!u5(;pJ|~6LwDC?p^zJ9R_QTh_&OEM6JP3UN;E<h`
z?Fb|)O7{KNbKVZbI2f-esj<_MCNNwPc><vKXP%Zf5U6RmESx9nmnJ~qcK}EYDKiW3
z`_rTc!0%7_k|S3L-&?Xy%LI~TrAsD@l*CFwM(rVF?mq}n8pWIxWISJojM_thBA?9+
zt{bTgFSDd#CDeRe51R@bsNM@vPz15I7=h}&UTIJHsoDeI`Y=R65dzh=Q$3(+KFh^y
zN`M=nfU!^JNy%RZ|CX|U+y1Q;@NFn{&w3KRjS={_RZjWYQV!)w%a5D_aV<xq!o<fY
z82K?$3Sf!MPoQcKKvQN~-#w_;e{oIxAE;edp!MB*grI^zRn*QTf26-BY!sSD04SGv
zQ1TW+tSr>Y#=ianoOCRhCU7!|u~VPxWMb7?C<_)zZ8U|pn>d-2fK4(7V*OLPw%XkZ
z_2xAfbgiNGbVI#yRUe~hgH)fGoJW9w)iMX7ph(xAxZL4_radMu>3tYuJPHP{G0LoV
zp~W%>l%qdEYdzPU_&GxB>DI@XZ+A*36E~}~&>X4x-1)jT4-ZO1xjp;v@PKU$1G0?*
z$J3}GoHun>FjDXq!zzJ<Oqqv=bZv*P<q9+}$2NumaihR0fj?x{JlL-{US42J&JBz{
z_(8u!69Cx6&8iMaSEkzCscZX+OB@M0!B-ryjqxZ5)Mb>J5>SAPG6(9FpLA_eP-H4>
zULaPifmo%tS356B^_k7w%yodMMdm>3y9f1#zHkM0*MfpU7jzAAvO)+v_mWPgc6UO%
z|EJuB*u>40K-Si_b^v!|PR7nO13a};C<_)L<HdSUNl;b@83*d2<Sm>MvX=5K$L-*@
zj+jws9)SjEU^*f5qV@iU@e8dwnOLzJne}f#tS}Wy6U53wWFC1P!mxP9&!2;K_qL5C
zpRjt0w7iWZ%SxAMf^R~0ClCUeb+1~^fAz*yOkD1O*3%6hN);)ZmkVWi0er;~)0|J)
zT*F_Vz6YqPjQyy>Vr8)9!d+Jh06@Gl@)0o(%K9l7L`Ll^X)R(PMSk>nlkJI?2uDNT
zw;!?WlNk*?vpH8xs9mtR7efdHs%qfhQttg~$r{GbpTpSclYnOXNZqfgYN71i)HZ6o
zqI55TzjWfFEXqe<=Wd9##ZIaKQoGIAnP!JMp8_-XWVf`RlJz@&ws=M47y&Q4A*SRl
zgjlx`V)Z&u&V10^)X9>E2Ec;@sr$pPKkIK|HXv|g=xj&5y^aGo8Wo9wTg?RQaus#v
z@Lfm^?xNP#2|FeCkGmt{6c{^ahMOb44F%Pj8F}0V06HB@h90Q9m~bq8ZVs`)jUhGo
ztQ+zveUFG&l++ODDC~Bp>40&cfx~tS)(RdkG(h&*j*}WtNT4PFqh9STFiM1@s$Ud(
zB@d+glW+Uxd<|MXi1z_l>e2iTz{eH#HCk0zx0spVtPM~`e%Q20Q)oLeg;TEwl#i+V
wbpk*y0oR#vk%(J@+d5)1@tbuPvv}O`HyS6|ll}e<F8}}l07*qoM6N<$f`<vuApigX

literal 0
HcmV?d00001

diff --git a/daemon/core/gui/dialogs/sessions.py b/daemon/core/gui/dialogs/sessions.py
index ad348280..0ec1a8cf 100644
--- a/daemon/core/gui/dialogs/sessions.py
+++ b/daemon/core/gui/dialogs/sessions.py
@@ -13,8 +13,9 @@ from core.gui.themes import PADX, PADY
 
 
 class SessionsDialog(Dialog):
-    def __init__(self, master, app):
+    def __init__(self, master, app, is_start_app=False):
         super().__init__(master, app, "Sessions", modal=True)
+        self.is_start_app = is_start_app
         self.selected = False
         self.selected_id = None
         self.tree = None
@@ -89,7 +90,7 @@ class SessionsDialog(Dialog):
 
     def draw_buttons(self):
         frame = ttk.Frame(self.top)
-        for i in range(4):
+        for i in range(5):
             frame.columnconfigure(i, weight=1)
         frame.grid(sticky="ew")
 
@@ -111,7 +112,7 @@ class SessionsDialog(Dialog):
         b.image = image
         b.grid(row=0, column=1, padx=PADX, sticky="ew")
 
-        image = Images.get(ImageEnum.EDITDELETE, 16)
+        image = Images.get(ImageEnum.SHUTDOWN, 16)
         b = ttk.Button(
             frame,
             image=image,
@@ -122,8 +123,32 @@ class SessionsDialog(Dialog):
         b.image = image
         b.grid(row=0, column=2, padx=PADX, sticky="ew")
 
-        b = ttk.Button(frame, text="Cancel", command=self.click_new)
-        b.grid(row=0, column=3, sticky="ew")
+        image = Images.get(ImageEnum.DELETE, 16)
+        b = ttk.Button(
+            frame,
+            image=image,
+            text="Delete",
+            compound=tk.LEFT,
+            command=self.click_delete,
+        )
+        b.image = image
+        b.grid(row=0, column=3, padx=PADX, sticky="ew")
+
+        image = Images.get(ImageEnum.CANCEL, 16)
+        if self.is_start_app:
+            b = ttk.Button(
+                frame, image=image, text="Exit", compound=tk.LEFT, command=self.destroy
+            )
+        else:
+            b = ttk.Button(
+                frame,
+                image=image,
+                text="Cancel",
+                compound=tk.LEFT,
+                command=self.destroy,
+            )
+        b.image = image
+        b.grid(row=0, column=4, sticky="ew")
 
     def click_new(self):
         self.app.core.create_new_session()
@@ -177,3 +202,13 @@ class SessionsDialog(Dialog):
         self.app.core.stop_session(sid)
         self.click_new()
         self.destroy()
+
+    def click_delete(self):
+        logging.debug("Click delete")
+        item = self.tree.selection()
+        if item:
+            sid = int(self.tree.item(item, "text"))
+            self.app.core.delete_session(sid)
+            self.tree.delete(item[0])
+            if sid == self.app.core.session_id:
+                self.click_new()
diff --git a/daemon/core/gui/images.py b/daemon/core/gui/images.py
index 0d55f650..a1ac922b 100644
--- a/daemon/core/gui/images.py
+++ b/daemon/core/gui/images.py
@@ -68,3 +68,6 @@ class ImageEnum(Enum):
     DOCKER = "docker"
     LXC = "lxc"
     ALERT = "alert"
+    DELETE = "delete"
+    SHUTDOWN = "shutdown"
+    CANCEL = "cancel"
diff --git a/daemon/core/gui/themes.py b/daemon/core/gui/themes.py
index 66565f8d..54ae3ce0 100644
--- a/daemon/core/gui/themes.py
+++ b/daemon/core/gui/themes.py
@@ -73,9 +73,7 @@ def load(style):
                     "shiftrelief": [("pressed", 1)],
                 },
             },
-            "TMenubutton": {
-                "configure": {"width": 11, "padding": (5, 1), "relief": tk.RAISED}
-            },
+            "TMenubutton": {"configure": {"padding": (5, 1), "relief": tk.RAISED}},
             "TCheckbutton": {
                 "configure": {
                     "indicatorbackground": Colors.white,