Changeset e0e9b8dd92e7…
Parent 03f517f05dcc…
by
Changes to one file · Browse files at e0e9b8dd92e7 Showing diff from parent 03f517f05dcc Diff from another changeset...
@@ -957,7 +957,9 @@ self.update_urllist()
## post pull drop-down list
- syncbox.append_widget(gtk.Label(_('After Pull:')))
+ ppullbox = gtk.HBox()
+ syncbox.append_widget(ppullbox)
+ ppullbox.pack_start(gtk.Label(_('After Pull:')), False, False, 4)
ppulldata = [('none', _('Nothing')), ('update', _('Update'))]
ppull = self.repo.ui.config('tortoisehg', 'postpull', 'none')
if 'fetch' in self.exs or 'fetch' == ppull:
@@ -968,7 +970,7 @@ ppulllist = gtk.ListStore(str, # name
str) # label (utf-8)
ppullcombo = gtk.ComboBox(ppulllist)
- syncbox.append_widget(ppullcombo)
+ ppullbox.pack_start(ppullcombo, False, False)
cell = gtk.CellRendererText()
ppullcombo.pack_start(cell)
ppullcombo.add_attribute(cell, 'text', 1)
@@ -976,6 +978,7 @@ ppulllist.append((name, label))
self.ppullcombo = ppullcombo
self.ppulldata = ppulldata
+ self.ppullbox = ppullbox
self.update_postpull(ppull)
@@ -1246,7 +1249,7 @@ self.cmd_set_sensitive(cmd, False)
self.incoming_disabled_cmds.append(cmd)
- ignore = (self.syncbar_apply, self.syncbar_reject, self.ppullcombo)
+ ignore = (self.syncbar_apply, self.syncbar_reject, self.ppullbox)
self.incoming_disabled = []
def disable_child(w):
if (w not in ignore) and w.get_property('sensitive'):
|
Loading...