239 |
239 |
240 self.inputGroup.setEnabled(True) |
240 self.inputGroup.setEnabled(True) |
241 self.inputGroup.show() |
241 self.inputGroup.show() |
242 |
242 |
243 self.process.start('svn', args) |
243 self.process.start('svn', args) |
244 procStarted = self.process.waitForStarted() |
244 procStarted = self.process.waitForStarted(5000) |
245 if not procStarted: |
245 if not procStarted: |
246 self.inputGroup.setEnabled(False) |
246 self.inputGroup.setEnabled(False) |
247 self.inputGroup.hide() |
247 self.inputGroup.hide() |
248 E5MessageBox.critical(self, |
248 E5MessageBox.critical(self, |
249 self.trUtf8('Process Generation Error'), |
249 self.trUtf8('Process Generation Error'), |
419 """ |
419 """ |
420 if self.diff is None: |
420 if self.diff is None: |
421 from .SvnDiffDialog import SvnDiffDialog |
421 from .SvnDiffDialog import SvnDiffDialog |
422 self.diff = SvnDiffDialog(self.vcs) |
422 self.diff = SvnDiffDialog(self.vcs) |
423 self.diff.show() |
423 self.diff.show() |
|
424 self.diff.raise_() |
424 self.diff.start(self.filename, [rev1, rev2]) |
425 self.diff.start(self.filename, [rev1, rev2]) |
425 |
426 |
426 def on_buttonBox_clicked(self, button): |
427 def on_buttonBox_clicked(self, button): |
427 """ |
428 """ |
428 Private slot called by a button of the button box clicked. |
429 Private slot called by a button of the button box clicked. |