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

Changeset 348e11312084…

Parent 89e3419b305f…

by Yuya Nishihara

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

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
22
23
24
 
25
26
27
 
103
104
105
 
106
107
108
109
 
 
 
110
111
112
 
116
117
118
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
119
120
121
 
501
502
503
504
 
505
506
507
 
22
23
24
25
26
27
28
 
104
105
106
107
108
109
110
111
112
113
114
115
116
117
 
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
 
523
524
525
 
526
527
528
529
@@ -22,6 +22,7 @@
   from tortoisehg.hgqt.repoview import HgRepoView  from tortoisehg.hgqt.revdetailswidget import RevDetailsWidget +from tortoisehg.hgqt.commit import CommitWidget    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -103,10 +104,14 @@
  sw.minimumSizeHint = lambda: QSize(0, 0)   self.logTabIndex = idx = tt.addTab(sw, geticon('log'), '')   tt.setTabToolTip(idx, _("Revision details")) +   self.commitStackedWidget = sw = QStackedWidget()   sw.minimumSizeHint = lambda: QSize(0, 0)   self.commitTabIndex = idx = tt.addTab(sw, geticon('commit'), '')   tt.setTabToolTip(idx, _("Commit")) + self.commitStackedWidget.addWidget(self.createCommitWidget()) + # TODO: unstack commit widget +   self.syncStackedWidget = sw = QStackedWidget()   sw.minimumSizeHint = lambda: QSize(0, 0)   self.syncTabIndex = idx = tt.addTab(sw, geticon('sync'), '') @@ -116,6 +121,23 @@
  self.grepTabIndex = idx = tt.addTab(gw, geticon('grep'), '') # TODO   tt.setTabToolTip(idx, _("Search"))   + def createCommitWidget(self): + pats = {} + opts = {} + # TODO: pass repo directly instead of repo.root ? + cw = CommitWidget(pats, opts, root=self.repo.root) + cw.errorMessage.connect(self.workbench.showMessage) + def commitcomplete(): + self.reload() + cw.stwidget.refreshWctx() + cw.commitComplete.connect(commitcomplete) + b = QPushButton(_('Commit')) + cw.buttonHBox.addWidget(b) + b.clicked.connect(cw.commit) + s = QSettings() + cw.loadConfigs(s) + return cw +   def load_config(self):   self._font = getfont(self.repo.ui, 'fontlog')   self.rowheight = 8 @@ -501,7 +523,7 @@
  self.revDetailsWidget.on_filled()     def getCommitWidget(self): - return self.workbench.getCommitWidget(self.repo.root) + return self.commitStackedWidget.currentWidget()     def setRepomodel(self, branch, allparents=True):   self.repomodel.setRepo(self.repo, branch=branch, allparents=allparents)
Change 1 of 6 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
24
25
26
27
28
29
30
 
50
51
52
53
54
55
56
 
297
298
299
300
301
302
303
304
 
361
362
363
364
365
366
367
368
369
370
 
371
372
373
 
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
 
442
443
444
445
446
447
448
449
450
451
 
24
25
26
 
27
28
29
 
49
50
51
 
52
53
54
 
295
296
297
 
 
298
299
300
 
357
358
359
 
 
 
 
 
 
 
360
361
362
363
 
403
404
405
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
406
407
408
 
412
413
414
 
 
 
 
415
416
417
@@ -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.commit import CommitWidget  from tortoisehg.hgqt.grep import SearchWidget  from tortoisehg.hgqt.reporegistry import RepoRegistryView  from tortoisehg.hgqt.logcolumns import ColumnSelectDialog @@ -50,7 +49,6 @@
  self._scanForRepoChanges = True   self._searchWidgets = []   - self.commitwidgets = {} # key: reporoot   self.grepwidgets = {} # key: reporoot   self.syncwidgets = {} # key: reporoot   @@ -297,8 +295,6 @@
  return self._dummystackedwidget     def workingCopySelected(self): - cw = self.createCommitWidget(self.currentRepoRoot) - self.commitStackedWidget.setCurrentWidget(cw)   self.taskTabsWidget.setCurrentIndex(1)     def revisionSelected(self): @@ -361,13 +357,7 @@
  tags = w.repo.tags().keys()   self.currentRepoRoot = root = w.repo.root   ti = self.taskTabsWidget.currentIndex() - if ti == self.commitTabIndex: - cw = self.getCommitWidget(root) - if cw: - self.commitStackedWidget.setCurrentWidget(cw) - else: - self.taskTabsWidget.setCurrentIndex(0) - elif ti == self.syncTabIndex: + if ti == self.syncTabIndex:   sw = self.getSyncWidget(root)   if sw:   self.syncStackedWidget.setCurrentWidget(sw) @@ -413,26 +403,6 @@
  tw.setCurrentIndex(index)   self.reporegistry.addRepo(repo.root)   - def createCommitWidget(self, root): - cw = self.getCommitWidget(root) - if cw is None: - pats = {} - opts = {} - cw = CommitWidget(pats, opts, root=root) - cw.errorMessage.connect(self.showMessage) - def commitcomplete(): - self.reloadRepository(root) - cw.stwidget.refreshWctx() - cw.commitComplete.connect(commitcomplete) - b = QPushButton(_('Commit')) - cw.buttonHBox.addWidget(b) - b.clicked.connect(cw.commit) - self.commitwidgets[root] = cw - self.commitStackedWidget.addWidget(cw) - s = QSettings() - cw.loadConfigs(s) - return cw -   def createGrepWidget(self, root):   gw = self.getGrepWidget(root)   if gw is None: @@ -442,10 +412,6 @@
  self.grepStackedWidget.addWidget(gw)   return gw   - def getCommitWidget(self, root): - '''returns None if no commit widget for that repo has been created yet''' - return self.commitwidgets.get(root) -   def getGrepWidget(self, root):   '''returns None if no grep widget for that repo has been created yet'''   return self.grepwidgets.get(root)