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: use gtklib.MenuItems

Changeset 41dcbde86ea1…

Parent 746f79461d85…

by Adrian Buehlmann

Changes to one file · Browse files at 41dcbde86ea1 Showing diff from parent 746f79461d85 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgtk/​status.py Stacked
 
1423
1424
1425
1426
1427
 
1428
1429
1430
 
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
 
1503
1504
1505
1506
 
1507
1508
1509
1510
1511
1512
1513
 
 
 
 
 
1514
1515
1516
 
1518
1519
1520
1521
 
 
1522
1523
 
 
1524
1525
1526
 
1537
1538
1539
 
1540
1541
1542
 
1423
1424
1425
 
 
1426
1427
1428
1429
 
1433
1434
1435
 
 
1436
 
 
1437
1438
1439
 
1498
1499
1500
 
1501
1502
1503
1504
1505
 
 
 
1506
1507
1508
1509
1510
1511
1512
1513
 
1515
1516
1517
 
1518
1519
1520
 
1521
1522
1523
1524
1525
 
1536
1537
1538
1539
1540
1541
1542
@@ -1423,8 +1423,7 @@
  types[row[FM_STATUS]].append(file)   all.append(file)   - def make(label, handler, stats, enabled=True, - sepbefore=False, sepafter=False): + def make(label, handler, stats, enabled=True):   files = []   for t in stats:   files.extend(types[t]) @@ -1434,11 +1433,7 @@
  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): @@ -1503,14 +1498,16 @@
  dlg.show_all()   dlg.set_notify_func(self.ignoremask_updated)   - menu = gtk.Menu() + menu = gtklib.MenuItems()   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) + menu.append_sep() + make(_('_Revert'), revert, 'MAR!ru') + menu.append_sep() + make(_('L_og'), log, 'MARC!ru') + menu.append_sep()   make(_('_Forget'), forget, 'MARC!ru')   make(_('_Add'), add, 'I?')   make(_('_Guess Rename...'), guess_rename, '?') @@ -1518,9 +1515,11 @@
  make(_('Remove versioned'), remove, 'C')   make(_('_Delete unversioned'), delete, '?I')   if len(all) == 1: - make(_('_Copy...'), copy, 'MC', sepbefore=True) + menu.append_sep() + make(_('_Copy...'), copy, 'MC')   make(_('Rename...'), rename, 'MC') - f = make(_('Restart Merge...'), resolve, 'u', sepbefore=True) + menu.append_sep() + f = make(_('Restart Merge...'), resolve, 'u')   make(_('Mark unresolved'), unmark, 'r')   make(_('Mark resolved'), mark, 'u')   if f: @@ -1537,6 +1536,7 @@
  for label, func, stats in self.get_custom_menus():   make(label, func, stats)   + menu = menu.create_menu()   if len(menu.get_children()) > 0:   menu.show_all()   menu.popup(None, None, None, 0, 0)