2022-02-20 13:26:15 +08:00
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<ui version="4.0">
|
|
|
|
<class>GitMergeDialog</class>
|
|
|
|
<widget class="QDialog" name="GitMergeDialog">
|
|
|
|
<property name="geometry">
|
|
|
|
<rect>
|
|
|
|
<x>0</x>
|
|
|
|
<y>0</y>
|
|
|
|
<width>597</width>
|
|
|
|
<height>508</height>
|
|
|
|
</rect>
|
|
|
|
</property>
|
|
|
|
<property name="windowTitle">
|
2022-02-20 21:47:57 +08:00
|
|
|
<string>Merge</string>
|
2022-02-20 13:26:15 +08:00
|
|
|
</property>
|
|
|
|
<layout class="QVBoxLayout" name="verticalLayout">
|
|
|
|
<item>
|
|
|
|
<widget class="QGroupBox" name="groupBox">
|
|
|
|
<property name="title">
|
|
|
|
<string>From</string>
|
|
|
|
</property>
|
|
|
|
<layout class="QGridLayout" name="gridLayout">
|
|
|
|
<item row="0" column="0">
|
|
|
|
<widget class="QRadioButton" name="rbBranch">
|
|
|
|
<property name="text">
|
|
|
|
<string>Branch</string>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
<item row="0" column="1">
|
|
|
|
<widget class="QComboBox" name="cbBranch">
|
|
|
|
<property name="sizePolicy">
|
|
|
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
|
|
|
<horstretch>0</horstretch>
|
|
|
|
<verstretch>0</verstretch>
|
|
|
|
</sizepolicy>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
</layout>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
<item>
|
|
|
|
<widget class="QGroupBox" name="grpOptions">
|
|
|
|
<property name="title">
|
|
|
|
<string>Option</string>
|
|
|
|
</property>
|
|
|
|
<layout class="QGridLayout" name="gridLayout_2">
|
|
|
|
<item row="0" column="0">
|
|
|
|
<widget class="QCheckBox" name="chkNoCommit">
|
|
|
|
<property name="text">
|
|
|
|
<string>No Commit</string>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
<item row="0" column="1">
|
|
|
|
<widget class="QCheckBox" name="chkSquash">
|
|
|
|
<property name="text">
|
|
|
|
<string>Squash</string>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
<item row="1" column="0">
|
|
|
|
<widget class="QCheckBox" name="chkNoFastFoward">
|
|
|
|
<property name="text">
|
|
|
|
<string>No Fast Forward</string>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
<item row="1" column="1">
|
|
|
|
<widget class="QCheckBox" name="chkFastForwardOnly">
|
|
|
|
<property name="text">
|
|
|
|
<string>Fast Forward Only</string>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
</layout>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
<item>
|
|
|
|
<widget class="QGroupBox" name="groupBox_3">
|
|
|
|
<property name="title">
|
|
|
|
<string>Merge Message</string>
|
|
|
|
</property>
|
|
|
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
|
|
<item>
|
|
|
|
<widget class="QPlainTextEdit" name="txtMergeMessage"/>
|
|
|
|
</item>
|
|
|
|
</layout>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
<item>
|
|
|
|
<widget class="QFrame" name="frame">
|
|
|
|
<property name="frameShape">
|
|
|
|
<enum>QFrame::StyledPanel</enum>
|
|
|
|
</property>
|
|
|
|
<property name="frameShadow">
|
|
|
|
<enum>QFrame::Raised</enum>
|
|
|
|
</property>
|
|
|
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
|
|
|
<property name="leftMargin">
|
|
|
|
<number>0</number>
|
|
|
|
</property>
|
|
|
|
<property name="topMargin">
|
|
|
|
<number>0</number>
|
|
|
|
</property>
|
|
|
|
<property name="rightMargin">
|
|
|
|
<number>0</number>
|
|
|
|
</property>
|
|
|
|
<property name="bottomMargin">
|
|
|
|
<number>0</number>
|
|
|
|
</property>
|
|
|
|
<item>
|
|
|
|
<spacer name="horizontalSpacer">
|
|
|
|
<property name="orientation">
|
|
|
|
<enum>Qt::Horizontal</enum>
|
|
|
|
</property>
|
|
|
|
<property name="sizeHint" stdset="0">
|
|
|
|
<size>
|
|
|
|
<width>40</width>
|
|
|
|
<height>20</height>
|
|
|
|
</size>
|
|
|
|
</property>
|
|
|
|
</spacer>
|
|
|
|
</item>
|
|
|
|
<item>
|
|
|
|
<widget class="QPushButton" name="btnOk">
|
|
|
|
<property name="text">
|
|
|
|
<string>Ok</string>
|
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
<item>
|
|
|
|
<widget class="QPushButton" name="btnCancel">
|
|
|
|
<property name="text">
|
2022-02-20 21:47:57 +08:00
|
|
|
<string>Cancel</string>
|
2022-02-20 13:26:15 +08:00
|
|
|
</property>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
</layout>
|
|
|
|
</widget>
|
|
|
|
</item>
|
|
|
|
</layout>
|
|
|
|
</widget>
|
|
|
|
<resources/>
|
|
|
|
<connections/>
|
|
|
|
</ui>
|