From bdb307fba965eebc7dff1991582041526b83e792 Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Mon, 12 Mar 2018 13:57:52 -0700
Subject: [PATCH] Add close button (WIP) to journal

---
 journal/unix/images/close.png | Bin 0 -> 465 bytes
 journal/unix/journal.py       |  11 ++++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 journal/unix/images/close.png

diff --git a/journal/unix/images/close.png b/journal/unix/images/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0b87ec42077ecc00bfa7c38bd36efaf425038f9
GIT binary patch
literal 465
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYYs>cdx@v7EBhm69uW(};|@tWKq1Kz*N775{M_8syb=cIqSVBa)D(sC
z%#sWRcTeAd@J2py1_nk;PZ!4!kK=o%`FbCA5NMlUCDav^{d)b!M}bH9bFRj#H*K2{
zRzFo^tEkIlnd`CoVQs0C&*XU*bI+7an_v0-?g2G<ZhyWx%;|~Wc&mLaElYIIxZK-f
zw4-HTYb!@xfQhNl$InbvTRH6u_WBe&;F%M8RLbIe61(S$q8C~hY*wXzY=7mf($D1E
zbM*Unrf-Yc;@Y(uo+*Wfp0``YFspD=j<>~!z{-rK&z-KN%7q!C(|WYh+>-*QE~;2}
zv#3GW_kx+swgr1@@(=n+_g%YG%V^8}nPE{{bik+cOR{W2Q?*6S4L*bvzgm6jz|*J;
z5j)mL954wHQ(JW6ws=XFm_fIz@fU+RCb|o5tzw>jZtkVkB`b7%TraJ5S^Qy@=j8V>
zmB;P+zG^W$>(09E5*<I~LjEqbc)P@M*69ELH~(PO(N3vP6mQ=E3~2^WS3j3^P6<r_
DYqGZV

literal 0
HcmV?d00001

diff --git a/journal/unix/journal.py b/journal/unix/journal.py
index a69b734..a061b9e 100644
--- a/journal/unix/journal.py
+++ b/journal/unix/journal.py
@@ -49,6 +49,9 @@ class AnimationTimer(QThread):
 
 class Journal(QWidget):
 	def __init__(self, *args, **kwargs):
+		self.app = kwargs['app']
+		del kwargs['app']
+
 		super().__init__(*args, **kwargs)
 
 		self.mousedown = False
@@ -57,6 +60,9 @@ class Journal(QWidget):
 		self.label = QLabel(self)
 		self.change_image('default_en')
 
+		self.close_label = QLabel(self)
+		self.close_label.setPixmap(QPixmap(os.path.join(base_path, 'images', 'close.png')))
+
 		self.setWindowFlags(self.windowFlags() | Qt.FramelessWindowHint)
 		self.setAttribute(Qt.WA_TranslucentBackground)
 		self.setMouseTracking(True)
@@ -70,6 +76,9 @@ class Journal(QWidget):
 		self.mousedown = True
 		self.mousedownpos = event.pos()
 
+		if self.mousedownpos.x() <= 24 and self.mousedownpos.y() < 24:
+			self.app.quit()
+
 	def mouseReleaseEvent(self, event):
 		self.mousedown = False
 
@@ -142,7 +151,7 @@ if __name__ == '__main__':
 
 	else:
 		# Author's Journal mode
-		journal = Journal()
+		journal = Journal(app = app)
 		save_path = os.path.join(documents_path, 'Oneshot', 'save_progress.oneshot')
 		if os.path.exists(save_path):
 			with open(save_path, 'rb') as save: