Warning, /sdk/kdesvn/src/settings/diffmergesettings.ui is written in an unsupported language. File is not indexed.
0001 <?xml version="1.0" encoding="UTF-8"?> 0002 <ui version="4.0"> 0003 <class>DiffMergeSettings</class> 0004 <widget class="QWidget" name="DiffMergeSettings"> 0005 <layout class="QGridLayout" name="gridLayout_2"> 0006 <item row="0" column="0"> 0007 <layout class="QGridLayout" name="gridLayout"> 0008 <item row="0" column="0"> 0009 <widget class="QCheckBox" name="kcfg_diff_ignore_content"> 0010 <property name="text"> 0011 <string>Diff ignores content type</string> 0012 </property> 0013 </widget> 0014 </item> 0015 <item row="1" column="0"> 0016 <widget class="QCheckBox" name="kcfg_tree_diff_rec"> 0017 <property name="text"> 0018 <string>Diff in revision tree is recursive</string> 0019 </property> 0020 </widget> 0021 </item> 0022 <item row="2" column="0"> 0023 <widget class="QCheckBox" name="kcfg_diff_ignore_spaces"> 0024 <property name="text"> 0025 <string>Diff ignores white space changes</string> 0026 </property> 0027 </widget> 0028 </item> 0029 <item row="3" column="0"> 0030 <widget class="QCheckBox" name="kcfg_diff_ignore_all_white_spaces"> 0031 <property name="text"> 0032 <string>Diff ignores all white spaces</string> 0033 </property> 0034 </widget> 0035 </item> 0036 <item row="4" column="0"> 0037 <widget class="QCheckBox" name="kcfg_use_external_diff"> 0038 <property name="toolTip"> 0039 <string>If kdesvn should use an external diff display and/or generator. If not checked use internal display.</string> 0040 </property> 0041 <property name="text"> 0042 <string>Use external diff display</string> 0043 </property> 0044 </widget> 0045 </item> 0046 <item row="5" column="0"> 0047 <widget class="QCheckBox" name="kcfg_extern_merge_default"> 0048 <property name="toolTip"> 0049 <string>Set if merge with external program is preferred and not Subversion's merge</string> 0050 </property> 0051 <property name="text"> 0052 <string>Prefer external merge program</string> 0053 </property> 0054 </widget> 0055 </item> 0056 <item row="6" column="0"> 0057 <widget class="QCheckBox" name="kcfg_diff_gitformat_default"> 0058 <property name="text"> 0059 <string>Use Git diff format</string> 0060 </property> 0061 </widget> 0062 </item> 0063 <item row="7" column="0"> 0064 <widget class="QCheckBox" name="kcfg_diff_copies_as_add"> 0065 <property name="text"> 0066 <string>Show copies as add</string> 0067 </property> 0068 </widget> 0069 </item> 0070 <item row="8" column="0"> 0071 <layout class="QGridLayout"> 0072 <item row="1" column="0"> 0073 <layout class="QGridLayout"> 0074 <item row="2" column="0"> 0075 <widget class="QLabel" name="resolveLabel"> 0076 <property name="text"> 0077 <string>Conflict resolver program:</string> 0078 </property> 0079 <property name="alignment"> 0080 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> 0081 </property> 0082 <property name="wordWrap"> 0083 <bool>false</bool> 0084 </property> 0085 </widget> 0086 </item> 0087 <item row="1" column="0"> 0088 <widget class="QLabel" name="textLabel1"> 0089 <property name="text"> 0090 <string>External merge program:</string> 0091 </property> 0092 <property name="alignment"> 0093 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> 0094 </property> 0095 <property name="wordWrap"> 0096 <bool>false</bool> 0097 </property> 0098 </widget> 0099 </item> 0100 <item row="2" column="1"> 0101 <widget class="KLineEdit" name="kcfg_conflict_resolver"> 0102 <property name="minimumSize"> 0103 <size> 0104 <width>200</width> 0105 <height>0</height> 0106 </size> 0107 </property> 0108 <property name="maximumSize"> 0109 <size> 0110 <width>500</width> 0111 <height>16777215</height> 0112 </size> 0113 </property> 0114 <property name="toolTip"> 0115 <string>Setup an external program for conflict resolving</string> 0116 </property> 0117 <property name="whatsThis"> 0118 <string><p> 0119 Enter how kdesvn should call the conflict resolver program. The form is 0120 <p align="center"> 0121 <b><tt>&lt;program&gt; &lt;programoptions&gt;</tt></b> 0122 </p> 0123 <p> 0124 Programoption may contain the place holders for substituting with filenames. 0125 </p> 0126 The substitutions means:<br> 0127 <b><tt>%o</tt></b> Old version<br> 0128 <b><tt>%m</tt></b> Mine or local edit version<br> 0129 <b><tt>%n</tt></b> Newest version<br> 0130 <b><tt>%t</tt></b> The target to save as, kdesvn will use the original file name for it. 0131 </p> 0132 <p> 0133 Default: <tt>kdiff3 %o %m %n -o %t</tt> 0134 </p></string> 0135 </property> 0136 </widget> 0137 </item> 0138 <item row="0" column="0"> 0139 <widget class="QLabel" name="mdiff_display_label"> 0140 <property name="text"> 0141 <string>External diff display:</string> 0142 </property> 0143 <property name="alignment"> 0144 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> 0145 </property> 0146 <property name="wordWrap"> 0147 <bool>false</bool> 0148 </property> 0149 </widget> 0150 </item> 0151 <item row="1" column="1"> 0152 <widget class="KLineEdit" name="kcfg_external_merge_program"> 0153 <property name="toolTip"> 0154 <string>Setup an external program for merging</string> 0155 </property> 0156 <property name="whatsThis"> 0157 <string><p> 0158 Enter how kdesvn should call the external merge program. The form is 0159 <p align="center"> 0160 <b><tt>&lt;program&gt; &lt;programoptions&gt; %s1 %s2 %t</tt></b> 0161 </p> 0162 The substitutions means:<br> 0163 <b><tt>%s1</tt></b> Source one for merge<br> 0164 <b><tt>%s2</tt></b> Source two for merge, if it was not set equal to source one but other revision<br> 0165 <b><tt>%t</tt></b> Local target for merge. 0166 </p></string> 0167 </property> 0168 </widget> 0169 </item> 0170 <item row="0" column="1"> 0171 <widget class="KLineEdit" name="kcfg_external_diff_display"> 0172 <property name="whatsThis"> 0173 <string><p align="left"> 0174 Enter an external program in form 0175 <p align="center"> 0176 <tt>&lt;program&gt; &lt;param&gt; %f</tt> 0177 </p> 0178 or 0179 <p align="center"> 0180 <tt>&lt;program&gt; &lt;param&gt;</tt> 0181 </p> 0182 or 0183 <p align="center"> 0184 <tt>&lt;program&gt; &lt;param&gt; %s1 %s2</tt> 0185 </p> 0186 <br> 0187 If one between the first or the second form is used, svn itself generates the diff. %f will be replaced with a temporary filename. If %f is not given, 0188 the diff-display should be able to read data from stdin. 0189 <br> 0190 When %s1 and %s2 are given, kdesvn lets this display make the diff. For that it makes a temporary export or get (if needed) and fills out the parameters with the right values. %s1 will be filled with the content of the initial revision, %s2 with the final revision. On large recursive diffs this may get really slow. 0191 </p></string> 0192 </property> 0193 </widget> 0194 </item> 0195 </layout> 0196 </item> 0197 <item row="0" column="0"> 0198 <widget class="QLabel" name="m_extern_hint"> 0199 <property name="text"> 0200 <string>see "What's this" for details</string> 0201 </property> 0202 <property name="alignment"> 0203 <set>Qt::AlignCenter</set> 0204 </property> 0205 <property name="wordWrap"> 0206 <bool>true</bool> 0207 </property> 0208 </widget> 0209 </item> 0210 </layout> 0211 </item> 0212 </layout> 0213 </item> 0214 <item row="0" column="1"> 0215 <spacer name="horizontalSpacer"> 0216 <property name="orientation"> 0217 <enum>Qt::Horizontal</enum> 0218 </property> 0219 <property name="sizeHint" stdset="0"> 0220 <size> 0221 <width>40</width> 0222 <height>20</height> 0223 </size> 0224 </property> 0225 </spacer> 0226 </item> 0227 <item row="1" column="0"> 0228 <spacer name="spacer"> 0229 <property name="orientation"> 0230 <enum>Qt::Vertical</enum> 0231 </property> 0232 <property name="sizeType"> 0233 <enum>QSizePolicy::Expanding</enum> 0234 </property> 0235 <property name="sizeHint" stdset="0"> 0236 <size> 0237 <width>20</width> 0238 <height>0</height> 0239 </size> 0240 </property> 0241 </spacer> 0242 </item> 0243 </layout> 0244 </widget> 0245 <layoutdefault spacing="6" margin="11"/> 0246 <customwidgets> 0247 <customwidget> 0248 <class>KLineEdit</class> 0249 <extends>QLineEdit</extends> 0250 <header>klineedit.h</header> 0251 </customwidget> 0252 </customwidgets> 0253 <tabstops> 0254 <tabstop>kcfg_diff_ignore_content</tabstop> 0255 <tabstop>kcfg_tree_diff_rec</tabstop> 0256 <tabstop>kcfg_diff_ignore_spaces</tabstop> 0257 <tabstop>kcfg_diff_ignore_all_white_spaces</tabstop> 0258 <tabstop>kcfg_use_external_diff</tabstop> 0259 <tabstop>kcfg_extern_merge_default</tabstop> 0260 <tabstop>kcfg_diff_gitformat_default</tabstop> 0261 <tabstop>kcfg_diff_copies_as_add</tabstop> 0262 <tabstop>kcfg_external_diff_display</tabstop> 0263 <tabstop>kcfg_external_merge_program</tabstop> 0264 <tabstop>kcfg_conflict_resolver</tabstop> 0265 </tabstops> 0266 <includes> 0267 <include location="local">klineedit.h</include> 0268 <include location="local">klineedit.h</include> 0269 <include location="local">klineedit.h</include> 0270 </includes> 0271 <resources/> 0272 <connections> 0273 <connection> 0274 <sender>kcfg_use_external_diff</sender> 0275 <signal>toggled(bool)</signal> 0276 <receiver>DiffMergeSettings</receiver> 0277 <slot>diffDispChanged(bool)</slot> 0278 <hints> 0279 <hint type="sourcelabel"> 0280 <x>20</x> 0281 <y>20</y> 0282 </hint> 0283 <hint type="destinationlabel"> 0284 <x>20</x> 0285 <y>20</y> 0286 </hint> 0287 </hints> 0288 </connection> 0289 </connections> 0290 </ui>