Mercurial Repositories > eric / file comparison
comparison: eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html
eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html
- changeset 7273
- 391d6b7b1eff
- parent 6942
- 2602857055c5
- child 7370
- 5fb53279f2df
equal
deleted
inserted
replaced
| 7272:1779dc278077 | 7273:391d6b7b1eff |
|---|---|
| 16 | 16 |
| 17 a { color: #BA6D36; } | 17 a { color: #BA6D36; } |
| 18 | 18 |
| 19 </style> | 19 </style> |
| 20 </head> | 20 </head> |
| 21 <body><a NAME="top" ID="top"></a> | 21 <body> |
| 22 <a NAME="top" ID="top"></a> | |
| 22 <h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog</h1> | 23 <h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog</h1> |
| 24 | |
| 23 <p> | 25 <p> |
| 24 Module implementing a dialog to show a list of files which had or still have | 26 Module implementing a dialog to show a list of files which had or still have |
| 25 conflicts. | 27 conflicts. |
| 26 </p> | 28 </p> |
| 27 <h3>Global Attributes</h3> | 29 <h3>Global Attributes</h3> |
| 30 | |
| 28 <table> | 31 <table> |
| 29 <tr><td>None</td></tr> | 32 <tr><td>None</td></tr> |
| 30 </table> | 33 </table> |
| 31 <h3>Classes</h3> | 34 <h3>Classes</h3> |
| 32 <table> | 35 |
| 36 <table> | |
| 37 | |
| 33 <tr> | 38 <tr> |
| 34 <td><a href="#HgConflictsListDialog">HgConflictsListDialog</a></td> | 39 <td><a href="#HgConflictsListDialog">HgConflictsListDialog</a></td> |
| 35 <td>Class implementing a dialog to show a list of files which had or still have conflicts.</td> | 40 <td>Class implementing a dialog to show a list of files which had or still have conflicts.</td> |
| 36 </tr> | 41 </tr> |
| 37 </table> | 42 </table> |
| 38 <h3>Functions</h3> | 43 <h3>Functions</h3> |
| 44 | |
| 39 <table> | 45 <table> |
| 40 <tr><td>None</td></tr> | 46 <tr><td>None</td></tr> |
| 41 </table> | 47 </table> |
| 42 <hr /><hr /> | 48 <hr /> |
| 49 <hr /> | |
| 43 <a NAME="HgConflictsListDialog" ID="HgConflictsListDialog"></a> | 50 <a NAME="HgConflictsListDialog" ID="HgConflictsListDialog"></a> |
| 44 <h2>HgConflictsListDialog</h2> | 51 <h2>HgConflictsListDialog</h2> |
| 52 | |
| 45 <p> | 53 <p> |
| 46 Class implementing a dialog to show a list of files which had or still | 54 Class implementing a dialog to show a list of files which had or still |
| 47 have conflicts. | 55 have conflicts. |
| 48 </p> | 56 </p> |
| 49 <h3>Derived from</h3> | 57 <h3>Derived from</h3> |
| 50 QWidget, Ui_HgConflictsListDialog | 58 QWidget, Ui_HgConflictsListDialog |
| 51 <h3>Class Attributes</h3> | 59 <h3>Class Attributes</h3> |
| 60 | |
| 52 <table> | 61 <table> |
| 53 <tr><td>FilenameRole</td></tr><tr><td>StatusRole</td></tr> | 62 <tr><td>FilenameRole</td></tr><tr><td>StatusRole</td></tr> |
| 54 </table> | 63 </table> |
| 55 <h3>Class Methods</h3> | 64 <h3>Class Methods</h3> |
| 65 | |
| 56 <table> | 66 <table> |
| 57 <tr><td>None</td></tr> | 67 <tr><td>None</td></tr> |
| 58 </table> | 68 </table> |
| 59 <h3>Methods</h3> | 69 <h3>Methods</h3> |
| 60 <table> | 70 |
| 71 <table> | |
| 72 | |
| 61 <tr> | 73 <tr> |
| 62 <td><a href="#HgConflictsListDialog.__init__">HgConflictsListDialog</a></td> | 74 <td><a href="#HgConflictsListDialog.__init__">HgConflictsListDialog</a></td> |
| 63 <td>Constructor</td> | 75 <td>Constructor</td> |
| 64 </tr><tr> | 76 </tr> |
| 77 <tr> | |
| 65 <td><a href="#HgConflictsListDialog.__finish">__finish</a></td> | 78 <td><a href="#HgConflictsListDialog.__finish">__finish</a></td> |
| 66 <td>Private slot called when the process finished or the user pressed the button.</td> | 79 <td>Private slot called when the process finished or the user pressed the button.</td> |
| 67 </tr><tr> | 80 </tr> |
| 81 <tr> | |
| 68 <td><a href="#HgConflictsListDialog.__generateItem">__generateItem</a></td> | 82 <td><a href="#HgConflictsListDialog.__generateItem">__generateItem</a></td> |
| 69 <td>Private method to generate a tag item in the tag list.</td> | 83 <td>Private method to generate a tag item in the tag list.</td> |
| 70 </tr><tr> | 84 </tr> |
| 85 <tr> | |
| 71 <td><a href="#HgConflictsListDialog.__getEntries">__getEntries</a></td> | 86 <td><a href="#HgConflictsListDialog.__getEntries">__getEntries</a></td> |
| 72 <td>Private method to get the conflict entries.</td> | 87 <td>Private method to get the conflict entries.</td> |
| 73 </tr><tr> | 88 </tr> |
| 89 <tr> | |
| 74 <td><a href="#HgConflictsListDialog.__procFinished">__procFinished</a></td> | 90 <td><a href="#HgConflictsListDialog.__procFinished">__procFinished</a></td> |
| 75 <td>Private slot connected to the finished signal.</td> | 91 <td>Private slot connected to the finished signal.</td> |
| 76 </tr><tr> | 92 </tr> |
| 93 <tr> | |
| 77 <td><a href="#HgConflictsListDialog.__processOutputLine">__processOutputLine</a></td> | 94 <td><a href="#HgConflictsListDialog.__processOutputLine">__processOutputLine</a></td> |
| 78 <td>Private method to process the lines of output.</td> | 95 <td>Private method to process the lines of output.</td> |
| 79 </tr><tr> | 96 </tr> |
| 97 <tr> | |
| 80 <td><a href="#HgConflictsListDialog.__readStderr">__readStderr</a></td> | 98 <td><a href="#HgConflictsListDialog.__readStderr">__readStderr</a></td> |
| 81 <td>Private slot to handle the readyReadStderr signal.</td> | 99 <td>Private slot to handle the readyReadStderr signal.</td> |
| 82 </tr><tr> | 100 </tr> |
| 101 <tr> | |
| 83 <td><a href="#HgConflictsListDialog.__readStdout">__readStdout</a></td> | 102 <td><a href="#HgConflictsListDialog.__readStdout">__readStdout</a></td> |
| 84 <td>Private slot to handle the readyReadStdout signal.</td> | 103 <td>Private slot to handle the readyReadStdout signal.</td> |
| 85 </tr><tr> | 104 </tr> |
| 105 <tr> | |
| 86 <td><a href="#HgConflictsListDialog.__resizeColumns">__resizeColumns</a></td> | 106 <td><a href="#HgConflictsListDialog.__resizeColumns">__resizeColumns</a></td> |
| 87 <td>Private method to resize the list columns.</td> | 107 <td>Private method to resize the list columns.</td> |
| 88 </tr><tr> | 108 </tr> |
| 109 <tr> | |
| 89 <td><a href="#HgConflictsListDialog.__resort">__resort</a></td> | 110 <td><a href="#HgConflictsListDialog.__resort">__resort</a></td> |
| 90 <td>Private method to resort the tree.</td> | 111 <td>Private method to resort the tree.</td> |
| 91 </tr><tr> | 112 </tr> |
| 113 <tr> | |
| 92 <td><a href="#HgConflictsListDialog.__showError">__showError</a></td> | 114 <td><a href="#HgConflictsListDialog.__showError">__showError</a></td> |
| 93 <td>Private slot to show some error.</td> | 115 <td>Private slot to show some error.</td> |
| 94 </tr><tr> | 116 </tr> |
| 117 <tr> | |
| 95 <td><a href="#HgConflictsListDialog.closeEvent">closeEvent</a></td> | 118 <td><a href="#HgConflictsListDialog.closeEvent">closeEvent</a></td> |
| 96 <td>Protected slot implementing a close event handler.</td> | 119 <td>Protected slot implementing a close event handler.</td> |
| 97 </tr><tr> | 120 </tr> |
| 121 <tr> | |
| 98 <td><a href="#HgConflictsListDialog.keyPressEvent">keyPressEvent</a></td> | 122 <td><a href="#HgConflictsListDialog.keyPressEvent">keyPressEvent</a></td> |
| 99 <td>Protected slot to handle a key press event.</td> | 123 <td>Protected slot to handle a key press event.</td> |
| 100 </tr><tr> | 124 </tr> |
| 125 <tr> | |
| 101 <td><a href="#HgConflictsListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> | 126 <td><a href="#HgConflictsListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> |
| 102 <td>Private slot called by a button of the button box clicked.</td> | 127 <td>Private slot called by a button of the button box clicked.</td> |
| 103 </tr><tr> | 128 </tr> |
| 129 <tr> | |
| 104 <td><a href="#HgConflictsListDialog.on_conflictsList_itemDoubleClicked">on_conflictsList_itemDoubleClicked</a></td> | 130 <td><a href="#HgConflictsListDialog.on_conflictsList_itemDoubleClicked">on_conflictsList_itemDoubleClicked</a></td> |
| 105 <td>Private slot to open the double clicked entry.</td> | 131 <td>Private slot to open the double clicked entry.</td> |
| 106 </tr><tr> | 132 </tr> |
| 133 <tr> | |
| 107 <td><a href="#HgConflictsListDialog.on_conflictsList_itemSelectionChanged">on_conflictsList_itemSelectionChanged</a></td> | 134 <td><a href="#HgConflictsListDialog.on_conflictsList_itemSelectionChanged">on_conflictsList_itemSelectionChanged</a></td> |
| 108 <td>Private slot to handle a change of selected conflict entries.</td> | 135 <td>Private slot to handle a change of selected conflict entries.</td> |
| 109 </tr><tr> | 136 </tr> |
| 137 <tr> | |
| 110 <td><a href="#HgConflictsListDialog.on_editButton_clicked">on_editButton_clicked</a></td> | 138 <td><a href="#HgConflictsListDialog.on_editButton_clicked">on_editButton_clicked</a></td> |
| 111 <td>Private slot to open the selected file in an editor.</td> | 139 <td>Private slot to open the selected file in an editor.</td> |
| 112 </tr><tr> | 140 </tr> |
| 141 <tr> | |
| 113 <td><a href="#HgConflictsListDialog.on_input_returnPressed">on_input_returnPressed</a></td> | 142 <td><a href="#HgConflictsListDialog.on_input_returnPressed">on_input_returnPressed</a></td> |
| 114 <td>Private slot to handle the press of the return key in the input field.</td> | 143 <td>Private slot to handle the press of the return key in the input field.</td> |
| 115 </tr><tr> | 144 </tr> |
| 145 <tr> | |
| 116 <td><a href="#HgConflictsListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> | 146 <td><a href="#HgConflictsListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> |
| 117 <td>Private slot to handle the password checkbox toggled.</td> | 147 <td>Private slot to handle the password checkbox toggled.</td> |
| 118 </tr><tr> | 148 </tr> |
| 149 <tr> | |
| 119 <td><a href="#HgConflictsListDialog.on_reMergeButton_clicked">on_reMergeButton_clicked</a></td> | 150 <td><a href="#HgConflictsListDialog.on_reMergeButton_clicked">on_reMergeButton_clicked</a></td> |
| 120 <td>Private slot to re-merge the selected entries.</td> | 151 <td>Private slot to re-merge the selected entries.</td> |
| 121 </tr><tr> | 152 </tr> |
| 153 <tr> | |
| 122 <td><a href="#HgConflictsListDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> | 154 <td><a href="#HgConflictsListDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> |
| 123 <td>Private slot to refresh the log.</td> | 155 <td>Private slot to refresh the log.</td> |
| 124 </tr><tr> | 156 </tr> |
| 157 <tr> | |
| 125 <td><a href="#HgConflictsListDialog.on_resolvedButton_clicked">on_resolvedButton_clicked</a></td> | 158 <td><a href="#HgConflictsListDialog.on_resolvedButton_clicked">on_resolvedButton_clicked</a></td> |
| 126 <td>Private slot to mark the selected entries as resolved.</td> | 159 <td>Private slot to mark the selected entries as resolved.</td> |
| 127 </tr><tr> | 160 </tr> |
| 161 <tr> | |
| 128 <td><a href="#HgConflictsListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> | 162 <td><a href="#HgConflictsListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> |
| 129 <td>Private slot to send the input to the subversion process.</td> | 163 <td>Private slot to send the input to the subversion process.</td> |
| 130 </tr><tr> | 164 </tr> |
| 165 <tr> | |
| 131 <td><a href="#HgConflictsListDialog.on_unresolvedButton_clicked">on_unresolvedButton_clicked</a></td> | 166 <td><a href="#HgConflictsListDialog.on_unresolvedButton_clicked">on_unresolvedButton_clicked</a></td> |
| 132 <td>Private slot to mark the selected entries as unresolved.</td> | 167 <td>Private slot to mark the selected entries as unresolved.</td> |
| 133 </tr><tr> | 168 </tr> |
| 169 <tr> | |
| 134 <td><a href="#HgConflictsListDialog.show">show</a></td> | 170 <td><a href="#HgConflictsListDialog.show">show</a></td> |
| 135 <td>Public slot to show the dialog.</td> | 171 <td>Public slot to show the dialog.</td> |
| 136 </tr><tr> | 172 </tr> |
| 173 <tr> | |
| 137 <td><a href="#HgConflictsListDialog.start">start</a></td> | 174 <td><a href="#HgConflictsListDialog.start">start</a></td> |
| 138 <td>Public slot to start the tags command.</td> | 175 <td>Public slot to start the tags command.</td> |
| 139 </tr> | 176 </tr> |
| 140 </table> | 177 </table> |
| 141 <h3>Static Methods</h3> | 178 <h3>Static Methods</h3> |
| 179 | |
| 142 <table> | 180 <table> |
| 143 <tr><td>None</td></tr> | 181 <tr><td>None</td></tr> |
| 144 </table> | 182 </table> |
| 183 | |
| 145 <a NAME="HgConflictsListDialog.__init__" ID="HgConflictsListDialog.__init__"></a> | 184 <a NAME="HgConflictsListDialog.__init__" ID="HgConflictsListDialog.__init__"></a> |
| 146 <h4>HgConflictsListDialog (Constructor)</h4> | 185 <h4>HgConflictsListDialog (Constructor)</h4> |
| 147 <b>HgConflictsListDialog</b>(<i>vcs, parent=None</i>) | 186 <b>HgConflictsListDialog</b>(<i>vcs, parent=None</i>) |
| 187 | |
| 148 <p> | 188 <p> |
| 149 Constructor | 189 Constructor |
| 150 </p><dl> | 190 </p> |
| 191 <dl> | |
| 192 | |
| 151 <dt><i>vcs</i></dt> | 193 <dt><i>vcs</i></dt> |
| 152 <dd> | 194 <dd> |
| 153 reference to the vcs object | 195 reference to the vcs object |
| 154 </dd><dt><i>parent</i></dt> | 196 </dd> |
| 197 <dt><i>parent</i></dt> | |
| 155 <dd> | 198 <dd> |
| 156 parent widget (QWidget) | 199 parent widget (QWidget) |
| 157 </dd> | 200 </dd> |
| 158 </dl><a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a> | 201 </dl> |
| 202 <a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a> | |
| 159 <h4>HgConflictsListDialog.__finish</h4> | 203 <h4>HgConflictsListDialog.__finish</h4> |
| 160 <b>__finish</b>(<i></i>) | 204 <b>__finish</b>(<i></i>) |
| 205 | |
| 161 <p> | 206 <p> |
| 162 Private slot called when the process finished or the user pressed | 207 Private slot called when the process finished or the user pressed |
| 163 the button. | 208 the button. |
| 164 </p><a NAME="HgConflictsListDialog.__generateItem" ID="HgConflictsListDialog.__generateItem"></a> | 209 </p> |
| 210 <a NAME="HgConflictsListDialog.__generateItem" ID="HgConflictsListDialog.__generateItem"></a> | |
| 165 <h4>HgConflictsListDialog.__generateItem</h4> | 211 <h4>HgConflictsListDialog.__generateItem</h4> |
| 166 <b>__generateItem</b>(<i>status, name</i>) | 212 <b>__generateItem</b>(<i>status, name</i>) |
| 213 | |
| 167 <p> | 214 <p> |
| 168 Private method to generate a tag item in the tag list. | 215 Private method to generate a tag item in the tag list. |
| 169 </p><dl> | 216 </p> |
| 217 <dl> | |
| 218 | |
| 170 <dt><i>status</i></dt> | 219 <dt><i>status</i></dt> |
| 171 <dd> | 220 <dd> |
| 172 status of the file (string) | 221 status of the file (string) |
| 173 </dd><dt><i>name</i></dt> | 222 </dd> |
| 223 <dt><i>name</i></dt> | |
| 174 <dd> | 224 <dd> |
| 175 name of the file (string) | 225 name of the file (string) |
| 176 </dd> | 226 </dd> |
| 177 </dl><a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a> | 227 </dl> |
| 228 <a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a> | |
| 178 <h4>HgConflictsListDialog.__getEntries</h4> | 229 <h4>HgConflictsListDialog.__getEntries</h4> |
| 179 <b>__getEntries</b>(<i></i>) | 230 <b>__getEntries</b>(<i></i>) |
| 231 | |
| 180 <p> | 232 <p> |
| 181 Private method to get the conflict entries. | 233 Private method to get the conflict entries. |
| 182 </p><a NAME="HgConflictsListDialog.__procFinished" ID="HgConflictsListDialog.__procFinished"></a> | 234 </p> |
| 235 <a NAME="HgConflictsListDialog.__procFinished" ID="HgConflictsListDialog.__procFinished"></a> | |
| 183 <h4>HgConflictsListDialog.__procFinished</h4> | 236 <h4>HgConflictsListDialog.__procFinished</h4> |
| 184 <b>__procFinished</b>(<i>exitCode, exitStatus</i>) | 237 <b>__procFinished</b>(<i>exitCode, exitStatus</i>) |
| 238 | |
| 185 <p> | 239 <p> |
| 186 Private slot connected to the finished signal. | 240 Private slot connected to the finished signal. |
| 187 </p><dl> | 241 </p> |
| 242 <dl> | |
| 243 | |
| 188 <dt><i>exitCode</i></dt> | 244 <dt><i>exitCode</i></dt> |
| 189 <dd> | 245 <dd> |
| 190 exit code of the process (integer) | 246 exit code of the process (integer) |
| 191 </dd><dt><i>exitStatus</i></dt> | 247 </dd> |
| 248 <dt><i>exitStatus</i></dt> | |
| 192 <dd> | 249 <dd> |
| 193 exit status of the process (QProcess.ExitStatus) | 250 exit status of the process (QProcess.ExitStatus) |
| 194 </dd> | 251 </dd> |
| 195 </dl><a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a> | 252 </dl> |
| 253 <a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a> | |
| 196 <h4>HgConflictsListDialog.__processOutputLine</h4> | 254 <h4>HgConflictsListDialog.__processOutputLine</h4> |
| 197 <b>__processOutputLine</b>(<i>line</i>) | 255 <b>__processOutputLine</b>(<i>line</i>) |
| 256 | |
| 198 <p> | 257 <p> |
| 199 Private method to process the lines of output. | 258 Private method to process the lines of output. |
| 200 </p><dl> | 259 </p> |
| 260 <dl> | |
| 261 | |
| 201 <dt><i>line</i></dt> | 262 <dt><i>line</i></dt> |
| 202 <dd> | 263 <dd> |
| 203 output line to be processed (string) | 264 output line to be processed (string) |
| 204 </dd> | 265 </dd> |
| 205 </dl><a NAME="HgConflictsListDialog.__readStderr" ID="HgConflictsListDialog.__readStderr"></a> | 266 </dl> |
| 267 <a NAME="HgConflictsListDialog.__readStderr" ID="HgConflictsListDialog.__readStderr"></a> | |
| 206 <h4>HgConflictsListDialog.__readStderr</h4> | 268 <h4>HgConflictsListDialog.__readStderr</h4> |
| 207 <b>__readStderr</b>(<i></i>) | 269 <b>__readStderr</b>(<i></i>) |
| 270 | |
| 208 <p> | 271 <p> |
| 209 Private slot to handle the readyReadStderr signal. | 272 Private slot to handle the readyReadStderr signal. |
| 210 </p><p> | 273 </p> |
| 274 <p> | |
| 211 It reads the error output of the process and inserts it into the | 275 It reads the error output of the process and inserts it into the |
| 212 error pane. | 276 error pane. |
| 213 </p><a NAME="HgConflictsListDialog.__readStdout" ID="HgConflictsListDialog.__readStdout"></a> | 277 </p> |
| 278 <a NAME="HgConflictsListDialog.__readStdout" ID="HgConflictsListDialog.__readStdout"></a> | |
| 214 <h4>HgConflictsListDialog.__readStdout</h4> | 279 <h4>HgConflictsListDialog.__readStdout</h4> |
| 215 <b>__readStdout</b>(<i></i>) | 280 <b>__readStdout</b>(<i></i>) |
| 281 | |
| 216 <p> | 282 <p> |
| 217 Private slot to handle the readyReadStdout signal. | 283 Private slot to handle the readyReadStdout signal. |
| 218 </p><p> | 284 </p> |
| 285 <p> | |
| 219 It reads the output of the process, formats it and inserts it into | 286 It reads the output of the process, formats it and inserts it into |
| 220 the contents pane. | 287 the contents pane. |
| 221 </p><a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> | 288 </p> |
| 289 <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> | |
| 222 <h4>HgConflictsListDialog.__resizeColumns</h4> | 290 <h4>HgConflictsListDialog.__resizeColumns</h4> |
| 223 <b>__resizeColumns</b>(<i></i>) | 291 <b>__resizeColumns</b>(<i></i>) |
| 292 | |
| 224 <p> | 293 <p> |
| 225 Private method to resize the list columns. | 294 Private method to resize the list columns. |
| 226 </p><a NAME="HgConflictsListDialog.__resort" ID="HgConflictsListDialog.__resort"></a> | 295 </p> |
| 296 <a NAME="HgConflictsListDialog.__resort" ID="HgConflictsListDialog.__resort"></a> | |
| 227 <h4>HgConflictsListDialog.__resort</h4> | 297 <h4>HgConflictsListDialog.__resort</h4> |
| 228 <b>__resort</b>(<i></i>) | 298 <b>__resort</b>(<i></i>) |
| 299 | |
| 229 <p> | 300 <p> |
| 230 Private method to resort the tree. | 301 Private method to resort the tree. |
| 231 </p><a NAME="HgConflictsListDialog.__showError" ID="HgConflictsListDialog.__showError"></a> | 302 </p> |
| 303 <a NAME="HgConflictsListDialog.__showError" ID="HgConflictsListDialog.__showError"></a> | |
| 232 <h4>HgConflictsListDialog.__showError</h4> | 304 <h4>HgConflictsListDialog.__showError</h4> |
| 233 <b>__showError</b>(<i>out</i>) | 305 <b>__showError</b>(<i>out</i>) |
| 306 | |
| 234 <p> | 307 <p> |
| 235 Private slot to show some error. | 308 Private slot to show some error. |
| 236 </p><dl> | 309 </p> |
| 310 <dl> | |
| 311 | |
| 237 <dt><i>out</i></dt> | 312 <dt><i>out</i></dt> |
| 238 <dd> | 313 <dd> |
| 239 error to be shown (string) | 314 error to be shown (string) |
| 240 </dd> | 315 </dd> |
| 241 </dl><a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> | 316 </dl> |
| 317 <a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> | |
| 242 <h4>HgConflictsListDialog.closeEvent</h4> | 318 <h4>HgConflictsListDialog.closeEvent</h4> |
| 243 <b>closeEvent</b>(<i>e</i>) | 319 <b>closeEvent</b>(<i>e</i>) |
| 320 | |
| 244 <p> | 321 <p> |
| 245 Protected slot implementing a close event handler. | 322 Protected slot implementing a close event handler. |
| 246 </p><dl> | 323 </p> |
| 324 <dl> | |
| 325 | |
| 247 <dt><i>e</i></dt> | 326 <dt><i>e</i></dt> |
| 248 <dd> | 327 <dd> |
| 249 close event (QCloseEvent) | 328 close event (QCloseEvent) |
| 250 </dd> | 329 </dd> |
| 251 </dl><a NAME="HgConflictsListDialog.keyPressEvent" ID="HgConflictsListDialog.keyPressEvent"></a> | 330 </dl> |
| 331 <a NAME="HgConflictsListDialog.keyPressEvent" ID="HgConflictsListDialog.keyPressEvent"></a> | |
| 252 <h4>HgConflictsListDialog.keyPressEvent</h4> | 332 <h4>HgConflictsListDialog.keyPressEvent</h4> |
| 253 <b>keyPressEvent</b>(<i>evt</i>) | 333 <b>keyPressEvent</b>(<i>evt</i>) |
| 334 | |
| 254 <p> | 335 <p> |
| 255 Protected slot to handle a key press event. | 336 Protected slot to handle a key press event. |
| 256 </p><dl> | 337 </p> |
| 338 <dl> | |
| 339 | |
| 257 <dt><i>evt</i></dt> | 340 <dt><i>evt</i></dt> |
| 258 <dd> | 341 <dd> |
| 259 the key press event (QKeyEvent) | 342 the key press event (QKeyEvent) |
| 260 </dd> | 343 </dd> |
| 261 </dl><a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> | 344 </dl> |
| 345 <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> | |
| 262 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4> | 346 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4> |
| 263 <b>on_buttonBox_clicked</b>(<i>button</i>) | 347 <b>on_buttonBox_clicked</b>(<i>button</i>) |
| 348 | |
| 264 <p> | 349 <p> |
| 265 Private slot called by a button of the button box clicked. | 350 Private slot called by a button of the button box clicked. |
| 266 </p><dl> | 351 </p> |
| 352 <dl> | |
| 353 | |
| 267 <dt><i>button</i></dt> | 354 <dt><i>button</i></dt> |
| 268 <dd> | 355 <dd> |
| 269 button that was clicked (QAbstractButton) | 356 button that was clicked (QAbstractButton) |
| 270 </dd> | 357 </dd> |
| 271 </dl><a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> | 358 </dl> |
| 359 <a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> | |
| 272 <h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4> | 360 <h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4> |
| 273 <b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>) | 361 <b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>) |
| 362 | |
| 274 <p> | 363 <p> |
| 275 Private slot to open the double clicked entry. | 364 Private slot to open the double clicked entry. |
| 276 </p><dl> | 365 </p> |
| 366 <dl> | |
| 367 | |
| 277 <dt><i>item</i></dt> | 368 <dt><i>item</i></dt> |
| 278 <dd> | 369 <dd> |
| 279 reference to the double clicked item (QTreeWidgetItem) | 370 reference to the double clicked item (QTreeWidgetItem) |
| 280 </dd><dt><i>column</i></dt> | 371 </dd> |
| 372 <dt><i>column</i></dt> | |
| 281 <dd> | 373 <dd> |
| 282 column that was double clicked (integer) | 374 column that was double clicked (integer) |
| 283 </dd> | 375 </dd> |
| 284 </dl><a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a> | 376 </dl> |
| 377 <a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a> | |
| 285 <h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4> | 378 <h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4> |
| 286 <b>on_conflictsList_itemSelectionChanged</b>(<i></i>) | 379 <b>on_conflictsList_itemSelectionChanged</b>(<i></i>) |
| 380 | |
| 287 <p> | 381 <p> |
| 288 Private slot to handle a change of selected conflict entries. | 382 Private slot to handle a change of selected conflict entries. |
| 289 </p><a NAME="HgConflictsListDialog.on_editButton_clicked" ID="HgConflictsListDialog.on_editButton_clicked"></a> | 383 </p> |
| 384 <a NAME="HgConflictsListDialog.on_editButton_clicked" ID="HgConflictsListDialog.on_editButton_clicked"></a> | |
| 290 <h4>HgConflictsListDialog.on_editButton_clicked</h4> | 385 <h4>HgConflictsListDialog.on_editButton_clicked</h4> |
| 291 <b>on_editButton_clicked</b>(<i></i>) | 386 <b>on_editButton_clicked</b>(<i></i>) |
| 387 | |
| 292 <p> | 388 <p> |
| 293 Private slot to open the selected file in an editor. | 389 Private slot to open the selected file in an editor. |
| 294 </p><a NAME="HgConflictsListDialog.on_input_returnPressed" ID="HgConflictsListDialog.on_input_returnPressed"></a> | 390 </p> |
| 391 <a NAME="HgConflictsListDialog.on_input_returnPressed" ID="HgConflictsListDialog.on_input_returnPressed"></a> | |
| 295 <h4>HgConflictsListDialog.on_input_returnPressed</h4> | 392 <h4>HgConflictsListDialog.on_input_returnPressed</h4> |
| 296 <b>on_input_returnPressed</b>(<i></i>) | 393 <b>on_input_returnPressed</b>(<i></i>) |
| 394 | |
| 297 <p> | 395 <p> |
| 298 Private slot to handle the press of the return key in the input field. | 396 Private slot to handle the press of the return key in the input field. |
| 299 </p><a NAME="HgConflictsListDialog.on_passwordCheckBox_toggled" ID="HgConflictsListDialog.on_passwordCheckBox_toggled"></a> | 397 </p> |
| 398 <a NAME="HgConflictsListDialog.on_passwordCheckBox_toggled" ID="HgConflictsListDialog.on_passwordCheckBox_toggled"></a> | |
| 300 <h4>HgConflictsListDialog.on_passwordCheckBox_toggled</h4> | 399 <h4>HgConflictsListDialog.on_passwordCheckBox_toggled</h4> |
| 301 <b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) | 400 <b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) |
| 401 | |
| 302 <p> | 402 <p> |
| 303 Private slot to handle the password checkbox toggled. | 403 Private slot to handle the password checkbox toggled. |
| 304 </p><dl> | 404 </p> |
| 405 <dl> | |
| 406 | |
| 305 <dt><i>isOn</i></dt> | 407 <dt><i>isOn</i></dt> |
| 306 <dd> | 408 <dd> |
| 307 flag indicating the status of the check box (boolean) | 409 flag indicating the status of the check box (boolean) |
| 308 </dd> | 410 </dd> |
| 309 </dl><a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a> | 411 </dl> |
| 412 <a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a> | |
| 310 <h4>HgConflictsListDialog.on_reMergeButton_clicked</h4> | 413 <h4>HgConflictsListDialog.on_reMergeButton_clicked</h4> |
| 311 <b>on_reMergeButton_clicked</b>(<i></i>) | 414 <b>on_reMergeButton_clicked</b>(<i></i>) |
| 415 | |
| 312 <p> | 416 <p> |
| 313 Private slot to re-merge the selected entries. | 417 Private slot to re-merge the selected entries. |
| 314 </p><a NAME="HgConflictsListDialog.on_refreshButton_clicked" ID="HgConflictsListDialog.on_refreshButton_clicked"></a> | 418 </p> |
| 419 <a NAME="HgConflictsListDialog.on_refreshButton_clicked" ID="HgConflictsListDialog.on_refreshButton_clicked"></a> | |
| 315 <h4>HgConflictsListDialog.on_refreshButton_clicked</h4> | 420 <h4>HgConflictsListDialog.on_refreshButton_clicked</h4> |
| 316 <b>on_refreshButton_clicked</b>(<i></i>) | 421 <b>on_refreshButton_clicked</b>(<i></i>) |
| 422 | |
| 317 <p> | 423 <p> |
| 318 Private slot to refresh the log. | 424 Private slot to refresh the log. |
| 319 </p><a NAME="HgConflictsListDialog.on_resolvedButton_clicked" ID="HgConflictsListDialog.on_resolvedButton_clicked"></a> | 425 </p> |
| 426 <a NAME="HgConflictsListDialog.on_resolvedButton_clicked" ID="HgConflictsListDialog.on_resolvedButton_clicked"></a> | |
| 320 <h4>HgConflictsListDialog.on_resolvedButton_clicked</h4> | 427 <h4>HgConflictsListDialog.on_resolvedButton_clicked</h4> |
| 321 <b>on_resolvedButton_clicked</b>(<i></i>) | 428 <b>on_resolvedButton_clicked</b>(<i></i>) |
| 429 | |
| 322 <p> | 430 <p> |
| 323 Private slot to mark the selected entries as resolved. | 431 Private slot to mark the selected entries as resolved. |
| 324 </p><a NAME="HgConflictsListDialog.on_sendButton_clicked" ID="HgConflictsListDialog.on_sendButton_clicked"></a> | 432 </p> |
| 433 <a NAME="HgConflictsListDialog.on_sendButton_clicked" ID="HgConflictsListDialog.on_sendButton_clicked"></a> | |
| 325 <h4>HgConflictsListDialog.on_sendButton_clicked</h4> | 434 <h4>HgConflictsListDialog.on_sendButton_clicked</h4> |
| 326 <b>on_sendButton_clicked</b>(<i></i>) | 435 <b>on_sendButton_clicked</b>(<i></i>) |
| 436 | |
| 327 <p> | 437 <p> |
| 328 Private slot to send the input to the subversion process. | 438 Private slot to send the input to the subversion process. |
| 329 </p><a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a> | 439 </p> |
| 440 <a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a> | |
| 330 <h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4> | 441 <h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4> |
| 331 <b>on_unresolvedButton_clicked</b>(<i></i>) | 442 <b>on_unresolvedButton_clicked</b>(<i></i>) |
| 443 | |
| 332 <p> | 444 <p> |
| 333 Private slot to mark the selected entries as unresolved. | 445 Private slot to mark the selected entries as unresolved. |
| 334 </p><a NAME="HgConflictsListDialog.show" ID="HgConflictsListDialog.show"></a> | 446 </p> |
| 447 <a NAME="HgConflictsListDialog.show" ID="HgConflictsListDialog.show"></a> | |
| 335 <h4>HgConflictsListDialog.show</h4> | 448 <h4>HgConflictsListDialog.show</h4> |
| 336 <b>show</b>(<i></i>) | 449 <b>show</b>(<i></i>) |
| 450 | |
| 337 <p> | 451 <p> |
| 338 Public slot to show the dialog. | 452 Public slot to show the dialog. |
| 339 </p><a NAME="HgConflictsListDialog.start" ID="HgConflictsListDialog.start"></a> | 453 </p> |
| 454 <a NAME="HgConflictsListDialog.start" ID="HgConflictsListDialog.start"></a> | |
| 340 <h4>HgConflictsListDialog.start</h4> | 455 <h4>HgConflictsListDialog.start</h4> |
| 341 <b>start</b>(<i>path</i>) | 456 <b>start</b>(<i>path</i>) |
| 457 | |
| 342 <p> | 458 <p> |
| 343 Public slot to start the tags command. | 459 Public slot to start the tags command. |
| 344 </p><dl> | 460 </p> |
| 461 <dl> | |
| 462 | |
| 345 <dt><i>path</i></dt> | 463 <dt><i>path</i></dt> |
| 346 <dd> | 464 <dd> |
| 347 name of directory to list conflicts for (string) | 465 name of directory to list conflicts for (string) |
| 348 </dd> | 466 </dd> |
| 349 </dl> | 467 </dl> |
