Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html
src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9209
- b99e7fd55fd3
- child 10479
- 856476537696
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 146 <p> | 146 <p> |
| 147 Constructor | 147 Constructor |
| 148 </p> | 148 </p> |
| 149 <dl> | 149 <dl> |
| 150 | 150 |
| 151 <dt><i>vcs</i></dt> | 151 <dt><i>vcs</i> (Hg)</dt> |
| 152 <dd> | 152 <dd> |
| 153 reference to the vcs object | 153 reference to the vcs object |
| 154 </dd> | 154 </dd> |
| 155 <dt><i>parent</i></dt> | 155 <dt><i>parent</i> (QWidget)</dt> |
| 156 <dd> | 156 <dd> |
| 157 parent widget (QWidget) | 157 parent widget |
| 158 </dd> | 158 </dd> |
| 159 </dl> | 159 </dl> |
| 160 <a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a> | 160 <a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a> |
| 161 <h4>HgConflictsListDialog.__finish</h4> | 161 <h4>HgConflictsListDialog.__finish</h4> |
| 162 <b>__finish</b>(<i></i>) | 162 <b>__finish</b>(<i></i>) |
| 172 <p> | 172 <p> |
| 173 Private method to generate a tag item in the tag list. | 173 Private method to generate a tag item in the tag list. |
| 174 </p> | 174 </p> |
| 175 <dl> | 175 <dl> |
| 176 | 176 |
| 177 <dt><i>status</i></dt> | 177 <dt><i>status</i> (str)</dt> |
| 178 <dd> | 178 <dd> |
| 179 status of the file (string) | 179 status of the file |
| 180 </dd> | 180 </dd> |
| 181 <dt><i>name</i></dt> | 181 <dt><i>name</i> (str)</dt> |
| 182 <dd> | 182 <dd> |
| 183 name of the file (string) | 183 name of the file |
| 184 </dd> | 184 </dd> |
| 185 </dl> | 185 </dl> |
| 186 <a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a> | 186 <a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a> |
| 187 <h4>HgConflictsListDialog.__getEntries</h4> | 187 <h4>HgConflictsListDialog.__getEntries</h4> |
| 188 <b>__getEntries</b>(<i></i>) | 188 <b>__getEntries</b>(<i></i>) |
| 197 <p> | 197 <p> |
| 198 Private method to process the lines of output. | 198 Private method to process the lines of output. |
| 199 </p> | 199 </p> |
| 200 <dl> | 200 <dl> |
| 201 | 201 |
| 202 <dt><i>line</i></dt> | 202 <dt><i>line</i> (str)</dt> |
| 203 <dd> | 203 <dd> |
| 204 output line to be processed (string) | 204 output line to be processed |
| 205 </dd> | 205 </dd> |
| 206 </dl> | 206 </dl> |
| 207 <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> | 207 <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> |
| 208 <h4>HgConflictsListDialog.__resizeColumns</h4> | 208 <h4>HgConflictsListDialog.__resizeColumns</h4> |
| 209 <b>__resizeColumns</b>(<i></i>) | 209 <b>__resizeColumns</b>(<i></i>) |
| 225 <p> | 225 <p> |
| 226 Private slot to show some error. | 226 Private slot to show some error. |
| 227 </p> | 227 </p> |
| 228 <dl> | 228 <dl> |
| 229 | 229 |
| 230 <dt><i>out</i></dt> | 230 <dt><i>out</i> (str)</dt> |
| 231 <dd> | 231 <dd> |
| 232 error to be shown (string) | 232 error to be shown |
| 233 </dd> | 233 </dd> |
| 234 </dl> | 234 </dl> |
| 235 <a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> | 235 <a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> |
| 236 <h4>HgConflictsListDialog.closeEvent</h4> | 236 <h4>HgConflictsListDialog.closeEvent</h4> |
| 237 <b>closeEvent</b>(<i>e</i>) | 237 <b>closeEvent</b>(<i>e</i>) |
| 239 <p> | 239 <p> |
| 240 Protected slot implementing a close event handler. | 240 Protected slot implementing a close event handler. |
| 241 </p> | 241 </p> |
| 242 <dl> | 242 <dl> |
| 243 | 243 |
| 244 <dt><i>e</i></dt> | 244 <dt><i>e</i> (QCloseEvent)</dt> |
| 245 <dd> | 245 <dd> |
| 246 close event (QCloseEvent) | 246 close event |
| 247 </dd> | 247 </dd> |
| 248 </dl> | 248 </dl> |
| 249 <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> | 249 <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> |
| 250 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4> | 250 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4> |
| 251 <b>on_buttonBox_clicked</b>(<i>button</i>) | 251 <b>on_buttonBox_clicked</b>(<i>button</i>) |
| 253 <p> | 253 <p> |
| 254 Private slot called by a button of the button box clicked. | 254 Private slot called by a button of the button box clicked. |
| 255 </p> | 255 </p> |
| 256 <dl> | 256 <dl> |
| 257 | 257 |
| 258 <dt><i>button</i></dt> | 258 <dt><i>button</i> (QAbstractButton)</dt> |
| 259 <dd> | 259 <dd> |
| 260 button that was clicked (QAbstractButton) | 260 button that was clicked |
| 261 </dd> | 261 </dd> |
| 262 </dl> | 262 </dl> |
| 263 <a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> | 263 <a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> |
| 264 <h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4> | 264 <h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4> |
| 265 <b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>) | 265 <b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>) |
| 267 <p> | 267 <p> |
| 268 Private slot to open the double clicked entry. | 268 Private slot to open the double clicked entry. |
| 269 </p> | 269 </p> |
| 270 <dl> | 270 <dl> |
| 271 | 271 |
| 272 <dt><i>item</i></dt> | 272 <dt><i>item</i> (QTreeWidgetItem)</dt> |
| 273 <dd> | 273 <dd> |
| 274 reference to the double clicked item (QTreeWidgetItem) | 274 reference to the double clicked item |
| 275 </dd> | 275 </dd> |
| 276 <dt><i>column</i></dt> | 276 <dt><i>column</i> (int)</dt> |
| 277 <dd> | 277 <dd> |
| 278 column that was double clicked (integer) | 278 column that was double clicked |
| 279 </dd> | 279 </dd> |
| 280 </dl> | 280 </dl> |
| 281 <a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a> | 281 <a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a> |
| 282 <h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4> | 282 <h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4> |
| 283 <b>on_conflictsList_itemSelectionChanged</b>(<i></i>) | 283 <b>on_conflictsList_itemSelectionChanged</b>(<i></i>) |
