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

guess: rename matchlv to matchtv

QListView -> QTreeView

Changeset 426b2fa51757…

Parent 9272935a699e…

by Steve Borho

Changes to one file · Browse files at 426b2fa51757 Showing diff from parent 9272935a699e Diff from another changeset...

Change 1 of 7 Show Entire File tortoisehg/​hgqt/​guess.py Stacked
 
93
94
95
96
97
98
99
100
101
102
 
 
 
 
 
 
103
104
105
 
107
108
109
110
 
111
 
112
113
114
 
171
172
173
174
 
175
176
177
 
186
187
188
189
 
190
191
 
192
193
194
 
195
196
197
 
230
231
232
233
234
 
 
235
236
237
 
243
244
245
246
 
247
248
249
 
252
253
254
255
256
 
 
257
258
259
 
93
94
95
 
 
 
 
 
 
 
96
97
98
99
100
101
102
103
104
 
106
107
108
 
109
110
111
112
113
114
 
171
172
173
 
174
175
176
177
 
186
187
188
 
189
190
 
191
192
193
 
194
195
196
197
 
230
231
232
 
 
233
234
235
236
237
 
243
244
245
 
246
247
248
249
 
252
253
254
 
 
255
256
257
258
259
@@ -93,13 +93,12 @@
    matchlbl = QLabel(_('<b>Candidate Matches</b>'))   matchvbox.addWidget(matchlbl) - self.matchlv = QTreeView() - self.matchlv.setSelectionMode(QTreeView.ExtendedSelection) - self.matchlv.setItemsExpandable(False) - self.matchlv.setRootIsDecorated(False) - self.model = MatchModel() - self.matchlv.setModel(self.model) - self.matchlv.clicked.connect(self.showDiff) + matchtv = QTreeView() + matchtv.setSelectionMode(QTreeView.ExtendedSelection) + matchtv.setItemsExpandable(False) + matchtv.setRootIsDecorated(False) + matchtv.setModel(MatchModel()) + matchtv.clicked.connect(self.showDiff)   buthbox = QHBoxLayout()   matchbtn = QPushButton(_('Accept Selected Matches'))   matchbtn.clicked.connect(self.acceptMatch) @@ -107,8 +106,9 @@
  self.matchbtn = matchbtn   buthbox.addStretch(1)   buthbox.addWidget(matchbtn) - matchvbox.addWidget(self.matchlv) + matchvbox.addWidget(matchtv)   matchvbox.addLayout(buthbox) + self.matchtv = matchtv     diffframe = QFrame(hsplit)   diffvbox = QVBoxLayout() @@ -171,7 +171,7 @@
  self.matchbtn.setEnabled(False)   self.errorstr = None   - self.matchlv.model().clear() + self.matchtv.model().clear()   self.thread = RenameSearchThread(self.repo, ulist, pct, copies)   self.connect(self.thread, SIGNAL('match'), self.rowReceived)   self.connect(self.thread, SIGNAL('progress'), self.progressReceived) @@ -186,12 +186,12 @@
  else:   self.pmon.hide()   for col in xrange(3): - self.matchlv.resizeColumnToContents(col) + self.matchtv.resizeColumnToContents(col)   self.findbtn.setEnabled(True) - self.matchbtn.setDisabled(self.matchlv.model().isEmpty()) + self.matchbtn.setDisabled(self.matchtv.model().isEmpty())     def rowReceived(self, args): - self.matchlv.model().appendRow(*args) + self.matchtv.model().appendRow(*args)     def errorReceived(self, qstr):   self.errorstr = qstr @@ -230,8 +230,8 @@
  def acceptMatch(self):   'User pressed "accept match" button'   remdests = {} - for index in self.matchlv.selectionModel().selectedRows(): - src, dest, percent = self.matchlv.model().getRow(index) + for index in self.matchtv.selectionModel().selectedRows(): + src, dest, percent = self.matchtv.model().getRow(index)   if dest in remdests:   QMessageBox.warning(self, _('Multiple sources chosen'),   _('You have multiple renames selected for ' @@ -243,7 +243,7 @@
  self.repo.remove([src]) # !->R   self.repo.copy(src, dest)   shlib.shell_notify([self.repo.wjoin(src), self.repo.wjoin(dest)]) - self.matchlv.model().remove(dest) + self.matchtv.model().remove(dest)   self.matchAccepted.emit()   self.refresh()   @@ -252,8 +252,8 @@
  hglib.invalidaterepo(self.repo)   ctx = self.repo['.']   hu = htmlui.htmlui() - row = self.matchlv.model().getRow(index) - src, dest, percent = self.matchlv.model().getRow(index) + row = self.matchtv.model().getRow(index) + src, dest, percent = self.matchtv.model().getRow(index)   aa = self.repo.wread(dest)   rr = ctx.filectx(src).data()   opts = mdiff.defaultopts