blob: 951dab5e6f7dc7ead888f2927ebd520b6047cd5c [file] [log] [blame]
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.openapi.vcs.changes.conflicts.ChangelistConflictDialog">
<grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="441" height="400"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="2f133" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="etched"/>
<children>
<component id="e62df" class="javax.swing.JRadioButton" binding="myShelveChangesRadioButton" default-binding="true">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<selected value="true"/>
<text value="&amp;Shelve changes"/>
</properties>
</component>
<component id="592c9" class="javax.swing.JRadioButton" binding="myMoveChangesToActiveRadioButton" default-binding="true">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="move.to.changelist"/>
</properties>
</component>
<component id="16741" class="javax.swing.JRadioButton" binding="myIgnoreRadioButton" default-binding="true">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="&amp;Ignore"/>
</properties>
</component>
<component id="25953" class="javax.swing.JRadioButton" binding="mySwitchToChangelistRadioButton" default-binding="true">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/VcsBundle" key="switch.to.changelist"/>
</properties>
</component>
</children>
</grid>
<component id="dbd63" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="&lt;html&gt;These files do not belong to active changelist:&lt;/html&gt;"/>
</properties>
</component>
<scrollpane class="com.intellij.ui.components.JBScrollPane" id="6c540">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="3aa3b" class="com.intellij.ui.components.JBList" binding="myFileList">
<constraints/>
<properties/>
</component>
</children>
</scrollpane>
</children>
</grid>
<buttonGroups>
<group name="resolution">
<member id="592c9"/>
<member id="e62df"/>
<member id="25953"/>
<member id="16741"/>
</group>
</buttonGroups>
</form>