From 570e8d9030824708e18f92debc42f64829b4cf07 Mon Sep 17 00:00:00 2001 From: Denis Tereshkin Date: Wed, 12 Dec 2018 21:41:44 +0700 Subject: [PATCH] Fix build_ui.sh, remove mainwindow.py.py Also, some minor tweaks in mainwindow --- build_ui.sh | 2 +- src/nailab/ui_gen/mainwindow.py | 12 ++++- src/nailab/ui_gen/mainwindow.py.py | 77 ------------------------------ ui/mainwindow.ui | 18 +++++++ 4 files changed, 30 insertions(+), 79 deletions(-) delete mode 100644 src/nailab/ui_gen/mainwindow.py.py diff --git a/build_ui.sh b/build_ui.sh index 639c88f..10db80f 100755 --- a/build_ui.sh +++ b/build_ui.sh @@ -1,7 +1,7 @@ #!/bin/bash /usr/bin/pyuic5 ui/csvdatasourceconfigwidget.ui > src/nailab/ui_gen/csvdatasourceconfigwidget.py -/usr/bin/pyuic5 ui/mainwindow.ui > src/nailab/ui_gen/mainwindow.py.py +/usr/bin/pyuic5 ui/mainwindow.ui > src/nailab/ui_gen/mainwindow.py /usr/bin/pyuic5 ui/newdatasourcedialog.ui > src/nailab/ui_gen/newdatasourcedialog.py /usr/bin/pyuic5 ui/strategywidget.ui > src/nailab/ui_gen/strategywidget.py diff --git a/src/nailab/ui_gen/mainwindow.py b/src/nailab/ui_gen/mainwindow.py index 6f99a6d..6f148ee 100644 --- a/src/nailab/ui_gen/mainwindow.py +++ b/src/nailab/ui_gen/mainwindow.py @@ -23,7 +23,7 @@ class Ui_MainWindow(object): self.gridLayout.addWidget(self.tabs, 0, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1060, 23)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1060, 19)) self.menubar.setObjectName("menubar") self.menuFile = QtWidgets.QMenu(self.menubar) self.menuFile.setObjectName("menuFile") @@ -46,11 +46,17 @@ class Ui_MainWindow(object): self.actionExecute.setObjectName("actionExecute") self.actionSave_strategy = QtWidgets.QAction(MainWindow) self.actionSave_strategy.setObjectName("actionSave_strategy") + self.actionExit = QtWidgets.QAction(MainWindow) + self.actionExit.setObjectName("actionExit") self.menuFile.addAction(self.actionNew_strategy) self.menuFile.addAction(self.actionOpen_strategy) + self.menuFile.addAction(self.actionSave_strategy) + self.menuFile.addAction(self.actionExit) self.menuBacktest.addAction(self.actionExecute) self.menubar.addAction(self.menuFile.menuAction()) self.menubar.addAction(self.menuBacktest.menuAction()) + self.toolBar.addAction(self.actionNew_strategy) + self.toolBar.addAction(self.actionOpen_strategy) self.toolBar.addAction(self.actionSave_strategy) self.toolBar.addAction(self.actionExecute) @@ -71,7 +77,11 @@ class Ui_MainWindow(object): self.toolBar.setWindowTitle(_translate("MainWindow", "toolBar")) self.actionOpenTrades.setText(_translate("MainWindow", "Open...")) self.actionNew_strategy.setText(_translate("MainWindow", "New strategy")) + self.actionNew_strategy.setShortcut(_translate("MainWindow", "Ctrl+N")) self.actionOpen_strategy.setText(_translate("MainWindow", "Open strategy")) + self.actionOpen_strategy.setShortcut(_translate("MainWindow", "Ctrl+O")) self.actionExecute.setText(_translate("MainWindow", "Execute")) self.actionSave_strategy.setText(_translate("MainWindow", "Save strategy")) + self.actionSave_strategy.setShortcut(_translate("MainWindow", "Ctrl+S")) + self.actionExit.setText(_translate("MainWindow", "Exit")) diff --git a/src/nailab/ui_gen/mainwindow.py.py b/src/nailab/ui_gen/mainwindow.py.py deleted file mode 100644 index 3f05536..0000000 --- a/src/nailab/ui_gen/mainwindow.py.py +++ /dev/null @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'ui/mainwindow.ui' -# -# Created by: PyQt5 UI code generator 5.5.1 -# -# WARNING! All changes made in this file will be lost! - -from PyQt5 import QtCore, QtGui, QtWidgets - -class Ui_MainWindow(object): - def setupUi(self, MainWindow): - MainWindow.setObjectName("MainWindow") - MainWindow.resize(1060, 587) - self.centralwidget = QtWidgets.QWidget(MainWindow) - self.centralwidget.setObjectName("centralwidget") - self.gridLayout = QtWidgets.QGridLayout(self.centralwidget) - self.gridLayout.setContentsMargins(3, 3, 3, 3) - self.gridLayout.setObjectName("gridLayout") - self.tabs = QtWidgets.QTabWidget(self.centralwidget) - self.tabs.setTabsClosable(True) - self.tabs.setObjectName("tabs") - self.gridLayout.addWidget(self.tabs, 0, 0, 1, 1) - MainWindow.setCentralWidget(self.centralwidget) - self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1060, 19)) - self.menubar.setObjectName("menubar") - self.menuFile = QtWidgets.QMenu(self.menubar) - self.menuFile.setObjectName("menuFile") - self.menuBacktest = QtWidgets.QMenu(self.menubar) - self.menuBacktest.setObjectName("menuBacktest") - MainWindow.setMenuBar(self.menubar) - self.statusbar = QtWidgets.QStatusBar(MainWindow) - self.statusbar.setObjectName("statusbar") - MainWindow.setStatusBar(self.statusbar) - self.toolBar = QtWidgets.QToolBar(MainWindow) - self.toolBar.setObjectName("toolBar") - MainWindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar) - self.actionOpenTrades = QtWidgets.QAction(MainWindow) - self.actionOpenTrades.setObjectName("actionOpenTrades") - self.actionNew_strategy = QtWidgets.QAction(MainWindow) - self.actionNew_strategy.setObjectName("actionNew_strategy") - self.actionOpen_strategy = QtWidgets.QAction(MainWindow) - self.actionOpen_strategy.setObjectName("actionOpen_strategy") - self.actionExecute = QtWidgets.QAction(MainWindow) - self.actionExecute.setObjectName("actionExecute") - self.actionSave_strategy = QtWidgets.QAction(MainWindow) - self.actionSave_strategy.setObjectName("actionSave_strategy") - self.menuFile.addAction(self.actionNew_strategy) - self.menuFile.addAction(self.actionOpen_strategy) - self.menuBacktest.addAction(self.actionExecute) - self.menubar.addAction(self.menuFile.menuAction()) - self.menubar.addAction(self.menuBacktest.menuAction()) - self.toolBar.addAction(self.actionSave_strategy) - self.toolBar.addAction(self.actionExecute) - - self.retranslateUi(MainWindow) - self.tabs.setCurrentIndex(-1) - self.actionOpen_strategy.triggered.connect(MainWindow.openStrategy) - self.tabs.tabCloseRequested['int'].connect(MainWindow.tabCloseRequested) - self.actionNew_strategy.triggered.connect(MainWindow.newStrategy) - self.actionExecute.triggered.connect(MainWindow.executeStrategy) - self.actionSave_strategy.triggered.connect(MainWindow.saveStrategy) - QtCore.QMetaObject.connectSlotsByName(MainWindow) - - def retranslateUi(self, MainWindow): - _translate = QtCore.QCoreApplication.translate - MainWindow.setWindowTitle(_translate("MainWindow", "Nailab")) - self.menuFile.setTitle(_translate("MainWindow", "File")) - self.menuBacktest.setTitle(_translate("MainWindow", "Backtest")) - self.toolBar.setWindowTitle(_translate("MainWindow", "toolBar")) - self.actionOpenTrades.setText(_translate("MainWindow", "Open...")) - self.actionNew_strategy.setText(_translate("MainWindow", "New strategy")) - self.actionOpen_strategy.setText(_translate("MainWindow", "Open strategy")) - self.actionExecute.setText(_translate("MainWindow", "Execute")) - self.actionSave_strategy.setText(_translate("MainWindow", "Save strategy")) - diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 4973fc1..1279ce0 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -54,6 +54,8 @@ + + @@ -75,6 +77,8 @@ false + + @@ -87,11 +91,17 @@ New strategy + + Ctrl+N + Open strategy + + Ctrl+O + @@ -102,6 +112,14 @@ Save strategy + + Ctrl+S + + + + + Exit +