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

stable tagadd: use dialog response to perform

Changeset 44a8de2a670c…

Parent 1c81d49a6cd1…

by Yuki KODAMA

Changes to one file · Browse files at 44a8de2a670c Showing diff from parent 1c81d49a6cd1 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​tagadd.py Stacked
 
19
20
21
 
 
 
22
23
24
 
35
36
37
38
 
39
40
41
42
43
 
 
44
45
46
 
54
55
56
57
 
 
58
59
60
 
138
139
140
141
142
143
 
 
 
 
 
 
 
 
 
144
 
 
 
145
146
147
 
148
149
150
 
19
20
21
22
23
24
25
26
27
 
38
39
40
 
41
42
43
44
45
 
46
47
48
49
50
 
58
59
60
 
61
62
63
64
65
 
143
144
145
 
 
 
146
147
148
149
150
151
152
153
154
155
156
157
158
159
 
 
160
161
162
163
@@ -19,6 +19,9 @@
   keep = i18n.keepgettext()   +RESPONSE_ADD = 1 +RESPONSE_REMOVE = 2 +  class TagAddDialog(gtk.Dialog):   """ Dialog to add tag to Mercurial repo """   def __init__(self, repo, tag='', rev=''): @@ -35,12 +38,13 @@
    # add Add button   addbutton = gtk.Button(_('Add')) - addbutton.connect('clicked', lambda b: self._do_add_tag()) + addbutton.connect('clicked', lambda b: self.response(RESPONSE_ADD))   self.action_area.pack_end(addbutton)     # add Remove button   removebutton = gtk.Button(_('Remove')) - removebutton.connect('clicked', lambda b: self._do_rm_tag()) + removebutton.connect('clicked', + lambda b: self.response(RESPONSE_REMOVE))   self.action_area.pack_end(removebutton)     # persistent settings @@ -54,7 +58,8 @@
  self._tagslist = gtk.ListStore(str)   self._taglistbox = gtk.ComboBoxEntry(self._tagslist, 0)   self._tag_input = self._taglistbox.get_child() - self._tag_input.connect('activate', self._taginput_activated) + self._tag_input.connect('activate', + lambda *a: self.response(RESPONSE_ADD))   self._tag_input.set_text(tag)   table.add_row(_('Tag:'), self._taglistbox, padding=False)   @@ -138,13 +143,21 @@
  self._commit_message.grab_focus()     def dialog_response(self, dialog, response_id): - self.store_settings() - if response_id == gtk.RESPONSE_CLOSE \ - or response_id == gtk.RESPONSE_DELETE_EVENT: + # Add button + if response_id == RESPONSE_ADD: + self._do_add_tag() + # Remove button + elif response_id == RESPONSE_REMOVE: + self._do_rm_tag() + # Close button or closed by the user + elif response_id in (gtk.RESPONSE_CLOSE, gtk.RESPONSE_DELETE_EVENT): + self.store_settings()   self.destroy() + return # close dialog + else: + raise _('unexpected response id: %s') % response_id   - def _taginput_activated(self, taginput): - self._do_add_tag() + self.run() # don't close dialog     def _do_add_tag(self):   # gather input data