Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

tagadd: use gtk.ComboBoxEntry without explicit model

Tag combobox has only one column, so there is no reason
to give gtk.ListStore model explicitly for this.
It can use simple text APIs, such as append_text().

Changeset 04a2e4dc29ff…

Parent b3eb2e9b0adb…

by Yuki KODAMA

Changes to one file · Browse files at 04a2e4dc29ff Showing diff from parent b3eb2e9b0adb Diff from another changeset...

Change 1 of 7 Show Entire File tortoisehg/​hgtk/​tagadd.py Stacked
 
48
49
50
51
52
53
54
55
56
57
 
 
 
 
 
 
58
59
60
 
90
91
92
93
 
94
95
96
97
98
 
99
100
101
 
103
104
105
106
 
107
108
109
110
 
111
112
113
 
158
159
160
161
 
162
163
164
 
169
170
171
172
 
173
174
175
 
195
196
197
198
 
199
200
201
 
203
204
205
206
 
207
208
209
 
48
49
50
 
 
 
 
 
 
 
51
52
53
54
55
56
57
58
59
 
89
90
91
 
92
93
94
95
96
 
97
98
99
100
 
102
103
104
 
105
106
107
108
 
109
110
111
112
 
157
158
159
 
160
161
162
163
 
168
169
170
 
171
172
173
174
 
194
195
196
 
197
198
199
200
 
202
203
204
 
205
206
207
208
@@ -48,13 +48,12 @@
  self.vbox.pack_start(table, True, True, 2)     ## tag name input - self._tagslist = gtk.ListStore(str) - self._taglistbox = gtk.ComboBoxEntry(self._tagslist, 0) - self._tag_input = self._taglistbox.get_child() - 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) + self.tagcombo = gtk.combo_box_entry_new_text() + self.tagentry = self.tagcombo.get_child() + self.tagentry.set_text(tag) + self.tagentry.connect('activate', + lambda *a: self.response(RESPONSE_ADD)) + table.add_row(_('Tag:'), self.tagcombo, padding=False)     ## revision input   self._rev_input = gtk.Entry() @@ -90,12 +89,12 @@
  # prepare to show   self.load_settings()   self._refresh(clear=False) - self._taglistbox.grab_focus() + self.tagentry.grab_focus()     def _refresh(self, clear=True):   """ update display on dialog with recent repo data """   self.repo.invalidate() - self._tagslist.clear() + self.tagcombo.get_model().clear()     # add tags to drop-down list   tags = [x[0] for x in self.repo.tagslist()] @@ -103,11 +102,11 @@
  for tagname in tags:   if tagname == 'tip':   continue - self._tagslist.append([tagname]) + self.tagcombo.append_text(tagname)     # clear tag input   if clear: - self._tag_input.set_text('') + self.tagentry.set_text('')     def load_settings(self):   expanded = self.settings.get_value('expanded', False, True) @@ -158,7 +157,7 @@
  def _do_add_tag(self):   # gather input data   is_local = self._local_tag.get_active() - name = self._tag_input.get_text() + name = self.tagentry.get_text()   rev = self._rev_input.get_text()   force = self._replace_tag.get_active()   eng_msg = self._eng_msg.get_active() @@ -169,7 +168,7 @@
  if name == '':   dialog.error_dialog(self, _('Tag input is empty'),   _('Please enter tag name')) - self._tag_input.grab_focus() + self.tagentry.grab_focus()   return False   if use_msg and not message:   dialog.error_dialog(self, _('Custom commit message is empty'), @@ -195,7 +194,7 @@
  def _do_remove_tag(self):   # gather input data   is_local = self._local_tag.get_active() - name = self._tag_input.get_text() + name = self.tagentry.get_text()   eng_msg = self._eng_msg.get_active()   use_msg = self._use_msg.get_active()   @@ -203,7 +202,7 @@
  if name == '':   dialog.error_dialog(self, _('Tag name is empty'),   _('Please select tag name to remove')) - self._tag_input.grab_focus() + self.tagentry.grab_focus()   return False     if use_msg: