Commits

Yuya Nishihara committed 4ff8d15

resolve: copy tooltip messages of buttons to corresponding actions

Comments (0)

Files changed (1)

tortoisehg/hgqt/resolve.py

         self.utree.setContextMenuPolicy(Qt.CustomContextMenu)
         self.utreecmenu = QMenu(self)
         cmauto = self.utreecmenu.addAction(_('Mercurial Re&solve'))
+        cmauto.setToolTip(_('Attempt automatic (trivial) merge'))
         cmauto.triggered.connect(lambda: self.merge('internal:merge'))
         cmmanual = self.utreecmenu.addAction(_('Tool &Resolve'))
+        cmmanual.setToolTip(_('Merge using selected merge tool'))
         cmmanual.triggered.connect(self.merge)
         cmlocal = self.utreecmenu.addAction(_('&Take Local'))
+        cmlocal.setToolTip(_('Accept the local file version (yours)'))
         cmlocal.triggered.connect(lambda: self.merge('internal:local'))
         cmother = self.utreecmenu.addAction(_('Take &Other'))
+        cmother.setToolTip(_('Accept the other file version (theirs)'))
         cmother.triggered.connect(lambda: self.merge('internal:other'))
         cmres = self.utreecmenu.addAction(_('&Mark as Resolved'))
+        cmres.setToolTip(_('Mark this file as resolved'))
         cmres.triggered.connect(self.markresolved)
         self.utreecmenu.addSeparator()
         cmdiffLocToAnc = self.utreecmenu.addAction(_('Diff &Local to Ancestor'))
         self.rtree.setContextMenuPolicy(Qt.CustomContextMenu)
         self.rtreecmenu = QMenu(self)
         cmedit = self.rtreecmenu.addAction(_('&Edit File'))
+        cmedit.setToolTip(_('Edit resolved file'))
         cmedit.triggered.connect(self.edit)
         cmv3way = self.rtreecmenu.addAction(_('3-&Way Diff'))
+        cmv3way.setToolTip(_('Visual three-way diff'))
         cmv3way.triggered.connect(self.v3way)
         cmvp0 = self.rtreecmenu.addAction(_('Diff to &Local'))
+        cmvp0.setToolTip(_('Visual diff between resolved file and first '
+                           'parent'))
         cmvp0.triggered.connect(self.vp0)
         cmvp1 = self.rtreecmenu.addAction(_('&Diff to Other'))
+        cmvp1.setToolTip(_('Visual diff between resolved file and second '
+                           'parent'))
         cmvp1.triggered.connect(self.vp1)
         cmures = self.rtreecmenu.addAction(_('Mark as &Unresolved'))
+        cmures.setToolTip(_('Mark this file as unresolved'))
         cmures.triggered.connect(self.markunresolved)
         self.rmenuitems = (cmedit, cmvp0, cmures)
         self.rmmenuitems = (cmvp1, cmv3way)