diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py index 056644944..4cb29d609 100755 --- a/artiq/frontend/artiq_gui.py +++ b/artiq/frontend/artiq_gui.py @@ -37,7 +37,7 @@ def get_argparser(): class MainWindow(QtWidgets.QMainWindow): def __init__(self, server): QtWidgets.QMainWindow.__init__(self) - icon = QtGui.QIcon(os.path.join(artiq_dir, "gui", "icon.png")) + icon = QtGui.QIcon(os.path.join(artiq_dir, "gui", "logo.svg")) self.setWindowIcon(icon) self.setWindowTitle("ARTIQ - {}".format(server)) self.exit_request = asyncio.Event() @@ -56,6 +56,19 @@ class MainWindow(QtWidgets.QMainWindow): self.restoreState(QtCore.QByteArray(state["state"])) +class MdiArea(QtWidgets.QMdiArea): + def __init__(self): + QtWidgets.QMdiArea.__init__(self) + self.pixmap = QtGui.QPixmap(os.path.join(artiq_dir, "gui", "logo.svg")) + + def paintEvent(self, event): + QtWidgets.QMdiArea.paintEvent(self, event) + painter = QtGui.QPainter(self.viewport()) + x = (self.width() - self.pixmap.width())//2 + y = (self.height() - self.pixmap.height())//2 + painter.drawPixmap(x, y, self.pixmap) + + def main(): # initialize application args = get_argparser().parse_args() @@ -93,7 +106,7 @@ def main(): status_bar = QtWidgets.QStatusBar() status_bar.showMessage("Connected to {}".format(args.server)) main_window.setStatusBar(status_bar) - mdi_area = QtWidgets.QMdiArea() + mdi_area = MdiArea() mdi_area.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) mdi_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) main_window.setCentralWidget(mdi_area) diff --git a/artiq/gui/icon.png b/artiq/gui/icon.png deleted file mode 100644 index 33c071886..000000000 Binary files a/artiq/gui/icon.png and /dev/null differ diff --git a/artiq/gui/logo.svg b/artiq/gui/logo.svg new file mode 100644 index 000000000..fcf9e2623 --- /dev/null +++ b/artiq/gui/logo.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +