Merge branch 'VIS-20'

This commit is contained in:
Agata 2020-12-21 15:15:46 +01:00
commit 4d2cf50bd9

View File

@ -2,7 +2,7 @@
import sys import sys
import os import os
from PyQt5 import QtCore from PyQt5 import QtCore
from PyQt5.QtWidgets import QApplication, QWidget, QLabel, QMainWindow, QGridLayout from PyQt5.QtWidgets import QApplication, QWidget, QLabel, QMainWindow, QGridLayout, QMenu, QFileDialog, QAction
from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtGui import QIcon, QPixmap
@ -16,16 +16,32 @@ def main():
scriptDir = os.path.dirname(os.path.realpath(__file__)) scriptDir = os.path.dirname(os.path.realpath(__file__))
w.setWindowIcon(QIcon(scriptDir + os.path.sep + 'static/v_logo.jpg')) w.setWindowIcon(QIcon(scriptDir + os.path.sep + 'static/v_logo.jpg'))
'''
label = QLabel() label = QLabel()
pixmap = QPixmap(scriptDir + os.path.sep + 'static/visionscore_logo.jpg') pixmap = QPixmap(scriptDir + os.path.sep + 'static/visionscore_logo.jpg')
label.setPixmap(pixmap) label.setPixmap(pixmap)
label.resize(pixmap.width(), pixmap.height()) label.resize(pixmap.width(), pixmap.height())
label.setAlignment(QtCore.Qt.AlignTop) label.setAlignment(QtCore.Qt.AlignTop)
w.setCentralWidget(label) w.setCentralWidget(label)
'''
# Toolbar
menuBar = w.menuBar()
homeMenu = QMenu("&Home", w)
menuBar.addMenu(homeMenu)
homeMenu.addAction("Load new file")
# Exit app
exitAct = QAction('&Exit', w)
exitAct.setShortcut('Ctrl+Q')
exitAct.setStatusTip('Exit')
exitAct.triggered.connect(app.quit)
homeMenu.addAction(exitAct)
historyMenu = menuBar.addMenu("&History")
helpMenu = menuBar.addMenu("&Help")
w.show() w.show()
sys.exit(app.exec_()) sys.exit(app.exec_())
if __name__ == '__main__': if __name__ == '__main__':