Commit 7d12ee92 authored by Darwin's avatar Darwin
Browse files

fix form

parent dc2418fa
......@@ -240,20 +240,12 @@
<Component id="portLabel" linkSize="7" min="-2" max="-2" attributes="0"/>
<Component id="ipaddressLabel" linkSize="7" min="-2" max="-2" attributes="0"/>
</Group>
<<<<<<< HEAD
<EmptySpace pref="163" max="32767" attributes="0"/>
=======
<EmptySpace pref="155" max="32767" attributes="0"/>
>>>>>>> bc4556fff5c99bc4b898c7dd8720e7cf066d81a5
<Group type="103" groupAlignment="0" attributes="0">
<Component id="ipaddressTextField" linkSize="6" alignment="1" min="-2" pref="151" max="-2" attributes="0"/>
<Component id="portTextField" linkSize="6" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
<<<<<<< HEAD
<EmptySpace pref="315" max="32767" attributes="0"/>
=======
<EmptySpace pref="299" max="32767" attributes="0"/>
>>>>>>> bc4556fff5c99bc4b898c7dd8720e7cf066d81a5
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
......@@ -458,11 +450,7 @@
</Group>
</Group>
</Group>
<<<<<<< HEAD
<EmptySpace min="278" pref="389" max="32767" attributes="0"/>
=======
<EmptySpace min="278" pref="365" max="32767" attributes="0"/>
>>>>>>> bc4556fff5c99bc4b898c7dd8720e7cf066d81a5
</Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
......@@ -534,11 +522,7 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<<<<<<< HEAD
<EmptySpace pref="97" max="32767" attributes="0"/>
=======
<EmptySpace pref="61" max="32767" attributes="0"/>
>>>>>>> bc4556fff5c99bc4b898c7dd8720e7cf066d81a5
<Component id="playerPanel" min="-2" pref="550" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="descriptionPanel" min="-2" max="-2" attributes="0"/>
......@@ -774,11 +758,7 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="Level2Panel" min="-2" max="-2" attributes="0"/>
<<<<<<< HEAD
<EmptySpace pref="337" max="32767" attributes="0"/>
=======
<EmptySpace pref="313" max="32767" attributes="0"/>
>>>>>>> bc4556fff5c99bc4b898c7dd8720e7cf066d81a5
<Component id="Level4Panel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="47" max="-2" attributes="0"/>
</Group>
......@@ -1040,7 +1020,6 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<<<<<<< HEAD
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="201" max="-2" attributes="0"/>
<Component id="Item1" min="-2" max="-2" attributes="0"/>
......@@ -1055,9 +1034,6 @@
<Component id="ItemPanel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="117" max="-2" attributes="0"/>
</Group>
=======
<EmptySpace min="0" pref="884" max="32767" attributes="0"/>
>>>>>>> bc4556fff5c99bc4b898c7dd8720e7cf066d81a5
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
......@@ -1314,15 +1290,11 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<<<<<<< HEAD
<EmptySpace min="0" pref="908" max="32767" attributes="0"/>
=======
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="19" max="-2" attributes="0"/>
<Component id="tradeboxScrollPane" min="-2" pref="847" max="-2" attributes="0"/>
<EmptySpace pref="18" max="32767" attributes="0"/>
</Group>
>>>>>>> bc4556fff5c99bc4b898c7dd8720e7cf066d81a5
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
......@@ -1352,7 +1324,6 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<<<<<<< HEAD
<Group type="102" alignment="0" attributes="0">
<Component id="ItemPanel1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="146" max="32767" attributes="0"/>
......@@ -1383,9 +1354,6 @@
</Group>
</Group>
</Group>
=======
<EmptySpace min="0" pref="884" max="32767" attributes="0"/>
>>>>>>> bc4556fff5c99bc4b898c7dd8720e7cf066d81a5
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
......@@ -1671,7 +1639,6 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<<<<<<< HEAD
<Group type="102" alignment="0" attributes="0">
<Component id="FindItem" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="146" max="32767" attributes="0"/>
......@@ -1683,9 +1650,6 @@
<Component id="Find" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="192" max="-2" attributes="0"/>
</Group>
=======
<EmptySpace min="0" pref="884" max="32767" attributes="0"/>
>>>>>>> bc4556fff5c99bc4b898c7dd8720e7cf066d81a5
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
......@@ -1927,11 +1891,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<<<<<<< HEAD
<EmptySpace min="0" pref="908" max="32767" attributes="0"/>
=======
<EmptySpace min="0" pref="884" max="32767" attributes="0"/>
>>>>>>> bc4556fff5c99bc4b898c7dd8720e7cf066d81a5
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment