Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

merge: use addPage, remove unnecessary page number variables

Changeset 4e32e29b8b83…

Parent 154a0bfafcd5…

by Steve Borho

Changes to one file · Browse files at 4e32e29b8b83 Showing diff from parent 154a0bfafcd5 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
16
17
18
19
20
21
22
23
24
25
26
 
40
41
42
43
44
45
46
 
 
 
 
47
48
49
 
16
17
18
 
 
 
 
 
19
20
21
 
35
36
37
 
 
 
 
38
39
40
41
42
43
44
@@ -16,11 +16,6 @@
 from PyQt4.QtCore import *  from PyQt4.QtGui import *   -SUMMARY_PAGE = 0 -MERGE_PAGE = 1 -COMMIT_PAGE = 2 -RESULT_PAGE = 3 -  MARGINS = (8, 0, 0, 0)    class MergeDialog(QWizard): @@ -40,10 +35,10 @@
  self.setOption(QWizard.IndependentPages, True)     # set pages - self.setPage(SUMMARY_PAGE, SummaryPage(repo, self)) - self.setPage(MERGE_PAGE, MergePage(repo, self)) - self.setPage(COMMIT_PAGE, CommitPage(repo, self)) - self.setPage(RESULT_PAGE, ResultPage(repo, self)) + self.addPage(SummaryPage(repo, self)) + self.addPage(MergePage(repo, self)) + self.addPage(CommitPage(repo, self)) + self.addPage(ResultPage(repo, self))   self.currentIdChanged.connect(self.pageChanged)     repo.repositoryChanged.connect(self.repositoryChanged)