Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html
src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html
- branch
- eric7
- changeset 10690
- fab36645aa7d
- parent 10479
- 856476537696
equal
deleted
inserted
replaced
| 10689:3ede487187f2 | 10690:fab36645aa7d |
|---|---|
| 186 tuple of (str, bool, str, bool, bool) | 186 tuple of (str, bool, str, bool, bool) |
| 187 </dd> | 187 </dd> |
| 188 </dl> | 188 </dl> |
| 189 <a NAME="GitMergeDialog.on_branchButton_toggled" ID="GitMergeDialog.on_branchButton_toggled"></a> | 189 <a NAME="GitMergeDialog.on_branchButton_toggled" ID="GitMergeDialog.on_branchButton_toggled"></a> |
| 190 <h4>GitMergeDialog.on_branchButton_toggled</h4> | 190 <h4>GitMergeDialog.on_branchButton_toggled</h4> |
| 191 <b>on_branchButton_toggled</b>(<i>checked</i>) | 191 <b>on_branchButton_toggled</b>(<i>_checked</i>) |
| 192 <p> | 192 <p> |
| 193 Private slot to handle changes of the Branch select button. | 193 Private slot to handle changes of the Branch select button. |
| 194 </p> | 194 </p> |
| 195 | 195 |
| 196 <dl> | 196 <dl> |
| 197 | 197 |
| 198 <dt><i>checked</i> (bool)</dt> | 198 <dt><i>_checked</i> (bool)</dt> |
| 199 <dd> | 199 <dd> |
| 200 state of the button | 200 state of the button (unused) |
| 201 </dd> | 201 </dd> |
| 202 </dl> | 202 </dl> |
| 203 <a NAME="GitMergeDialog.on_branchCombo_editTextChanged" ID="GitMergeDialog.on_branchCombo_editTextChanged"></a> | 203 <a NAME="GitMergeDialog.on_branchCombo_editTextChanged" ID="GitMergeDialog.on_branchCombo_editTextChanged"></a> |
| 204 <h4>GitMergeDialog.on_branchCombo_editTextChanged</h4> | 204 <h4>GitMergeDialog.on_branchCombo_editTextChanged</h4> |
| 205 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>) | 205 <b>on_branchCombo_editTextChanged</b>(<i>_txt</i>) |
| 206 <p> | 206 <p> |
| 207 Private slot to handle changes of the Branch combo. | 207 Private slot to handle changes of the Branch combo. |
| 208 </p> | 208 </p> |
| 209 | 209 |
| 210 <dl> | 210 <dl> |
| 211 | 211 |
| 212 <dt><i>txt</i> (str)</dt> | 212 <dt><i>_txt</i> (str)</dt> |
| 213 <dd> | 213 <dd> |
| 214 text of the combo | 214 text of the combo (unused) |
| 215 </dd> | 215 </dd> |
| 216 </dl> | 216 </dl> |
| 217 <a NAME="GitMergeDialog.on_commitGroupBox_toggled" ID="GitMergeDialog.on_commitGroupBox_toggled"></a> | 217 <a NAME="GitMergeDialog.on_commitGroupBox_toggled" ID="GitMergeDialog.on_commitGroupBox_toggled"></a> |
| 218 <h4>GitMergeDialog.on_commitGroupBox_toggled</h4> | 218 <h4>GitMergeDialog.on_commitGroupBox_toggled</h4> |
| 219 <b>on_commitGroupBox_toggled</b>(<i>checked</i>) | 219 <b>on_commitGroupBox_toggled</b>(<i>_checked</i>) |
| 220 <p> | 220 <p> |
| 221 Private slot to handle changes of the Commit select group. | 221 Private slot to handle changes of the Commit select group. |
| 222 </p> | 222 </p> |
| 223 | 223 |
| 224 <dl> | 224 <dl> |
| 225 | 225 |
| 226 <dt><i>checked</i> (bool)</dt> | 226 <dt><i>_checked</i> (bool)</dt> |
| 227 <dd> | 227 <dd> |
| 228 state of the group | 228 state of the group (unused) |
| 229 </dd> | 229 </dd> |
| 230 </dl> | 230 </dl> |
| 231 <a NAME="GitMergeDialog.on_commitMessageEdit_textChanged" ID="GitMergeDialog.on_commitMessageEdit_textChanged"></a> | 231 <a NAME="GitMergeDialog.on_commitMessageEdit_textChanged" ID="GitMergeDialog.on_commitMessageEdit_textChanged"></a> |
| 232 <h4>GitMergeDialog.on_commitMessageEdit_textChanged</h4> | 232 <h4>GitMergeDialog.on_commitMessageEdit_textChanged</h4> |
| 233 <b>on_commitMessageEdit_textChanged</b>(<i></i>) | 233 <b>on_commitMessageEdit_textChanged</b>(<i></i>) |
| 235 Private slot to handle changes of the commit message edit. | 235 Private slot to handle changes of the commit message edit. |
| 236 </p> | 236 </p> |
| 237 | 237 |
| 238 <a NAME="GitMergeDialog.on_idButton_toggled" ID="GitMergeDialog.on_idButton_toggled"></a> | 238 <a NAME="GitMergeDialog.on_idButton_toggled" ID="GitMergeDialog.on_idButton_toggled"></a> |
| 239 <h4>GitMergeDialog.on_idButton_toggled</h4> | 239 <h4>GitMergeDialog.on_idButton_toggled</h4> |
| 240 <b>on_idButton_toggled</b>(<i>checked</i>) | 240 <b>on_idButton_toggled</b>(<i>_checked</i>) |
| 241 <p> | 241 <p> |
| 242 Private slot to handle changes of the ID select button. | 242 Private slot to handle changes of the ID select button. |
| 243 </p> | 243 </p> |
| 244 | 244 |
| 245 <dl> | 245 <dl> |
| 246 | 246 |
| 247 <dt><i>checked</i> (bool)</dt> | 247 <dt><i>_checked</i> (bool)</dt> |
| 248 <dd> | 248 <dd> |
| 249 state of the button | 249 state of the button (unused) |
| 250 </dd> | 250 </dd> |
| 251 </dl> | 251 </dl> |
| 252 <a NAME="GitMergeDialog.on_idEdit_textChanged" ID="GitMergeDialog.on_idEdit_textChanged"></a> | 252 <a NAME="GitMergeDialog.on_idEdit_textChanged" ID="GitMergeDialog.on_idEdit_textChanged"></a> |
| 253 <h4>GitMergeDialog.on_idEdit_textChanged</h4> | 253 <h4>GitMergeDialog.on_idEdit_textChanged</h4> |
| 254 <b>on_idEdit_textChanged</b>(<i>txt</i>) | 254 <b>on_idEdit_textChanged</b>(<i>_txt</i>) |
| 255 <p> | 255 <p> |
| 256 Private slot to handle changes of the Commit edit. | 256 Private slot to handle changes of the Commit edit. |
| 257 </p> | 257 </p> |
| 258 | 258 |
| 259 <dl> | 259 <dl> |
| 260 | 260 |
| 261 <dt><i>txt</i> (str)</dt> | 261 <dt><i>_txt</i> (str)</dt> |
| 262 <dd> | 262 <dd> |
| 263 text of the edit | 263 text of the edit (unused) |
| 264 </dd> | 264 </dd> |
| 265 </dl> | 265 </dl> |
| 266 <a NAME="GitMergeDialog.on_noneButton_toggled" ID="GitMergeDialog.on_noneButton_toggled"></a> | 266 <a NAME="GitMergeDialog.on_noneButton_toggled" ID="GitMergeDialog.on_noneButton_toggled"></a> |
| 267 <h4>GitMergeDialog.on_noneButton_toggled</h4> | 267 <h4>GitMergeDialog.on_noneButton_toggled</h4> |
| 268 <b>on_noneButton_toggled</b>(<i>checked</i>) | 268 <b>on_noneButton_toggled</b>(<i>_checked</i>) |
| 269 <p> | 269 <p> |
| 270 Private slot to handle changes of the None select button. | 270 Private slot to handle changes of the None select button. |
| 271 </p> | 271 </p> |
| 272 | 272 |
| 273 <dl> | 273 <dl> |
| 274 | 274 |
| 275 <dt><i>checked</i> (bool)</dt> | 275 <dt><i>_checked</i> (bool)</dt> |
| 276 <dd> | 276 <dd> |
| 277 state of the button | 277 state of the button (unused) |
| 278 </dd> | 278 </dd> |
| 279 </dl> | 279 </dl> |
| 280 <a NAME="GitMergeDialog.on_remoteBranchButton_toggled" ID="GitMergeDialog.on_remoteBranchButton_toggled"></a> | 280 <a NAME="GitMergeDialog.on_remoteBranchButton_toggled" ID="GitMergeDialog.on_remoteBranchButton_toggled"></a> |
| 281 <h4>GitMergeDialog.on_remoteBranchButton_toggled</h4> | 281 <h4>GitMergeDialog.on_remoteBranchButton_toggled</h4> |
| 282 <b>on_remoteBranchButton_toggled</b>(<i>checked</i>) | 282 <b>on_remoteBranchButton_toggled</b>(<i>_checked</i>) |
| 283 <p> | 283 <p> |
| 284 Private slot to handle changes of the Remote Branch select button. | 284 Private slot to handle changes of the Remote Branch select button. |
| 285 </p> | 285 </p> |
| 286 | 286 |
| 287 <dl> | 287 <dl> |
| 288 | 288 |
| 289 <dt><i>checked</i> (bool)</dt> | 289 <dt><i>_checked</i> (bool)</dt> |
| 290 <dd> | 290 <dd> |
| 291 state of the button | 291 state of the button (unused) |
| 292 </dd> | 292 </dd> |
| 293 </dl> | 293 </dl> |
| 294 <a NAME="GitMergeDialog.on_remoteBranchCombo_editTextChanged" ID="GitMergeDialog.on_remoteBranchCombo_editTextChanged"></a> | 294 <a NAME="GitMergeDialog.on_remoteBranchCombo_editTextChanged" ID="GitMergeDialog.on_remoteBranchCombo_editTextChanged"></a> |
| 295 <h4>GitMergeDialog.on_remoteBranchCombo_editTextChanged</h4> | 295 <h4>GitMergeDialog.on_remoteBranchCombo_editTextChanged</h4> |
| 296 <b>on_remoteBranchCombo_editTextChanged</b>(<i>txt</i>) | 296 <b>on_remoteBranchCombo_editTextChanged</b>(<i>_txt</i>) |
| 297 <p> | 297 <p> |
| 298 Private slot to handle changes of the Remote Branch combo. | 298 Private slot to handle changes of the Remote Branch combo. |
| 299 </p> | 299 </p> |
| 300 | 300 |
| 301 <dl> | 301 <dl> |
| 302 | 302 |
| 303 <dt><i>txt</i> (str)</dt> | 303 <dt><i>_txt</i> (str)</dt> |
| 304 <dd> | 304 <dd> |
| 305 text of the combo | 305 text of the combo (unused) |
| 306 </dd> | 306 </dd> |
| 307 </dl> | 307 </dl> |
| 308 <a NAME="GitMergeDialog.on_tagButton_toggled" ID="GitMergeDialog.on_tagButton_toggled"></a> | 308 <a NAME="GitMergeDialog.on_tagButton_toggled" ID="GitMergeDialog.on_tagButton_toggled"></a> |
| 309 <h4>GitMergeDialog.on_tagButton_toggled</h4> | 309 <h4>GitMergeDialog.on_tagButton_toggled</h4> |
| 310 <b>on_tagButton_toggled</b>(<i>checked</i>) | 310 <b>on_tagButton_toggled</b>(<i>_checked</i>) |
| 311 <p> | 311 <p> |
| 312 Private slot to handle changes of the Tag select button. | 312 Private slot to handle changes of the Tag select button. |
| 313 </p> | 313 </p> |
| 314 | 314 |
| 315 <dl> | 315 <dl> |
| 316 | 316 |
| 317 <dt><i>checked</i> (bool)</dt> | 317 <dt><i>_checked</i> (bool)</dt> |
| 318 <dd> | 318 <dd> |
| 319 state of the button | 319 state of the button (unused) |
| 320 </dd> | 320 </dd> |
| 321 </dl> | 321 </dl> |
| 322 <a NAME="GitMergeDialog.on_tagCombo_editTextChanged" ID="GitMergeDialog.on_tagCombo_editTextChanged"></a> | 322 <a NAME="GitMergeDialog.on_tagCombo_editTextChanged" ID="GitMergeDialog.on_tagCombo_editTextChanged"></a> |
| 323 <h4>GitMergeDialog.on_tagCombo_editTextChanged</h4> | 323 <h4>GitMergeDialog.on_tagCombo_editTextChanged</h4> |
| 324 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>) | 324 <b>on_tagCombo_editTextChanged</b>(<i>_txt</i>) |
| 325 <p> | 325 <p> |
| 326 Private slot to handle changes of the Tag combo. | 326 Private slot to handle changes of the Tag combo. |
| 327 </p> | 327 </p> |
| 328 | 328 |
| 329 <dl> | 329 <dl> |
| 330 | 330 |
| 331 <dt><i>txt</i> (str)</dt> | 331 <dt><i>_txt</i> (str)</dt> |
| 332 <dd> | 332 <dd> |
| 333 text of the combo | 333 text of the combo (unused) |
| 334 </dd> | 334 </dd> |
| 335 </dl> | 335 </dl> |
| 336 <div align="right"><a href="#top">Up</a></div> | 336 <div align="right"><a href="#top">Up</a></div> |
| 337 <hr /> | 337 <hr /> |
| 338 </body></html> | 338 </body></html> |
