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