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

stable history: move apply and reject buttons to directly after the incoming button

This emphasizes the fact that apply and reject act upon what was tentativley
pulled into the preview bundle with the incoming button.

Changeset d0eb4b56b8c2…

Parent 7309a8ee1daf…

by Adrian Buehlmann

Changes to one file · Browse files at d0eb4b56b8c2 Showing diff from parent 7309a8ee1daf Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
918
919
920
 
 
 
 
921
922
923
 
926
927
928
929
930
931
932
933
934
935
 
918
919
920
921
922
923
924
925
926
927
 
930
931
932
 
 
 
 
933
934
935
@@ -918,6 +918,10 @@
    incoming = syncbox.append_stock(gtk.STOCK_GO_DOWN,   _('Download and view incoming changesets')) + apply = syncbox.append_stock(gtk.STOCK_APPLY, + _('Accept changes from Bundle preview')) + reject = syncbox.append_stock(gtk.STOCK_DIALOG_ERROR, + _('Reject changes from Bundle preview'))   pull = syncbox.append_stock(gtk.STOCK_GOTO_BOTTOM,   _('Pull incoming changesets'))   outgoing = syncbox.append_stock(gtk.STOCK_GO_UP, @@ -926,10 +930,6 @@
  _('Push outgoing changesets'))   email = syncbox.append_stock(gtk.STOCK_GOTO_LAST,   _('Email outgoing changesets')) - apply = syncbox.append_stock(gtk.STOCK_APPLY, - _('Accept changes from Bundle preview')) - reject = syncbox.append_stock(gtk.STOCK_DIALOG_ERROR, - _('Reject changes from Bundle preview'))   conf = syncbox.append_stock(gtk.STOCK_PREFERENCES,   _('Configure aliases and after pull behavior'))   stop = syncbox.append_stock(gtk.STOCK_STOP,