Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
- changeset 2966
- f85f686981ad
- parent 2387
- 2d119e79ab54
- child 3018
- 70924c0bdaf1
equal
deleted
inserted
replaced
| 2965:d133c7edd88a | 2966:f85f686981ad |
|---|---|
| 102 </dl><a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> | 102 </dl><a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> |
| 103 <h4>SvnMergeDialog.__enableOkButton</h4> | 103 <h4>SvnMergeDialog.__enableOkButton</h4> |
| 104 <b>__enableOkButton</b>(<i></i>) | 104 <b>__enableOkButton</b>(<i></i>) |
| 105 <p> | 105 <p> |
| 106 Private method used to enable/disable the OK-button. | 106 Private method used to enable/disable the OK-button. |
| 107 </p><dl> | 107 </p><a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a> |
| 108 <dt><i>text</i></dt> | |
| 109 <dd> | |
| 110 ignored | |
| 111 </dd> | |
| 112 </dl><a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a> | |
| 113 <h4>SvnMergeDialog.getParameters</h4> | 108 <h4>SvnMergeDialog.getParameters</h4> |
| 114 <b>getParameters</b>(<i></i>) | 109 <b>getParameters</b>(<i></i>) |
| 115 <p> | 110 <p> |
| 116 Public method to retrieve the merge data. | 111 Public method to retrieve the merge data. |
| 117 </p><dl> | 112 </p><dl> |
| 123 </dl><a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> | 118 </dl><a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> |
| 124 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4> | 119 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4> |
| 125 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>) | 120 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>) |
| 126 <p> | 121 <p> |
| 127 Private slot to handle the tag1Combo editTextChanged signal. | 122 Private slot to handle the tag1Combo editTextChanged signal. |
| 128 </p><a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> | 123 </p><dl> |
| 124 <dt><i>text</i></dt> | |
| 125 <dd> | |
| 126 text of the combo (string) | |
| 127 </dd> | |
| 128 </dl><a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> | |
| 129 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4> | 129 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4> |
| 130 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>) | 130 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>) |
| 131 <p> | 131 <p> |
| 132 Private slot to handle the tag2Combo editTextChanged signal. | 132 Private slot to handle the tag2Combo editTextChanged signal. |
| 133 </p> | 133 </p><dl> |
| 134 <dt><i>text</i></dt> | |
| 135 <dd> | |
| 136 text of the combo (string) | |
| 137 </dd> | |
| 138 </dl> | |
| 134 <div align="right"><a href="#top">Up</a></div> | 139 <div align="right"><a href="#top">Up</a></div> |
| 135 <hr /> | 140 <hr /> |
| 136 </body></html> | 141 </body></html> |
