Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.UI.DiffDialog.html
src/eric7/Documentation/Source/eric7.UI.DiffDialog.html
- branch
- eric7
- changeset 10433
- 328f3ec4b77a
- parent 10303
- ee1aadab1215
- child 10479
- 856476537696
equal
deleted
inserted
replaced
| 10432:2fe91fe443dd | 10433:328f3ec4b77a |
|---|---|
| 108 <p> | 108 <p> |
| 109 Constructor | 109 Constructor |
| 110 </p> | 110 </p> |
| 111 <dl> | 111 <dl> |
| 112 | 112 |
| 113 <dt><i>files</i> (list of two str)</dt> | 113 <dt><i>files</i> (list of [str, str])</dt> |
| 114 <dd> | 114 <dd> |
| 115 list of two file names to be diffed | 115 list of two file names to be diffed |
| 116 </dd> | 116 </dd> |
| 117 <dt><i>parent</i> (QWidget)</dt> | 117 <dt><i>parent</i> (QWidget)</dt> |
| 118 <dd> | 118 <dd> |
| 126 <p> | 126 <p> |
| 127 Private method to append text to the end of the contents pane. | 127 Private method to append text to the end of the contents pane. |
| 128 </p> | 128 </p> |
| 129 <dl> | 129 <dl> |
| 130 | 130 |
| 131 <dt><i>txt</i></dt> | 131 <dt><i>txt</i> (str)</dt> |
| 132 <dd> | 132 <dd> |
| 133 text to insert (string) | 133 text to insert |
| 134 </dd> | 134 </dd> |
| 135 </dl> | 135 </dl> |
| 136 <a NAME="DiffDialog.__fileChanged" ID="DiffDialog.__fileChanged"></a> | 136 <a NAME="DiffDialog.__fileChanged" ID="DiffDialog.__fileChanged"></a> |
| 137 <h4>DiffDialog.__fileChanged</h4> | 137 <h4>DiffDialog.__fileChanged</h4> |
| 138 <b>__fileChanged</b>(<i></i>) | 138 <b>__fileChanged</b>(<i></i>) |
| 147 <p> | 147 <p> |
| 148 Private slot to generate a context diff output. | 148 Private slot to generate a context diff output. |
| 149 </p> | 149 </p> |
| 150 <dl> | 150 <dl> |
| 151 | 151 |
| 152 <dt><i>a</i></dt> | 152 <dt><i>a</i> (list of str)</dt> |
| 153 <dd> | 153 <dd> |
| 154 first sequence of lines (list of strings) | 154 first sequence of lines |
| 155 </dd> | 155 </dd> |
| 156 <dt><i>b</i></dt> | 156 <dt><i>b</i> (list of str)</dt> |
| 157 <dd> | 157 <dd> |
| 158 second sequence of lines (list of strings) | 158 second sequence of lines |
| 159 </dd> | 159 </dd> |
| 160 <dt><i>fromfile</i></dt> | 160 <dt><i>fromfile</i> (str)</dt> |
| 161 <dd> | 161 <dd> |
| 162 filename of the first file (string) | 162 filename of the first file |
| 163 </dd> | 163 </dd> |
| 164 <dt><i>tofile</i></dt> | 164 <dt><i>tofile</i> (str)</dt> |
| 165 <dd> | 165 <dd> |
| 166 filename of the second file (string) | 166 filename of the second file |
| 167 </dd> | 167 </dd> |
| 168 <dt><i>fromfiledate</i></dt> | 168 <dt><i>fromfiledate</i> (str)</dt> |
| 169 <dd> | 169 <dd> |
| 170 modification time of the first file (string) | 170 modification time of the first file |
| 171 </dd> | 171 </dd> |
| 172 <dt><i>tofiledate</i></dt> | 172 <dt><i>tofiledate</i> (str)</dt> |
| 173 <dd> | 173 <dd> |
| 174 modification time of the second file (string) | 174 modification time of the second file |
| 175 </dd> | 175 </dd> |
| 176 </dl> | 176 </dl> |
| 177 <a NAME="DiffDialog.__generateUnifiedDiff" ID="DiffDialog.__generateUnifiedDiff"></a> | 177 <a NAME="DiffDialog.__generateUnifiedDiff" ID="DiffDialog.__generateUnifiedDiff"></a> |
| 178 <h4>DiffDialog.__generateUnifiedDiff</h4> | 178 <h4>DiffDialog.__generateUnifiedDiff</h4> |
| 179 <b>__generateUnifiedDiff</b>(<i>a, b, fromfile, tofile, fromfiledate, tofiledate</i>) | 179 <b>__generateUnifiedDiff</b>(<i>a, b, fromfile, tofile, fromfiledate, tofiledate</i>) |
| 181 <p> | 181 <p> |
| 182 Private slot to generate a unified diff output. | 182 Private slot to generate a unified diff output. |
| 183 </p> | 183 </p> |
| 184 <dl> | 184 <dl> |
| 185 | 185 |
| 186 <dt><i>a</i></dt> | 186 <dt><i>a</i> (list of str)</dt> |
| 187 <dd> | 187 <dd> |
| 188 first sequence of lines (list of strings) | 188 first sequence of lines |
| 189 </dd> | 189 </dd> |
| 190 <dt><i>b</i></dt> | 190 <dt><i>b</i> (list of str)</dt> |
| 191 <dd> | 191 <dd> |
| 192 second sequence of lines (list of strings) | 192 second sequence of lines |
| 193 </dd> | 193 </dd> |
| 194 <dt><i>fromfile</i></dt> | 194 <dt><i>fromfile</i> (str)</dt> |
| 195 <dd> | 195 <dd> |
| 196 filename of the first file (string) | 196 filename of the first file |
| 197 </dd> | 197 </dd> |
| 198 <dt><i>tofile</i></dt> | 198 <dt><i>tofile</i> (str)</dt> |
| 199 <dd> | 199 <dd> |
| 200 filename of the second file (string) | 200 filename of the second file |
| 201 </dd> | 201 </dd> |
| 202 <dt><i>fromfiledate</i></dt> | 202 <dt><i>fromfiledate</i> (str)</dt> |
| 203 <dd> | 203 <dd> |
| 204 modification time of the first file (string) | 204 modification time of the first file |
| 205 </dd> | 205 </dd> |
| 206 <dt><i>tofiledate</i></dt> | 206 <dt><i>tofiledate</i> (str)</dt> |
| 207 <dd> | 207 <dd> |
| 208 modification time of the second file (string) | 208 modification time of the second file |
| 209 </dd> | 209 </dd> |
| 210 </dl> | 210 </dl> |
| 211 <a NAME="DiffDialog.on_buttonBox_clicked" ID="DiffDialog.on_buttonBox_clicked"></a> | 211 <a NAME="DiffDialog.on_buttonBox_clicked" ID="DiffDialog.on_buttonBox_clicked"></a> |
| 212 <h4>DiffDialog.on_buttonBox_clicked</h4> | 212 <h4>DiffDialog.on_buttonBox_clicked</h4> |
| 213 <b>on_buttonBox_clicked</b>(<i>button</i>) | 213 <b>on_buttonBox_clicked</b>(<i>button</i>) |
| 215 <p> | 215 <p> |
| 216 Private slot called by a button of the button box clicked. | 216 Private slot called by a button of the button box clicked. |
| 217 </p> | 217 </p> |
| 218 <dl> | 218 <dl> |
| 219 | 219 |
| 220 <dt><i>button</i></dt> | 220 <dt><i>button</i> (QAbstractButton)</dt> |
| 221 <dd> | 221 <dd> |
| 222 button that was clicked (QAbstractButton) | 222 button that was clicked |
| 223 </dd> | 223 </dd> |
| 224 </dl> | 224 </dl> |
| 225 <a NAME="DiffDialog.on_diffButton_clicked" ID="DiffDialog.on_diffButton_clicked"></a> | 225 <a NAME="DiffDialog.on_diffButton_clicked" ID="DiffDialog.on_diffButton_clicked"></a> |
| 226 <h4>DiffDialog.on_diffButton_clicked</h4> | 226 <h4>DiffDialog.on_diffButton_clicked</h4> |
| 227 <b>on_diffButton_clicked</b>(<i></i>) | 227 <b>on_diffButton_clicked</b>(<i></i>) |
| 247 <p> | 247 <p> |
| 248 Public slot to show the dialog. | 248 Public slot to show the dialog. |
| 249 </p> | 249 </p> |
| 250 <dl> | 250 <dl> |
| 251 | 251 |
| 252 <dt><i>filename</i></dt> | 252 <dt><i>filename</i> (str)</dt> |
| 253 <dd> | 253 <dd> |
| 254 name of a file to use as the first file (string) | 254 name of a file to use as the first file |
| 255 </dd> | 255 </dd> |
| 256 </dl> | 256 </dl> |
| 257 <div align="right"><a href="#top">Up</a></div> | 257 <div align="right"><a href="#top">Up</a></div> |
| 258 <hr /> | 258 <hr /> |
| 259 <hr /> | 259 <hr /> |
| 301 <p> | 301 <p> |
| 302 Constructor | 302 Constructor |
| 303 </p> | 303 </p> |
| 304 <dl> | 304 <dl> |
| 305 | 305 |
| 306 <dt><i>files</i> (list of two str)</dt> | 306 <dt><i>files</i> (list of [str, str])</dt> |
| 307 <dd> | 307 <dd> |
| 308 list of two file names to be diffed | 308 list of two file names to be diffed |
| 309 </dd> | 309 </dd> |
| 310 <dt><i>parent</i> (QWidget)</dt> | 310 <dt><i>parent</i> (QWidget)</dt> |
| 311 <dd> | 311 <dd> |
| 319 <p> | 319 <p> |
| 320 Public method to filter events. | 320 Public method to filter events. |
| 321 </p> | 321 </p> |
| 322 <dl> | 322 <dl> |
| 323 | 323 |
| 324 <dt><i>obj</i></dt> | 324 <dt><i>obj</i> (QObject)</dt> |
| 325 <dd> | 325 <dd> |
| 326 reference to the object the event is meant for (QObject) | 326 reference to the object the event is meant for |
| 327 </dd> | 327 </dd> |
| 328 <dt><i>event</i></dt> | 328 <dt><i>event</i> (QEvent)</dt> |
| 329 <dd> | 329 <dd> |
| 330 reference to the event object (QEvent) | 330 reference to the event object |
| 331 </dd> | 331 </dd> |
| 332 </dl> | 332 </dl> |
| 333 <dl> | 333 <dl> |
| 334 <dt>Return:</dt> | 334 <dt>Return:</dt> |
| 335 <dd> | 335 <dd> |
| 336 flag indicating, whether the event was handled (boolean) | 336 flag indicating, whether the event was handled |
| 337 </dd> | |
| 338 </dl> | |
| 339 <dl> | |
| 340 <dt>Return Type:</dt> | |
| 341 <dd> | |
| 342 bool | |
| 337 </dd> | 343 </dd> |
| 338 </dl> | 344 </dl> |
| 339 <div align="right"><a href="#top">Up</a></div> | 345 <div align="right"><a href="#top">Up</a></div> |
| 340 <hr /> | 346 <hr /> |
| 341 </body></html> | 347 </body></html> |
