Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
- changeset 17
- edde1fe80b3e
- child 21
- b88a0e6268bd
equal
deleted
inserted
replaced
| 16:892c1787d666 | 17:edde1fe80b3e |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | |
| 2 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' | |
| 3 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> | |
| 4 <html><head> | |
| 5 <title>eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog</title> | |
| 6 <style> | |
| 7 b'body {\n background:white;\n margin: 0em 1em 10em 1em;\n color: black;\n}\n\nh1 { color: white; background: #4FA4FF; }\nh2 { color: white; background: #4FA4FF; }\nh3 { color: white; background: #00557F; }\nh4 { color: white; background: #00557F; }\n \na { color: #AA5500; }\n' | |
| 8 </style> | |
| 9 </head> | |
| 10 <body><a NAME="top" ID="top"></a> | |
| 11 <h1>eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog</h1> | |
| 12 <p> | |
| 13 Module implementing a dialog to enter the data for a merge operation. | |
| 14 </p> | |
| 15 <h3>Global Attributes</h3> | |
| 16 <table> | |
| 17 <tr><td>None</td></tr> | |
| 18 </table> | |
| 19 <h3>Classes</h3> | |
| 20 <table> | |
| 21 <tr> | |
| 22 <td><a href="#SvnMergeDialog">SvnMergeDialog</a></td> | |
| 23 <td>Class implementing a dialog to enter the data for a merge operation.</td> | |
| 24 </tr> | |
| 25 </table> | |
| 26 <h3>Functions</h3> | |
| 27 <table> | |
| 28 <tr><td>None</td></tr> | |
| 29 </table> | |
| 30 <hr /><hr /> | |
| 31 <a NAME="SvnMergeDialog" ID="SvnMergeDialog"></a> | |
| 32 <h2>SvnMergeDialog</h2> | |
| 33 <p> | |
| 34 Class implementing a dialog to enter the data for a merge operation. | |
| 35 </p> | |
| 36 <h3>Derived from</h3> | |
| 37 QDialog, Ui_SvnMergeDialog | |
| 38 <h3>Class Attributes</h3> | |
| 39 <table> | |
| 40 <tr><td>None</td></tr> | |
| 41 </table> | |
| 42 <h3>Methods</h3> | |
| 43 <table> | |
| 44 <tr> | |
| 45 <td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td> | |
| 46 <td>Constructor</td> | |
| 47 </tr><tr> | |
| 48 <td><a href="#SvnMergeDialog.__enableOkButton">__enableOkButton</a></td> | |
| 49 <td>Private method used to enable/disable the OK-button.</td> | |
| 50 </tr><tr> | |
| 51 <td><a href="#SvnMergeDialog.getParameters">getParameters</a></td> | |
| 52 <td>Public method to retrieve the tag data.</td> | |
| 53 </tr><tr> | |
| 54 <td><a href="#SvnMergeDialog.on_tag1Combo_editTextChanged">on_tag1Combo_editTextChanged</a></td> | |
| 55 <td>Private slot to handle the tag1Combo editTextChanged signal.</td> | |
| 56 </tr><tr> | |
| 57 <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> | |
| 58 <td>Private slot to handle the tag2Combo editTextChanged signal.</td> | |
| 59 </tr> | |
| 60 </table> | |
| 61 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> | |
| 62 <h4>SvnMergeDialog (Constructor)</h4> | |
| 63 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force = False, parent = None</i>) | |
| 64 <p> | |
| 65 Constructor | |
| 66 </p><dl> | |
| 67 <dt><i>mergelist1</i></dt> | |
| 68 <dd> | |
| 69 list of previously entered URLs/revisions (list of strings) | |
| 70 </dd><dt><i>mergelist2</i></dt> | |
| 71 <dd> | |
| 72 list of previously entered URLs/revisions (list of strings) | |
| 73 </dd><dt><i>targetlist</i></dt> | |
| 74 <dd> | |
| 75 list of previously entered targets (list of strings) | |
| 76 </dd><dt><i>force</i></dt> | |
| 77 <dd> | |
| 78 flag indicating a forced merge (boolean) | |
| 79 </dd><dt><i>parent</i></dt> | |
| 80 <dd> | |
| 81 parent widget (QWidget) | |
| 82 </dd> | |
| 83 </dl><a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> | |
| 84 <h4>SvnMergeDialog.__enableOkButton</h4> | |
| 85 <b>__enableOkButton</b>(<i></i>) | |
| 86 <p> | |
| 87 Private method used to enable/disable the OK-button. | |
| 88 </p><dl> | |
| 89 <dt><i>text</i></dt> | |
| 90 <dd> | |
| 91 ignored | |
| 92 </dd> | |
| 93 </dl><a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a> | |
| 94 <h4>SvnMergeDialog.getParameters</h4> | |
| 95 <b>getParameters</b>(<i></i>) | |
| 96 <p> | |
| 97 Public method to retrieve the tag data. | |
| 98 </p><dl> | |
| 99 <dt>Returns:</dt> | |
| 100 <dd> | |
| 101 tuple naming two tag names or two revisions, a target and | |
| 102 a flag indicating a forced merge (string, string, string, boolean) | |
| 103 </dd> | |
| 104 </dl><a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> | |
| 105 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4> | |
| 106 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>) | |
| 107 <p> | |
| 108 Private slot to handle the tag1Combo editTextChanged signal. | |
| 109 </p><a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> | |
| 110 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4> | |
| 111 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>) | |
| 112 <p> | |
| 113 Private slot to handle the tag2Combo editTextChanged signal. | |
| 114 </p> | |
| 115 <div align="right"><a href="#top">Up</a></div> | |
| 116 <hr /> | |
| 117 </body></html> |
