Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- changeset 2560
- cb82017d4dac
- parent 2559
- 56b91939d319
- child 2596
- 32c4afbe0801
equal
deleted
inserted
replaced
| 2559:56b91939d319 | 2560:cb82017d4dac |
|---|---|
| 4173 | 4173 |
| 4174 if toolProcData[0] is None or \ | 4174 if toolProcData[0] is None or \ |
| 4175 toolProcData[1] not in ["insert", "replaceSelection"]: | 4175 toolProcData[1] not in ["insert", "replaceSelection"]: |
| 4176 # not connected to an editor or wrong mode | 4176 # not connected to an editor or wrong mode |
| 4177 while toolProc.canReadLine(): | 4177 while toolProc.canReadLine(): |
| 4178 s = "{0} - ".format(program) | |
| 4179 output = str(toolProc.readLine(), ioEncoding, 'replace') | 4178 output = str(toolProc.readLine(), ioEncoding, 'replace') |
| 4180 s.append(output) | 4179 s = "{0} - {1}".format(program, output) |
| 4181 self.appendToStdout(s) | 4180 self.appendToStdout(s) |
| 4182 else: | 4181 else: |
| 4183 if toolProcData[1] == "insert": | 4182 if toolProcData[1] == "insert": |
| 4184 text = str(toolProc.readAll(), ioEncoding, 'replace') | 4183 text = str(toolProc.readAll(), ioEncoding, 'replace') |
| 4185 toolProcData[0].insert(text) | 4184 toolProcData[0].insert(text) |
| 4196 # loop through all running tool processes | 4195 # loop through all running tool processes |
| 4197 for program, toolProc, toolProcData in self.toolProcs: | 4196 for program, toolProc, toolProcData in self.toolProcs: |
| 4198 toolProc.setReadChannel(QProcess.StandardError) | 4197 toolProc.setReadChannel(QProcess.StandardError) |
| 4199 | 4198 |
| 4200 while toolProc.canReadLine(): | 4199 while toolProc.canReadLine(): |
| 4201 s = "{0} - ".format(program) | |
| 4202 error = str(toolProc.readLine(), ioEncoding, 'replace') | 4200 error = str(toolProc.readLine(), ioEncoding, 'replace') |
| 4203 s.append(error) | 4201 s = "{0} - {1}".format(program, error) |
| 4204 self.appendToStderr(s) | 4202 self.appendToStderr(s) |
| 4205 | 4203 |
| 4206 def __toolFinished(self, exitCode, exitStatus): | 4204 def __toolFinished(self, exitCode, exitStatus): |
| 4207 """ | 4205 """ |
| 4208 Private slot to handle the finished signal of a tool process. | 4206 Private slot to handle the finished signal of a tool process. |
