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

browse: switch to flat ListStore

Show only one directory at a time, based on example code from
http://www.pygtk.org/pygtk2tutorial/examples/filelisting.py

Shows more promise. Obviously needs event handlers to be useful.

Changeset 6ce9d6d9dbc0…

Parent 3615af1c313a…

by Steve Borho

Changes to one file · Browse files at 6ce9d6d9dbc0 Showing diff from parent 3615af1c313a Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgtk/​browse.py Stacked
 
18
19
20
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
22
23
 
50
51
52
53
 
54
55
56
 
59
60
61
62
 
 
63
 
64
65
66
67
68
 
69
70
71
 
89
90
91
 
 
 
 
 
 
 
 
 
 
92
93
94
 
135
136
137
138
139
 
 
 
140
141
142
 
 
143
144
145
 
156
157
158
159
 
160
161
162
163
 
164
165
166
167
168
169
 
 
170
171
172
 
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
 
98
99
100
 
101
102
103
104
 
107
108
109
 
110
111
112
113
114
115
116
117
118
119
120
121
122
 
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
 
196
197
198
 
 
199
200
201
202
203
 
204
205
206
207
208
 
219
220
221
 
222
223
224
 
 
225
226
227
 
 
 
 
228
229
230
231
232
@@ -18,6 +18,54 @@
   from tortoisehg.hgtk import hgcmd, gtklib, gdialog   +folderxpm = [ + "17 16 7 1", + " c #000000", + ". c #808000", + "X c yellow", + "o c #808080", + "O c #c0c0c0", + "+ c white", + "@ c None", + "@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@", + "@@+XXXX.@@@@@@@@@", + "@+OOOOOO.@@@@@@@@", + "@+OXOXOXOXOXOXO. ", + "@+XOXOXOXOXOXOX. ", + "@+OXOXOXOXOXOXO. ", + "@+XOXOXOXOXOXOX. ", + "@+OXOXOXOXOXOXO. ", + "@+XOXOXOXOXOXOX. ", + "@+OXOXOXOXOXOXO. ", + "@+XOXOXOXOXOXOX. ", + "@+OOOOOOOOOOOOO. ", + "@ ", + "@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@" + ] +folderpb = gtk.gdk.pixbuf_new_from_xpm_data(folderxpm) + +filexpm = [ + "12 12 3 1", + " c #000000", + ". c #ffff04", + "X c #b2c0dc", + "X XXX", + "X ...... XXX", + "X ...... X", + "X . ... X", + "X ........ X", + "X . .... X", + "X ........ X", + "X . .. X", + "X ........ X", + "X . .. X", + "X ........ X", + "X X" + ] +filepb = gtk.gdk.pixbuf_new_from_xpm_data(filexpm) +  class BrowseDialog(gtk.Dialog):   'Dialog for performing quick dirstate operations'   def __init__(self, command, pats): @@ -50,7 +98,7 @@
  def __init__(self, repo):   gtk.TreeView.__init__(self)   self.repo = repo - fm = gtk.TreeStore(str, # Path + fm = gtk.ListStore(str, # Path   bool, # Checked   str, # Path-UTF8   bool, # M @@ -59,13 +107,16 @@
  bool, # !   bool, # ?   bool, # I - bool) # C + bool, # C + gobject.TYPE_PYOBJECT) # file or folder xpm   self.set_model(fm) + self.set_headers_visible(False)   self.set_reorderable(True)   if hasattr(self, 'set_rubber_banding'):   self.set_rubber_banding(True)   fontlist = repo.ui.config('gtools', 'fontlist', 'MS UI Gothic 9')   self.modify_font(pango.FontDescription(fontlist)) +   col = gtk.TreeViewColumn(_('status'))   self.append_column(col)   @@ -89,6 +140,16 @@
  #packpixmap('ignore.ico', 8) # ignored   #packpixmap('hg.ico', 9) # clean   + def cell_seticon(column, cell, model, iter): + pixbuf = model.get_value(iter, 10) + cell.set_property('pixbuf', pixbuf) + + col = gtk.TreeViewColumn(_('type')) + cell = gtk.CellRendererPixbuf() + col.pack_start(cell, expand=False) + col.set_cell_data_func(cell, cell_seticon) + self.append_column(col) +   col = gtk.TreeViewColumn(_('path'), gtk.CellRendererText(), text=2)   self.append_column(col)   @@ -135,11 +196,13 @@
  def addstatus(self, st):   self.statuses.add(st)   - def buildrow(name, stset): - return [ name, False, hglib.toutf(name), + def buildrow(name, stset, isfile): + pixmap = isfile and filepb or folderpb + row = [ name, False, hglib.toutf(name),   'M' in stset, 'A' in stset, 'R' in stset,   '!' in stset, '?' in stset, 'I' in stset, - 'C' in stset ] + 'C' in stset, pixmap ] + return row     # Build tree data structure   modelroot = dirnode() @@ -156,17 +219,14 @@
  model = self.get_model()   self.set_model(None) # disable updates while we fill the model   model.clear() - def adddir(node, iter): + def adddir(node):   # insert subdirectories at this level (recursive)   for dname, dirnode in node.subdirs.iteritems(): - piter = model.append(iter, buildrow(dname, dirnode.statuses)) - adddir(dirnode, piter) + model.append(buildrow(dname, dirnode.statuses, False))   # insert files at this level   for fname, st in node.files: - model.append(iter, buildrow(fname, st)) - - # insert directory tree into TreeModel - adddir(modelroot, model.get_iter_root()) + model.append(buildrow(fname, st, True)) + adddir(modelroot)   self.set_model(model)