Remove duplicate menu in canvas

mppsk0 · May 17, 2019 · ea23c7c · ea23c7c
1 parent add90d2
commit ea23c7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/labelme/app.py b/labelme/app.py
@@ -526,13 +526,6 @@ def __init__(
  action('&Move here', self.moveShape),
  ),
  )
- utils.addActions(
- self.canvas.menus[2],
- (
- action('&Copy here', self.copyShape),
- action('&Move here', self.moveShape),
- ),
- )
 
  self.tools = self.toolbar('Tools')
  # Menu buttons on Left

diff --git a/labelme/widgets/canvas.py b/labelme/widgets/canvas.py
@@ -67,7 +67,8 @@ def __init__(self, *args, **kwargs):
  self._painter = QtGui.QPainter()
  self._cursor = CURSOR_DEFAULT
  # Menus:
- self.menus = (QtWidgets.QMenu(), QtWidgets.QMenu(), QtWidgets.QMenu())
+ # 0: right-click, 1: ctrl+right-click
+ self.menus = (QtWidgets.QMenu(), QtWidgets.QMenu())
  # Set widget options.
  self.setMouseTracking(True)
  self.setFocusPolicy(QtCore.Qt.WheelFocus)
@@ -330,7 +331,7 @@ def mousePressEvent(self, ev):
 
  def mouseReleaseEvent(self, ev):
  if ev.button() == QtCore.Qt.RightButton:
- menu = self.menus[min(len(self.selectedShapesCopy), 2)]
+ menu = self.menus[len(self.selectedShapesCopy) > 0]
  self.restoreCursor()
  if not menu.exec_(self.mapToGlobal(ev.pos())) \
  and self.selectedShapesCopy: