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 10479
- 856476537696
- parent 10438
- 4cd7e5a8b3cf
- child 10690
- fab36645aa7d
equal
deleted
inserted
replaced
| 10478:de9106c55c3d | 10479:856476537696 |
|---|---|
| 5 <link rel="stylesheet" href="styles.css"> | 5 <link rel="stylesheet" href="styles.css"> |
| 6 </head> | 6 </head> |
| 7 <body> | 7 <body> |
| 8 <a NAME="top" ID="top"></a> | 8 <a NAME="top" ID="top"></a> |
| 9 <h1>eric7.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog</h1> | 9 <h1>eric7.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog</h1> |
| 10 | |
| 11 <p> | 10 <p> |
| 12 Module implementing a dialog to enter the data for a merge operation. | 11 Module implementing a dialog to enter the data for a merge operation. |
| 13 </p> | 12 </p> |
| 13 | |
| 14 <h3>Global Attributes</h3> | 14 <h3>Global Attributes</h3> |
| 15 | |
| 16 <table> | 15 <table> |
| 17 <tr><td>None</td></tr> | 16 <tr><td>None</td></tr> |
| 18 </table> | 17 </table> |
| 18 | |
| 19 <h3>Classes</h3> | 19 <h3>Classes</h3> |
| 20 | |
| 21 <table> | 20 <table> |
| 22 | |
| 23 <tr> | 21 <tr> |
| 24 <td><a href="#SvnMergeDialog">SvnMergeDialog</a></td> | 22 <td><a href="#SvnMergeDialog">SvnMergeDialog</a></td> |
| 25 <td>Class implementing a dialog to enter the data for a merge operation.</td> | 23 <td>Class implementing a dialog to enter the data for a merge operation.</td> |
| 26 </tr> | 24 </tr> |
| 27 </table> | 25 </table> |
| 26 | |
| 28 <h3>Functions</h3> | 27 <h3>Functions</h3> |
| 29 | |
| 30 <table> | 28 <table> |
| 31 <tr><td>None</td></tr> | 29 <tr><td>None</td></tr> |
| 32 </table> | 30 </table> |
| 31 | |
| 33 <hr /> | 32 <hr /> |
| 34 <hr /> | 33 <hr /> |
| 35 <a NAME="SvnMergeDialog" ID="SvnMergeDialog"></a> | 34 <a NAME="SvnMergeDialog" ID="SvnMergeDialog"></a> |
| 36 <h2>SvnMergeDialog</h2> | 35 <h2>SvnMergeDialog</h2> |
| 37 | |
| 38 <p> | 36 <p> |
| 39 Class implementing a dialog to enter the data for a merge operation. | 37 Class implementing a dialog to enter the data for a merge operation. |
| 40 </p> | 38 </p> |
| 39 | |
| 41 <h3>Derived from</h3> | 40 <h3>Derived from</h3> |
| 42 QDialog, Ui_SvnMergeDialog | 41 QDialog, Ui_SvnMergeDialog |
| 43 <h3>Class Attributes</h3> | 42 <h3>Class Attributes</h3> |
| 44 | |
| 45 <table> | 43 <table> |
| 46 <tr><td>None</td></tr> | 44 <tr><td>None</td></tr> |
| 47 </table> | 45 </table> |
| 46 | |
| 48 <h3>Class Methods</h3> | 47 <h3>Class Methods</h3> |
| 49 | |
| 50 <table> | 48 <table> |
| 51 <tr><td>None</td></tr> | 49 <tr><td>None</td></tr> |
| 52 </table> | 50 </table> |
| 51 | |
| 53 <h3>Methods</h3> | 52 <h3>Methods</h3> |
| 54 | |
| 55 <table> | 53 <table> |
| 56 | |
| 57 <tr> | 54 <tr> |
| 58 <td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td> | 55 <td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td> |
| 59 <td>Constructor</td> | 56 <td>Constructor</td> |
| 60 </tr> | 57 </tr> |
| 61 <tr> | 58 <tr> |
| 73 <tr> | 70 <tr> |
| 74 <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> | 71 <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> |
| 75 <td>Private slot to handle the tag2Combo editTextChanged signal.</td> | 72 <td>Private slot to handle the tag2Combo editTextChanged signal.</td> |
| 76 </tr> | 73 </tr> |
| 77 </table> | 74 </table> |
| 75 | |
| 78 <h3>Static Methods</h3> | 76 <h3>Static Methods</h3> |
| 79 | |
| 80 <table> | 77 <table> |
| 81 <tr><td>None</td></tr> | 78 <tr><td>None</td></tr> |
| 82 </table> | 79 </table> |
| 83 | 80 |
| 81 | |
| 84 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> | 82 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> |
| 85 <h4>SvnMergeDialog (Constructor)</h4> | 83 <h4>SvnMergeDialog (Constructor)</h4> |
| 86 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>) | 84 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>) |
| 87 | |
| 88 <p> | 85 <p> |
| 89 Constructor | 86 Constructor |
| 90 </p> | 87 </p> |
| 88 | |
| 91 <dl> | 89 <dl> |
| 92 | 90 |
| 93 <dt><i>mergelist1</i> (list of str)</dt> | 91 <dt><i>mergelist1</i> (list of str)</dt> |
| 94 <dd> | 92 <dd> |
| 95 list of previously entered URLs/revisions | 93 list of previously entered URLs/revisions |
| 112 </dd> | 110 </dd> |
| 113 </dl> | 111 </dl> |
| 114 <a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> | 112 <a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> |
| 115 <h4>SvnMergeDialog.__enableOkButton</h4> | 113 <h4>SvnMergeDialog.__enableOkButton</h4> |
| 116 <b>__enableOkButton</b>(<i></i>) | 114 <b>__enableOkButton</b>(<i></i>) |
| 117 | |
| 118 <p> | 115 <p> |
| 119 Private method used to enable/disable the OK-button. | 116 Private method used to enable/disable the OK-button. |
| 120 </p> | 117 </p> |
| 118 | |
| 121 <a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a> | 119 <a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a> |
| 122 <h4>SvnMergeDialog.getParameters</h4> | 120 <h4>SvnMergeDialog.getParameters</h4> |
| 123 <b>getParameters</b>(<i></i>) | 121 <b>getParameters</b>(<i></i>) |
| 124 | |
| 125 <p> | 122 <p> |
| 126 Public method to retrieve the merge data. | 123 Public method to retrieve the merge data. |
| 127 </p> | 124 </p> |
| 125 | |
| 128 <dl> | 126 <dl> |
| 129 <dt>Return:</dt> | 127 <dt>Return:</dt> |
| 130 <dd> | 128 <dd> |
| 131 tuple naming two tag names or two revisions, a target and | 129 tuple naming two tag names or two revisions, a target and |
| 132 a flag indicating a forced merge | 130 a flag indicating a forced merge |
| 139 </dd> | 137 </dd> |
| 140 </dl> | 138 </dl> |
| 141 <a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> | 139 <a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> |
| 142 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4> | 140 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4> |
| 143 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>) | 141 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>) |
| 144 | |
| 145 <p> | 142 <p> |
| 146 Private slot to handle the tag1Combo editTextChanged signal. | 143 Private slot to handle the tag1Combo editTextChanged signal. |
| 147 </p> | 144 </p> |
| 145 | |
| 148 <dl> | 146 <dl> |
| 149 | 147 |
| 150 <dt><i>text</i> (str)</dt> | 148 <dt><i>text</i> (str)</dt> |
| 151 <dd> | 149 <dd> |
| 152 text of the combo | 150 text of the combo |
| 153 </dd> | 151 </dd> |
| 154 </dl> | 152 </dl> |
| 155 <a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> | 153 <a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> |
| 156 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4> | 154 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4> |
| 157 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>) | 155 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>) |
| 158 | |
| 159 <p> | 156 <p> |
| 160 Private slot to handle the tag2Combo editTextChanged signal. | 157 Private slot to handle the tag2Combo editTextChanged signal. |
| 161 </p> | 158 </p> |
| 159 | |
| 162 <dl> | 160 <dl> |
| 163 | 161 |
| 164 <dt><i>text</i> (str)</dt> | 162 <dt><i>text</i> (str)</dt> |
| 165 <dd> | 163 <dd> |
| 166 text of the combo | 164 text of the combo |
