Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

status: introduce a QSortFilterProxy model

Changeset 07274674f0b3…

Parent 7c717c52ae60…

by Steve Borho

Changes to one file · Browse files at 07274674f0b3 Showing diff from parent 7c717c52ae60 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
12
13
14
15
16
17
18
 
 
 
 
 
19
20
21
 
29
30
31
32
33
34
35
 
66
67
68
69
70
71
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
72
73
74
 
114
115
116
117
118
119
120
121
122
123
124
125
126
 
 
127
128
129
 
131
132
133
 
 
 
134
135
136
 
390
391
392
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
393
394
395
 
12
13
14
 
 
 
 
15
16
17
18
19
20
21
22
 
30
31
32
 
33
34
35
 
66
67
68
 
 
 
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
 
136
137
138
 
 
 
139
140
 
 
 
 
 
141
142
143
144
145
 
147
148
149
150
151
152
153
154
155
 
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
@@ -12,10 +12,11 @@
 from tortoisehg.util import paths, hglib  from tortoisehg.util.i18n import _   -from PyQt4.QtCore import Qt, QVariant, SIGNAL, QAbstractTableModel -from PyQt4.QtCore import QObject, QEvent, QMimeData, QUrl -from PyQt4.QtGui import QWidget, QVBoxLayout, QSplitter, QTreeView -from PyQt4.QtGui import QTextEdit, QFont, QColor, QDrag +from PyQt4.QtCore import Qt, QVariant, SIGNAL, SLOT, QAbstractTableModel +from PyQt4.QtCore import QObject, QEvent, QMimeData, QUrl, QString +from PyQt4.QtGui import QWidget, QVBoxLayout, QSplitter, QTreeView, QLineEdit +from PyQt4.QtGui import QTextEdit, QFont, QColor, QDrag, QSortFilterProxyModel +from PyQt4.QtGui import QFrame, QHBoxLayout, QLabel    # This widget can be used as the basis of the commit tool or any other  # working copy browser. @@ -29,7 +30,6 @@
 # Need mechanism to override file size/binary check  # Show subrepos better  # Save splitter position to parent's QSetting -# Sorting, filtering of working files  # Chunk selection  # tri-state checkboxes for commit  # Investigate Qt.DecorationRole and possible use of overlay icons @@ -66,9 +66,31 @@
  layout.addWidget(split)   self.setLayout(layout)   - self.tv = WctxFileTree(self.repo, split) - self.connect(self.tv, SIGNAL('clicked(QModelIndex)'), self.rowSelected) - self.connect(self.tv, SIGNAL('menuAction()'), self.refreshWctx) + vbox = QVBoxLayout() + frame = QFrame(split) + frame.setLayout(vbox) + hbox = QHBoxLayout() + lbl = QLabel(_('Filter:')) + le = QLineEdit() + hbox.addWidget(lbl) + hbox.addWidget(le) + tv = WctxFileTree(self.repo) + vbox.addLayout(hbox) + vbox.addWidget(tv) + split.addWidget(frame) + + self.connect(tv, SIGNAL('clicked(QModelIndex)'), self.rowSelected) + self.connect(tv, SIGNAL('menuAction()'), self.refreshWctx) + tv.setItemsExpandable(False) + tv.setRootIsDecorated(False) + tv.setSortingEnabled(True) + + self.proxy = WctxProxyModel() + self.proxy.setFilterKeyColumn(COL_PATH_DISPLAY) + self.connect(le, SIGNAL('textEdited(QString)'), self.proxy, + SLOT('setFilterWildcard(QString)')) + tv.setModel(self.proxy) + self.tv = tv     self.te = QTextEdit(split)   self.te.document().setDefaultStyleSheet(qtlib.thgstylesheet) @@ -114,16 +136,10 @@
  self.wctx = wctx   self.updateModel()   - def isMerge(self): - return bool(self.wctx.p2()) -   def updateModel(self):   tm = WctxModel(self.wctx, self.ms, self.opts) - self.tv.setModel(tm) - self.tv.setItemsExpandable(False) - self.tv.setRootIsDecorated(False) - self.tv.setSortingEnabled(True) - self.tv.sortByColumn(COL_PATH_DISPLAY) + self.rawmodel = tm + self.proxy.setSourceModel(tm)   for col in xrange(COL_PATH):   self.tv.resizeColumnToContents(col)   self.tv.setColumnHidden(COL_CHECK, self.isMerge()) @@ -131,6 +147,9 @@
  self.connect(self.tv, SIGNAL('activated(QModelIndex)'), tm.toggleRow)   self.connect(self.tv, SIGNAL('pressed(QModelIndex)'), tm.pressedRow)   + def isMerge(self): + return bool(self.wctx.p2()) +   def rowSelected(self, index):   'Connected to treeview "clicked" signal'   pfile = index.model().getPath(index) @@ -390,6 +409,27 @@
  if index.column() == COL_CHECK:   self.toggleRow(index)   +class WctxProxyModel(QSortFilterProxyModel): + def __init__(self, parent=None): + QSortFilterProxyModel.__init__(self, parent) + + def getPath(self, index): + index = self.mapToSource(index) + return self.sourceModel().getPath(index) + + def getRow(self, index): + index = self.mapToSource(index) + return self.sourceModel().getRow(index) + + def toggleRow(self, index): + 'Connected to "activated" signal, emitted by dbl-click or enter' + index = self.mapToSource(index) + return self.sourceModel().toggleRow(index) + + def pressedRow(self, index): + 'Connected to "pressed" signal, emitted by mouse clicks' + index = self.mapToSource(index) + return self.sourceModel().pressedRow(index)    def run(ui, *pats, **opts):   return StatusWidget(pats, opts)