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 SyncWidget creation to RepoWidget

Changeset 8f2cedd76a60…

Parent 348e11312084…

by Yuya Nishihara

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

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
23
24
25
 
26
27
28
 
116
117
118
 
 
 
119
120
121
 
138
139
140
 
 
 
 
 
 
141
142
143
 
23
24
25
26
27
28
29
 
117
118
119
120
121
122
123
124
125
 
142
143
144
145
146
147
148
149
150
151
152
153
@@ -23,6 +23,7 @@
 from tortoisehg.hgqt.repoview import HgRepoView  from tortoisehg.hgqt.revdetailswidget import RevDetailsWidget  from tortoisehg.hgqt.commit import CommitWidget +from tortoisehg.hgqt.sync import SyncWidget    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -116,6 +117,9 @@
  sw.minimumSizeHint = lambda: QSize(0, 0)   self.syncTabIndex = idx = tt.addTab(sw, geticon('sync'), '')   tt.setTabToolTip(idx, _("Synchronize")) + self.syncStackedWidget.addWidget(self.createSyncWidget()) + # TODO: unstack sync widget +   self.grepStackedWidget = gw = QStackedWidget()   gw.minimumSizeHint = lambda: QSize(0, 0)   self.grepTabIndex = idx = tt.addTab(gw, geticon('grep'), '') # TODO @@ -138,6 +142,12 @@
  cw.loadConfigs(s)   return cw   + def createSyncWidget(self): + # TODO: pass repo directly instead of repo.root ? + # TODO: don't pass workbench + sw = SyncWidget(root=self.repo.root, parent=self.workbench) + return sw +   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
 
27
28
29
30
31
32
33
 
50
51
52
53
54
55
56
 
357
358
359
360
361
362
363
364
365
366
 
367
368
369
 
381
382
383
384
385
386
387
388
389
 
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
 
27
28
29
 
30
31
32
 
49
50
51
 
52
53
54
 
355
356
357
 
 
 
 
 
 
 
358
359
360
361
 
373
374
375
 
 
 
376
377
378
 
405
406
407
 
 
 
 
 
 
 
 
 
 
 
408
409
410
@@ -27,7 +27,6 @@
 from tortoisehg.hgqt.grep import SearchWidget  from tortoisehg.hgqt.reporegistry import RepoRegistryView  from tortoisehg.hgqt.logcolumns import ColumnSelectDialog -from tortoisehg.hgqt.sync import SyncWidget  from tortoisehg.hgqt.docklog import LogDockWidget    from PyQt4.QtCore import * @@ -50,7 +49,6 @@
  self._searchWidgets = []     self.grepwidgets = {} # key: reporoot - self.syncwidgets = {} # key: reporoot     QMainWindow.__init__(self)   @@ -357,13 +355,7 @@
  tags = w.repo.tags().keys()   self.currentRepoRoot = root = w.repo.root   ti = self.taskTabsWidget.currentIndex() - if ti == self.syncTabIndex: - sw = self.getSyncWidget(root) - if sw: - self.syncStackedWidget.setCurrentWidget(sw) - else: - self.taskTabsWidget.setCurrentIndex(0) - elif ti == self.grepTabIndex: + if ti == self.grepTabIndex:   gw = self.getGrepWidget(root)   if gw:   self.grepStackedWidget.setCurrentWidget(gw) @@ -381,9 +373,6 @@
  def taskTabChanged(self, index):   if index == self.commitTabIndex:   self.workingCopySelected() - elif index == self.syncTabIndex: - sw = self.createSyncWidget(self.currentRepoRoot) - self.syncStackedWidget.setCurrentWidget(sw)   elif index == self.grepTabIndex:   gw = self.createGrepWidget(self.currentRepoRoot)   self.grepStackedWidget.setCurrentWidget(gw) @@ -416,17 +405,6 @@
  '''returns None if no grep widget for that repo has been created yet'''   return self.grepwidgets.get(root)   - def createSyncWidget(self, root): - sw = self.getSyncWidget(root) - if sw is None: - sw = SyncWidget(root, self) - self.syncwidgets[root] = sw - self.syncStackedWidget.addWidget(sw) - return sw - - def getSyncWidget(self, root): - return self.syncwidgets.get(root) -   def switchTo(self, widget):   self.repoTabsWidget.setCurrentWidget(widget)