Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.ui
src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.ui
- branch
- eric7
- changeset 9209
- b99e7fd55fd3
- parent 8312
- 800c432b34c8
equal
deleted
inserted
replaced
| 9208:3fc8dfeb6ebe | 9209:b99e7fd55fd3 |
|---|---|
| 1 <ui version="4.0" > | |
| 2 <class>SvnMergeDialog</class> | |
| 3 <widget class="QDialog" name="SvnMergeDialog" > | |
| 4 <property name="geometry" > | |
| 5 <rect> | |
| 6 <x>0</x> | |
| 7 <y>0</y> | |
| 8 <width>456</width> | |
| 9 <height>152</height> | |
| 10 </rect> | |
| 11 </property> | |
| 12 <property name="windowTitle" > | |
| 13 <string>Subversion Merge</string> | |
| 14 </property> | |
| 15 <property name="sizeGripEnabled" > | |
| 16 <bool>true</bool> | |
| 17 </property> | |
| 18 <layout class="QGridLayout" > | |
| 19 <item row="3" column="0" colspan="2" > | |
| 20 <widget class="QCheckBox" name="forceCheckBox" > | |
| 21 <property name="toolTip" > | |
| 22 <string>Select to force the merge operation</string> | |
| 23 </property> | |
| 24 <property name="text" > | |
| 25 <string>Enforce merge</string> | |
| 26 </property> | |
| 27 </widget> | |
| 28 </item> | |
| 29 <item row="4" column="0" colspan="2" > | |
| 30 <widget class="QDialogButtonBox" name="buttonBox" > | |
| 31 <property name="orientation" > | |
| 32 <enum>Qt::Horizontal</enum> | |
| 33 </property> | |
| 34 <property name="standardButtons" > | |
| 35 <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> | |
| 36 </property> | |
| 37 </widget> | |
| 38 </item> | |
| 39 <item row="2" column="0" > | |
| 40 <widget class="QLabel" name="textLabel1" > | |
| 41 <property name="text" > | |
| 42 <string>Target:</string> | |
| 43 </property> | |
| 44 </widget> | |
| 45 </item> | |
| 46 <item row="2" column="1" > | |
| 47 <widget class="QComboBox" name="targetCombo" > | |
| 48 <property name="toolTip" > | |
| 49 <string>Enter the target</string> | |
| 50 </property> | |
| 51 <property name="whatsThis" > | |
| 52 <string><b>Target</b> | |
| 53 <p>Enter the target for the merge operation into this field. Leave it empty to | |
| 54 get the target URL from the working copy.</p> | |
| 55 <p><b>Note:</b> This entry is only needed, if you enter revision numbers above.</p></string> | |
| 56 </property> | |
| 57 <property name="editable" > | |
| 58 <bool>true</bool> | |
| 59 </property> | |
| 60 <property name="insertPolicy" > | |
| 61 <enum>QComboBox::InsertAtTop</enum> | |
| 62 </property> | |
| 63 <property name="duplicatesEnabled" > | |
| 64 <bool>false</bool> | |
| 65 </property> | |
| 66 </widget> | |
| 67 </item> | |
| 68 <item row="0" column="0" > | |
| 69 <widget class="QLabel" name="TextLabel1" > | |
| 70 <property name="text" > | |
| 71 <string>1. URL/Revision:</string> | |
| 72 </property> | |
| 73 </widget> | |
| 74 </item> | |
| 75 <item row="1" column="1" > | |
| 76 <widget class="QComboBox" name="tag2Combo" > | |
| 77 <property name="sizePolicy" > | |
| 78 <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > | |
| 79 <horstretch>0</horstretch> | |
| 80 <verstretch>0</verstretch> | |
| 81 </sizepolicy> | |
| 82 </property> | |
| 83 <property name="toolTip" > | |
| 84 <string>Enter an URL or a revision number</string> | |
| 85 </property> | |
| 86 <property name="whatsThis" > | |
| 87 <string><b>URL/Revision</b> | |
| 88 <p>Enter an URL or a revision number to be merged into | |
| 89 the working copy.</p></string> | |
| 90 </property> | |
| 91 <property name="editable" > | |
| 92 <bool>true</bool> | |
| 93 </property> | |
| 94 <property name="duplicatesEnabled" > | |
| 95 <bool>false</bool> | |
| 96 </property> | |
| 97 </widget> | |
| 98 </item> | |
| 99 <item row="0" column="1" > | |
| 100 <widget class="QComboBox" name="tag1Combo" > | |
| 101 <property name="sizePolicy" > | |
| 102 <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > | |
| 103 <horstretch>0</horstretch> | |
| 104 <verstretch>0</verstretch> | |
| 105 </sizepolicy> | |
| 106 </property> | |
| 107 <property name="toolTip" > | |
| 108 <string>Enter an URL or a revision number</string> | |
| 109 </property> | |
| 110 <property name="whatsThis" > | |
| 111 <string><b>URL/Revision</b> | |
| 112 <p>Enter an URL or a revision number to be merged into | |
| 113 the working copy.</p></string> | |
| 114 </property> | |
| 115 <property name="editable" > | |
| 116 <bool>true</bool> | |
| 117 </property> | |
| 118 <property name="duplicatesEnabled" > | |
| 119 <bool>false</bool> | |
| 120 </property> | |
| 121 </widget> | |
| 122 </item> | |
| 123 <item row="1" column="0" > | |
| 124 <widget class="QLabel" name="TextLabel1_2" > | |
| 125 <property name="text" > | |
| 126 <string>2. URL/Revision:</string> | |
| 127 </property> | |
| 128 </widget> | |
| 129 </item> | |
| 130 </layout> | |
| 131 </widget> | |
| 132 <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> | |
| 133 <tabstops> | |
| 134 <tabstop>tag1Combo</tabstop> | |
| 135 <tabstop>tag2Combo</tabstop> | |
| 136 <tabstop>targetCombo</tabstop> | |
| 137 <tabstop>forceCheckBox</tabstop> | |
| 138 <tabstop>buttonBox</tabstop> | |
| 139 </tabstops> | |
| 140 <resources/> | |
| 141 <connections> | |
| 142 <connection> | |
| 143 <sender>buttonBox</sender> | |
| 144 <signal>accepted()</signal> | |
| 145 <receiver>SvnMergeDialog</receiver> | |
| 146 <slot>accept()</slot> | |
| 147 <hints> | |
| 148 <hint type="sourcelabel" > | |
| 149 <x>35</x> | |
| 150 <y>101</y> | |
| 151 </hint> | |
| 152 <hint type="destinationlabel" > | |
| 153 <x>34</x> | |
| 154 <y>126</y> | |
| 155 </hint> | |
| 156 </hints> | |
| 157 </connection> | |
| 158 <connection> | |
| 159 <sender>buttonBox</sender> | |
| 160 <signal>rejected()</signal> | |
| 161 <receiver>SvnMergeDialog</receiver> | |
| 162 <slot>reject()</slot> | |
| 163 <hints> | |
| 164 <hint type="sourcelabel" > | |
| 165 <x>105</x> | |
| 166 <y>107</y> | |
| 167 </hint> | |
| 168 <hint type="destinationlabel" > | |
| 169 <x>105</x> | |
| 170 <y>126</y> | |
| 171 </hint> | |
| 172 </hints> | |
| 173 </connection> | |
| 174 </connections> | |
| 175 </ui> |
