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

repowidget: rename textview_status to fileview

Changeset 783f3d23f6a0…

Parent ff1dd22c3dca…

by Adrian Buehlmann

Changes to 4 files · Browse files at 783f3d23f6a0 Showing diff from parent ff1dd22c3dca Diff from another changeset...

Change 1 of 9 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
64
65
66
67
68
 
 
69
70
71
 
76
77
78
79
 
80
81
82
 
151
152
153
154
 
155
156
157
 
159
160
161
162
163
 
 
164
165
166
 
206
207
208
209
 
210
211
212
213
214
 
215
216
217
218
219
 
220
221
222
223
224
 
225
226
227
 
279
280
281
282
 
283
284
285
286
287
 
 
 
288
289
290
291
292
 
 
 
293
294
295
 
310
311
312
313
 
314
315
316
317
318
319
 
 
320
321
322
 
326
327
328
329
 
330
331
332
 
396
397
398
399
 
400
401
402
 
64
65
66
 
 
67
68
69
70
71
 
76
77
78
 
79
80
81
82
 
151
152
153
 
154
155
156
157
 
159
160
161
 
 
162
163
164
165
166
 
206
207
208
 
209
210
211
212
213
 
214
215
216
217
218
 
219
220
221
222
223
 
224
225
226
227
 
279
280
281
 
282
283
284
 
 
 
285
286
287
288
289
 
 
 
290
291
292
293
294
295
 
310
311
312
 
313
314
315
316
317
 
 
318
319
320
321
322
 
326
327
328
 
329
330
331
332
 
396
397
398
 
399
400
401
402
@@ -64,8 +64,8 @@
    self.createActions()   - self.textview_status.setFont(self._font) - connect(self.textview_status, SIGNAL('showMessage'), self.showMessage) + self.fileview.setFont(self._font) + connect(self.fileview, SIGNAL('showMessage'), self.showMessage)   connect(self.tableView_revisions, SIGNAL('showMessage'), self.showMessage)     self.textview_header.setMessageWidget(self.message) @@ -76,7 +76,7 @@
    # setup tables and views   self.setupHeaderTextview() - connect(self.textview_status, SIGNAL('fileDisplayed'), + connect(self.fileview, SIGNAL('fileDisplayed'),   self.file_displayed)   self.setupBranchCombo()   self.setupModels(fromhead) @@ -151,7 +151,7 @@
  #self.actionAnnMode = QtGui.QAction('Annotate', self)   #self.actionAnnMode.setCheckable(True)   #connect(self.actionAnnMode, SIGNAL('toggled(bool)'), - # self.textview_status.setAnnotate) + # self.fileview.setAnnotate)     # Next/Prev diff (in full file mode)   ''' @@ -159,8 +159,8 @@
  self.actionNextDiff.setShortcut('Alt+Down')   def filled():   self.actionNextDiff.setEnabled( - self.textview_status.fileMode() and self.textview_status.nDiffs()) - connect(self.textview_status, SIGNAL('filled'), filled) + self.fileview.fileMode() and self.fileview.nDiffs()) + connect(self.fileview, SIGNAL('filled'), filled)   self.actionPrevDiff = QtGui.QAction(geticon('up'), 'Previous diff', self)   self.actionPrevDiff.setShortcut('Alt+Up')   connect(self.actionNextDiff, SIGNAL('triggered()'), @@ -206,22 +206,22 @@
  self.actionNextLine = QtGui.QAction('Next line', self)   self.actionNextLine.setShortcut(Qt.SHIFT + Qt.Key_Down)   connect(self.actionNextLine, SIGNAL('triggered()'), - self.textview_status.nextLine) + self.fileview.nextLine)   self.addAction(self.actionNextLine)   self.actionPrevLine = QtGui.QAction('Prev line', self)   self.actionPrevLine.setShortcut(Qt.SHIFT + Qt.Key_Up)   connect(self.actionPrevLine, SIGNAL('triggered()'), - self.textview_status.prevLine) + self.fileview.prevLine)   self.addAction(self.actionPrevLine)   self.actionNextCol = QtGui.QAction('Next column', self)   self.actionNextCol.setShortcut(Qt.SHIFT + Qt.Key_Right)   connect(self.actionNextCol, SIGNAL('triggered()'), - self.textview_status.nextCol) + self.fileview.nextCol)   self.addAction(self.actionNextCol)   self.actionPrevCol = QtGui.QAction('Prev column', self)   self.actionPrevCol.setShortcut(Qt.SHIFT + Qt.Key_Left)   connect(self.actionPrevCol, SIGNAL('triggered()'), - self.textview_status.prevCol) + self.fileview.prevCol)   self.addAction(self.actionPrevCol)     # Activate file (file diff navigator) @@ -279,17 +279,17 @@
  self.refreshRevisionTable(sender=self)     def setMode(self, mode): - self.textview_status.setMode(mode) + self.fileview.setMode(mode)     def nextDiff(self): - notlast = self.textview_status.nextDiff() - self.actionNextDiff.setEnabled(self.textview_status.fileMode() and notlast and self.textview_status.nDiffs()) - self.actionPrevDiff.setEnabled(self.textview_status.fileMode() and self.textview_status.nDiffs()) + notlast = self.fileview.nextDiff() + self.actionNextDiff.setEnabled(self.fileview.fileMode() and notlast and self.fileview.nDiffs()) + self.actionPrevDiff.setEnabled(self.fileview.fileMode() and self.fileview.nDiffs())     def prevDiff(self): - notfirst = self.textview_status.prevDiff() - self.actionPrevDiff.setEnabled(self.textview_status.fileMode() and notfirst and self.textview_status.nDiffs()) - self.actionNextDiff.setEnabled(self.textview_status.fileMode() and self.textview_status.nDiffs()) + notfirst = self.fileview.prevDiff() + self.actionPrevDiff.setEnabled(self.fileview.fileMode() and notfirst and self.fileview.nDiffs()) + self.actionNextDiff.setEnabled(self.fileview.fileMode() and self.fileview.nDiffs())     def load_config(self):   cfg = WidgetMixin.load_config(self) @@ -310,13 +310,13 @@
  self.create_models(fromhead)   self.tableView_revisions.setModel(self.repomodel)   self.tableView_filelist.setModel(self.filelistmodel) - self.textview_status.setModel(self.repomodel) + self.fileview.setModel(self.repomodel)   #self.find_toolbar.setModel(self.repomodel)     filetable = self.tableView_filelist   connect(filetable, SIGNAL('fileSelected'), - self.textview_status.displayFile) - connect(self.textview_status, SIGNAL('revForDiffChanged'), + self.fileview.displayFile) + connect(self.fileview, SIGNAL('revForDiffChanged'),   self.textview_header.setDiffRevision)     def setupRevisionTable(self): @@ -326,7 +326,7 @@
  connect(view, SIGNAL('revisionActivated'), self.revision_activated)   connect(view, SIGNAL('updateToRevision'), self.updateToRevision)   connect(self.textview_header, SIGNAL('revisionSelected'), view.goto) - connect(self.textview_header, SIGNAL('parentRevisionSelected'), self.textview_status.displayDiff) + connect(self.textview_header, SIGNAL('parentRevisionSelected'), self.fileview.displayDiff)   self.attachQuickBar(view.goto_toolbar)   gotoaction = view.goto_toolbar.toggleViewAction()   gotoaction.setIcon(geticon('goto')) @@ -396,7 +396,7 @@
  """   if self.repomodel.graph:   ctx = self.repomodel.repo.changectx(rev) - self.textview_status.setContext(ctx) + self.fileview.setContext(ctx)   self.textview_header.displayRevision(ctx)   self.filelistmodel.setSelectedRev(ctx)   if len(self.filelistmodel):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.ui Stacked
 
161
162
163
164
 
165
166
167
 
161
162
163
 
164
165
166
167
@@ -161,7 +161,7 @@
  </font>   </property>   </widget> - <widget class="HgFileView" name="textview_status" native="true"> + <widget class="HgFileView" name="fileview" native="true">   <property name="sizePolicy">   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">   <horstretch>0</horstretch>
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget_ui.py Stacked
 
2
3
4
5
 
6
7
8
 
102
103
104
105
 
106
107
108
109
110
111
112
 
 
 
 
113
114
115
 
2
3
4
 
5
6
7
8
 
102
103
104
 
105
106
107
108
 
 
 
 
109
110
111
112
113
114
115
@@ -2,7 +2,7 @@
   # Form implementation generated from reading ui file 'C:\Users\adi\hgrepos\thg-qt\tortoisehg\hgqt\repowidget.ui'  # -# Created: Tue May 11 16:08:13 2010 +# Created: Fri May 14 15:00:21 2010  # by: PyQt4 UI code generator 4.7.3  #  # WARNING! All changes made in this file will be lost! @@ -102,14 +102,14 @@
  font.setPointSize(9)   self.message.setFont(font)   self.message.setObjectName("message") - self.textview_status = HgFileView(self.message_splitter) + self.fileview = HgFileView(self.message_splitter)   sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)   sizePolicy.setHorizontalStretch(0)   sizePolicy.setVerticalStretch(1) - sizePolicy.setHeightForWidth(self.textview_status.sizePolicy().hasHeightForWidth()) - self.textview_status.setSizePolicy(sizePolicy) - self.textview_status.setMinimumSize(QtCore.QSize(0, 0)) - self.textview_status.setObjectName("textview_status") + sizePolicy.setHeightForWidth(self.fileview.sizePolicy().hasHeightForWidth()) + self.fileview.setSizePolicy(sizePolicy) + self.fileview.setMinimumSize(QtCore.QSize(0, 0)) + self.fileview.setObjectName("fileview")   self.verticalLayout.addWidget(self.message_splitter)   self.verticalLayout_2.addWidget(self.filelist_splitter)   self.horizontalLayout.addWidget(self.revisions_splitter)
Change 1 of 5 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
71
72
73
74
 
75
76
77
 
165
166
167
168
 
169
170
171
 
253
254
255
256
 
257
258
259
 
265
266
267
268
269
 
 
270
271
272
 
307
308
309
310
 
311
312
313
314
315
 
316
317
318
319
320
 
321
322
323
324
325
 
326
327
328
 
71
72
73
 
74
75
76
77
 
165
166
167
 
168
169
170
171
 
253
254
255
 
256
257
258
259
 
265
266
267
 
 
268
269
270
271
272
 
307
308
309
 
310
311
312
313
314
 
315
316
317
318
319
 
320
321
322
323
324
 
325
326
327
328
@@ -71,7 +71,7 @@
    # setup tables and views   #self.setupHeaderTextview() - #connect(self.textview_status, SIGNAL('fileDisplayed'), + #connect(self.fileview, SIGNAL('fileDisplayed'),   # self.file_displayed)   self.setupBranchCombo()   # self.setupModels(fromhead) @@ -165,7 +165,7 @@
  # find quickbar   self.find_toolbar = tb = FindInGraphlogQuickBar(self)   tb.setObjectName("find_toolbar") - #tb.attachFileView(self.textview_status) + #tb.attachFileView(self.fileview)   #tb.attachHeaderView(self.textview_header)   #connect(tb, SIGNAL('revisionSelected'), self.tableView_revisions.goto)   #connect(tb, SIGNAL('fileSelected'), self.tableView_filelist.selectFile) @@ -253,7 +253,7 @@
  self.actionAnnMode = QtGui.QAction('Annotate', self)   self.actionAnnMode.setCheckable(True)   #connect(self.actionAnnMode, SIGNAL('toggled(bool)'), - # self.textview_status.setAnnotate) + # self.fileview.setAnnotate)     self.actionHelp.setShortcut(Qt.Key_F1)   self.actionHelp.setIcon(geticon('help')) @@ -265,8 +265,8 @@
  self.actionNextDiff.setShortcut('Alt+Down')   def filled():   self.actionNextDiff.setEnabled( - self.textview_status.fileMode() and self.textview_status.nDiffs()) - #connect(self.textview_status, SIGNAL('filled'), filled) + self.fileview.fileMode() and self.fileview.nDiffs()) + #connect(self.fileview, SIGNAL('filled'), filled)   self.actionPrevDiff = QtGui.QAction(geticon('up'), 'Previous diff', self)   self.actionPrevDiff.setShortcut('Alt+Up')   connect(self.actionNextDiff, SIGNAL('triggered()'), @@ -307,22 +307,22 @@
  self.actionNextLine = QtGui.QAction('Next line', self)   self.actionNextLine.setShortcut(Qt.SHIFT + Qt.Key_Down)   #connect(self.actionNextLine, SIGNAL('triggered()'), - # self.textview_status.nextLine) + # self.fileview.nextLine)   self.addAction(self.actionNextLine)   self.actionPrevLine = QtGui.QAction('Prev line', self)   self.actionPrevLine.setShortcut(Qt.SHIFT + Qt.Key_Up)   #connect(self.actionPrevLine, SIGNAL('triggered()'), - # self.textview_status.prevLine) + # self.fileview.prevLine)   self.addAction(self.actionPrevLine)   self.actionNextCol = QtGui.QAction('Next column', self)   self.actionNextCol.setShortcut(Qt.SHIFT + Qt.Key_Right)   #connect(self.actionNextCol, SIGNAL('triggered()'), - # self.textview_status.nextCol) + # self.fileview.nextCol)   self.addAction(self.actionNextCol)   self.actionPrevCol = QtGui.QAction('Prev column', self)   self.actionPrevCol.setShortcut(Qt.SHIFT + Qt.Key_Left)   #connect(self.actionPrevCol, SIGNAL('triggered()'), - # self.textview_status.prevCol) + # self.fileview.prevCol)   self.addAction(self.actionPrevCol)     self.actionStartAtRev = QtGui.QAction('Start at rev.', self)