asakul
/
nailab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix build_ui.sh, remove mainwindow.py.py 

Also, some minor tweaks in mainwindow
master
Denis Tereshkin 7 years ago
parent
647978ed68
commit
570e8d9030
4 changed files with 30 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      build_ui.sh
  2. 12
      src/nailab/ui_gen/mainwindow.py
  3. 77
      src/nailab/ui_gen/mainwindow.py.py
  4. 18
      ui/mainwindow.ui

2
build_ui.sh
Unescape View File

@ -1,7 +1,7 @@ @@ -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

12
src/nailab/ui_gen/mainwindow.py
Unescape View File

@ -23,7 +23,7 @@ class Ui_MainWindow(object): @@ -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): @@ -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): @@ -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"))

77
src/nailab/ui_gen/mainwindow.py.py
Unescape View File

@ -1,77 +0,0 @@ @@ -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"))

18
ui/mainwindow.ui
Unescape View File

@ -54,6 +54,8 @@ @@ -54,6 +54,8 @@
</property>
<addaction name="actionNew_strategy"/>
<addaction name="actionOpen_strategy"/>
<addaction name="actionSave_strategy"/>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuBacktest">
<property name="title">
@ -75,6 +77,8 @@ @@ -75,6 +77,8 @@
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionNew_strategy"/>
<addaction name="actionOpen_strategy"/>
<addaction name="actionSave_strategy"/>
<addaction name="actionExecute"/>
</widget>
@ -87,11 +91,17 @@ @@ -87,11 +91,17 @@
<property name="text">
<string>New strategy</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
</property>
</action>
<action name="actionOpen_strategy">
<property name="text">
<string>Open strategy</string>
</property>
<property name="shortcut">
<string>Ctrl+O</string>
</property>
</action>
<action name="actionExecute">
<property name="text">
@ -102,6 +112,14 @@ @@ -102,6 +112,14 @@
<property name="text">
<string>Save strategy</string>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
</action>
<action name="actionExit">
<property name="text">
<string>Exit</string>
</property>
</action>
</widget>
<resources/>

Write Preview
Loading…
Cancel
Save