Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
- branch
- eric7
- changeset 10690
- fab36645aa7d
- parent 10439
- 21c28b0f9e41
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 10689:3ede487187f2 | 10690:fab36645aa7d |
|---|---|
| 106 self.commitMessageEdit.setPlainText(msg) | 106 self.commitMessageEdit.setPlainText(msg) |
| 107 else: | 107 else: |
| 108 self.commitMessageEdit.clear() | 108 self.commitMessageEdit.clear() |
| 109 | 109 |
| 110 @pyqtSlot(bool) | 110 @pyqtSlot(bool) |
| 111 def on_idButton_toggled(self, checked): | 111 def on_idButton_toggled(self, _checked): |
| 112 """ | 112 """ |
| 113 Private slot to handle changes of the ID select button. | 113 Private slot to handle changes of the ID select button. |
| 114 | 114 |
| 115 @param checked state of the button | 115 @param _checked state of the button (unused) |
| 116 @type bool | 116 @type bool |
| 117 """ | 117 """ |
| 118 self.__generateDefaultCommitMessage() | 118 self.__generateDefaultCommitMessage() |
| 119 self.__updateOK() | 119 self.__updateOK() |
| 120 | 120 |
| 121 @pyqtSlot(bool) | 121 @pyqtSlot(bool) |
| 122 def on_tagButton_toggled(self, checked): | 122 def on_tagButton_toggled(self, _checked): |
| 123 """ | 123 """ |
| 124 Private slot to handle changes of the Tag select button. | 124 Private slot to handle changes of the Tag select button. |
| 125 | 125 |
| 126 @param checked state of the button | 126 @param _checked state of the button (unused) |
| 127 @type bool | 127 @type bool |
| 128 """ | 128 """ |
| 129 self.__generateDefaultCommitMessage() | 129 self.__generateDefaultCommitMessage() |
| 130 self.__updateOK() | 130 self.__updateOK() |
| 131 | 131 |
| 132 @pyqtSlot(bool) | 132 @pyqtSlot(bool) |
| 133 def on_branchButton_toggled(self, checked): | 133 def on_branchButton_toggled(self, _checked): |
| 134 """ | 134 """ |
| 135 Private slot to handle changes of the Branch select button. | 135 Private slot to handle changes of the Branch select button. |
| 136 | 136 |
| 137 @param checked state of the button | 137 @param _checked state of the button (unused) |
| 138 @type bool | 138 @type bool |
| 139 """ | 139 """ |
| 140 self.__generateDefaultCommitMessage() | 140 self.__generateDefaultCommitMessage() |
| 141 self.__updateOK() | 141 self.__updateOK() |
| 142 | 142 |
| 143 @pyqtSlot(bool) | 143 @pyqtSlot(bool) |
| 144 def on_remoteBranchButton_toggled(self, checked): | 144 def on_remoteBranchButton_toggled(self, _checked): |
| 145 """ | 145 """ |
| 146 Private slot to handle changes of the Remote Branch select button. | 146 Private slot to handle changes of the Remote Branch select button. |
| 147 | 147 |
| 148 @param checked state of the button | 148 @param _checked state of the button (unused) |
| 149 @type bool | 149 @type bool |
| 150 """ | 150 """ |
| 151 self.__generateDefaultCommitMessage() | 151 self.__generateDefaultCommitMessage() |
| 152 self.__updateOK() | 152 self.__updateOK() |
| 153 | 153 |
| 154 @pyqtSlot(bool) | 154 @pyqtSlot(bool) |
| 155 def on_noneButton_toggled(self, checked): | 155 def on_noneButton_toggled(self, _checked): |
| 156 """ | 156 """ |
| 157 Private slot to handle changes of the None select button. | 157 Private slot to handle changes of the None select button. |
| 158 | 158 |
| 159 @param checked state of the button | 159 @param _checked state of the button (unused) |
| 160 @type bool | 160 @type bool |
| 161 """ | 161 """ |
| 162 self.__generateDefaultCommitMessage() | 162 self.__generateDefaultCommitMessage() |
| 163 | 163 |
| 164 @pyqtSlot(str) | 164 @pyqtSlot(str) |
| 165 def on_idEdit_textChanged(self, txt): | 165 def on_idEdit_textChanged(self, _txt): |
| 166 """ | 166 """ |
| 167 Private slot to handle changes of the Commit edit. | 167 Private slot to handle changes of the Commit edit. |
| 168 | 168 |
| 169 @param txt text of the edit | 169 @param _txt text of the edit (unused) |
| 170 @type str | 170 @type str |
| 171 """ | 171 """ |
| 172 self.__generateDefaultCommitMessage() | 172 self.__generateDefaultCommitMessage() |
| 173 self.__updateOK() | 173 self.__updateOK() |
| 174 | 174 |
| 175 @pyqtSlot(str) | 175 @pyqtSlot(str) |
| 176 def on_tagCombo_editTextChanged(self, txt): | 176 def on_tagCombo_editTextChanged(self, _txt): |
| 177 """ | 177 """ |
| 178 Private slot to handle changes of the Tag combo. | 178 Private slot to handle changes of the Tag combo. |
| 179 | 179 |
| 180 @param txt text of the combo | 180 @param _txt text of the combo (unused) |
| 181 @type str | 181 @type str |
| 182 """ | 182 """ |
| 183 self.__generateDefaultCommitMessage() | 183 self.__generateDefaultCommitMessage() |
| 184 self.__updateOK() | 184 self.__updateOK() |
| 185 | 185 |
| 186 @pyqtSlot(str) | 186 @pyqtSlot(str) |
| 187 def on_branchCombo_editTextChanged(self, txt): | 187 def on_branchCombo_editTextChanged(self, _txt): |
| 188 """ | 188 """ |
| 189 Private slot to handle changes of the Branch combo. | 189 Private slot to handle changes of the Branch combo. |
| 190 | 190 |
| 191 @param txt text of the combo | 191 @param _txt text of the combo (unused) |
| 192 @type str | 192 @type str |
| 193 """ | 193 """ |
| 194 self.__generateDefaultCommitMessage() | 194 self.__generateDefaultCommitMessage() |
| 195 self.__updateOK() | 195 self.__updateOK() |
| 196 | 196 |
| 197 @pyqtSlot(str) | 197 @pyqtSlot(str) |
| 198 def on_remoteBranchCombo_editTextChanged(self, txt): | 198 def on_remoteBranchCombo_editTextChanged(self, _txt): |
| 199 """ | 199 """ |
| 200 Private slot to handle changes of the Remote Branch combo. | 200 Private slot to handle changes of the Remote Branch combo. |
| 201 | 201 |
| 202 @param txt text of the combo | 202 @param _txt text of the combo (unused) |
| 203 @type str | 203 @type str |
| 204 """ | 204 """ |
| 205 self.__generateDefaultCommitMessage() | 205 self.__generateDefaultCommitMessage() |
| 206 self.__updateOK() | 206 self.__updateOK() |
| 207 | 207 |
| 208 @pyqtSlot(bool) | 208 @pyqtSlot(bool) |
| 209 def on_commitGroupBox_toggled(self, checked): | 209 def on_commitGroupBox_toggled(self, _checked): |
| 210 """ | 210 """ |
| 211 Private slot to handle changes of the Commit select group. | 211 Private slot to handle changes of the Commit select group. |
| 212 | 212 |
| 213 @param checked state of the group | 213 @param _checked state of the group (unused) |
| 214 @type bool | 214 @type bool |
| 215 """ | 215 """ |
| 216 self.__generateDefaultCommitMessage() | 216 self.__generateDefaultCommitMessage() |
| 217 self.__updateOK() | 217 self.__updateOK() |
| 218 | 218 |
