Mercurial Repositories > eric / file comparison

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

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

changeset 1020
adf7e95f05e7
parent 945
8cd4d08fa9f6
child 1228
7afaf2fca55b
equal deleted inserted replaced
1019:d8a9697f78d1 1020:adf7e95f05e7
55 <table> 55 <table>
56 <tr> 56 <tr>
57 <td><a href="#HgMergeDialog.__init__">HgMergeDialog</a></td> 57 <td><a href="#HgMergeDialog.__init__">HgMergeDialog</a></td>
58 <td>Constructor</td> 58 <td>Constructor</td>
59 </tr><tr> 59 </tr><tr>
60 <td><a href="#HgMergeDialog.__updateOK">__updateOK</a></td>
61 <td>Private slot to update the OK button.</td>
62 </tr><tr>
60 <td><a href="#HgMergeDialog.getParameters">getParameters</a></td> 63 <td><a href="#HgMergeDialog.getParameters">getParameters</a></td>
61 <td>Public method to retrieve the merge data.</td> 64 <td>Public method to retrieve the merge data.</td>
65 </tr><tr>
66 <td><a href="#HgMergeDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td>
67 <td>Private slot to handle changes of the Bookmark select button.</td>
68 </tr><tr>
69 <td><a href="#HgMergeDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td>
70 <td>Private slot to handle changes of the Bookmark combo.</td>
71 </tr><tr>
72 <td><a href="#HgMergeDialog.on_branchButton_toggled">on_branchButton_toggled</a></td>
73 <td>Private slot to handle changes of the Branch select button.</td>
74 </tr><tr>
75 <td><a href="#HgMergeDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td>
76 <td>Private slot to handle changes of the Branch combo.</td>
77 </tr><tr>
78 <td><a href="#HgMergeDialog.on_idButton_toggled">on_idButton_toggled</a></td>
79 <td>Private slot to handle changes of the ID select button.</td>
80 </tr><tr>
81 <td><a href="#HgMergeDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td>
82 <td>Private slot to handle changes of the ID edit.</td>
83 </tr><tr>
84 <td><a href="#HgMergeDialog.on_tagButton_toggled">on_tagButton_toggled</a></td>
85 <td>Private slot to handle changes of the Tag select button.</td>
86 </tr><tr>
87 <td><a href="#HgMergeDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td>
88 <td>Private slot to handle changes of the Tag combo.</td>
62 </tr> 89 </tr>
63 </table> 90 </table>
64 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> 91 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a>
65 <h4>HgMergeDialog (Constructor)</h4> 92 <h4>HgMergeDialog (Constructor)</h4>
66 <b>HgMergeDialog</b>(<i>force, tagsList, branchesList, parent=None</i>) 93 <b>HgMergeDialog</b>(<i>force, tagsList, branchesList, bookmarksList=None, parent=None</i>)
67 <p> 94 <p>
68 Constructor 95 Constructor
69 </p><dl> 96 </p><dl>
70 <dt><i>force</i></dt> 97 <dt><i>force</i></dt>
71 <dd> 98 <dd>
74 <dd> 101 <dd>
75 list of tags (list of strings) 102 list of tags (list of strings)
76 </dd><dt><i>branchesList</i></dt> 103 </dd><dt><i>branchesList</i></dt>
77 <dd> 104 <dd>
78 list of branches (list of strings) 105 list of branches (list of strings)
106 </dd><dt><i>bookmarksList</i></dt>
107 <dd>
108 list of bookmarks (list of strings)
79 </dd><dt><i>parent</i></dt> 109 </dd><dt><i>parent</i></dt>
80 <dd> 110 <dd>
81 parent widget (QWidget) 111 parent widget (QWidget)
82 </dd> 112 </dd>
83 </dl><a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a> 113 </dl><a NAME="HgMergeDialog.__updateOK" ID="HgMergeDialog.__updateOK"></a>
114 <h4>HgMergeDialog.__updateOK</h4>
115 <b>__updateOK</b>(<i></i>)
116 <p>
117 Private slot to update the OK button.
118 </p><a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a>
84 <h4>HgMergeDialog.getParameters</h4> 119 <h4>HgMergeDialog.getParameters</h4>
85 <b>getParameters</b>(<i></i>) 120 <b>getParameters</b>(<i></i>)
86 <p> 121 <p>
87 Public method to retrieve the merge data. 122 Public method to retrieve the merge data.
88 </p><dl> 123 </p><dl>
89 <dt>Returns:</dt> 124 <dt>Returns:</dt>
90 <dd> 125 <dd>
91 tuple naming the revision and a flag indicating a 126 tuple naming the revision and a flag indicating a
92 forced merge (string, boolean) 127 forced merge (string, boolean)
128 </dd>
129 </dl><a NAME="HgMergeDialog.on_bookmarkButton_toggled" ID="HgMergeDialog.on_bookmarkButton_toggled"></a>
130 <h4>HgMergeDialog.on_bookmarkButton_toggled</h4>
131 <b>on_bookmarkButton_toggled</b>(<i>checked</i>)
132 <p>
133 Private slot to handle changes of the Bookmark select button.
134 </p><dl>
135 <dt><i>checked</i></dt>
136 <dd>
137 state of the button (boolean)
138 </dd>
139 </dl><a NAME="HgMergeDialog.on_bookmarkCombo_editTextChanged" ID="HgMergeDialog.on_bookmarkCombo_editTextChanged"></a>
140 <h4>HgMergeDialog.on_bookmarkCombo_editTextChanged</h4>
141 <b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>)
142 <p>
143 Private slot to handle changes of the Bookmark combo.
144 </p><dl>
145 <dt><i>txt</i></dt>
146 <dd>
147 text of the combo (string)
148 </dd>
149 </dl><a NAME="HgMergeDialog.on_branchButton_toggled" ID="HgMergeDialog.on_branchButton_toggled"></a>
150 <h4>HgMergeDialog.on_branchButton_toggled</h4>
151 <b>on_branchButton_toggled</b>(<i>checked</i>)
152 <p>
153 Private slot to handle changes of the Branch select button.
154 </p><dl>
155 <dt><i>checked</i></dt>
156 <dd>
157 state of the button (boolean)
158 </dd>
159 </dl><a NAME="HgMergeDialog.on_branchCombo_editTextChanged" ID="HgMergeDialog.on_branchCombo_editTextChanged"></a>
160 <h4>HgMergeDialog.on_branchCombo_editTextChanged</h4>
161 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>)
162 <p>
163 Private slot to handle changes of the Branch combo.
164 </p><dl>
165 <dt><i>txt</i></dt>
166 <dd>
167 text of the combo (string)
168 </dd>
169 </dl><a NAME="HgMergeDialog.on_idButton_toggled" ID="HgMergeDialog.on_idButton_toggled"></a>
170 <h4>HgMergeDialog.on_idButton_toggled</h4>
171 <b>on_idButton_toggled</b>(<i>checked</i>)
172 <p>
173 Private slot to handle changes of the ID select button.
174 </p><dl>
175 <dt><i>checked</i></dt>
176 <dd>
177 state of the button (boolean)
178 </dd>
179 </dl><a NAME="HgMergeDialog.on_idEdit_textChanged" ID="HgMergeDialog.on_idEdit_textChanged"></a>
180 <h4>HgMergeDialog.on_idEdit_textChanged</h4>
181 <b>on_idEdit_textChanged</b>(<i>txt</i>)
182 <p>
183 Private slot to handle changes of the ID edit.
184 </p><dl>
185 <dt><i>txt</i></dt>
186 <dd>
187 text of the edit (string)
188 </dd>
189 </dl><a NAME="HgMergeDialog.on_tagButton_toggled" ID="HgMergeDialog.on_tagButton_toggled"></a>
190 <h4>HgMergeDialog.on_tagButton_toggled</h4>
191 <b>on_tagButton_toggled</b>(<i>checked</i>)
192 <p>
193 Private slot to handle changes of the Tag select button.
194 </p><dl>
195 <dt><i>checked</i></dt>
196 <dd>
197 state of the button (boolean)
198 </dd>
199 </dl><a NAME="HgMergeDialog.on_tagCombo_editTextChanged" ID="HgMergeDialog.on_tagCombo_editTextChanged"></a>
200 <h4>HgMergeDialog.on_tagCombo_editTextChanged</h4>
201 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>)
202 <p>
203 Private slot to handle changes of the Tag combo.
204 </p><dl>
205 <dt><i>txt</i></dt>
206 <dd>
207 text of the combo (string)
93 </dd> 208 </dd>
94 </dl> 209 </dl>
95 <div align="right"><a href="#top">Up</a></div> 210 <div align="right"><a href="#top">Up</a></div>
96 <hr /> 211 <hr />
97 </body></html> 212 </body></html>

Mercurial Repository: eric

eric ide

mercurial