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: 138ba7e2fab3
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: 179416dac75d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 27, 2015

  1. gui/schedule: improve delete status bar message

    @sbourdeauducq
    sbourdeauducq committed Oct 27, 2015
    Copy the full SHA
    f872d92 View commit details

  2. gui: delete shortcuts

    @sbourdeauducq
    sbourdeauducq committed Oct 27, 2015
    Copy the full SHA
    179416d View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 artiq/gui/schedule.py
8 changes: 7 additions & 1 deletion artiq/gui/schedule.py
View file
Original file line number Diff line number Diff line change
@@ -75,9 +75,11 @@ def __init__(self, status_bar, schedule_ctl):
self.table.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
request_termination_action = QtGui.QAction("Request termination", self.table)
request_termination_action.triggered.connect(partial(self.delete_clicked, True))
request_termination_action.setShortcut("DELETE")
self.table.addAction(request_termination_action)
delete_action = QtGui.QAction("Delete", self.table)
delete_action.triggered.connect(partial(self.delete_clicked, False))
delete_action.setShortcut("SHIFT+DELETE")
self.table.addAction(delete_action)


@@ -104,5 +106,9 @@ def delete_clicked(self, graceful):
if idx:
row = idx[0].row()
rid = self.table_model.row_to_key[row]
self.status_bar.showMessage("Deleted RID {}".format(rid))
if graceful:
msg = "Requested termination of RID {}".format(rid)
else:
msg = "Deleted RID {}".format(rid)
self.status_bar.showMessage(msg)
asyncio.ensure_future(self.delete(rid, graceful))