From f12e3f1af814899b546a47fa6b304f72926db29f Mon Sep 17 00:00:00 2001 From: midichef <67946319+midichef@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:15:32 -0800 Subject: [PATCH] [sheets-] record key-col toggle for replay as key-col-on/-off --- visidata/deprecated.py | 9 +++++++++ visidata/sheets.py | 10 ++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/visidata/deprecated.py b/visidata/deprecated.py index 983a754dd..435410272 100644 --- a/visidata/deprecated.py +++ b/visidata/deprecated.py @@ -252,3 +252,12 @@ def keystr(sheet, row): return sheet.rowname(row) vd.optalias('color_refline', 'color_graph_refline') # color_refline was used in v3.1 by mistake + +@deprecated('3.2', '[self.unsetKeys([c]) if c.keycol else self.setKeys([c]) for c in cols]') +@visidata.TableSheet.api +def toggleKeys(self, cols): + for col in cols: + if col.keycol: + self.unsetKeys([col]) + else: + self.setKeys([col]) diff --git a/visidata/sheets.py b/visidata/sheets.py index daa9fe351..e33a29b77 100644 --- a/visidata/sheets.py +++ b/visidata/sheets.py @@ -607,13 +607,6 @@ def unsetKeys(self, cols): for col in cols: col.keycol = 0 - def toggleKeys(self, cols): - for col in cols: - if col.keycol: - self.unsetKeys([col]) - else: - self.setKeys([col]) - def rowkey(self, row): 'Return tuple of the key for *row*.' return tuple(c.getTypedValue(row) for c in self.keyCols) @@ -1192,7 +1185,8 @@ def _async_deepcopy(newlist, oldlist): BaseSheet.addCommand('^R', 'reload-sheet', 'preloadHook(); reload()', 'Reload current sheet') Sheet.addCommand('', 'show-cursor', 'status(statusLine)', 'show cursor position and bounds of current sheet on status line') -Sheet.addCommand('!', 'key-col', 'toggleKeys([cursorCol])', 'toggle current column as a key column') +Sheet.addCommand('!', 'key-col', 'exec_longname("key-col-off") if cursorCol.keycol else exec_longname("key-col-on")', 'toggle current column as a key column', replay=False) +Sheet.addCommand('', 'key-col-on', 'setKeys([cursorCol])', 'set current column as a key column') Sheet.addCommand('z!', 'key-col-off', 'unsetKeys([cursorCol])', 'unset current column as a key column') Sheet.addCommand('e', 'edit-cell', 'cursorCol.setValues([cursorRow], editCell(cursorVisibleColIndex)) if not (cursorRow is None) else fail("no rows to edit")', 'edit contents of current cell')