bookmarks: improve usability in the context menu

The "Edit" action was really "Launch Editor", so the menu action
explicitly to avoid ambiguities.

Add a new "Edit" action that actually edits the bookmarks list, which is
what most users would expect when clicking on "Edit".

Closes git-cola#281

Reported-by: Ｖ字龍(Vdragon) <pika1021@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>

cola/cmds.py

@@ -503,7 +503,7 @@ class Edit(Command):
 
     @staticmethod
     def name():
-        return N_('Edit')
+        return N_('Launch Editor')
 
     def __init__(self, filenames, line_number=None):
         Command.__init__(self)
@@ -1238,7 +1238,7 @@ def __init__(self, paths):
         Command.__init__(self)
         browser = utils.shell_split(prefs.history_browser())
         if paths:
-            self.argv = browser + paths
+            self.argv = browser + list(paths)
         else:
             self.argv = browser
 

cola/widgets/bookmarks.py

@@ -143,7 +143,7 @@ def __init__(self, parent=None):
                 tooltip=N_('Bookmarks...'), icon=qtutils.add_icon())
 
         qtutils.connect_button(self.open_button, self.tree.open_repo)
-        qtutils.connect_button(self.edit_button, self.manage_bookmarks)
+        qtutils.connect_button(self.edit_button, self.tree.edit_bookmarks)
 
         self.connect(self.tree, SIGNAL('itemSelectionChanged()'),
                      self._tree_selection_changed)
@@ -170,12 +170,8 @@ def _tree_selection_changed(self):
         enabled = bool(self.tree.selected_item())
         self.open_button.setEnabled(enabled)
 
-    def manage_bookmarks(self):
-        manage_bookmarks()
-        self.refresh()
-
-    def refresh(self):
-        self.tree.refresh()
+    def edit_bookmarks(self):
+        self.tree.edit_bookmarks()
 
 
 class BookmarksTreeWidget(standard.TreeWidget):
@@ -199,6 +195,10 @@ def __init__(self, parent=None):
                 cmds.OpenDefaultApp.SHORTCUT)
         self.open_default_action.setEnabled(False)
 
+        self.edit_bookmarks_action = qtutils.add_action(self,
+                N_('Edit'), self.edit_bookmarks)
+        self.edit_bookmarks_action.setEnabled(False)
+
         self.launch_editor_action = qtutils.add_action(self,
                 cmds.Edit.name(), self.launch_editor,
                 cmds.Edit.SHORTCUT)
@@ -243,6 +243,7 @@ def contextMenuEvent(self, event):
         menu.addAction(self.open_action)
         menu.addAction(self.open_new_action)
         menu.addAction(self.open_default_action)
+        menu.addAction(self.edit_bookmarks_action)
         menu.addSeparator()
         menu.addAction(self.copy_action)
         menu.addAction(self.launch_editor_action)
@@ -273,6 +274,10 @@ def open_new_repo(self):
             return
         cmds.do(cmds.OpenNewRepo, item.path)
 
+    def edit_bookmarks(self):
+        manage_bookmarks()
+        self.refresh()
+
     def launch_editor(self):
         item = self.selected_item()
         if not item:
@@ -293,6 +298,7 @@ def _tree_selection_changed(self):
         self.launch_editor_action.setEnabled(enabled)
         self.launch_terminal_action.setEnabled(enabled)
         self.open_default_action.setEnabled(enabled)
+        self.edit_bookmarks_action.setEnabled(enabled)
 
     def _tree_double_clicked(self, item, column):
         cmds.do(cmds.OpenRepo, item.path)

share/doc/git-cola/relnotes.rst

@@ -26,6 +26,10 @@ Usability, bells and whistles
 * New hotkeys: Ctrl+f for fetch, Ctrl+p for push,
   and Ctrl-shift-p for pull.
 
+* The bookmarks widget's context menu actions were made clearer.
+
+  https://github.com/git-cola/git-cola/issues/281
+
 Fixes
 -----
 * We now use bold fonts instead of SmallCaps to avoid