Mercurial Repositories > eric / file comparison

comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html

Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html

changeset 3586
6e3a6c5b58bf
child 3591
2f2a4a76dd22
equal deleted inserted replaced
3585:f09a457c83fe 3586:6e3a6c5b58bf
1 <!DOCTYPE html>
2 <html><head>
3 <title>eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog</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>eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog</h1>
23 <p>
24 Module implementing a dialog to show a list of files which had or still have
25 conflicts.
26 </p>
27 <h3>Global Attributes</h3>
28 <table>
29 <tr><td>None</td></tr>
30 </table>
31 <h3>Classes</h3>
32 <table>
33 <tr>
34 <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>
36 </tr>
37 </table>
38 <h3>Functions</h3>
39 <table>
40 <tr><td>None</td></tr>
41 </table>
42 <hr /><hr />
43 <a NAME="HgConflictsListDialog" ID="HgConflictsListDialog"></a>
44 <h2>HgConflictsListDialog</h2>
45 <p>
46 Class implementing a dialog to show a list of files which had or still
47 have conflicts.
48 </p>
49 <h3>Derived from</h3>
50 QWidget, Ui_HgConflictsListDialog
51 <h3>Class Attributes</h3>
52 <table>
53 <tr><td>StatusRole</td></tr>
54 </table>
55 <h3>Class Methods</h3>
56 <table>
57 <tr><td>None</td></tr>
58 </table>
59 <h3>Methods</h3>
60 <table>
61 <tr>
62 <td><a href="#HgConflictsListDialog.__init__">HgConflictsListDialog</a></td>
63 <td>Constructor</td>
64 </tr><tr>
65 <td><a href="#HgConflictsListDialog.__finish">__finish</a></td>
66 <td>Private slot called when the process finished or the user pressed the button.</td>
67 </tr><tr>
68 <td><a href="#HgConflictsListDialog.__generateItem">__generateItem</a></td>
69 <td>Private method to generate a tag item in the tag list.</td>
70 </tr><tr>
71 <td><a href="#HgConflictsListDialog.__getEntries">__getEntries</a></td>
72 <td>Private method to get the conflict entries.</td>
73 </tr><tr>
74 <td><a href="#HgConflictsListDialog.__procFinished">__procFinished</a></td>
75 <td>Private slot connected to the finished signal.</td>
76 </tr><tr>
77 <td><a href="#HgConflictsListDialog.__processOutputLine">__processOutputLine</a></td>
78 <td>Private method to process the lines of output.</td>
79 </tr><tr>
80 <td><a href="#HgConflictsListDialog.__readStderr">__readStderr</a></td>
81 <td>Private slot to handle the readyReadStderr signal.</td>
82 </tr><tr>
83 <td><a href="#HgConflictsListDialog.__readStdout">__readStdout</a></td>
84 <td>Private slot to handle the readyReadStdout signal.</td>
85 </tr><tr>
86 <td><a href="#HgConflictsListDialog.__resizeColumns">__resizeColumns</a></td>
87 <td>Private method to resize the list columns.</td>
88 </tr><tr>
89 <td><a href="#HgConflictsListDialog.__resort">__resort</a></td>
90 <td>Private method to resort the tree.</td>
91 </tr><tr>
92 <td><a href="#HgConflictsListDialog.__showError">__showError</a></td>
93 <td>Private slot to show some error.</td>
94 </tr><tr>
95 <td><a href="#HgConflictsListDialog.closeEvent">closeEvent</a></td>
96 <td>Private slot implementing a close event handler.</td>
97 </tr><tr>
98 <td><a href="#HgConflictsListDialog.keyPressEvent">keyPressEvent</a></td>
99 <td>Protected slot to handle a key press event.</td>
100 </tr><tr>
101 <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>
103 </tr><tr>
104 <td><a href="#HgConflictsListDialog.on_conflictsList_itemDoubleClicked">on_conflictsList_itemDoubleClicked</a></td>
105 <td>Private slot to open the double clicked entry.</td>
106 </tr><tr>
107 <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>
109 </tr><tr>
110 <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>
112 </tr><tr>
113 <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>
115 </tr><tr>
116 <td><a href="#HgConflictsListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td>
117 <td>Private slot to handle the password checkbox toggled.</td>
118 </tr><tr>
119 <td><a href="#HgConflictsListDialog.on_reMergeButton_clicked">on_reMergeButton_clicked</a></td>
120 <td>Private slot to re-merge the selected entries.</td>
121 </tr><tr>
122 <td><a href="#HgConflictsListDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td>
123 <td>Private slot to refresh the log.</td>
124 </tr><tr>
125 <td><a href="#HgConflictsListDialog.on_resolvedButton_clicked">on_resolvedButton_clicked</a></td>
126 <td>Private slot to mark the selected entries as resolved.</td>
127 </tr><tr>
128 <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>
130 </tr><tr>
131 <td><a href="#HgConflictsListDialog.on_unresolvedButton_clicked">on_unresolvedButton_clicked</a></td>
132 <td>Private slot to mark the selected entries as unresolved.</td>
133 </tr><tr>
134 <td><a href="#HgConflictsListDialog.show">show</a></td>
135 <td>Public slot to show the dialog.</td>
136 </tr><tr>
137 <td><a href="#HgConflictsListDialog.start">start</a></td>
138 <td>Public slot to start the tags command.</td>
139 </tr>
140 </table>
141 <h3>Static Methods</h3>
142 <table>
143 <tr><td>None</td></tr>
144 </table>
145 <a NAME="HgConflictsListDialog.__init__" ID="HgConflictsListDialog.__init__"></a>
146 <h4>HgConflictsListDialog (Constructor)</h4>
147 <b>HgConflictsListDialog</b>(<i>vcs, parent=None</i>)
148 <p>
149 Constructor
150 </p><dl>
151 <dt><i>vcs</i></dt>
152 <dd>
153 reference to the vcs object
154 </dd><dt><i>parent</i></dt>
155 <dd>
156 parent widget (QWidget)
157 </dd>
158 </dl><a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a>
159 <h4>HgConflictsListDialog.__finish</h4>
160 <b>__finish</b>(<i></i>)
161 <p>
162 Private slot called when the process finished or the user pressed
163 the button.
164 </p><a NAME="HgConflictsListDialog.__generateItem" ID="HgConflictsListDialog.__generateItem"></a>
165 <h4>HgConflictsListDialog.__generateItem</h4>
166 <b>__generateItem</b>(<i>status, name</i>)
167 <p>
168 Private method to generate a tag item in the tag list.
169 </p><dl>
170 <dt><i>status</i></dt>
171 <dd>
172 status of the file (string)
173 </dd><dt><i>name</i></dt>
174 <dd>
175 name of the file (string)
176 </dd>
177 </dl><a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a>
178 <h4>HgConflictsListDialog.__getEntries</h4>
179 <b>__getEntries</b>(<i></i>)
180 <p>
181 Private method to get the conflict entries.
182 </p><a NAME="HgConflictsListDialog.__procFinished" ID="HgConflictsListDialog.__procFinished"></a>
183 <h4>HgConflictsListDialog.__procFinished</h4>
184 <b>__procFinished</b>(<i>exitCode, exitStatus</i>)
185 <p>
186 Private slot connected to the finished signal.
187 </p><dl>
188 <dt><i>exitCode</i></dt>
189 <dd>
190 exit code of the process (integer)
191 </dd><dt><i>exitStatus</i></dt>
192 <dd>
193 exit status of the process (QProcess.ExitStatus)
194 </dd>
195 </dl><a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a>
196 <h4>HgConflictsListDialog.__processOutputLine</h4>
197 <b>__processOutputLine</b>(<i>line</i>)
198 <p>
199 Private method to process the lines of output.
200 </p><dl>
201 <dt><i>line</i></dt>
202 <dd>
203 output line to be processed (string)
204 </dd>
205 </dl><a NAME="HgConflictsListDialog.__readStderr" ID="HgConflictsListDialog.__readStderr"></a>
206 <h4>HgConflictsListDialog.__readStderr</h4>
207 <b>__readStderr</b>(<i></i>)
208 <p>
209 Private slot to handle the readyReadStderr signal.
210 </p><p>
211 It reads the error output of the process and inserts it into the
212 error pane.
213 </p><a NAME="HgConflictsListDialog.__readStdout" ID="HgConflictsListDialog.__readStdout"></a>
214 <h4>HgConflictsListDialog.__readStdout</h4>
215 <b>__readStdout</b>(<i></i>)
216 <p>
217 Private slot to handle the readyReadStdout signal.
218 </p><p>
219 It reads the output of the process, formats it and inserts it into
220 the contents pane.
221 </p><a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a>
222 <h4>HgConflictsListDialog.__resizeColumns</h4>
223 <b>__resizeColumns</b>(<i></i>)
224 <p>
225 Private method to resize the list columns.
226 </p><a NAME="HgConflictsListDialog.__resort" ID="HgConflictsListDialog.__resort"></a>
227 <h4>HgConflictsListDialog.__resort</h4>
228 <b>__resort</b>(<i></i>)
229 <p>
230 Private method to resort the tree.
231 </p><a NAME="HgConflictsListDialog.__showError" ID="HgConflictsListDialog.__showError"></a>
232 <h4>HgConflictsListDialog.__showError</h4>
233 <b>__showError</b>(<i>out</i>)
234 <p>
235 Private slot to show some error.
236 </p><dl>
237 <dt><i>out</i></dt>
238 <dd>
239 error to be shown (string)
240 </dd>
241 </dl><a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a>
242 <h4>HgConflictsListDialog.closeEvent</h4>
243 <b>closeEvent</b>(<i>e</i>)
244 <p>
245 Private slot implementing a close event handler.
246 </p><dl>
247 <dt><i>e</i></dt>
248 <dd>
249 close event (QCloseEvent)
250 </dd>
251 </dl><a NAME="HgConflictsListDialog.keyPressEvent" ID="HgConflictsListDialog.keyPressEvent"></a>
252 <h4>HgConflictsListDialog.keyPressEvent</h4>
253 <b>keyPressEvent</b>(<i>evt</i>)
254 <p>
255 Protected slot to handle a key press event.
256 </p><dl>
257 <dt><i>evt</i></dt>
258 <dd>
259 the key press event (QKeyEvent)
260 </dd>
261 </dl><a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a>
262 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4>
263 <b>on_buttonBox_clicked</b>(<i>button</i>)
264 <p>
265 Private slot called by a button of the button box clicked.
266 </p><dl>
267 <dt><i>button</i></dt>
268 <dd>
269 button that was clicked (QAbstractButton)
270 </dd>
271 </dl><a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a>
272 <h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4>
273 <b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>)
274 <p>
275 Private slot to open the double clicked entry.
276 </p><a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a>
277 <h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4>
278 <b>on_conflictsList_itemSelectionChanged</b>(<i></i>)
279 <p>
280 Private slot to handle a change of selected conflict entries.
281 </p><a NAME="HgConflictsListDialog.on_editButton_clicked" ID="HgConflictsListDialog.on_editButton_clicked"></a>
282 <h4>HgConflictsListDialog.on_editButton_clicked</h4>
283 <b>on_editButton_clicked</b>(<i></i>)
284 <p>
285 Private slot to open the selected file in an editor.
286 </p><a NAME="HgConflictsListDialog.on_input_returnPressed" ID="HgConflictsListDialog.on_input_returnPressed"></a>
287 <h4>HgConflictsListDialog.on_input_returnPressed</h4>
288 <b>on_input_returnPressed</b>(<i></i>)
289 <p>
290 Private slot to handle the press of the return key in the input field.
291 </p><a NAME="HgConflictsListDialog.on_passwordCheckBox_toggled" ID="HgConflictsListDialog.on_passwordCheckBox_toggled"></a>
292 <h4>HgConflictsListDialog.on_passwordCheckBox_toggled</h4>
293 <b>on_passwordCheckBox_toggled</b>(<i>isOn</i>)
294 <p>
295 Private slot to handle the password checkbox toggled.
296 </p><dl>
297 <dt><i>isOn</i></dt>
298 <dd>
299 flag indicating the status of the check box (boolean)
300 </dd>
301 </dl><a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a>
302 <h4>HgConflictsListDialog.on_reMergeButton_clicked</h4>
303 <b>on_reMergeButton_clicked</b>(<i></i>)
304 <p>
305 Private slot to re-merge the selected entries.
306 </p><a NAME="HgConflictsListDialog.on_refreshButton_clicked" ID="HgConflictsListDialog.on_refreshButton_clicked"></a>
307 <h4>HgConflictsListDialog.on_refreshButton_clicked</h4>
308 <b>on_refreshButton_clicked</b>(<i></i>)
309 <p>
310 Private slot to refresh the log.
311 </p><a NAME="HgConflictsListDialog.on_resolvedButton_clicked" ID="HgConflictsListDialog.on_resolvedButton_clicked"></a>
312 <h4>HgConflictsListDialog.on_resolvedButton_clicked</h4>
313 <b>on_resolvedButton_clicked</b>(<i></i>)
314 <p>
315 Private slot to mark the selected entries as resolved.
316 </p><a NAME="HgConflictsListDialog.on_sendButton_clicked" ID="HgConflictsListDialog.on_sendButton_clicked"></a>
317 <h4>HgConflictsListDialog.on_sendButton_clicked</h4>
318 <b>on_sendButton_clicked</b>(<i></i>)
319 <p>
320 Private slot to send the input to the subversion process.
321 </p><a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a>
322 <h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4>
323 <b>on_unresolvedButton_clicked</b>(<i></i>)
324 <p>
325 Private slot to mark the selected entries as unresolved.
326 </p><a NAME="HgConflictsListDialog.show" ID="HgConflictsListDialog.show"></a>
327 <h4>HgConflictsListDialog.show</h4>
328 <b>show</b>(<i></i>)
329 <p>
330 Public slot to show the dialog.
331 </p><a NAME="HgConflictsListDialog.start" ID="HgConflictsListDialog.start"></a>
332 <h4>HgConflictsListDialog.start</h4>
333 <b>start</b>(<i>path</i>)
334 <p>
335 Public slot to start the tags command.
336 </p><dl>
337 <dt><i>path</i></dt>
338 <dd>
339 name of directory to list conflicts for (string)
340 </dd>
341 </dl>
342 <div align="right"><a href="#top">Up</a></div>
343 <hr />
344 </body></html>

Mercurial Repository: eric

eric ide

mercurial