← Back to branch summary

~mcfletch/eric/update-to-4.5.13

« back to all changes in this revision

Viewing changes to eric/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py

* New upstream release
* Bump standards version to 3.9.3
* Add manpage eric4_iconeditor.1
* Rename all man pages from eric4-* to eric4_* and
  edit them to reflect the changes
* Add an override file to suppress the warning about the
  empty directory /usr/share/eric/api

Show diffs side-by-side

added added

removed removed

Lines of Context:
eric/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
98
98
            (only valid for URL diffs) (boolean)
99
99
        """
100
100
        self.errorGroup.hide()
 
101
        self.inputGroup.show()
101
102
        self.intercept = False
102
103
        self.filename = fn
103
104
        
166
167
        procStarted = self.process.waitForStarted()
167
168
        if not procStarted:
168
169
            self.inputGroup.setEnabled(False)
 
170
            self.inputGroup.hide()
169
171
            KQMessageBox.critical(None,
170
172
                self.trUtf8('Process Generation Error'),
171
173
                self.trUtf8(
181
183
        @param exitStatus exit status of the process (QProcess.ExitStatus)
182
184
        """
183
185
        self.inputGroup.setEnabled(False)
 
186
        self.inputGroup.hide()
184
187
        
185
188
        if self.paras == 0:
186
189
            self.contents.insertPlainText(\
188
191
            return
189
192
            
190
193
        self.buttonBox.button(QDialogButtonBox.Save).setEnabled(True)
 
194
        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
 
195
        self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason)
 
196
        
191
197
        tc = self.contents.textCursor()
192
198
        tc.movePosition(QTextCursor.Start)
193
199
        self.contents.setTextCursor(tc)