TDE
/
tdesvn
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesvn
0
0
Fork 0
Code Issues Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'c001d10c42'
${ noResults }
tdesvn/src/settings/diffmergesettings.ui

250 lines
10 KiB
Raw Blame History

<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>DiffMergeSettings</class>
<widget class="TQWidget">
<property name="name">
<cstring>DiffMergeSettings</cstring>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>260</width>
<height>308</height>
</rect>
</property>
<property name="caption">
<string>DiffMergeSettings</string>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_diff_ignore_content</cstring>
</property>
<property name="text">
<string>Diff ignores content type</string>
</property>
</widget>
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_tree_diff_rec</cstring>
</property>
<property name="text">
<string>Diff in revisiontree is recursive</string>
</property>
</widget>
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_diff_ignore_spaces</cstring>
</property>
<property name="text">
<string>Diff ignores white space changes</string>
</property>
</widget>
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_diff_ignore_all_white_spaces</cstring>
</property>
<property name="text">
<string>Diff ignores all white spaces</string>
</property>
</widget>
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_use_external_diff</cstring>
</property>
<property name="text">
<string>Use external diff display</string>
</property>
<property name="toolTip" stdset="0">
<string>If tdesvn should use an external diff display and/or generator. If not checked use internal display.</string>
</property>
</widget>
<widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_extern_merge_default</cstring>
</property>
<property name="text">
<string>Prefer external merge program</string>
</property>
<property name="toolTip" stdset="0">
<string>Set if merge with external program is prefered and not subversions merge</string>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout2</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_extern_hint</cstring>
</property>
<property name="text">
<string>see "Whats this" for details</string>
</property>
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>layout2</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>resolveLabel</cstring>
</property>
<property name="text">
<string>Conflict resolver program:</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
<widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
<property name="text">
<string>External merge program:</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
<widget class="KLineEdit" row="2" column="1">
<property name="name">
<cstring>kcfg_conflict_resolver</cstring>
</property>
<property name="toolTip" stdset="0">
<string>Setup an external program for conflict resolving</string>
</property>
<property name="whatsThis" stdset="0">
<string>&lt;p&gt;
Enter how tdesvn should call the conflict resolver program. The form is
&lt;p align="center"&gt;
&lt;b&gt;&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;programoptions&amp;gt;&lt;/tt&gt;&lt;/b&gt;
&lt;/p&gt;
&lt;p&gt;
Programoption may contain the place holders for substituting with filenames.
&lt;/p&gt;
The substitutions means:&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%o&lt;/tt&gt;&lt;/b&gt; Old version&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%m&lt;/tt&gt;&lt;/b&gt; Mine or local edit version&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%n&lt;/tt&gt;&lt;/b&gt; Newest version&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%t&lt;/tt&gt;&lt;/b&gt; The target to save as, tdesvn will use the orignal file name for it.
&lt;/p&gt;
&lt;p&gt;
Default: &lt;tt&gt;kdiff3 %o %m %n -o %t&lt;/tt&gt;
&lt;/p&gt;</string>
</property>
</widget>
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>mdiff_display_label</cstring>
</property>
<property name="text">
<string>External diff display:</string>
</property>
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
<widget class="KLineEdit" row="1" column="1">
<property name="name">
<cstring>kcfg_external_merge_program</cstring>
</property>
<property name="toolTip" stdset="0">
<string>Setup an external program for merging</string>
</property>
<property name="whatsThis" stdset="0">
<string>&lt;p&gt;
Enter how tdesvn should call the external merge program. The form is
&lt;p align="center"&gt;
&lt;b&gt;&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;programoptions&amp;gt; %s1 %s2 %t&lt;/tt&gt;&lt;/b&gt;
&lt;/p&gt;
The substitutions means:&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%s1&lt;/tt&gt;&lt;/b&gt; Source one for merge&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%s2&lt;/tt&gt;&lt;/b&gt; Source two for merge, if it was not set equal to source one but other revision&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%t&lt;/tt&gt;&lt;/b&gt; Local target for merge.
&lt;/p&gt;</string>
</property>
</widget>
<widget class="KLineEdit" row="0" column="1">
<property name="name">
<cstring>kcfg_external_diff_display</cstring>
</property>
<property name="whatsThis" stdset="0">
<string>&lt;p align="left"&gt;
Enter an external program in form
&lt;p align="center"&gt;
&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;param&amp;gt; %f&lt;/tt&gt;
&lt;/p&gt;
or
&lt;p align="center"&gt;
&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;param&amp;gt;&lt;/tt&gt;
&lt;/p&gt;
or
&lt;p align="center"&gt;
&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;param&amp;gt; %1 %2&lt;/tt&gt;
&lt;/p&gt;
&lt;br&gt;
If using first or second form, svn itself will generate the diff. %f will replaced with a temporary filename. If %f is not given,
the diff-display should able reading data from stdin.
&lt;br&gt;
When %1 and %2 is given, tdesvn let this display make the diff. For that it it makes a temporary export or get (if needed) and fill out the parameters with the right value. %1 will filled with the content of start-revision, %2 with the endrevision. On large recoursive diffs this may get real slow!
&lt;/p&gt;</string>
</property>
</widget>
</grid>
</widget>
</grid>
</widget>
<spacer>
<property name="name">
<cstring>spacer3</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
</vbox>
</widget>
<customwidgets>
</customwidgets>
<connections>
<connection>
<sender>kcfg_use_external_diff</sender>
<signal>toggled(bool)</signal>
<receiver>DiffMergeSettings</receiver>
<slot>diffDispChanged(bool)</slot>
</connection>
</connections>
<slots>
<slot access="protected">diffDispChanged(bool)</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">klineedit.h</include>
</includes>
</UI>
View Git Blame Copy Permalink