Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

status: add separators, capitalization and '...' in tree popup menu

Changeset 75af0e6d69ae…

Parent 0e8d52f2f4ad…

by Adrian Buehlmann

Changes to one file · Browse files at 75af0e6d69ae Showing diff from parent 0e8d52f2f4ad Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​status.py Stacked
 
1423
1424
1425
1426
 
 
1427
1428
1429
 
1433
1434
1435
 
 
1436
 
 
1437
1438
1439
 
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
 
 
 
 
 
 
 
 
 
 
 
 
 
1514
1515
1516
1517
1518
1519
 
 
 
 
 
1520
1521
1522
 
1524
1525
1526
1527
 
1528
1529
1530
 
1423
1424
1425
 
1426
1427
1428
1429
1430
 
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
 
1504
1505
1506
 
 
 
 
 
 
 
 
 
 
 
 
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
 
 
 
 
 
1521
1522
1523
1524
1525
1526
1527
1528
 
1530
1531
1532
 
1533
1534
1535
1536
@@ -1423,7 +1423,8 @@
  types[row[FM_STATUS]].append(file)   all.append(file)   - def make(label, handler, stats, enabled=True): + def make(label, handler, stats, enabled=True, + sepbefore=False, sepafter=False):   files = []   for t in stats:   files.extend(types[t]) @@ -1433,7 +1434,11 @@
  item.connect('activate', handler, files)   item.set_border_width(1)   item.set_sensitive(enabled) + if sepbefore: + menu.append(gtk.SeparatorMenuItem())   menu.append(item) + if sepafter: + menu.append(gtk.SeparatorMenuItem())   return files     def vdiff(menuitem, files): @@ -1499,24 +1504,25 @@
  dlg.set_notify_func(self.ignoremask_updated)     menu = gtk.Menu() - make(_('_visual diff'), vdiff, 'MAR!ru') - make(_('edit'), edit, 'MACI?ru') - make(_('view missing'), viewmissing, 'R!') - make(_('view other'), other, 'MAru', self.is_merge()) - make(_('_revert'), revert, 'MAR!ru') - make(_('l_og'), log, 'MARC!ru') - make(_('_forget'), forget, 'MARC!ru') - make(_('_add'), add, 'I?') - make(_('_guess rename'), guess_rename, '?') - make(_('_ignore'), ignore, '?') - make(_('remove versioned'), remove, 'C') - make(_('_delete unversioned'), delete, '?I') + make(_('_Visual Diff'), vdiff, 'MAR!ru') + make(_('Edit'), edit, 'MACI?ru') + make(_('View missing'), viewmissing, 'R!') + make(_('View other'), other, 'MAru', self.is_merge()) + menu.append(gtk.SeparatorMenuItem()) + make(_('_Revert'), revert, 'MAR!ru', sepafter=True) + make(_('L_og'), log, 'MARC!ru', sepafter=True) + make(_('_Forget'), forget, 'MARC!ru') + make(_('_Add'), add, 'I?') + make(_('_Guess Rename...'), guess_rename, '?') + make(_('_Ignore'), ignore, '?') + make(_('Remove versioned'), remove, 'C') + make(_('_Delete unversioned'), delete, '?I')   if len(all) == 1: - make(_('_copy'), copy, 'MC') - make(_('rename'), rename, 'MC') - f = make(_('restart merge'), resolve, 'u') - make(_('mark unresolved'), unmark, 'r') - make(_('mark resolved'), mark, 'u') + make(_('_Copy...'), copy, 'MC', sepbefore=True) + make(_('Rename...'), rename, 'MC') + f = make(_('Restart Merge...'), resolve, 'u', sepbefore=True) + make(_('Mark unresolved'), unmark, 'r') + make(_('Mark resolved'), mark, 'u')   if f:   rmenu = gtk.Menu()   for tool in hglib.mergetools(self.repo.ui): @@ -1524,7 +1530,7 @@
  item.connect('activate', resolve_with, tool, f)   item.set_border_width(1)   rmenu.append(item) - item = gtk.MenuItem(_('restart merge with'), True) + item = gtk.MenuItem(_('Restart merge with'), True)   item.set_submenu(rmenu)   menu.append(item)