Mercurial Repositories > eric / file comparison

comparison: eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html

eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html

branch
eric7
changeset 8372
e0227a7c850e
child 8596
d64760b2da50
equal deleted inserted replaced
8371:d6062691d424 8372:e0227a7c850e
1 <!DOCTYPE html>
2 <html><head>
3 <title>eric7.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>
22 <a NAME="top" ID="top"></a>
23 <h1>eric7.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog</h1>
24
25 <p>
26 Module implementing a dialog to enter the data for a merge operation.
27 </p>
28 <h3>Global Attributes</h3>
29
30 <table>
31 <tr><td>None</td></tr>
32 </table>
33 <h3>Classes</h3>
34
35 <table>
36
37 <tr>
38 <td><a href="#HgMergeDialog">HgMergeDialog</a></td>
39 <td>Class implementing a dialog to enter the data for a merge operation.</td>
40 </tr>
41 </table>
42 <h3>Functions</h3>
43
44 <table>
45 <tr><td>None</td></tr>
46 </table>
47 <hr />
48 <hr />
49 <a NAME="HgMergeDialog" ID="HgMergeDialog"></a>
50 <h2>HgMergeDialog</h2>
51
52 <p>
53 Class implementing a dialog to enter the data for a merge operation.
54 </p>
55 <h3>Derived from</h3>
56 QDialog, Ui_HgMergeDialog
57 <h3>Class Attributes</h3>
58
59 <table>
60 <tr><td>None</td></tr>
61 </table>
62 <h3>Class Methods</h3>
63
64 <table>
65 <tr><td>None</td></tr>
66 </table>
67 <h3>Methods</h3>
68
69 <table>
70
71 <tr>
72 <td><a href="#HgMergeDialog.__init__">HgMergeDialog</a></td>
73 <td>Constructor</td>
74 </tr>
75 <tr>
76 <td><a href="#HgMergeDialog.__updateOK">__updateOK</a></td>
77 <td>Private slot to update the OK button.</td>
78 </tr>
79 <tr>
80 <td><a href="#HgMergeDialog.getParameters">getParameters</a></td>
81 <td>Public method to retrieve the merge data.</td>
82 </tr>
83 <tr>
84 <td><a href="#HgMergeDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td>
85 <td>Private slot to handle changes of the Bookmark select button.</td>
86 </tr>
87 <tr>
88 <td><a href="#HgMergeDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td>
89 <td>Private slot to handle changes of the Bookmark combo.</td>
90 </tr>
91 <tr>
92 <td><a href="#HgMergeDialog.on_branchButton_toggled">on_branchButton_toggled</a></td>
93 <td>Private slot to handle changes of the Branch select button.</td>
94 </tr>
95 <tr>
96 <td><a href="#HgMergeDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td>
97 <td>Private slot to handle changes of the Branch combo.</td>
98 </tr>
99 <tr>
100 <td><a href="#HgMergeDialog.on_idButton_toggled">on_idButton_toggled</a></td>
101 <td>Private slot to handle changes of the ID select button.</td>
102 </tr>
103 <tr>
104 <td><a href="#HgMergeDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td>
105 <td>Private slot to handle changes of the ID edit.</td>
106 </tr>
107 <tr>
108 <td><a href="#HgMergeDialog.on_tagButton_toggled">on_tagButton_toggled</a></td>
109 <td>Private slot to handle changes of the Tag select button.</td>
110 </tr>
111 <tr>
112 <td><a href="#HgMergeDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td>
113 <td>Private slot to handle changes of the Tag combo.</td>
114 </tr>
115 </table>
116 <h3>Static Methods</h3>
117
118 <table>
119 <tr><td>None</td></tr>
120 </table>
121
122 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a>
123 <h4>HgMergeDialog (Constructor)</h4>
124 <b>HgMergeDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>)
125
126 <p>
127 Constructor
128 </p>
129 <dl>
130
131 <dt><i>tagsList</i></dt>
132 <dd>
133 list of tags (list of strings)
134 </dd>
135 <dt><i>branchesList</i></dt>
136 <dd>
137 list of branches (list of strings)
138 </dd>
139 <dt><i>bookmarksList</i></dt>
140 <dd>
141 list of bookmarks (list of strings)
142 </dd>
143 <dt><i>parent</i></dt>
144 <dd>
145 parent widget (QWidget)
146 </dd>
147 </dl>
148 <a NAME="HgMergeDialog.__updateOK" ID="HgMergeDialog.__updateOK"></a>
149 <h4>HgMergeDialog.__updateOK</h4>
150 <b>__updateOK</b>(<i></i>)
151
152 <p>
153 Private slot to update the OK button.
154 </p>
155 <a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a>
156 <h4>HgMergeDialog.getParameters</h4>
157 <b>getParameters</b>(<i></i>)
158
159 <p>
160 Public method to retrieve the merge data.
161 </p>
162 <dl>
163 <dt>Return:</dt>
164 <dd>
165 tuple naming the revision and a flag indicating a
166 forced merge (string, boolean)
167 </dd>
168 </dl>
169 <a NAME="HgMergeDialog.on_bookmarkButton_toggled" ID="HgMergeDialog.on_bookmarkButton_toggled"></a>
170 <h4>HgMergeDialog.on_bookmarkButton_toggled</h4>
171 <b>on_bookmarkButton_toggled</b>(<i>checked</i>)
172
173 <p>
174 Private slot to handle changes of the Bookmark select button.
175 </p>
176 <dl>
177
178 <dt><i>checked</i></dt>
179 <dd>
180 state of the button (boolean)
181 </dd>
182 </dl>
183 <a NAME="HgMergeDialog.on_bookmarkCombo_editTextChanged" ID="HgMergeDialog.on_bookmarkCombo_editTextChanged"></a>
184 <h4>HgMergeDialog.on_bookmarkCombo_editTextChanged</h4>
185 <b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>)
186
187 <p>
188 Private slot to handle changes of the Bookmark combo.
189 </p>
190 <dl>
191
192 <dt><i>txt</i></dt>
193 <dd>
194 text of the combo (string)
195 </dd>
196 </dl>
197 <a NAME="HgMergeDialog.on_branchButton_toggled" ID="HgMergeDialog.on_branchButton_toggled"></a>
198 <h4>HgMergeDialog.on_branchButton_toggled</h4>
199 <b>on_branchButton_toggled</b>(<i>checked</i>)
200
201 <p>
202 Private slot to handle changes of the Branch select button.
203 </p>
204 <dl>
205
206 <dt><i>checked</i></dt>
207 <dd>
208 state of the button (boolean)
209 </dd>
210 </dl>
211 <a NAME="HgMergeDialog.on_branchCombo_editTextChanged" ID="HgMergeDialog.on_branchCombo_editTextChanged"></a>
212 <h4>HgMergeDialog.on_branchCombo_editTextChanged</h4>
213 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>)
214
215 <p>
216 Private slot to handle changes of the Branch combo.
217 </p>
218 <dl>
219
220 <dt><i>txt</i></dt>
221 <dd>
222 text of the combo (string)
223 </dd>
224 </dl>
225 <a NAME="HgMergeDialog.on_idButton_toggled" ID="HgMergeDialog.on_idButton_toggled"></a>
226 <h4>HgMergeDialog.on_idButton_toggled</h4>
227 <b>on_idButton_toggled</b>(<i>checked</i>)
228
229 <p>
230 Private slot to handle changes of the ID select button.
231 </p>
232 <dl>
233
234 <dt><i>checked</i></dt>
235 <dd>
236 state of the button (boolean)
237 </dd>
238 </dl>
239 <a NAME="HgMergeDialog.on_idEdit_textChanged" ID="HgMergeDialog.on_idEdit_textChanged"></a>
240 <h4>HgMergeDialog.on_idEdit_textChanged</h4>
241 <b>on_idEdit_textChanged</b>(<i>txt</i>)
242
243 <p>
244 Private slot to handle changes of the ID edit.
245 </p>
246 <dl>
247
248 <dt><i>txt</i></dt>
249 <dd>
250 text of the edit (string)
251 </dd>
252 </dl>
253 <a NAME="HgMergeDialog.on_tagButton_toggled" ID="HgMergeDialog.on_tagButton_toggled"></a>
254 <h4>HgMergeDialog.on_tagButton_toggled</h4>
255 <b>on_tagButton_toggled</b>(<i>checked</i>)
256
257 <p>
258 Private slot to handle changes of the Tag select button.
259 </p>
260 <dl>
261
262 <dt><i>checked</i></dt>
263 <dd>
264 state of the button (boolean)
265 </dd>
266 </dl>
267 <a NAME="HgMergeDialog.on_tagCombo_editTextChanged" ID="HgMergeDialog.on_tagCombo_editTextChanged"></a>
268 <h4>HgMergeDialog.on_tagCombo_editTextChanged</h4>
269 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>)
270
271 <p>
272 Private slot to handle changes of the Tag combo.
273 </p>
274 <dl>
275
276 <dt><i>txt</i></dt>
277 <dd>
278 text of the combo (string)
279 </dd>
280 </dl>
281 <div align="right"><a href="#top">Up</a></div>
282 <hr />
283 </body></html>

Mercurial Repository: eric

eric ide

mercurial