Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
- changeset 3673
- e26d7d0c1088
equal
deleted
inserted
replaced
| 3670:f0cb7579c0b4 | 3673:e26d7d0c1088 |
|---|---|
| 1 <!DOCTYPE html> | |
| 2 <html><head> | |
| 3 <title>eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog</title> | |
| 4 <meta charset="UTF-8"> | |
| 5 <style> | |
| 6 body { | |
| 7 background: #EDECE6; | |
| 8 margin: 0em 1em 10em 1em; | |
| 9 color: black; | |
| 10 } | |
| 11 | |
| 12 h1 { color: white; background: #85774A; } | |
| 13 h2 { color: white; background: #85774A; } | |
| 14 h3 { color: white; background: #9D936E; } | |
| 15 h4 { color: white; background: #9D936E; } | |
| 16 | |
| 17 a { color: #BA6D36; } | |
| 18 | |
| 19 </style> | |
| 20 </head> | |
| 21 <body><a NAME="top" ID="top"></a> | |
| 22 <h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog</h1> | |
| 23 <p> | |
| 24 Module implementing a dialog to enter the data for a merge operation. | |
| 25 </p> | |
| 26 <h3>Global Attributes</h3> | |
| 27 <table> | |
| 28 <tr><td>None</td></tr> | |
| 29 </table> | |
| 30 <h3>Classes</h3> | |
| 31 <table> | |
| 32 <tr> | |
| 33 <td><a href="#HgMergeDialog">HgMergeDialog</a></td> | |
| 34 <td>Class implementing a dialog to enter the data for a merge operation.</td> | |
| 35 </tr> | |
| 36 </table> | |
| 37 <h3>Functions</h3> | |
| 38 <table> | |
| 39 <tr><td>None</td></tr> | |
| 40 </table> | |
| 41 <hr /><hr /> | |
| 42 <a NAME="HgMergeDialog" ID="HgMergeDialog"></a> | |
| 43 <h2>HgMergeDialog</h2> | |
| 44 <p> | |
| 45 Class implementing a dialog to enter the data for a merge operation. | |
| 46 </p> | |
| 47 <h3>Derived from</h3> | |
| 48 QDialog, Ui_HgMergeDialog | |
| 49 <h3>Class Attributes</h3> | |
| 50 <table> | |
| 51 <tr><td>None</td></tr> | |
| 52 </table> | |
| 53 <h3>Class Methods</h3> | |
| 54 <table> | |
| 55 <tr><td>None</td></tr> | |
| 56 </table> | |
| 57 <h3>Methods</h3> | |
| 58 <table> | |
| 59 <tr> | |
| 60 <td><a href="#HgMergeDialog.__init__">HgMergeDialog</a></td> | |
| 61 <td>Constructor</td> | |
| 62 </tr><tr> | |
| 63 <td><a href="#HgMergeDialog.__updateOK">__updateOK</a></td> | |
| 64 <td>Private slot to update the OK button.</td> | |
| 65 </tr><tr> | |
| 66 <td><a href="#HgMergeDialog.getParameters">getParameters</a></td> | |
| 67 <td>Public method to retrieve the merge data.</td> | |
| 68 </tr><tr> | |
| 69 <td><a href="#HgMergeDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> | |
| 70 <td>Private slot to handle changes of the Bookmark select button.</td> | |
| 71 </tr><tr> | |
| 72 <td><a href="#HgMergeDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> | |
| 73 <td>Private slot to handle changes of the Bookmark combo.</td> | |
| 74 </tr><tr> | |
| 75 <td><a href="#HgMergeDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> | |
| 76 <td>Private slot to handle changes of the Branch select button.</td> | |
| 77 </tr><tr> | |
| 78 <td><a href="#HgMergeDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> | |
| 79 <td>Private slot to handle changes of the Branch combo.</td> | |
| 80 </tr><tr> | |
| 81 <td><a href="#HgMergeDialog.on_idButton_toggled">on_idButton_toggled</a></td> | |
| 82 <td>Private slot to handle changes of the ID select button.</td> | |
| 83 </tr><tr> | |
| 84 <td><a href="#HgMergeDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> | |
| 85 <td>Private slot to handle changes of the ID edit.</td> | |
| 86 </tr><tr> | |
| 87 <td><a href="#HgMergeDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> | |
| 88 <td>Private slot to handle changes of the Tag select button.</td> | |
| 89 </tr><tr> | |
| 90 <td><a href="#HgMergeDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> | |
| 91 <td>Private slot to handle changes of the Tag combo.</td> | |
| 92 </tr> | |
| 93 </table> | |
| 94 <h3>Static Methods</h3> | |
| 95 <table> | |
| 96 <tr><td>None</td></tr> | |
| 97 </table> | |
| 98 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> | |
| 99 <h4>HgMergeDialog (Constructor)</h4> | |
| 100 <b>HgMergeDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) | |
| 101 <p> | |
| 102 Constructor | |
| 103 </p><dl> | |
| 104 <dt><i>tagsList</i></dt> | |
| 105 <dd> | |
| 106 list of tags (list of strings) | |
| 107 </dd><dt><i>branchesList</i></dt> | |
| 108 <dd> | |
| 109 list of branches (list of strings) | |
| 110 </dd><dt><i>bookmarksList</i></dt> | |
| 111 <dd> | |
| 112 list of bookmarks (list of strings) | |
| 113 </dd><dt><i>parent</i></dt> | |
| 114 <dd> | |
| 115 parent widget (QWidget) | |
| 116 </dd> | |
| 117 </dl><a NAME="HgMergeDialog.__updateOK" ID="HgMergeDialog.__updateOK"></a> | |
| 118 <h4>HgMergeDialog.__updateOK</h4> | |
| 119 <b>__updateOK</b>(<i></i>) | |
| 120 <p> | |
| 121 Private slot to update the OK button. | |
| 122 </p><a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a> | |
| 123 <h4>HgMergeDialog.getParameters</h4> | |
| 124 <b>getParameters</b>(<i></i>) | |
| 125 <p> | |
| 126 Public method to retrieve the merge data. | |
| 127 </p><dl> | |
| 128 <dt>Returns:</dt> | |
| 129 <dd> | |
| 130 tuple naming the revision and a flag indicating a | |
| 131 forced merge (string, boolean) | |
| 132 </dd> | |
| 133 </dl><a NAME="HgMergeDialog.on_bookmarkButton_toggled" ID="HgMergeDialog.on_bookmarkButton_toggled"></a> | |
| 134 <h4>HgMergeDialog.on_bookmarkButton_toggled</h4> | |
| 135 <b>on_bookmarkButton_toggled</b>(<i>checked</i>) | |
| 136 <p> | |
| 137 Private slot to handle changes of the Bookmark select button. | |
| 138 </p><dl> | |
| 139 <dt><i>checked</i></dt> | |
| 140 <dd> | |
| 141 state of the button (boolean) | |
| 142 </dd> | |
| 143 </dl><a NAME="HgMergeDialog.on_bookmarkCombo_editTextChanged" ID="HgMergeDialog.on_bookmarkCombo_editTextChanged"></a> | |
| 144 <h4>HgMergeDialog.on_bookmarkCombo_editTextChanged</h4> | |
| 145 <b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) | |
| 146 <p> | |
| 147 Private slot to handle changes of the Bookmark combo. | |
| 148 </p><dl> | |
| 149 <dt><i>txt</i></dt> | |
| 150 <dd> | |
| 151 text of the combo (string) | |
| 152 </dd> | |
| 153 </dl><a NAME="HgMergeDialog.on_branchButton_toggled" ID="HgMergeDialog.on_branchButton_toggled"></a> | |
| 154 <h4>HgMergeDialog.on_branchButton_toggled</h4> | |
| 155 <b>on_branchButton_toggled</b>(<i>checked</i>) | |
| 156 <p> | |
| 157 Private slot to handle changes of the Branch select button. | |
| 158 </p><dl> | |
| 159 <dt><i>checked</i></dt> | |
| 160 <dd> | |
| 161 state of the button (boolean) | |
| 162 </dd> | |
| 163 </dl><a NAME="HgMergeDialog.on_branchCombo_editTextChanged" ID="HgMergeDialog.on_branchCombo_editTextChanged"></a> | |
| 164 <h4>HgMergeDialog.on_branchCombo_editTextChanged</h4> | |
| 165 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>) | |
| 166 <p> | |
| 167 Private slot to handle changes of the Branch combo. | |
| 168 </p><dl> | |
| 169 <dt><i>txt</i></dt> | |
| 170 <dd> | |
| 171 text of the combo (string) | |
| 172 </dd> | |
| 173 </dl><a NAME="HgMergeDialog.on_idButton_toggled" ID="HgMergeDialog.on_idButton_toggled"></a> | |
| 174 <h4>HgMergeDialog.on_idButton_toggled</h4> | |
| 175 <b>on_idButton_toggled</b>(<i>checked</i>) | |
| 176 <p> | |
| 177 Private slot to handle changes of the ID select button. | |
| 178 </p><dl> | |
| 179 <dt><i>checked</i></dt> | |
| 180 <dd> | |
| 181 state of the button (boolean) | |
| 182 </dd> | |
| 183 </dl><a NAME="HgMergeDialog.on_idEdit_textChanged" ID="HgMergeDialog.on_idEdit_textChanged"></a> | |
| 184 <h4>HgMergeDialog.on_idEdit_textChanged</h4> | |
| 185 <b>on_idEdit_textChanged</b>(<i>txt</i>) | |
| 186 <p> | |
| 187 Private slot to handle changes of the ID edit. | |
| 188 </p><dl> | |
| 189 <dt><i>txt</i></dt> | |
| 190 <dd> | |
| 191 text of the edit (string) | |
| 192 </dd> | |
| 193 </dl><a NAME="HgMergeDialog.on_tagButton_toggled" ID="HgMergeDialog.on_tagButton_toggled"></a> | |
| 194 <h4>HgMergeDialog.on_tagButton_toggled</h4> | |
| 195 <b>on_tagButton_toggled</b>(<i>checked</i>) | |
| 196 <p> | |
| 197 Private slot to handle changes of the Tag select button. | |
| 198 </p><dl> | |
| 199 <dt><i>checked</i></dt> | |
| 200 <dd> | |
| 201 state of the button (boolean) | |
| 202 </dd> | |
| 203 </dl><a NAME="HgMergeDialog.on_tagCombo_editTextChanged" ID="HgMergeDialog.on_tagCombo_editTextChanged"></a> | |
| 204 <h4>HgMergeDialog.on_tagCombo_editTextChanged</h4> | |
| 205 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>) | |
| 206 <p> | |
| 207 Private slot to handle changes of the Tag combo. | |
| 208 </p><dl> | |
| 209 <dt><i>txt</i></dt> | |
| 210 <dd> | |
| 211 text of the combo (string) | |
| 212 </dd> | |
| 213 </dl> | |
| 214 <div align="right"><a href="#top">Up</a></div> | |
| 215 <hr /> | |
| 216 </body></html> |
