Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric6.UI.DiffDialog.html
Documentation/Source/eric6.UI.DiffDialog.html
- changeset 4602
- 48cc4820e2c2
- parent 4109
- 809b8268183d
equal
deleted
inserted
replaced
| 4601:0017e7cb67ae | 4602:48cc4820e2c2 |
|---|---|
| 79 <td>Private slot to generate a context diff output.</td> | 79 <td>Private slot to generate a context diff output.</td> |
| 80 </tr><tr> | 80 </tr><tr> |
| 81 <td><a href="#DiffDialog.__generateUnifiedDiff">__generateUnifiedDiff</a></td> | 81 <td><a href="#DiffDialog.__generateUnifiedDiff">__generateUnifiedDiff</a></td> |
| 82 <td>Private slot to generate a unified diff output.</td> | 82 <td>Private slot to generate a unified diff output.</td> |
| 83 </tr><tr> | 83 </tr><tr> |
| 84 <td><a href="#DiffDialog.__selectFile">__selectFile</a></td> | |
| 85 <td>Private slot to display a file selection dialog.</td> | |
| 86 </tr><tr> | |
| 87 <td><a href="#DiffDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> | 84 <td><a href="#DiffDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> |
| 88 <td>Private slot called by a button of the button box clicked.</td> | 85 <td>Private slot called by a button of the button box clicked.</td> |
| 89 </tr><tr> | 86 </tr><tr> |
| 90 <td><a href="#DiffDialog.on_diffButton_clicked">on_diffButton_clicked</a></td> | 87 <td><a href="#DiffDialog.on_diffButton_clicked">on_diffButton_clicked</a></td> |
| 91 <td>Private slot to handle the Compare button press.</td> | 88 <td>Private slot to handle the Compare button press.</td> |
| 92 </tr><tr> | |
| 93 <td><a href="#DiffDialog.on_file1Button_clicked">on_file1Button_clicked</a></td> | |
| 94 <td>Private slot to handle the file 1 file selection button press.</td> | |
| 95 </tr><tr> | |
| 96 <td><a href="#DiffDialog.on_file2Button_clicked">on_file2Button_clicked</a></td> | |
| 97 <td>Private slot to handle the file 2 file selection button press.</td> | |
| 98 </tr><tr> | 89 </tr><tr> |
| 99 <td><a href="#DiffDialog.on_saveButton_clicked">on_saveButton_clicked</a></td> | 90 <td><a href="#DiffDialog.on_saveButton_clicked">on_saveButton_clicked</a></td> |
| 100 <td>Private slot to handle the Save button press.</td> | 91 <td>Private slot to handle the Save button press.</td> |
| 101 </tr><tr> | 92 </tr><tr> |
| 102 <td><a href="#DiffDialog.show">show</a></td> | 93 <td><a href="#DiffDialog.show">show</a></td> |
| 180 modification time of the first file (string) | 171 modification time of the first file (string) |
| 181 </dd><dt><i>tofiledate</i></dt> | 172 </dd><dt><i>tofiledate</i></dt> |
| 182 <dd> | 173 <dd> |
| 183 modification time of the second file (string) | 174 modification time of the second file (string) |
| 184 </dd> | 175 </dd> |
| 185 </dl><a NAME="DiffDialog.__selectFile" ID="DiffDialog.__selectFile"></a> | |
| 186 <h4>DiffDialog.__selectFile</h4> | |
| 187 <b>__selectFile</b>(<i>lineEdit</i>) | |
| 188 <p> | |
| 189 Private slot to display a file selection dialog. | |
| 190 </p><dl> | |
| 191 <dt><i>lineEdit</i></dt> | |
| 192 <dd> | |
| 193 field for the display of the selected filename | |
| 194 (QLineEdit) | |
| 195 </dd> | |
| 196 </dl><a NAME="DiffDialog.on_buttonBox_clicked" ID="DiffDialog.on_buttonBox_clicked"></a> | 176 </dl><a NAME="DiffDialog.on_buttonBox_clicked" ID="DiffDialog.on_buttonBox_clicked"></a> |
| 197 <h4>DiffDialog.on_buttonBox_clicked</h4> | 177 <h4>DiffDialog.on_buttonBox_clicked</h4> |
| 198 <b>on_buttonBox_clicked</b>(<i>button</i>) | 178 <b>on_buttonBox_clicked</b>(<i>button</i>) |
| 199 <p> | 179 <p> |
| 200 Private slot called by a button of the button box clicked. | 180 Private slot called by a button of the button box clicked. |
| 206 </dl><a NAME="DiffDialog.on_diffButton_clicked" ID="DiffDialog.on_diffButton_clicked"></a> | 186 </dl><a NAME="DiffDialog.on_diffButton_clicked" ID="DiffDialog.on_diffButton_clicked"></a> |
| 207 <h4>DiffDialog.on_diffButton_clicked</h4> | 187 <h4>DiffDialog.on_diffButton_clicked</h4> |
| 208 <b>on_diffButton_clicked</b>(<i></i>) | 188 <b>on_diffButton_clicked</b>(<i></i>) |
| 209 <p> | 189 <p> |
| 210 Private slot to handle the Compare button press. | 190 Private slot to handle the Compare button press. |
| 211 </p><a NAME="DiffDialog.on_file1Button_clicked" ID="DiffDialog.on_file1Button_clicked"></a> | |
| 212 <h4>DiffDialog.on_file1Button_clicked</h4> | |
| 213 <b>on_file1Button_clicked</b>(<i></i>) | |
| 214 <p> | |
| 215 Private slot to handle the file 1 file selection button press. | |
| 216 </p><a NAME="DiffDialog.on_file2Button_clicked" ID="DiffDialog.on_file2Button_clicked"></a> | |
| 217 <h4>DiffDialog.on_file2Button_clicked</h4> | |
| 218 <b>on_file2Button_clicked</b>(<i></i>) | |
| 219 <p> | |
| 220 Private slot to handle the file 2 file selection button press. | |
| 221 </p><a NAME="DiffDialog.on_saveButton_clicked" ID="DiffDialog.on_saveButton_clicked"></a> | 191 </p><a NAME="DiffDialog.on_saveButton_clicked" ID="DiffDialog.on_saveButton_clicked"></a> |
| 222 <h4>DiffDialog.on_saveButton_clicked</h4> | 192 <h4>DiffDialog.on_saveButton_clicked</h4> |
| 223 <b>on_saveButton_clicked</b>(<i></i>) | 193 <b>on_saveButton_clicked</b>(<i></i>) |
| 224 <p> | 194 <p> |
| 225 Private slot to handle the Save button press. | 195 Private slot to handle the Save button press. |
