From 98149b6d57b0d611007e6e32fd1f15b24818749b Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan.grewe@g-node.org>
Date: Sat, 26 Dec 2020 13:52:41 +0100
Subject: [PATCH] add more icons

---
 icons/nix_plot.png  | Bin 0 -> 1007 bytes
 icons/nix_table.png | Bin 0 -> 1968 bytes
 icons/quit.png      | Bin 0 -> 1312 bytes
 main.py             |   3 +--
 main_window.py      |  56 ++++++++++++++++++++++++++++++++------------
 5 files changed, 42 insertions(+), 17 deletions(-)
 create mode 100644 icons/nix_plot.png
 create mode 100644 icons/nix_table.png
 create mode 100644 icons/quit.png

diff --git a/icons/nix_plot.png b/icons/nix_plot.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f1bbf893ea2702980a852a3d7c05b568edfcea2
GIT binary patch
literal 1007
zcmV<L0}%X)P)<h;3K|Lk000e1NJLTq001xm001Qj1^@s61Q}|t0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#kx4{BRCwC#SiNu4Komb{RnZK^Y5oAh
zLdQB|yTno1Ne}|IIueL6=?>HZ_Ot^a1j1oN9g>!ns$nT(+zHVo5n+I#;#gX#i+L~n
zPCBAAIL?O>#FL(UcfMSH@B5vn#BWLyUm*S_CXA-={6zenxH@S9oEH;L{{<K&-MM?u
zB#w`r00b&e>@dJCdt7?di0d@A)%x@pfG<WOk^JoJtT;M4%F(<)%Z9dP5pyeRuZquy
zhhl&K<0{QdX9>X4v6(8w-VlKsNZ;w@r6sYvyd)kye!^=x;)b@B#|Ok_%{wqiNM4ib
z<vBck;sRb2P16*f=kYkvc32po7AxY_%NG)J27L|S4Jb*u4)05JIcFVs*3^0J0wgV>
za=9#`(I~HHV2Q9A-UB!ZliM2TO+K4}!1oPZ(4f>V03Td73`0mMm8tlTHgvNE6oA3H
z4<FnYPoF(!|88iY8-sGi_84GorwF`>u??SGg@C0V&TfIEfD<PtCp_FF;2Wc;16638
z0XW2$v8K|P74U2pTE5@itsWmAZwv#xPCmePBNIODYtJ9BQm4G`BVb2DK?G357VsU%
z@zd!v|E{iOkyf?<cxM#A!xS=hCrN46K%mFrT5^6q#_z13QhHlkZ&`pMglna~UK7Ev
zETHZWbpU68=G@%HeCGNMpLu3x#>bg{KA-m~tMNELPR(2e!JR<r^={s}y%>wdByr;O
z^fU^Mi)1n>I4u)h8kZOl0fW|ng;cQnaH)RCgv$<20JOM4g4Tv0H9hEiAXmAip85J}
zr?qy0tLxtc;3Am9c&}6X?Lw?|+jU)G+qSAP;oE6wdtIxz*?>Rw5I03=G}$FPscuy@
zeqwujo10A0X@5^H#4fY5^Ui<mme_UbAq|+;T*`%2(qP?PT&$@=>gxA}=@8m)Y2!=t
zt3Yoq`p9Ig&OORfHZ{SbQmI&4t;u4KuI*IlLI!_V+9;7JRW?}bLkM=i27!;~ayb@2
zfeie4r@ftax@g^nHnJ43gZzHPXO}grWCqqs;0r(zf5P2lq1OvXKv#+))AW3Wo$lZ!
zMI6=ua0Z+ju-4m2hP{8c*Map&Bw}A(S+S6(Sv!d#gCA%w6sKNBEG%46^EX3qnV||$
zXf~UY@36RFSH+mq9|90yPj#7Recl*X>Z=<aCl{JH(hC{;`-cg_E>W9WRMwiON#UCK
d7wDG&0|0P;o}n|q)?fet002ovPDHLkV1ff#(6Rsk

literal 0
HcmV?d00001

diff --git a/icons/nix_table.png b/icons/nix_table.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6ea080495adddf8c47b16c2c8c8e153dad52af6
GIT binary patch
literal 1968
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

literal 0
HcmV?d00001

diff --git a/icons/quit.png b/icons/quit.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed27c9759def9c8616d6ba75c41303cb8304a771
GIT binary patch
literal 1312
zcmV+*1>gFKP)<h;3K|Lk000e1NJLTq0018V0015c1^@s6)bhog00004b3#c}2nYxW
zd<bNS00009a7bBm0007E0007E0l_d;`Tzg`8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11f5AlK~zYI&DUQ{TU8tf@b9_pZRA23hCg!z=t9En?p2H>oexH%
z4=S-hVH3geqz}Y~_qC417-P~wmYD5DF+AuK6O0UcSxwXjqs9l*(O_aPz32j61B5>@
zqkl4b+jD%N)Vh`pHVA&7?(I3}_i4_(X@7?>#&D3dwY5EGG#VQjV^0Bi62RYtkX1_Q
zUy7p49i$f758m0?X=RKJ05}JrK5r-qK*+m~Fvf0h9QWDu^mO>KaEHTD&GY<+jIs9s
zBsh+{X|vgat*xz3G&eUlnoOoMsZ?q{91j1fC`u|A4B9BAZ2(FMA)o8I{*mABUq3MJ
zbUI%Ia07r)Q&aQhl`B`CK5^p23mnJsi9|xzG>t?e5o1F`Ls}F?R$5xhQ%d!_ckljs
z@#4il*4EbE$?nWKpU?NpzHz71*$3bYLP%(6Xh^YItsYfX$;8A2zp$`?wY9Z^H8nLg
zXliOgPfw37NfOmG&Fgl%I{`cc;9Z~3H}+7xqod;$Ldf?eB_%(Nj*glIL1-Br9W_i&
zPGUdr2O$LK&!0zse}5*CNCf)(`{VcS-Fula_L`z7KkkV;oz4aT0gmG$V`F2dqS0uz
z*X!k@(P#nUa=CE!>{(1rO+itVg7Lb#It&gD>UDK>>wSHFE0od(0Cu0x7ulV|-M8jb
z0JwVfYIu8lyV~t`7lmb6Mt65NEEWp}1_od@n+xVdqfxlsZhm`vyZYL-YxCKUKgpky
z!`s{2Ujoq9($aGM^y$+VhKGmwcsyQE6aY@1Jej-Zc^(xN6-DR8<8cfR5Azm_rO#%w
zeFfmnj*gD!3viC(-Y10IzI5qQkKgZSfk2>W!Gk6c2*B_6v%$f^w+JD(2_YZ+2X{Ce
z<p5r_+wGxDCQ~^wGIIapc&v<!jBuGurqX7!{SM&utha+342CxVn4C_h9twq!OePQ0
zMlzX1C=^0hS62#vDeL97y#>I!BuQsfRpk#=&PG*LUY2DEz<So(!3iO!2qAZjMx&@{
z+ELihGz~n@ON5X+gpgA?96)V(d3l24I72x6(Eo!+N;n(_A;f4ln-c(P^YLTJF220A
zwN*+f%~-A0BY~_|D;Q(xSS(fwU^#~~##R_(_33n46Gibza8VSY>$=Jqt7nX@<ZuA9
z0IF40otGp@KMGuuBs~-gsQ{|8-VUD0WWEKE^7(wcEXxoC;Q?h19zhTw%QB{>rc3}*
zS#JmT`~6!0eh35tvcX{3bh%vgFmad5MGXeSW-u6h7QlB|@87qbQaZ#KYrK5<@`S_T
zAa=Wb&tkf+Kkz<3cDo%8hl6;%-me*Bjf}C6cgJ%0%*@Qs0B+9C&R$qtT)gh_c=WQe
zvZ4iV-MWQXECyib$76MMwdlOEvNCu)9(`$PX)G8Fz760TMNxj+9e?CzLJ$N<l7zXr
zIi%C+g7N({6aSw!DsKmhHjv}v<GiM6*x1-8SW{J11yK~y+uQr-4P@RI*t2zx#bPN{
zRk@|5C8Nb+NlTJM&1SRdP+I5R9NVEGKgV)hDwga)u?aveW2}-8vI$_BQmP&Fp!g50
Wo|dVI`0vI50000<MNUMnLSTZN(qE?l

literal 0
HcmV?d00001

diff --git a/main.py b/main.py
index 993303e..5ac00de 100644
--- a/main.py
+++ b/main.py
@@ -7,8 +7,7 @@ def main():
     app = QApplication(sys.argv)
     window = NixView()
     window.show()
-    app.exec()
-    return 0
+    sys.exit(app.exec_())
 
 if __name__ == "__main__":
     main()
diff --git a/main_window.py b/main_window.py
index c3936e3..83c99ae 100644
--- a/main_window.py
+++ b/main_window.py
@@ -1,29 +1,42 @@
-from PyQt5.QtWidgets import QFrame, QLabel, QListWidget, QMainWindow, QStackedLayout, QToolBar, QAction, QStatusBar, QVBoxLayout, QWidget, QGridLayout, QSpacerItem, QSizePolicy
-from PyQt5.QtGui import QIcon, QPixmap
+import sys
+from PyQt5.QtWidgets import QFrame, QLabel, QListWidget, QMainWindow, QMenuBar, QStackedLayout, QToolBar, QAction, QStatusBar, QVBoxLayout, QWidget, QGridLayout, QSpacerItem, QSizePolicy
+from PyQt5.QtGui import QIcon, QPixmap, QKeySequence
 from PyQt5.QtCore import Qt, QSize
 import typing
 
+from file_handler import FileHandler
+
 class NixView(QMainWindow):
     
     def __init__(self, *args, **kwargs):
         super(NixView, self).__init__(*args, **kwargs)
         self.setWindowTitle("NixView")
+        self.setWindowIcon(QIcon('./icons/nixview.icns'))
 
-        cw = CentralWidget(self)
-        self.setCentralWidget(cw)
+        self._file_handler = FileHandler()
+        self.setStatusBar(QStatusBar(self))
+        self.setMenuBar(QMenuBar(self))
         self.create_actions()
         
-        self.setStatusBar(QStatusBar(self))
-
+        cw = CentralWidget(self)
+        self.setCentralWidget(cw)
+        self.show()
 
     def create_actions(self):
         self._file_open_action = QAction(QIcon("./icons/nix_open.png"), "Open", self)
         self._file_open_action.setStatusTip("Open nix file")
-        self._file_open_action.triggered.connect(self.onFileOpenClick)
+        self._file_open_action.setShortcut(QKeySequence("Ctrl+o"))
+        self._file_open_action.triggered.connect(self.on_file_open)
         
         self._file_close_action = QAction(QIcon("./icons/nix_close.png"), "Close", self)
-        self._file_close_action.setStatusTip("Close nix file")
-        self._file_close_action.triggered.connect(self.onFileCloseClick)
+        self._file_close_action.setStatusTip("Close current nix file")
+        self._file_close_action.setShortcut(QKeySequence("Ctrl+w"))
+        self._file_close_action.setEnabled(False)
+        self._file_close_action.triggered.connect(self.on_file_close)
+        
+        self._quit_action = QAction(QIcon("./icons/quit.png"), "Quit", self)
+        self._quit_action.setStatusTip("Close current file and quit")
+        self._quit_action.triggered.connect(self.on_quit)
         
         self.create_toolbar()
         self.create_menu()
@@ -35,18 +48,31 @@ class NixView(QMainWindow):
 
         self._toolbar.addAction(self._file_open_action)
         self._toolbar.addAction(self._file_close_action)
+        self._toolbar.addAction(self._quit_action)
         self.addToolBar(self._toolbar)
 
 
     def create_menu(self):
-        pass
+        menu = self.menuBar()
+        file_menu = menu.addMenu("&File")
+        file_menu.addAction(self._file_open_action)
+        file_menu.addAction(self._file_close_action)
+        file_menu.addAction(self._quit_action)
+        self.setMenuBar(menu)
     
-    def onFileOpenClick(self, s):
-        print("click", s)
+    def on_file_open(self, s):
+        success, msg = self._file_handler.open("nix_test.h5")
+        self.statusBar().showMessage(msg, 5000)
+        self._file_close_action.setEnabled(success)
 
-    def onFileCloseClick(self, s):
-        print("click", s)
+    def on_file_close(self, s):
+        self._file_handler.close()
+        self.statusBar().showMessage("Successfully closed current file", 1000)
 
+    def on_quit(self, s):
+        self._file_handler.close()
+        sys.exit()
+        
 
 class CentralWidget(QWidget):
     
@@ -66,7 +92,7 @@ class SplashScreen(QWidget):
         super().__init__(parent=parent)
         layout = QGridLayout()
         self.setLayout(layout)
-        self.setStyleSheet("background-color: red;")
+        self.setStyleSheet("background-color: white;")
         label = QLabel()
         label.setPixmap(QPixmap("./icons/nixview256.png"))
         label.setAlignment(Qt.AlignCenter)