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

hgignore: cleanup UI codes #2

Changeset 4db467fcd3eb…

Parent c28f3118861b…

by Yuki KODAMA

Changes to one file · Browse files at 4db467fcd3eb Showing diff from parent c28f3118861b Diff from another changeset...

Change 1 of 11 Show Entire File tortoisehg/​hgtk/​hgignore.py Stacked
 
47
48
49
50
51
 
 
52
53
54
 
63
64
65
66
67
 
 
 
68
69
70
 
80
81
82
83
 
84
85
86
 
103
104
105
106
107
 
108
109
110
 
113
114
115
116
117
118
119
 
 
 
 
120
121
122
 
130
131
132
133
134
135
 
 
 
136
137
 
138
139
140
 
 
141
142
143
 
145
146
147
148
149
 
 
 
 
 
 
150
151
152
153
154
155
156
157
 
158
159
160
 
166
167
168
169
170
 
 
 
171
172
173
174
175
176
 
177
178
179
 
180
181
182
 
184
185
186
187
 
188
189
190
 
200
201
202
203
204
 
 
205
206
207
 
213
214
215
216
217
218
219
220
221
222
 
223
224
225
 
47
48
49
 
 
50
51
52
53
54
 
63
64
65
 
 
66
67
68
69
70
71
 
81
82
83
 
84
85
86
87
 
104
105
106
 
 
107
108
109
110
 
113
114
115
 
 
 
 
116
117
118
119
120
121
122
 
130
131
132
 
 
 
133
134
135
136
 
137
138
 
 
139
140
141
142
143
 
145
146
147
 
 
148
149
150
151
152
153
154
155
156
 
 
157
158
 
159
160
161
162
 
168
169
170
 
 
171
172
173
174
175
176
177
178
 
179
180
181
 
182
183
184
185
 
187
188
189
 
190
191
192
193
 
203
204
205
 
 
206
207
208
209
210
 
216
217
218
 
 
 
 
 
 
 
219
220
221
222
@@ -47,8 +47,8 @@
  hbox.pack_start(glob_entry, True, True, 4)   glob_button = gtk.Button(_('Add'))   hbox.pack_start(glob_button, False, False, 4) - glob_button.connect('clicked', self.add_glob, glob_entry) - glob_entry.connect('activate', self.add_glob, glob_entry) + glob_button.connect('clicked', self.add_glob) + glob_entry.connect('activate', self.add_glob)   glob_entry.set_text(hglib.toutf(fileglob))   self.glob_entry = glob_entry   @@ -63,8 +63,9 @@
  hbox.pack_start(regexp_entry, True, True, 4)   regexp_button = gtk.Button(_('Add'))   hbox.pack_start(regexp_button, False, False, 4) - regexp_button.connect('clicked', self.add_regexp, regexp_entry) - regexp_entry.connect('activate', self.add_regexp, regexp_entry) + regexp_button.connect('clicked', self.add_regexp) + regexp_entry.connect('activate', self.add_regexp) + self.regexp_entry = regexp_entry     try: repo = hg.repository(ui.ui(), path=self.root)   except: self.destroy() @@ -80,7 +81,7 @@
  for f in ignorefiles:   combo.append_text(hglib.toutf(f))   combo.set_active(0) - combo.connect('changed', self.fileselect) + combo.connect('changed', self.file_selected)   self.ignorefile = ignorefiles[0]     ## hbox for filter & unknown list @@ -103,8 +104,7 @@
  scrolledwindow.add(pattree)   pattree.set_enable_search(False)   pattree.set_reorderable(False) - sel = pattree.get_selection() - sel.set_mode(gtk.SELECTION_SINGLE) + pattree.get_selection().set_mode(gtk.SELECTION_SINGLE)   col = gtk.TreeViewColumn(_('Patterns'), gtk.CellRendererText(), text=0)   pattree.append_column(col)   pattree.set_headers_visible(False) @@ -113,10 +113,10 @@
  #### remove button   bhbox = gtk.HBox()   vbox.pack_start(bhbox, False, False, 2) - remove = gtk.Button(_('Remove Selected')) - bhbox.pack_start(remove, False, False, 2) - remove.connect('pressed', self.remove_pressed, sel) - remove.set_sensitive(False) + self.removebtn = gtk.Button(_('Remove Selected')) + bhbox.pack_start(self.removebtn, False, False, 2) + self.removebtn.connect('clicked', self.remove_clicked) + self.removebtn.set_sensitive(False)     ### frame for unknown file list & button   frame = gtk.Frame(_('Unknown Files')) @@ -130,14 +130,14 @@
  vbox.pack_start(scrolledwindow, True, True, 2)   scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   scrolledwindow.set_border_width(4) - unknowntree = gtk.TreeView() - scrolledwindow.add(unknowntree) - unknowntree.set_search_equal_func(self.unknown_search) + unktree = gtk.TreeView() + scrolledwindow.add(unktree) + unktree.set_search_equal_func(self.unknown_search)   col = gtk.TreeViewColumn(_('Files'), gtk.CellRendererText(), text=0) - unknowntree.append_column(col) + unktree.append_column(col)   model = gtk.ListStore(str, str) - unknowntree.set_model(model) - unknowntree.set_headers_visible(False) + unktree.set_model(model) + unktree.set_headers_visible(False)   self.unkmodel = model     #### refresh button @@ -145,16 +145,18 @@
  vbox.pack_start(bhbox, False, False, 2)   refresh = gtk.Button(_('Refresh'))   bhbox.pack_start(refresh, False, False, 2) - refresh.connect('pressed', self.refresh_clicked, sel) - self.connect('thg-refresh', self.thgrefresh) + refresh.connect('pressed', lambda b: self.refresh()) + self.connect('thg-refresh', lambda w: self.refresh()) + + # register signal handlers + pattree.get_selection().connect('changed', self.pattree_rowchanged) + unktree.get_selection().connect('changed', self.unknown_rowchanged)     # prepare to show   glob_entry.grab_focus() - pattree.get_selection().connect('changed', self.pattree_rowchanged, remove) - unknowntree.get_selection().connect('changed', self.unknown_rowchanged)   gobject.idle_add(self.refresh)   - def fileselect(self, combo): + def file_selected(self, combo):   'select another ignore file'   self.ignorefile = hglib.fromutf(combo.get_active_text())   self.refresh() @@ -166,17 +168,18 @@
  return False   return True   - def remove_pressed(self, widget, selection): - model, rows = selection.get_selected_rows() + def remove_clicked(self, button): + sel = self.pattree.get_selection() + model, rows = sel.get_selected_rows()   del model[rows[0]]   del self.ignorelines[rows[0][0]]   self.write_ignore_lines()   self.refresh()   - def pattree_rowchanged(self, sel, remove): + def pattree_rowchanged(self, sel):   model, ppaths = sel.get_selected()   sensitive = ppaths and True or False - remove.set_sensitive(sensitive) + self.removebtn.set_sensitive(sensitive)     def unknown_rowchanged(self, sel):   model, upaths = sel.get_selected() @@ -184,7 +187,7 @@
  return   self.glob_entry.set_text(model[upaths][0])   - def add_glob(self, widget, glob_entry): + def add_glob(self, widget):   newglob = hglib.fromutf(glob_entry.get_text())   if newglob == '':   return @@ -200,8 +203,8 @@
  glob_entry.set_text('')   self.refresh()   - def add_regexp(self, widget, regexp_entry): - newregexp = hglib.fromutf(regexp_entry.get_text()) + def add_regexp(self, widget): + newregexp = hglib.fromutf(self.regexp_entry.get_text())   if newregexp == '':   return   try: @@ -213,13 +216,7 @@
  return   self.ignorelines.append('relre:' + newregexp)   self.write_ignore_lines() - regexp_entry.set_text('') - self.refresh() - - def thgrefresh(self, window): - self.refresh() - - def refresh_clicked(self, togglebutton, data=None): + self.regexp_entry.set_text('')   self.refresh()     def set_notify_func(self, func):