# HG changeset patch # User Adrian Buehlmann <adr...@cadifra.com> # Date 1253028430 -7200 # Node ID fe4454c5d2062a8e86818b2b662ac1bffb6bc462 # Parent c19b2e2c6dfa820322be307701244fe756e65d8e status: move function get_status_types outside block of overrides
diff --git a/tortoisehg/hgtk/status.py b/tortoisehg/hgtk/status.py --- a/tortoisehg/hgtk/status.py +++ b/tortoisehg/hgtk/status.py @@ -405,35 +405,6 @@ class GStatus(gdialog.GDialog): def page_switched(self, notebook, page, page_num, filesel, difftree): self.tree_sel_changed(filesel, difftree, page_num) - def get_status_types(self): - table = gtk.Table(rows=2, columns=3) - table.set_col_spacings(8) - - self._show_checks = {} - row, col = 0, 0 - # Tuple: (ctype, translated label) - checks = (('modified', _('M: modified')), - ('added', _('A: added')), - ('removed', _('R: removed'))) - if self.count_revs() <= 1: - checks += (('deleted', _('!: deleted')), - ('unknown', _('?: unknown')), - ('clean', _('C: clean')), - ('ignored', _('I: ignored'))) - - for ctuple in checks: - check = gtk.CheckButton(ctuple[1]) - check.connect('toggled', self.show_toggle, ctuple[0]) - table.attach(check, col, col+1, row, row+1) - self._show_checks[ctuple[0]] = check - col += row - row = not row - - hbox = gtk.HBox() - hbox.pack_start(table, False, False) - - return hbox - def get_extras(self): self.counter = gtk.Label('') self.counter.set_alignment(1.0, 0.0) # right up @@ -499,6 +470,35 @@ class GStatus(gdialog.GDialog): ### End of overrides ### + def get_status_types(self): + table = gtk.Table(rows=2, columns=3) + table.set_col_spacings(8) + + self._show_checks = {} + row, col = 0, 0 + # Tuple: (ctype, translated label) + checks = (('modified', _('M: modified')), + ('added', _('A: added')), + ('removed', _('R: removed'))) + if self.count_revs() <= 1: + checks += (('deleted', _('!: deleted')), + ('unknown', _('?: unknown')), + ('clean', _('C: clean')), + ('ignored', _('I: ignored'))) + + for ctuple in checks: + check = gtk.CheckButton(ctuple[1]) + check.connect('toggled', self.show_toggle, ctuple[0]) + table.attach(check, col, col+1, row, row+1) + self._show_checks[ctuple[0]] = check + col += row + row = not row + + hbox = gtk.HBox() + hbox.pack_start(table, False, False) + + return hbox + def realize_status_settings(self): self.diffpane.set_position(self.setting_pos) self.reload_status() ------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop