srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

browser: s/results/files/

This commit is contained in:
Robert Jördens 2016-04-14 17:55:44 +08:00
parent faa268e814
commit 4a297f0c42
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/browser/results.py → artiq/browser/files.py
View File

@ -36,10 +36,10 @@ class ResultIconProvider(QtWidgets.QFileIconProvider):
return QtGui.QIcon(pix) return QtGui.QIcon(pix)
class ResultsDock(QtWidgets.QDockWidget): class FilesDock(QtWidgets.QDockWidget):
def __init__(self, datasets, main_window, root=None): def __init__(self, datasets, main_window, root=None):
QtWidgets.QDockWidget.__init__(self, "Results") QtWidgets.QDockWidget.__init__(self, "Files")
self.setObjectName("Results") self.setObjectName("Files")
self.setFeatures(QtWidgets.QDockWidget.DockWidgetMovable | self.setFeatures(QtWidgets.QDockWidget.DockWidgetMovable |
QtWidgets.QDockWidget.DockWidgetFloatable) QtWidgets.QDockWidget.DockWidgetFloatable)

10
artiq/frontend/artiq_browser.py
View File

@ -11,7 +11,7 @@ from quamash import QEventLoop
from artiq import __artiq_dir__ as artiq_dir from artiq import __artiq_dir__ as artiq_dir
from artiq.tools import verbosity_args, init_logger, atexit_register_coroutine from artiq.tools import verbosity_args, init_logger, atexit_register_coroutine
from artiq.gui import state, applets, models from artiq.gui import state, applets, models
from artiq.browser import datasets, results from artiq.browser import datasets, files
def get_argparser(): def get_argparser():
@ -85,8 +85,8 @@ def main():
status_bar = QtWidgets.QStatusBar() status_bar = QtWidgets.QStatusBar()
main_window.setStatusBar(status_bar) main_window.setStatusBar(status_bar)
d_results = results.ResultsDock(datasets_sub, main_window) d_files = files.FilesDock(datasets_sub, main_window)
smgr.register(d_results) smgr.register(d_files)
d_applets = applets.AppletsDock(main_window, datasets_sub) d_applets = applets.AppletsDock(main_window, datasets_sub)
atexit_register_coroutine(d_applets.stop) atexit_register_coroutine(d_applets.stop)
@ -100,7 +100,7 @@ def main():
mdi_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) mdi_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
main_window.setCentralWidget(mdi_area) main_window.setCentralWidget(mdi_area)
main_window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, d_results) main_window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, d_files)
main_window.addDockWidget(QtCore.Qt.BottomDockWidgetArea, d_applets) main_window.addDockWidget(QtCore.Qt.BottomDockWidgetArea, d_applets)
main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, d_datasets) main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, d_datasets)
@ -114,7 +114,7 @@ def main():
smgr.load() smgr.load()
if args.PATH: if args.PATH:
d_results.select(args.PATH) d_files.select(args.PATH)
smgr.start() smgr.start()
atexit_register_coroutine(smgr.stop) atexit_register_coroutine(smgr.stop)