~mcfletch/eric/update-to-4.5.13

« back to all changes in this revision

Viewing changes to eric/Plugins/VcsPlugins/vcsSubversion/SvnDialog.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:
60
60
        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
61
61
        
62
62
        self.inputGroup.setEnabled(False)
 
63
        self.inputGroup.hide()
63
64
        
64
65
        self.proc = None
65
66
        
 
67
        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
 
68
        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
 
69
        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
 
70
        self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason)
 
71
        
66
72
        if Preferences.getVCS("AutoClose") and \
67
73
           self.normal and \
68
74
           not self.errors.toPlainText().length() > 0:
132
138
        if not procStarted:
133
139
            self.buttonBox.setFocus()
134
140
            self.inputGroup.setEnabled(False)
 
141
            self.inputGroup.hide()
135
142
            KQMessageBox.critical(None,
136
143
                self.trUtf8('Process Generation Error'),
137
144
                self.trUtf8(
140
147
                ).arg('svn'))
141
148
        else:
142
149
            self.inputGroup.setEnabled(True)
 
150
            self.inputGroup.show()
143
151
        return procStarted
144
152
        
145
153
    def normalExit(self):