Mercurial Repositories > eric / file comparison
comparison: UI/CompareDialog.py
UI/CompareDialog.py
- changeset 6247
- 5c677a7f7d51
- parent 6048
- 82ad8ec9548c
- child 6645
- ad476851d7e0
equal
deleted
inserted
replaced
| 6246:fe07a9f16f23 | 6247:5c677a7f7d51 |
|---|---|
| 143 self.vsb2.valueChanged.connect(self.vsb1.setValue) | 143 self.vsb2.valueChanged.connect(self.vsb1.setValue) |
| 144 | 144 |
| 145 self.diffParas = [] | 145 self.diffParas = [] |
| 146 self.currentDiffPos = -1 | 146 self.currentDiffPos = -1 |
| 147 | 147 |
| 148 self.markerPattern = "\0\+|\0\^|\0\-" | 148 self.markerPattern = r"\0\+|\0\^|\0\-" |
| 149 | 149 |
| 150 if len(files) == 2: | 150 if len(files) == 2: |
| 151 self.filesGroup.hide() | 151 self.filesGroup.hide() |
| 152 self.file1Picker.setText(files[0][1]) | 152 self.file1Picker.setText(files[0][1]) |
| 153 self.file2Picker.setText(files[1][1]) | 153 self.file2Picker.setText(files[1][1]) |
