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.
276 lines
11 KiB
276 lines
11 KiB
15 years ago
|
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
|
||
|
|
<class>DiffDialogBase</class>
|
||
|
|
<widget class="QDialog">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>DiffDialog</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="geometry">
|
||
|
|
<rect>
|
||
|
|
<x>0</x>
|
||
|
|
<y>0</y>
|
||
|
|
<width>519</width>
|
||
|
|
<height>246</height>
|
||
|
|
</rect>
|
||
|
|
</property>
|
||
|
|
<property name="caption">
|
||
|
|
<string>Choose Revisions to Diff</string>
|
||
|
|
</property>
|
||
|
|
<property name="sizeGripEnabled">
|
||
|
|
<bool>true</bool>
|
||
|
|
</property>
|
||
|
|
<vbox>
|
||
|
|
<property name="name">
|
||
|
|
<cstring>unnamed</cstring>
|
||
|
|
</property>
|
||
|
|
<widget class="QButtonGroup">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>buttonGroup1</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="title">
|
||
|
|
<string>Build Difference Between</string>
|
||
|
|
</property>
|
||
|
|
<grid>
|
||
|
|
<property name="name">
|
||
|
|
<cstring>unnamed</cstring>
|
||
|
|
</property>
|
||
|
|
<widget class="QLayoutWidget" row="2" column="0">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>layout3</cstring>
|
||
|
|
</property>
|
||
|
|
<hbox>
|
||
|
|
<property name="name">
|
||
|
|
<cstring>unnamed</cstring>
|
||
|
|
</property>
|
||
|
|
<widget class="QRadioButton">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>diffLocalOtherRadio</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="text">
|
||
|
|
<string>Local copy and an arbitrary &revision:</string>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
<widget class="KLineEdit">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>revOtherEdit</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="enabled">
|
||
|
|
<bool>false</bool>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
</hbox>
|
||
|
|
</widget>
|
||
|
|
<widget class="QRadioButton" row="3" column="0">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>diffArbitraryRevRadio</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="text">
|
||
|
|
<string>&Two arbitrary revisions/tags:</string>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
<widget class="QLayoutWidget" row="4" column="0">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>layout3</cstring>
|
||
|
|
</property>
|
||
|
|
<grid>
|
||
|
|
<property name="name">
|
||
|
|
<cstring>unnamed</cstring>
|
||
|
|
</property>
|
||
|
|
<widget class="QLabel" row="0" column="0">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>textLabel1</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="sizePolicy">
|
||
|
|
<sizepolicy>
|
||
|
|
<hsizetype>0</hsizetype>
|
||
|
|
<vsizetype>0</vsizetype>
|
||
|
|
<horstretch>0</horstretch>
|
||
|
|
<verstretch>0</verstretch>
|
||
|
|
</sizepolicy>
|
||
|
|
</property>
|
||
|
|
<property name="text">
|
||
|
|
<string>Revision A:</string>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
<widget class="KLineEdit" row="1" column="1">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>revbEdit</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="enabled">
|
||
|
|
<bool>false</bool>
|
||
|
|
</property>
|
||
|
|
<property name="text">
|
||
|
|
<string></string>
|
||
|
|
</property>
|
||
|
|
<property name="toolTip" stdset="0">
|
||
|
|
<string>Second revision to compare (leave empty to diff against HEAD)</string>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
<widget class="KLineEdit" row="1" column="0">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>revaEdit</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="enabled">
|
||
|
|
<bool>false</bool>
|
||
|
|
</property>
|
||
|
|
<property name="toolTip" stdset="0">
|
||
|
|
<string>First revision to compare</string>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
<widget class="QLabel" row="0" column="1">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>textLabel2</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="sizePolicy">
|
||
|
|
<sizepolicy>
|
||
|
|
<hsizetype>0</hsizetype>
|
||
|
|
<vsizetype>0</vsizetype>
|
||
|
|
<horstretch>0</horstretch>
|
||
|
|
<verstretch>0</verstretch>
|
||
|
|
</sizepolicy>
|
||
|
|
</property>
|
||
|
|
<property name="text">
|
||
|
|
<string>Revision B:</string>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
</grid>
|
||
|
|
</widget>
|
||
|
|
<widget class="QRadioButton" row="1" column="0">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>diffLocalHeadRadio</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="text">
|
||
|
|
<string>Local cop&y and HEAD</string>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
<widget class="QRadioButton" row="0" column="0">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>diffLocalBaseRadio</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="text">
|
||
|
|
<string>Local copy a&nd BASE</string>
|
||
|
|
</property>
|
||
|
|
<property name="checked">
|
||
|
|
<bool>true</bool>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
</grid>
|
||
|
|
</widget>
|
||
|
|
<widget class="Line">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>line1</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="frameShape">
|
||
|
|
<enum>HLine</enum>
|
||
|
|
</property>
|
||
|
|
<property name="frameShadow">
|
||
|
|
<enum>Sunken</enum>
|
||
|
|
</property>
|
||
|
|
<property name="orientation">
|
||
|
|
<enum>Horizontal</enum>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
<widget class="QLayoutWidget">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>layout2</cstring>
|
||
|
|
</property>
|
||
|
|
<hbox>
|
||
|
|
<property name="name">
|
||
|
|
<cstring>unnamed</cstring>
|
||
|
|
</property>
|
||
|
|
<spacer>
|
||
|
|
<property name="name">
|
||
|
|
<cstring>Horizontal Spacing2</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="orientation">
|
||
|
|
<enum>Horizontal</enum>
|
||
|
|
</property>
|
||
|
|
<property name="sizeType">
|
||
|
|
<enum>Expanding</enum>
|
||
|
|
</property>
|
||
|
|
<property name="sizeHint">
|
||
|
|
<size>
|
||
|
|
<width>130</width>
|
||
|
|
<height>20</height>
|
||
|
|
</size>
|
||
|
|
</property>
|
||
|
|
</spacer>
|
||
|
|
<widget class="QPushButton">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>buttonOk</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="text">
|
||
|
|
<string>&OK</string>
|
||
|
|
</property>
|
||
|
|
<property name="accel">
|
||
|
|
<string></string>
|
||
|
|
</property>
|
||
|
|
<property name="autoDefault">
|
||
|
|
<bool>true</bool>
|
||
|
|
</property>
|
||
|
|
<property name="default">
|
||
|
|
<bool>true</bool>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
<widget class="QPushButton">
|
||
|
|
<property name="name">
|
||
|
|
<cstring>buttonCancel</cstring>
|
||
|
|
</property>
|
||
|
|
<property name="text">
|
||
|
|
<string>&Cancel</string>
|
||
|
|
</property>
|
||
|
|
<property name="accel">
|
||
|
|
<string></string>
|
||
|
|
</property>
|
||
|
|
<property name="autoDefault">
|
||
|
|
<bool>true</bool>
|
||
|
|
</property>
|
||
|
|
</widget>
|
||
|
|
</hbox>
|
||
|
|
</widget>
|
||
|
|
</vbox>
|
||
|
|
</widget>
|
||
|
|
<connections>
|
||
|
|
<connection>
|
||
|
|
<sender>buttonOk</sender>
|
||
|
|
<signal>clicked()</signal>
|
||
|
|
<receiver>DiffDialog</receiver>
|
||
|
|
<slot>accept()</slot>
|
||
|
|
</connection>
|
||
|
|
<connection>
|
||
|
|
<sender>buttonCancel</sender>
|
||
|
|
<signal>clicked()</signal>
|
||
|
|
<receiver>DiffDialog</receiver>
|
||
|
|
<slot>reject()</slot>
|
||
|
|
</connection>
|
||
|
|
<connection>
|
||
|
|
<sender>diffArbitraryRevRadio</sender>
|
||
|
|
<signal>toggled(bool)</signal>
|
||
|
|
<receiver>revaEdit</receiver>
|
||
|
|
<slot>setEnabled(bool)</slot>
|
||
|
|
</connection>
|
||
|
|
<connection>
|
||
|
|
<sender>diffArbitraryRevRadio</sender>
|
||
|
|
<signal>toggled(bool)</signal>
|
||
|
|
<receiver>revbEdit</receiver>
|
||
|
|
<slot>setEnabled(bool)</slot>
|
||
|
|
</connection>
|
||
|
|
<connection>
|
||
|
|
<sender>diffLocalOtherRadio</sender>
|
||
|
|
<signal>toggled(bool)</signal>
|
||
|
|
<receiver>revOtherEdit</receiver>
|
||
|
|
<slot>setEnabled(bool)</slot>
|
||
|
|
</connection>
|
||
|
|
</connections>
|
||
|
|
<tabstops>
|
||
|
|
<tabstop>diffLocalBaseRadio</tabstop>
|
||
|
|
<tabstop>diffLocalHeadRadio</tabstop>
|
||
|
|
<tabstop>diffLocalOtherRadio</tabstop>
|
||
|
|
<tabstop>revOtherEdit</tabstop>
|
||
|
|
<tabstop>revaEdit</tabstop>
|
||
|
|
<tabstop>revbEdit</tabstop>
|
||
|
|
<tabstop>buttonOk</tabstop>
|
||
|
|
<tabstop>buttonCancel</tabstop>
|
||
|
|
</tabstops>
|
||
|
|
<layoutdefaults spacing="6" margin="11"/>
|
||
|
|
</UI>
|