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: bc5e12d0aa46
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: fc47d8c0eabb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 20, 2016

  1. gui/log: fix dock close tracking

    @sbourdeauducq
    sbourdeauducq committed Feb 20, 2016
    Copy the full SHA
    804592a View commit details

  2. Merge branch 'master' of github.com:m-labs/artiq

    @sbourdeauducq
    sbourdeauducq committed Feb 20, 2016
    Copy the full SHA
    fc47d8c View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 artiq/gui/log.py
3 changes: 2 additions & 1 deletion artiq/gui/log.py
View file
Original file line number Diff line number Diff line change
@@ -322,9 +322,10 @@ def restore_state(self, state):
raise NotImplementedError
for name, dock_state in state.items():
dock = _LogDock(self, name, self.log_sub)
self.docks[name] = dock
dock.restore_state(dock_state)
self.main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, dock)
self.docks[name] = dock
dock.sigClosed.connect(partial(self.on_dock_closed, name))
self.update_closable()

def first_log_dock(self):