Skip to content

Commit

Permalink
gui: add ARTIQ icon
Browse files Browse the repository at this point in the history
fallen committed Jun 16, 2015
1 parent a3f0663 commit 95ff21d
Showing 3 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions artiq/frontend/artiq_gui.py
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
# it has chosen.
from quamash import QEventLoop, QtGui
from pyqtgraph import dockarea
import os

from artiq.protocols.file_db import FlatFileDB
from artiq.protocols.pc_rpc import AsyncioClient
@@ -17,6 +18,8 @@
from artiq.gui.schedule import ScheduleDock
from artiq.gui.log import LogDock

data_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)),
"..", "gui")

def get_argparser():
parser = argparse.ArgumentParser(description="ARTIQ GUI client")
@@ -51,6 +54,7 @@ def main():
atexit.register(lambda: schedule_ctl.close_rpc())

win = QtGui.QMainWindow()
win.setWindowIcon(QtGui.QIcon(os.path.join(data_dir, "icon.png")))
area = dockarea.DockArea()
win.setCentralWidget(area)
status_bar = QtGui.QStatusBar()
Binary file added artiq/gui/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

from setuptools import setup, find_packages
import sys
import os

if sys.version_info[:3] < (3, 4, 3):
raise Exception("You need at least Python 3.4.3 to run ARTIQ")
@@ -44,6 +45,7 @@
packages=find_packages(),
namespace_packages=[],
test_suite="artiq.test",
package_data={"artiq": [os.path.join("gui", "icon.png")]},
ext_modules=[],
entry_points={
"console_scripts": scripts,

0 comments on commit 95ff21d

Please sign in to comment.