From d81ce1586939794c024447d7e28ec8628bdff0f5 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 14 Feb 2016 23:04:14 +0100 Subject: [PATCH] gui: Qt wants a central widget in the main window, use explorer --- artiq/frontend/artiq_gui.py | 10 +++++----- artiq/gui/explorer.py | 11 +++-------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py index 7f5394f78..3772e5a5e 100755 --- a/artiq/frontend/artiq_gui.py +++ b/artiq/frontend/artiq_gui.py @@ -100,10 +100,10 @@ def main(): smgr.register(expmgr) d_shortcuts = shortcuts.ShortcutsDock(main_window, expmgr) smgr.register(d_shortcuts) - d_explorer = explorer.ExplorerDock(status_bar, expmgr, d_shortcuts, - sub_clients["explist"], - rpc_clients["schedule"], - rpc_clients["experiment_db"]) + d_explorer = explorer.Explorer(status_bar, expmgr, d_shortcuts, + sub_clients["explist"], + rpc_clients["schedule"], + rpc_clients["experiment_db"]) d_datasets = datasets.DatasetsDock(sub_clients["datasets"], rpc_clients["dataset_db"]) @@ -124,6 +124,7 @@ def main(): smgr.register(logmgr) # lay out docks + main_window.setCentralWidget(d_explorer) if os.name != "nt": main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, d_ttl_dds.dds_dock) main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, d_ttl_dds.ttl_dock) @@ -133,7 +134,6 @@ def main(): main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, d_applets) main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, d_datasets) main_window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, d_shortcuts) - main_window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, d_explorer) main_window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, d_schedule) # load/initialize state diff --git a/artiq/gui/explorer.py b/artiq/gui/explorer.py index 079b1dcbe..b391b7f0e 100644 --- a/artiq/gui/explorer.py +++ b/artiq/gui/explorer.py @@ -115,18 +115,13 @@ class Model(DictSyncTreeSepModel): DictSyncTreeSepModel.__init__(self, "/", ["Experiment"], init) -class ExplorerDock(QtWidgets.QDockWidget): +class Explorer(QtWidgets.QWidget): def __init__(self, status_bar, exp_manager, d_shortcuts, explist_sub, schedule_ctl, experiment_db_ctl): - QtWidgets.QDockWidget.__init__(self, "Explorer") - self.setObjectName("Explorer") - self.setFeatures(QtWidgets.QDockWidget.DockWidgetMovable | - QtWidgets.QDockWidget.DockWidgetFloatable) + QtWidgets.QWidget.__init__(self) layout = QtWidgets.QGridLayout() - top_widget = QtWidgets.QWidget() - top_widget.setLayout(layout) - self.setWidget(top_widget) + self.setLayout(layout) layout.setSpacing(5) layout.setContentsMargins(5, 5, 5, 5)