Przeglądaj źródła

Add 'Delete' as a secondary shortcut to delete

Michael Pitidis 13 lat temu
rodzic
commit
02d3cba8f5
3 zmienionych plików z 5 dodań i 3 usunięć
  1. 0 1
      canvas.py
  2. 1 1
      labelme.py
  3. 4 1
      lib.py

+ 0 - 1
canvas.py

@@ -138,7 +138,6 @@ class Canvas(QWidget):
             self.selectedShape.selected = False
             self.selectedShape = shape
             self.repaint()
-
         else:
             shape.label = self.selectedShape.label
             self.deleteSelected()

+ 1 - 1
labelme.py

@@ -110,7 +110,7 @@ class MainWindow(QMainWindow, WindowMixin):
         copy = action('&Copy', self.copySelectedShape,
                 'Ctrl+C', 'copy', u'Copy', enabled=False)
         delete = action('&Delete', self.deleteSelectedShape,
-                'Ctrl+D', 'delete', u'Delete', enabled=False)
+                ['Ctrl+D', 'Delete'], 'delete', u'Delete', enabled=False)
         hide = action('&Hide labels', self.hideLabelsToggle,
                 'Ctrl+H', 'hide', u'Hide background labels when drawing',
                 checkable=True)

+ 4 - 1
lib.py

@@ -21,7 +21,10 @@ def newAction(parent, text, slot=None, shortcut=None, icon=None,
     if icon is not None:
         a.setIcon(newIcon(icon))
     if shortcut is not None:
-        a.setShortcut(shortcut)
+        if isinstance(shortcut, (list, tuple)):
+            a.setShortcuts(shortcut)
+        else:
+            a.setShortcut(shortcut)
     if tip is not None:
         a.setToolTip(tip)
         a.setStatusTip(tip)