瀏覽代碼

Fix some ambiguous shortcuts and accelerators

Also change the name of current line/fill color menu entries.
Michael Pitidis 13 年之前
父節點
當前提交
9351f12637
共有 1 個文件被更改,包括 8 次插入7 次删除
  1. 8 7
      labelme.py

+ 8 - 7
labelme.py

@@ -130,14 +130,15 @@ class MainWindow(QMainWindow, WindowMixin):
         close = action('&Close', self.closeFile,
         close = action('&Close', self.closeFile,
                 'Ctrl+K', 'close', u'Close current file')
                 'Ctrl+K', 'close', u'Close current file')
         color1 = action('Polygon &Line Color', self.chooseColor1,
         color1 = action('Polygon &Line Color', self.chooseColor1,
-                'Ctrl+C', 'color', u'Choose polygon line color')
+                'Ctrl+L', 'color', u'Choose polygon line color')
         color2 = action('Polygon &Fill Color', self.chooseColor2,
         color2 = action('Polygon &Fill Color', self.chooseColor2,
-                'Ctrl+Shift+C', 'color', u'Choose polygon fill color')
-        mode = action('&Draw Polygon', self.toggleDrawing,
+                'Ctrl+Shift+F', 'color', u'Choose polygon fill color')
+        mode = action('Draw &Polygon', self.toggleDrawing,
                 'Ctrl+N', 'new', u'Start drawing polygons',
                 'Ctrl+N', 'new', u'Start drawing polygons',
                 checkable=True, enabled=False)
                 checkable=True, enabled=False)
         copy = action('&Copy Polygon', self.copySelectedShape,
         copy = action('&Copy Polygon', self.copySelectedShape,
-                'Ctrl+C', 'copy', u'Copy selected polygon', enabled=False)
+                'Ctrl+C', 'copy', u'Create a duplicate of the selected polygon',
+                enabled=False)
         delete = action('&Delete Polygon', self.deleteSelectedShape,
         delete = action('&Delete Polygon', self.deleteSelectedShape,
                 ['Ctrl+D', 'Delete'], 'delete', u'Delete', enabled=False)
                 ['Ctrl+D', 'Delete'], 'delete', u'Delete', enabled=False)
         hide = action('&Hide Polygons', self.hideLabelsToggle,
         hide = action('&Hide Polygons', self.hideLabelsToggle,
@@ -178,10 +179,10 @@ class MainWindow(QMainWindow, WindowMixin):
                 'Ctrl+E', 'edit', u'Modify the label of the selected polygon',
                 'Ctrl+E', 'edit', u'Modify the label of the selected polygon',
                 enabled=False)
                 enabled=False)
 
 
-        shapeLineColor = action('&Shape Line Color', self.chshapeLineColor,
+        shapeLineColor = action('Current &Line Color', self.chshapeLineColor,
                 icon='color', tip=u'Change the line color for this specific shape',
                 icon='color', tip=u'Change the line color for this specific shape',
                 enabled=False)
                 enabled=False)
-        shapeFillColor = action('&Shape Fill Color', self.chshapeFillColor,
+        shapeFillColor = action('Current &Fill Color', self.chshapeFillColor,
                 icon='color', tip=u'Change the fill color for this specific shape',
                 icon='color', tip=u'Change the fill color for this specific shape',
                 enabled=False)
                 enabled=False)
 
 
@@ -197,7 +198,7 @@ class MainWindow(QMainWindow, WindowMixin):
 
 
         labels = self.dock.toggleViewAction()
         labels = self.dock.toggleViewAction()
         labels.setText('Show/Hide Label Panel')
         labels.setText('Show/Hide Label Panel')
-        labels.setShortcut('Ctrl+L')
+        labels.setShortcut('Ctrl+Shift+L')
 
 
         # Lavel list context menu.
         # Lavel list context menu.
         labelMenu = QMenu()
         labelMenu = QMenu()