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

rename tableView_revisions members to repoview

Changeset 7b28d4754813

Parent 0f9c61665997

by Adrian Buehlmann

Changes to 7 files · Browse files at 7b28d4754813 Showing diff from parent 0f9c61665997 Diff from another changeset...

 
30
31
32
33
 
34
35
36
 
30
31
32
 
33
34
35
36
@@ -30,7 +30,7 @@
  <property name="orientation" >   <enum>Qt::Vertical</enum>   </property> - <widget class="HgRepoView" name="tableView_revisions" > + <widget class="HgRepoView" name="repoview" >   <property name="alternatingRowColors" >   <bool>true</bool>   </property>
 
2
3
4
5
 
6
7
8
 
22
23
24
25
26
27
28
29
30
31
 
 
 
 
 
 
 
32
33
34
 
2
3
4
 
5
6
7
8
 
22
23
24
 
 
 
 
 
 
 
25
26
27
28
29
30
31
32
33
34
@@ -2,7 +2,7 @@
   # Form implementation generated from reading ui file 'C:\Users\adi\hgrepos\thg-qt\tortoisehg\hgqt\FileLogDialog.ui'  # -# Created: Sun May 02 12:30:26 2010 +# Created: Fri May 14 15:43:00 2010  # by: PyQt4 UI code generator 4.7.3  #  # WARNING! All changes made in this file will be lost! @@ -22,13 +22,13 @@
  self.splitter = QtGui.QSplitter(self.centralwidget)   self.splitter.setOrientation(QtCore.Qt.Vertical)   self.splitter.setObjectName("splitter") - self.tableView_revisions = HgRepoView(self.splitter) - self.tableView_revisions.setAlternatingRowColors(True) - self.tableView_revisions.setSelectionMode(QtGui.QAbstractItemView.SingleSelection) - self.tableView_revisions.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) - self.tableView_revisions.setShowGrid(False) - self.tableView_revisions.setGridStyle(QtCore.Qt.NoPen) - self.tableView_revisions.setObjectName("tableView_revisions") + self.repoview = HgRepoView(self.splitter) + self.repoview.setAlternatingRowColors(True) + self.repoview.setSelectionMode(QtGui.QAbstractItemView.SingleSelection) + self.repoview.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) + self.repoview.setShowGrid(False) + self.repoview.setGridStyle(QtCore.Qt.NoPen) + self.repoview.setObjectName("repoview")   self.textView = HgFileView(self.splitter)   self.textView.setObjectName("textView")   self.verticalLayout.addWidget(self.splitter)
 
96
97
98
99
 
100
101
102
 
126
127
128
129
 
130
131
132
133
134
135
136
 
 
137
138
139
140
141
142
143
 
144
145
146
147
148
 
 
149
150
151
 
152
153
154
 
203
204
205
206
 
207
208
209
 
231
232
233
234
 
235
236
237
 
96
97
98
 
99
100
101
102
 
126
127
128
 
129
130
131
132
133
134
 
 
135
136
137
138
139
140
141
142
 
143
144
145
146
 
 
147
148
149
150
 
151
152
153
154
 
203
204
205
 
206
207
208
209
 
231
232
233
 
234
235
236
237
@@ -96,7 +96,7 @@
  self._show_rev = None   else:   index = self.filerevmodel.index(0,0) - self.tableView_revisions.setCurrentIndex(index) + self.repoview.setCurrentIndex(index)     def revisionActivated(self, rev):   """ @@ -126,29 +126,29 @@
  self.find_toolbar = FindInGraphlogQuickBar(self)   self.find_toolbar.attachFileView(self.textView)   connect(self.find_toolbar, SIGNAL('revisionSelected'), - self.tableView_revisions.goto) + self.repoview.goto)   connect(self.find_toolbar, SIGNAL('showMessage'),   self.statusBar().showMessage)   self.attachQuickBar(self.find_toolbar)     self.toolBar_edit.addSeparator() - self.toolBar_edit.addAction(self.tableView_revisions._actions['back']) - self.toolBar_edit.addAction(self.tableView_revisions._actions['forward']) + self.toolBar_edit.addAction(self.repoview._actions['back']) + self.toolBar_edit.addAction(self.repoview._actions['forward'])   self.toolBar_edit.addSeparator()   self.toolBar_edit.addAction(self.actionDiffMode)   self.toolBar_edit.addAction(self.actionAnnMode)   self.toolBar_edit.addAction(self.actionNextDiff)   self.toolBar_edit.addAction(self.actionPrevDiff)   - self.attachQuickBar(self.tableView_revisions.goto_toolbar) + self.attachQuickBar(self.repoview.goto_toolbar)     def setupModels(self):   self.filerevmodel = FileRevModel(self.repo) - self.tableView_revisions.setModel(self.filerevmodel) - connect(self.tableView_revisions, + self.repoview.setModel(self.filerevmodel) + connect(self.repoview,   SIGNAL('revisionSelected'),   self.revisionSelected) - connect(self.tableView_revisions, + connect(self.repoview,   SIGNAL('revisionActivated'),   self.revisionActivated)   connect(self.filerevmodel, SIGNAL('showMessage'), @@ -203,7 +203,7 @@
  def goto(self, rev):   index = self.filerevmodel.indexFromRev(rev)   if index is not None: - self.tableView_revisions.setCurrentIndex(index) + self.repoview.setCurrentIndex(index)   else:   self._show_rev = rev   @@ -231,7 +231,7 @@
  _uifile = 'FileDiffDialog.ui'     def setupViews(self): - self.tableView_revisions = self.tableView_revisions_left + self.repoview = self.tableView_revisions_left   self.tableViews = {'left': self.tableView_revisions_left,   'right': self.tableView_revisions_right}   # viewers are Scintilla editors
 
66
67
68
69
 
70
71
72
73
74
75
 
76
77
78
 
199
200
201
202
 
203
204
205
 
207
208
209
210
 
211
212
213
 
245
246
247
248
 
249
250
251
 
257
258
259
260
 
261
262
263
 
286
287
288
289
 
290
291
292
 
302
303
304
305
 
306
307
308
 
340
341
342
343
344
 
 
345
346
347
 
362
363
364
365
 
366
367
368
 
66
67
68
 
69
70
71
72
73
74
 
75
76
77
78
 
199
200
201
 
202
203
204
205
 
207
208
209
 
210
211
212
213
 
245
246
247
 
248
249
250
251
 
257
258
259
 
260
261
262
263
 
286
287
288
 
289
290
291
292
 
302
303
304
 
305
306
307
308
 
340
341
342
 
 
343
344
345
346
347
 
362
363
364
 
365
366
367
368
@@ -66,13 +66,13 @@
    self.fileview.setFont(self._font)   connect(self.fileview, SIGNAL('showMessage'), self.showMessage) - connect(self.tableView_revisions, SIGNAL('showMessage'), self.showMessage) + connect(self.repoview, SIGNAL('showMessage'), self.showMessage)     self.textview_header.setMessageWidget(self.message)     self.textview_header.commitsignal.connect(self.commit)   - connect(self.message, SIGNAL('revisionSelected'), self.tableView_revisions.goto) + connect(self.message, SIGNAL('revisionSelected'), self.repoview.goto)     # setup tables and views   self.setupHeaderTextview() @@ -199,7 +199,7 @@
  self.addAction(self.actionClearStartAtRev)     def startAtCurrentRev(self): - crev = self.tableView_revisions.current_rev + crev = self.repoview.current_rev   if crev:   self.startrev_entry.setText(str(crev))   # XXX workaround: see refreshRevisionTable method @@ -207,7 +207,7 @@
    def clearStartAtRev(self):   self.startrev_entry.setText("") - self._reload_rev = self.tableView_revisions.current_rev + self._reload_rev = self.repoview.current_rev   self._reload_file = self.tableView_filelist.currentFile()   # XXX workaround: see refreshRevisionTable method   self.refreshRevisionTable(sender=self) @@ -245,7 +245,7 @@
    def setupModels(self, fromhead=None):   self.create_models(fromhead) - self.tableView_revisions.setModel(self.repomodel) + self.repoview.setModel(self.repomodel)   self.tableView_filelist.setModel(self.filelistmodel)   self.fileview.setModel(self.repomodel)   #self.find_toolbar.setModel(self.repomodel) @@ -257,7 +257,7 @@
  self.textview_header.setDiffRevision)     def setupRevisionTable(self): - view = self.tableView_revisions + view = self.repoview   view.installEventFilter(self)   connect(view, SIGNAL('revisionSelected'), self.revision_selected)   connect(view, SIGNAL('revisionActivated'), self.revision_activated) @@ -286,7 +286,7 @@
  self.header_diff_format.setBackground(Qt.gray)     def on_filled(self): - tv = self.tableView_revisions + tv = self.repoview   if self._reload_rev is not None:   try:   tv.goto(self._reload_rev) @@ -302,7 +302,7 @@
  Callback called when a revision is double-clicked in the revisions table   """   if rev is None: - rev = self.tableView_revisions.current_rev + rev = self.repoview.current_rev   self._manifestdlg = ManifestDialog(self.repo, rev)   self._manifestdlg.show()   @@ -340,8 +340,8 @@
  self.tableView_filelist.selectRow(0)     def goto(self, rev): - if len(self.tableView_revisions.model().graph): - self.tableView_revisions.goto(rev) + if len(self.repoview.model().graph): + self.repoview.goto(rev)   else:   # store rev to show once it's available (when graph   # filling is still running) @@ -362,7 +362,7 @@
  def reload(self, rev=None):   """Reload the repository"""   if rev == None: - self._reload_rev = self.tableView_revisions.current_rev + self._reload_rev = self.repoview.current_rev   else:   self._reload_rev = rev   self._loading = True
 
25
26
27
28
 
29
30
31
 
25
26
27
 
28
29
30
31
@@ -25,7 +25,7 @@
  <property name="orientation">   <enum>Qt::Vertical</enum>   </property> - <widget class="HgRepoView" name="tableView_revisions"> + <widget class="HgRepoView" name="repoview">   <property name="sizePolicy">   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">   <horstretch>0</horstretch>
 
2
3
4
5
 
6
7
8
 
20
21
22
23
 
24
25
26
27
28
29
30
 
 
 
 
31
32
33
 
2
3
4
 
5
6
7
8
 
20
21
22
 
23
24
25
26
 
 
 
 
27
28
29
30
31
32
33
@@ -2,7 +2,7 @@
   # Form implementation generated from reading ui file 'C:\Users\adi\hgrepos\thg-qt\tortoisehg\hgqt\repowidget.ui'  # -# Created: Fri May 14 15:00:21 2010 +# Created: Fri May 14 15:41:05 2010  # by: PyQt4 UI code generator 4.7.3  #  # WARNING! All changes made in this file will be lost! @@ -20,14 +20,14 @@
  self.revisions_splitter = QtGui.QSplitter(Form)   self.revisions_splitter.setOrientation(QtCore.Qt.Vertical)   self.revisions_splitter.setObjectName("revisions_splitter") - self.tableView_revisions = HgRepoView(self.revisions_splitter) + self.repoview = HgRepoView(self.revisions_splitter)   sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)   sizePolicy.setHorizontalStretch(0)   sizePolicy.setVerticalStretch(1) - sizePolicy.setHeightForWidth(self.tableView_revisions.sizePolicy().hasHeightForWidth()) - self.tableView_revisions.setSizePolicy(sizePolicy) - self.tableView_revisions.setFrameShape(QtGui.QFrame.StyledPanel) - self.tableView_revisions.setObjectName("tableView_revisions") + sizePolicy.setHeightForWidth(self.repoview.sizePolicy().hasHeightForWidth()) + self.repoview.setSizePolicy(sizePolicy) + self.repoview.setFrameShape(QtGui.QFrame.StyledPanel) + self.repoview.setObjectName("repoview")   self.frame_maincontent = QtGui.QFrame(self.revisions_splitter)   sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)   sizePolicy.setHorizontalStretch(0)
 
174
175
176
177
 
178
179
180
 
182
183
184
185
186
 
 
187
188
189
 
300
301
302
303
 
304
305
306
307
 
308
309
310
 
174
175
176
 
177
178
179
180
 
182
183
184
 
 
185
186
187
188
189
 
300
301
302
 
303
304
305
306
 
307
308
309
310
@@ -174,7 +174,7 @@
  tb.setObjectName("find_toolbar")   #tb.attachFileView(self.fileview)   #tb.attachHeaderView(self.textview_header) - #connect(tb, SIGNAL('revisionSelected'), self.tableView_revisions.goto) + #connect(tb, SIGNAL('revisionSelected'), self.repoview.goto)   #connect(tb, SIGNAL('fileSelected'), self.tableView_filelist.selectFile)   connect(tb, SIGNAL('showMessage'), self.statusBar().showMessage,   Qt.QueuedConnection) @@ -182,8 +182,8 @@
  self.attachQuickBar(tb)     # navigation toolbar - #self.toolBar_edit.addAction(self.tableView_revisions._actions['back']) - #self.toolBar_edit.addAction(self.tableView_revisions._actions['forward']) + #self.toolBar_edit.addAction(self.repoview._actions['back']) + #self.toolBar_edit.addAction(self.repoview._actions['forward'])     findaction = self.find_toolbar.toggleViewAction()   findaction.setIcon(geticon('find')) @@ -300,11 +300,11 @@
  self.actionNextRev = QtGui.QAction('Next revision', self)   self.actionNextRev.setShortcut('Down')   #connect(self.actionNextRev, SIGNAL('triggered()'), - # self.tableView_revisions.nextRev) + # self.repoview.nextRev)   self.actionPrevRev = QtGui.QAction('Prev revision', self)   self.actionPrevRev.setShortcut('Up')   #connect(self.actionPrevRev, SIGNAL('triggered()'), - # self.tableView_revisions.prevRev) + # self.repoview.prevRev)   self.addAction(self.actionNextRev)   self.addAction(self.actionPrevRev)   self.disab_shortcuts.append(self.actionNextRev)