m-labs · Apr 21, 2016 · Apr 21, 2016
Showing with 22 additions and 8 deletions.

+2 −1 README.rst

+4 −3 artiq/browser/files.py

+16 −4 setup.py
diff --git a/README.rst b/README.rst
@@ -1,6 +1,7 @@
 .. Always keep doc/manual/introduction.rst synchronized with this file, with the exception of the logo.
 
-.. image:: doc/logo/artiq.png
+.. Absolute so that it works on github and on pypi
+.. image:: https://raw.githubusercontent.com/m-labs/artiq/master/doc/logo/artiq.png
 
 ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is the next-generation control system for quantum information experiments.
 It is developed by `M-Labs <https://m-labs.hk>`_ for and in partnership with the `Ion Storage Group at NIST <http://www.nist.gov/pml/div688/grp10/index.cfm>`_ as free software.

diff --git a/artiq/browser/files.py b/artiq/browser/files.py
@@ -111,8 +111,11 @@ def __init__(self, datasets, main_window, browse_root="", select=None):
         self.model.directoryLoaded.connect(
             lambda: self.rt.resizeColumnToContents(0))
         self.rt.setAnimated(False)
+        if browse_root != "":
+            browse_root = os.path.abspath(browse_root)
         self.rt.setRootIndex(rt_model.mapFromSource(
-            self.model.setRootPath(os.path.abspath(browse_root))))
+            self.model.setRootPath(browse_root)))
+        self.rt.setHeaderHidden(True)
         self.rt.setSelectionBehavior(self.rt.SelectRows)
         self.rt.setSelectionMode(self.rt.SingleSelection)
         self.rt.selectionModel().currentChanged.connect(
@@ -206,13 +209,11 @@ def save_state(self):
         return {
             "dir": self.model.filePath(self.rl.rootIndex()),
             "file": self.model.filePath(self.rl.currentIndex()),
-            "header": bytes(self.rt.header().saveState()),
             "splitter": bytes(self.splitter.saveState()),
         }
 
     def restore_state(self, state):
         if self.restore_selected:
             self.select_dir(state["dir"])
             self.select_file(state["file"])
-        self.rt.header().restoreState(QtCore.QByteArray(state["header"]))
         self.splitter.restoreState(QtCore.QByteArray(state["splitter"]))
diff --git a/setup.py b/setup.py
@@ -48,12 +48,24 @@
     name="artiq",
     version=versioneer.get_version(),
     cmdclass=versioneer.get_cmdclass(),
-    author="M-Labs / NIST Ion Storage Group",
-    author_email="sb@m-labs.hk",
+    author="M-Labs",
+    author_email="artiq@lists.m-labs.hk",
     url="https://m-labs.hk/artiq",
-    description="A control system for trapped-ion experiments",
+    description="Advanced Real-Time Infrastructure for Quantum physics",
     long_description=open("README.rst").read(),
-    license="GPL",
+    license="GPLv3+",
+    classifiers="""\
+Development Status :: 5 - Production/Stable
+Environment :: Console
+Environment :: X11 Applications :: Qt
+Intended Audience :: Science/Research
+License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+Operating System :: Microsoft :: Windows
+Operating System :: POSIX :: Linux
+Programming Language :: Python :: 3.5
+Topic :: Scientific/Engineering :: Physics
+Topic :: System :: Hardware
+""".splitlines(),
     install_requires=requirements,
     extras_require={},
     dependency_links=[