Merge branch 'master' into TESTS

win_venv/files/input/test.txt

@@ -0,0 +1 @@
+test txt file

win_venv/main.py

@@ -15,20 +15,28 @@ def files(path):
         if os.path.isfile(os.path.join(path, file)):
             yield file
 
-class LibraryTableButtons(QWidget):
-    def __init__(self, parent=None):
-        super(LibraryTableButtons,self).__init__(parent)
-        layout = QHBoxLayout()
 
+class LibraryTableButtons(QWidget):
+    def __init__(self, filename, parent=None):
+        super(LibraryTableButtons,self).__init__(parent)
+
+        def viewFile():
+            os.startfile(filePath + '\\' + filename)
+
+        layout = QHBoxLayout()
         layout.setContentsMargins(0,0,0,0)
         layout.setSpacing(0)
 
-        layout.addWidget(QPushButton('View'))
+        view_btn = QPushButton('View')
+        view_btn.clicked.connect(viewFile)
+        layout.addWidget(view_btn)
         layout.addWidget(QPushButton('Delete'))
 
         self.setLayout(layout)
 
+
 class LibraryTable(QTableWidget):
+
     def __init__(self, parent=None):
         QTableWidget.__init__(self)
         self.setColumnCount(3)
@@ -48,60 +56,53 @@ class LibraryTable(QTableWidget):
         for index, date in enumerate(dates):
             self.setItem(index,0,date)
             self.setItem(index,1,names[index])
-            self.setCellWidget(index,2,LibraryTableButtons())
+            self.setCellWidget(index,2,LibraryTableButtons(names[index].text()))
 
-        def handleButtonClicked(w):
+
-            button = qApp.focusWidget()
+class MainWindow(QMainWindow):
-            # or button = self.sender()
+    def __init__(self):
-            index = self.table.indexAt(button.pos())
+        super().__init__()
-            if index.isValid():
+        self.initUI()
-                print(index.row(), index.column())
+        
+    # Show raw uploaded files
+    def showLibrary(self):
+        libTable = LibraryTable()
+        self.setCentralWidget(libTable)
+        
+    def initUI(self):
+        self.setGeometry(0, 0, 600, 400) 
+        self.setWindowTitle('VisionScore')
+        scriptDir = os.path.dirname(os.path.realpath(__file__))
+        self.setWindowIcon(QIcon(scriptDir + os.path.sep + 'static/v_logo.jpg'))
+        
+        # Toolbar
+        menuBar = self.menuBar()
+        homeMenu = QMenu("&Home", self)
+        menuBar.addMenu(homeMenu)
+        homeMenu.addAction("Load new file")
+
+        libraryAct = QAction('&Library', self)
+        libraryAct.triggered.connect(self.showLibrary)
+        menuBar.addAction(libraryAct)
+
+        # Exit app
+        exitAct = QAction('&Exit', self)
+        exitAct.setShortcut('Ctrl+Q')
+        exitAct.setStatusTip('Exit')
+        exitAct.triggered.connect(qApp.quit)
+        homeMenu.addAction(exitAct)
+        
+        helpMenu = menuBar.addMenu("&Help")  
+        
+        self.show()
 
 
 def main():
     app = QApplication(sys.argv)
 
-    #w = QWidget()
+    w = MainWindow()
-    w = QMainWindow()
-    w.setGeometry(0, 0, 600, 400) 
-    w.setWindowTitle('VisionScore')
-    scriptDir = os.path.dirname(os.path.realpath(__file__))
-    w.setWindowIcon(QIcon(scriptDir + os.path.sep + 'static/v_logo.jpg'))
-    
-    '''
-    label = QLabel()
-    pixmap = QPixmap(scriptDir + os.path.sep + 'static/visionscore_logo.jpg')
-    label.setPixmap(pixmap)
-    label.resize(pixmap.width(), pixmap.height())
-    label.setAlignment(QtCore.Qt.AlignTop)
-    w.setCentralWidget(label)
-    '''
-    # Toolbar
-    menuBar = w.menuBar()
-    homeMenu = QMenu("&Home", w)
-    menuBar.addMenu(homeMenu)
-    homeMenu.addAction("Load new file")
-
-    # Show raw uploaded files
-    def showLibrary():
-        libTable = LibraryTable()
-        w.setCentralWidget(libTable)
-
-    libraryAct = QAction('&Library', w)
-    libraryAct.triggered.connect(showLibrary)
-    menuBar.addAction(libraryAct)
-
-    # Exit app
-    exitAct = QAction('&Exit', w)
-    exitAct.setShortcut('Ctrl+Q')
-    exitAct.setStatusTip('Exit')
-    exitAct.triggered.connect(app.quit)
-    homeMenu.addAction(exitAct)
-    
-    helpMenu = menuBar.addMenu("&Help")  
-    
-    w.show()
     sys.exit(app.exec_())
 
+
 if __name__ == '__main__':
     main()