changelist conflict dialog refactored
[fedora-idea.git] / platform / vcs-impl / src / com / intellij / openapi / vcs / changes / conflicts / ChangelistConflictDialog.form
blob7627f71451d56ec77c3d832738b9c0eed8bbf834
1 <?xml version="1.0" encoding="UTF-8"?>
2 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.openapi.vcs.changes.conflicts.ChangelistConflictDialog">
3 <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">
4 <margin top="0" left="0" bottom="0" right="0"/>
5 <constraints>
6 <xy x="20" y="20" width="441" height="400"/>
7 </constraints>
8 <properties/>
9 <border type="none"/>
10 <children>
11 <grid id="2f133" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
12 <margin top="0" left="0" bottom="0" right="0"/>
13 <constraints>
14 <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"/>
15 </constraints>
16 <properties/>
17 <border type="etched"/>
18 <children>
19 <component id="e62df" class="javax.swing.JRadioButton" binding="myShelveChangesRadioButton" default-binding="true">
20 <constraints>
21 <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"/>
22 </constraints>
23 <properties>
24 <selected value="true"/>
25 <text value="&amp;Shelve changes"/>
26 </properties>
27 </component>
28 <component id="592c9" class="javax.swing.JRadioButton" binding="myMoveChangesToActiveRadioButton" default-binding="true">
29 <constraints>
30 <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"/>
31 </constraints>
32 <properties>
33 <text resource-bundle="messages/VcsBundle" key="move.to.changelist"/>
34 </properties>
35 </component>
36 <component id="16741" class="javax.swing.JRadioButton" binding="myIgnoreRadioButton" default-binding="true">
37 <constraints>
38 <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"/>
39 </constraints>
40 <properties>
41 <text value="&amp;Ignore"/>
42 </properties>
43 </component>
44 <component id="25953" class="javax.swing.JRadioButton" binding="mySwitchToChangelistRadioButton" default-binding="true">
45 <constraints>
46 <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"/>
47 </constraints>
48 <properties>
49 <text resource-bundle="messages/VcsBundle" key="switch.to.changelist"/>
50 </properties>
51 </component>
52 </children>
53 </grid>
54 <component id="dbd63" class="javax.swing.JLabel">
55 <constraints>
56 <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"/>
57 </constraints>
58 <properties>
59 <text value="&lt;html&gt;These files do not belong to active changelist:&lt;/html&gt;"/>
60 </properties>
61 </component>
62 <scrollpane id="6c540">
63 <constraints>
64 <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"/>
65 </constraints>
66 <properties/>
67 <border type="none"/>
68 <children>
69 <component id="3aa3b" class="javax.swing.JList" binding="myFileList">
70 <constraints/>
71 <properties/>
72 </component>
73 </children>
74 </scrollpane>
75 </children>
76 </grid>
77 <buttonGroups>
78 <group name="resolution">
79 <member id="592c9"/>
80 <member id="e62df"/>
81 <member id="25953"/>
82 <member id="16741"/>
83 </group>
84 </buttonGroups>
85 </form>