Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0cf6df19333e
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b00089c3d3ff
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 18, 2016

  1. RELEASE_NOTES: 1.0rc3

    @sbourdeauducq
    sbourdeauducq committed Apr 18, 2016
    Copy the full SHA
    89f92a6 View commit details

Commits on Apr 20, 2016

  1. browser: simplify and fix state restore

    @sbourdeauducq
    sbourdeauducq committed Apr 20, 2016
    Copy the full SHA
    b00089c View commit details
Showing with 8 additions and 12 deletions.
  1. +2 −2 RELEASE_NOTES.rst
  2. +6 −10 artiq/browser/files.py
4 changes: 2 additions & 2 deletions RELEASE_NOTES.rst
View file
Original file line number Diff line number Diff line change
@@ -40,8 +40,8 @@ unreleased [2.x]
has been replaced. Pass the parent as first argument instead.


unreleased [1.0rc3]
-------------------
1.0rc3
------

* The HDF5 format has changed.

16 changes: 6 additions & 10 deletions artiq/browser/files.py
View file
Original file line number Diff line number Diff line change
@@ -115,7 +115,9 @@ def list_current_changed(self, current, previous):
self.datasets.init(rd)

def select(self, path):
idx = self.rt_model.index(os.path.dirname(path))
idx = self.rt_model.index(path)
if not idx.isValid():
return
self.rt.expand(idx)
self.rt.scrollTo(idx)
self.rt.setCurrentIndex(idx)
@@ -129,12 +131,6 @@ def save_state(self):
}

def restore_state(self, state):
selected = state.get("selected")
if selected:
self.select(selected)
header = state.get("header")
if header:
self.rt.header().restoreState(QtCore.QByteArray(header))
splitter = state.get("splitter")
if splitter:
self.splitter.restoreState(QtCore.QByteArray(splitter))
self.select(state["selected"])
self.rt.header().restoreState(QtCore.QByteArray(state["header"]))
self.splitter.restoreState(QtCore.QByteArray(state["splitter"]))