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

workbench: move SearchWidget (grep widget) to RepoWidget

Changeset 8914a102c55d…

Parent 8f2cedd76a60…

by Yuya Nishihara

Changes to 2 files · Browse files at 8914a102c55d Showing diff from parent 8f2cedd76a60 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
24
25
26
 
27
28
29
 
124
125
126
 
 
127
128
129
 
148
149
150
 
 
 
 
 
 
151
152
153
 
24
25
26
27
28
29
30
 
125
126
127
128
129
130
131
132
 
151
152
153
154
155
156
157
158
159
160
161
162
@@ -24,6 +24,7 @@
 from tortoisehg.hgqt.revdetailswidget import RevDetailsWidget  from tortoisehg.hgqt.commit import CommitWidget  from tortoisehg.hgqt.sync import SyncWidget +from tortoisehg.hgqt.grep import SearchWidget    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -124,6 +125,8 @@
  gw.minimumSizeHint = lambda: QSize(0, 0)   self.grepTabIndex = idx = tt.addTab(gw, geticon('grep'), '') # TODO   tt.setTabToolTip(idx, _("Search")) + self.grepStackedWidget.addWidget(self.createGrepWidget()) + # TODO: unstack grep widget     def createCommitWidget(self):   pats = {} @@ -148,6 +151,12 @@
  sw = SyncWidget(root=self.repo.root, parent=self.workbench)   return sw   + def createGrepWidget(self): + # TODO: pass repo directly instead of repo.root ? + upats = {} + gw = SearchWidget(upats, self.repo.root, self) + return gw +   def load_config(self):   self._font = getfont(self.repo.ui, 'fontlog')   self.rowheight = 8
Change 1 of 5 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
24
25
26
27
28
29
30
 
48
49
50
51
52
53
54
55
 
349
350
351
 
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
 
371
372
373
 
374
375
376
377
378
379
380
381
 
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
 
24
25
26
 
27
28
29
 
47
48
49
 
 
50
51
52
 
346
347
348
349
350
351
352
353
354
355
 
 
 
 
 
 
356
357
358
 
363
364
365
366
367
368
 
 
 
369
370
371
 
382
383
384
 
 
 
 
 
 
 
 
 
 
 
 
 
385
386
387
@@ -24,7 +24,6 @@
 from tortoisehg.hgqt.qtlib import geticon, getfont, configstyles  from tortoisehg.hgqt.quickbar import FindInGraphlogQuickBar  from tortoisehg.hgqt.repowidget import RepoWidget -from tortoisehg.hgqt.grep import SearchWidget  from tortoisehg.hgqt.reporegistry import RepoRegistryView  from tortoisehg.hgqt.logcolumns import ColumnSelectDialog  from tortoisehg.hgqt.docklog import LogDockWidget @@ -48,8 +47,6 @@
  self._scanForRepoChanges = True   self._searchWidgets = []   - self.grepwidgets = {} # key: reporoot -   QMainWindow.__init__(self)     self.load_config(ui) @@ -349,18 +346,13 @@
  def repoTabChanged(self, index=0):   self.setupBranchCombo()   + # TODO: code to switch task tab should be no longer used   w = self.repoTabsWidget.currentWidget()   tags = []   if w:   tags = w.repo.tags().keys()   self.currentRepoRoot = root = w.repo.root   ti = self.taskTabsWidget.currentIndex() - if ti == self.grepTabIndex: - gw = self.getGrepWidget(root) - if gw: - self.grepStackedWidget.setCurrentWidget(gw) - else: - self.taskTabsWidget.setCurrentIndex(0)   w.switchedTo()   else:   self.currentRepoRoot = '' @@ -371,11 +363,9 @@
  self.actionPrevDiff.setEnabled(False)     def taskTabChanged(self, index): + # TODO: maybe unused?   if index == self.commitTabIndex:   self.workingCopySelected() - elif index == self.grepTabIndex: - gw = self.createGrepWidget(self.currentRepoRoot) - self.grepStackedWidget.setCurrentWidget(gw)     def getCurentRepoRoot(self):   return self.currentRepoRoot @@ -392,19 +382,6 @@
  tw.setCurrentIndex(index)   self.reporegistry.addRepo(repo.root)   - def createGrepWidget(self, root): - gw = self.getGrepWidget(root) - if gw is None: - upats = {} - gw = SearchWidget(upats, root, self) - self.grepwidgets[root] = gw - self.grepStackedWidget.addWidget(gw) - return gw - - def getGrepWidget(self, root): - '''returns None if no grep widget for that repo has been created yet''' - return self.grepwidgets.get(root) -   def switchTo(self, widget):   self.repoTabsWidget.setCurrentWidget(widget)