Skip to content

Commit 95dbafd

Browse files
committedFeb 21, 2016
gui: add logo to MDI area
1 parent fc47d8c commit 95dbafd

File tree

3 files changed

+118
-2
lines changed

3 files changed

+118
-2
lines changed
 

Diff for: ‎artiq/frontend/artiq_gui.py

+15-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get_argparser():
3737
class MainWindow(QtWidgets.QMainWindow):
3838
def __init__(self, server):
3939
QtWidgets.QMainWindow.__init__(self)
40-
icon = QtGui.QIcon(os.path.join(artiq_dir, "gui", "icon.png"))
40+
icon = QtGui.QIcon(os.path.join(artiq_dir, "gui", "logo.svg"))
4141
self.setWindowIcon(icon)
4242
self.setWindowTitle("ARTIQ - {}".format(server))
4343
self.exit_request = asyncio.Event()
@@ -56,6 +56,19 @@ def restore_state(self, state):
5656
self.restoreState(QtCore.QByteArray(state["state"]))
5757

5858

59+
class MdiArea(QtWidgets.QMdiArea):
60+
def __init__(self):
61+
QtWidgets.QMdiArea.__init__(self)
62+
self.pixmap = QtGui.QPixmap(os.path.join(artiq_dir, "gui", "logo.svg"))
63+
64+
def paintEvent(self, event):
65+
QtWidgets.QMdiArea.paintEvent(self, event)
66+
painter = QtGui.QPainter(self.viewport())
67+
x = (self.width() - self.pixmap.width())//2
68+
y = (self.height() - self.pixmap.height())//2
69+
painter.drawPixmap(x, y, self.pixmap)
70+
71+
5972
def main():
6073
# initialize application
6174
args = get_argparser().parse_args()
@@ -93,7 +106,7 @@ def main():
93106
status_bar = QtWidgets.QStatusBar()
94107
status_bar.showMessage("Connected to {}".format(args.server))
95108
main_window.setStatusBar(status_bar)
96-
mdi_area = QtWidgets.QMdiArea()
109+
mdi_area = MdiArea()
97110
mdi_area.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
98111
mdi_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
99112
main_window.setCentralWidget(mdi_area)

Diff for: ‎artiq/gui/icon.png

-13.4 KB
Binary file not shown.

Diff for: ‎artiq/gui/logo.svg

+103
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.