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 conf button to the end of the syncbar

Motivation:
* in the synchronize dialog it's at the end as well
* it's good to have it separated from frequently used "action" buttons
* have things that are used less frequently at the end

Changeset 01b3e55fee5a…

Parent d0eb4b56b8c2…

by Adrian Buehlmann

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

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
924
925
926
 
927
928
929
930
931
932
933
934
 
935
936
 
937
938
939
 
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
 
986
987
988
 
 
 
 
 
 
 
 
 
 
 
 
 
 
989
990
991
 
924
925
926
927
928
929
930
931
932
933
 
 
934
935
936
937
938
939
940
 
955
956
957
 
 
 
 
 
 
 
 
 
958
959
960
 
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
@@ -924,16 +924,17 @@
  _('Reject changes from Bundle preview'))   pull = syncbox.append_stock(gtk.STOCK_GOTO_BOTTOM,   _('Pull incoming changesets')) +   outgoing = syncbox.append_stock(gtk.STOCK_GO_UP,   _('Determine and mark outgoing changesets'))   push = syncbox.append_stock(gtk.STOCK_GOTO_TOP,   _('Push outgoing changesets'))   email = syncbox.append_stock(gtk.STOCK_GOTO_LAST,   _('Email outgoing changesets')) - conf = syncbox.append_stock(gtk.STOCK_PREFERENCES, - _('Configure aliases and after pull behavior')) +   stop = syncbox.append_stock(gtk.STOCK_STOP,   _('Stop current transaction')) +   stop.set_sensitive(False)   apply.set_sensitive(False)   reject.set_sensitive(False) @@ -954,15 +955,6 @@
    self.update_urllist()   - incoming.connect('clicked', self.incoming_clicked) - pull.connect('clicked', self.pull_clicked) - outgoing.connect('clicked', self.outgoing_clicked) - push.connect('clicked', self.push_clicked) - apply.connect('clicked', self.apply_clicked) - reject.connect('clicked', self.reject_clicked) - conf.connect('clicked', self.conf_clicked, urlcombo) - email.connect('clicked', self.email_clicked) -   ## post pull drop-down list   syncbox.append_widget(gtk.Label(_('After Pull:')))   ppulldata = [('none', _('Nothing')), ('update', _('Update'))] @@ -986,6 +978,20 @@
    self.update_postpull(ppull)   + ## add conf button + conf = syncbox.append_stock(gtk.STOCK_PREFERENCES, + _('Configure aliases and after pull behavior')) + + ## connect syncbar buttons + incoming.connect('clicked', self.incoming_clicked) + pull.connect('clicked', self.pull_clicked) + outgoing.connect('clicked', self.outgoing_clicked) + push.connect('clicked', self.push_clicked) + apply.connect('clicked', self.apply_clicked) + reject.connect('clicked', self.reject_clicked) + conf.connect('clicked', self.conf_clicked, urlcombo) + email.connect('clicked', self.email_clicked) +   # filter bar   self.filterbox = gtklib.SlimToolbar()   filterbox = self.filterbox