Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9209
- b99e7fd55fd3
- child 10479
- 856476537696
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 88 <p> | 88 <p> |
| 89 Constructor | 89 Constructor |
| 90 </p> | 90 </p> |
| 91 <dl> | 91 <dl> |
| 92 | 92 |
| 93 <dt><i>mergelist1</i></dt> | 93 <dt><i>mergelist1</i> (list of str)</dt> |
| 94 <dd> | 94 <dd> |
| 95 list of previously entered URLs/revisions | 95 list of previously entered URLs/revisions |
| 96 (list of strings) | |
| 97 </dd> | 96 </dd> |
| 98 <dt><i>mergelist2</i></dt> | 97 <dt><i>mergelist2</i> (list of str)</dt> |
| 99 <dd> | 98 <dd> |
| 100 list of previously entered URLs/revisions | 99 list of previously entered URLs/revisions |
| 101 (list of strings) | |
| 102 </dd> | 100 </dd> |
| 103 <dt><i>targetlist</i></dt> | 101 <dt><i>targetlist</i> (list of str)</dt> |
| 104 <dd> | 102 <dd> |
| 105 list of previously entered targets (list of strings) | 103 list of previously entered targets |
| 106 </dd> | 104 </dd> |
| 107 <dt><i>force</i></dt> | 105 <dt><i>force</i> (bool)</dt> |
| 108 <dd> | 106 <dd> |
| 109 flag indicating a forced merge (boolean) | 107 flag indicating a forced merge |
| 110 </dd> | 108 </dd> |
| 111 <dt><i>parent</i></dt> | 109 <dt><i>parent</i> (QWidget)</dt> |
| 112 <dd> | 110 <dd> |
| 113 parent widget (QWidget) | 111 parent widget |
| 114 </dd> | 112 </dd> |
| 115 </dl> | 113 </dl> |
| 116 <a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> | 114 <a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> |
| 117 <h4>SvnMergeDialog.__enableOkButton</h4> | 115 <h4>SvnMergeDialog.__enableOkButton</h4> |
| 118 <b>__enableOkButton</b>(<i></i>) | 116 <b>__enableOkButton</b>(<i></i>) |
| 129 </p> | 127 </p> |
| 130 <dl> | 128 <dl> |
| 131 <dt>Return:</dt> | 129 <dt>Return:</dt> |
| 132 <dd> | 130 <dd> |
| 133 tuple naming two tag names or two revisions, a target and | 131 tuple naming two tag names or two revisions, a target and |
| 134 a flag indicating a forced merge (string, string, string, boolean) | 132 a flag indicating a forced merge |
| 133 </dd> | |
| 134 </dl> | |
| 135 <dl> | |
| 136 <dt>Return Type:</dt> | |
| 137 <dd> | |
| 138 tuple of (str, str, str, bool) | |
| 135 </dd> | 139 </dd> |
| 136 </dl> | 140 </dl> |
| 137 <a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> | 141 <a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> |
| 138 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4> | 142 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4> |
| 139 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>) | 143 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>) |
| 141 <p> | 145 <p> |
| 142 Private slot to handle the tag1Combo editTextChanged signal. | 146 Private slot to handle the tag1Combo editTextChanged signal. |
| 143 </p> | 147 </p> |
| 144 <dl> | 148 <dl> |
| 145 | 149 |
| 146 <dt><i>text</i></dt> | 150 <dt><i>text</i> (str)</dt> |
| 147 <dd> | 151 <dd> |
| 148 text of the combo (string) | 152 text of the combo |
| 149 </dd> | 153 </dd> |
| 150 </dl> | 154 </dl> |
| 151 <a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> | 155 <a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> |
| 152 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4> | 156 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4> |
| 153 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>) | 157 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>) |
| 155 <p> | 159 <p> |
| 156 Private slot to handle the tag2Combo editTextChanged signal. | 160 Private slot to handle the tag2Combo editTextChanged signal. |
| 157 </p> | 161 </p> |
| 158 <dl> | 162 <dl> |
| 159 | 163 |
| 160 <dt><i>text</i></dt> | 164 <dt><i>text</i> (str)</dt> |
| 161 <dd> | 165 <dd> |
| 162 text of the combo (string) | 166 text of the combo |
| 163 </dd> | 167 </dd> |
| 164 </dl> | 168 </dl> |
| 165 <div align="right"><a href="#top">Up</a></div> | 169 <div align="right"><a href="#top">Up</a></div> |
| 166 <hr /> | 170 <hr /> |
| 167 </body></html> | 171 </body></html> |
