From ddf6ec433ebb7d5022aefe7099728c0b97c0426b Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 29 Mar 2016 16:59:43 +0800 Subject: [PATCH] gui: better default layout --- artiq/frontend/artiq_gui.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py index 4d2cb8c53..ffe3b7cd3 100755 --- a/artiq/frontend/artiq_gui.py +++ b/artiq/frontend/artiq_gui.py @@ -37,9 +37,14 @@ def get_argparser(): class MainWindow(QtWidgets.QMainWindow): def __init__(self, server): QtWidgets.QMainWindow.__init__(self) + icon = QtGui.QIcon(os.path.join(artiq_dir, "gui", "logo.svg")) self.setWindowIcon(icon) self.setWindowTitle("ARTIQ - {}".format(server)) + + qfm = QtGui.QFontMetrics(self.font()) + self.resize(140*qfm.averageCharWidth(), 38*qfm.lineSpacing()) + self.exit_request = asyncio.Event() def closeEvent(self, *args): @@ -149,17 +154,14 @@ def main(): smgr.register(logmgr) # lay out docks + right_docks = [d_explorer, d_shortcuts] if os.name != "nt": - main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, d_ttl_dds.dds_dock) - main_window.tabifyDockWidget(d_ttl_dds.dds_dock, d_ttl_dds.ttl_dock) - main_window.tabifyDockWidget(d_ttl_dds.ttl_dock, d_applets) - main_window.tabifyDockWidget(d_applets, d_datasets) - else: - main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, d_applets) - main_window.tabifyDockWidget(d_applets, d_datasets) - main_window.tabifyDockWidget(d_datasets, d_shortcuts) + right_docks += [d_ttl_dds.ttl_dock, d_ttl_dds.dds_dock] + right_docks += [d_datasets, d_applets] + main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, right_docks[0]) + for d1, d2 in zip(right_docks, right_docks[1:]): + main_window.tabifyDockWidget(d1, d2) main_window.addDockWidget(QtCore.Qt.BottomDockWidgetArea, d_schedule) - main_window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, d_explorer) # load/initialize state if os.name == "nt":