From d5164ae724e0bbd4e32682c57644451b5b48669c Mon Sep 17 00:00:00 2001
From: Olesya Smirnova <Olesya.Smirnova@jetbrains.com>
Date: Wed, 23 Feb 2005 18:10:33 +0300
Subject: [PATCH] http://www.jetbrains.net/jira/browse/IDEADEV-115 fixed

---
 .../config/ui/CvsConfigurationPanel.form      | 110 +++++++++---------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/plugins/cvs2/source/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form b/plugins/cvs2/source/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form
index 1b7081df5c98..ef8d11b936e4 100644
--- a/plugins/cvs2/source/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form
+++ b/plugins/cvs2/source/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form
@@ -11,20 +11,20 @@
     <children>
       <hspacer id="b26a4">
         <constraints>
-          <xy x="556" y="289" width="43" height="11"/>
+          <xy x="570" y="274" width="29" height="11"/>
           <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1"/>
         </constraints>
       </hspacer>
       <vspacer id="573da">
         <constraints>
-          <xy x="272" y="473" width="11" height="101"/>
+          <xy x="279" y="453" width="11" height="121"/>
           <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2"/>
         </constraints>
       </vspacer>
       <grid id="a9d61" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <xy x="0" y="449" width="556" height="24"/>
+          <xy x="0" y="428" width="570" height="25"/>
           <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
         </constraints>
         <properties/>
@@ -32,7 +32,7 @@
         <children>
           <component id="bfbd0" class="javax.swing.JButton" binding="myConfigureGlobalButton">
             <constraints>
-              <xy x="439" y="0" width="117" height="24"/>
+              <xy x="451" y="0" width="119" height="25"/>
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1"/>
             </constraints>
             <properties>
@@ -41,24 +41,24 @@
           </component>
           <hspacer id="5ef92">
             <constraints>
-              <xy x="0" y="6" width="439" height="11"/>
+              <xy x="0" y="7" width="451" height="11"/>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1"/>
             </constraints>
           </hspacer>
         </children>
       </grid>
       <grid id="9d089" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">
-        <margin top="0" left="0" bottom="0" right="0"/>
+        <margin top="0" left="2" bottom="0" right="0"/>
         <constraints>
-          <xy x="0" y="235" width="556" height="120"/>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
+          <xy x="0" y="220" width="570" height="120"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3"/>
         </constraints>
         <properties/>
         <border type="etched" title="Files Creation/Deletion"/>
         <children>
           <component id="61a1a" class="javax.swing.JLabel">
             <constraints>
-              <xy x="271" y="23" width="162" height="14"/>
+              <xy x="279" y="23" width="166" height="14"/>
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>
             </constraints>
             <properties>
@@ -67,37 +67,37 @@
           </component>
           <component id="94821" class="javax.swing.JRadioButton" binding="myShowDialogOnRemovingFile">
             <constraints>
-              <xy x="271" y="40" width="218" height="30"/>
+              <xy x="279" y="40" width="218" height="30"/>
               <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
-              <margin top="10" left="2" bottom="2" right="2"/>
               <text value="Show options before removing from CVS"/>
+              <margin top="10" left="2" bottom="2" right="2"/>
             </properties>
           </component>
           <component id="8d230" class="javax.swing.JRadioButton" binding="myPerformActionOnRemovingFile">
             <constraints>
-              <xy x="271" y="70" width="147" height="22"/>
+              <xy x="279" y="70" width="147" height="22"/>
               <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
-              <margin top="2" left="2" bottom="2" right="2"/>
               <text value="Remove from CVS silently"/>
+              <margin top="2" left="2" bottom="2" right="2"/>
             </properties>
           </component>
           <component id="ffa2b" class="javax.swing.JRadioButton" binding="myDoNothingOnRemovingFile">
             <constraints>
-              <xy x="271" y="92" width="143" height="22"/>
+              <xy x="279" y="92" width="143" height="22"/>
               <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
-              <margin top="2" left="2" bottom="2" right="2"/>
               <text value="Do not remove from CVS"/>
+              <margin top="2" left="2" bottom="2" right="2"/>
             </properties>
           </component>
           <component id="c9eaa" class="javax.swing.JLabel">
             <constraints>
-              <xy x="6" y="23" width="163" height="14"/>
+              <xy x="8" y="23" width="167" height="14"/>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>
             </constraints>
             <properties>
@@ -106,17 +106,17 @@
           </component>
           <component id="9bc97" class="javax.swing.JRadioButton" binding="myShowDialogOnAddingFile">
             <constraints>
-              <xy x="6" y="40" width="194" height="30"/>
+              <xy x="8" y="40" width="194" height="30"/>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
-              <margin top="10" left="2" bottom="2" right="2"/>
               <text value="Show options before adding to CVS"/>
+              <margin top="10" left="2" bottom="2" right="2"/>
             </properties>
           </component>
           <component id="f0112" class="javax.swing.JRadioButton" binding="myPerformActionOnAddingFile">
             <constraints>
-              <xy x="6" y="70" width="115" height="22"/>
+              <xy x="8" y="70" width="117" height="22"/>
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
@@ -125,7 +125,7 @@
           </component>
           <component id="f6275" class="javax.swing.JRadioButton" binding="myDoNothingOnAddingFile">
             <constraints>
-              <xy x="6" y="92" width="116" height="22"/>
+              <xy x="8" y="92" width="118" height="22"/>
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
@@ -134,18 +134,18 @@
           </component>
         </children>
       </grid>
-      <grid id="2ac61" 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"/>
+      <grid id="2ac61" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">
+        <margin top="0" left="2" bottom="0" right="0"/>
         <constraints>
-          <xy x="0" y="103" width="556" height="127"/>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
+          <xy x="0" y="103" width="570" height="112"/>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1"/>
         </constraints>
         <properties/>
         <border type="etched" title="Updating"/>
         <children>
           <component id="6f65e" class="javax.swing.JLabel">
             <constraints>
-              <xy x="6" y="23" width="250" height="14"/>
+              <xy x="8" y="23" width="254" height="14"/>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>
             </constraints>
             <properties>
@@ -154,7 +154,7 @@
           </component>
           <component id="1a661" class="javax.swing.JRadioButton" binding="myShowDialogOnMergedWithConflict">
             <constraints>
-              <xy x="6" y="45" width="82" height="22"/>
+              <xy x="8" y="40" width="84" height="22"/>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
@@ -163,7 +163,7 @@
           </component>
           <component id="26cb9" class="javax.swing.JRadioButton" binding="mySkipOnMergedWithConflict">
             <constraints>
-              <xy x="6" y="72" width="328" height="22"/>
+              <xy x="8" y="62" width="330" height="22"/>
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
@@ -172,7 +172,7 @@
           </component>
           <component id="57343" class="javax.swing.JRadioButton" binding="myGetLatestVersionOnMergedWithConflict">
             <constraints>
-              <xy x="6" y="99" width="203" height="22"/>
+              <xy x="8" y="84" width="205" height="22"/>
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
@@ -184,7 +184,7 @@
       <grid id="28102" row-count="1" 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="0" y="0" width="556" height="98"/>
+          <xy x="0" y="0" width="570" height="98"/>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
         </constraints>
         <properties/>
@@ -193,7 +193,7 @@
           <grid id="89718" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">
             <margin top="0" left="2" bottom="0" right="0"/>
             <constraints>
-              <xy x="6" y="20" width="544" height="72"/>
+              <xy x="6" y="20" width="558" height="72"/>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
             </constraints>
             <properties/>
@@ -201,19 +201,19 @@
             <children>
               <component id="1b52c" class="javax.swing.JCheckBox" binding="myShowAdd">
                 <constraints>
-                  <xy x="2" y="20" width="44" height="30"/>
+                  <xy x="2" y="20" width="43" height="30"/>
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
                 </constraints>
                 <properties>
+                  <text value="Add"/>
                   <focusable value="false"/>
                   <label value="Add"/>
                   <margin top="10" left="2" bottom="2" right="2"/>
-                  <text value="Add"/>
                 </properties>
               </component>
               <component id="4288c" class="javax.swing.JLabel">
                 <constraints>
-                  <xy x="2" y="3" width="278" height="14"/>
+                  <xy x="2" y="3" width="282" height="14"/>
                   <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>
                 </constraints>
                 <properties>
@@ -222,99 +222,99 @@
               </component>
               <component id="aaaa1" class="javax.swing.JCheckBox" binding="myShowUpdate">
                 <constraints>
-                  <xy x="420" y="20" width="60" height="30"/>
+                  <xy x="431" y="20" width="59" height="30"/>
                   <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
                 </constraints>
                 <properties>
+                  <text value="Update"/>
                   <focusable value="false"/>
                   <label value="Update"/>
                   <margin top="10" left="2" bottom="2" right="2"/>
-                  <text value="Update"/>
                 </properties>
               </component>
               <component id="fd74a" class="javax.swing.JCheckBox" binding="myShowEdit">
                 <constraints>
-                  <xy x="208" y="20" width="43" height="30"/>
+                  <xy x="214" y="20" width="42" height="30"/>
                   <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
                 </constraints>
                 <properties>
+                  <text value="Edit"/>
                   <label value="Edit"/>
                   <margin top="10" left="2" bottom="2" right="2"/>
-                  <text value="Edit"/>
                 </properties>
               </component>
               <component id="47b54" class="javax.swing.JCheckBox" binding="myShowRemove">
                 <constraints>
-                  <xy x="2" y="50" width="64" height="22"/>
+                  <xy x="2" y="50" width="63" height="22"/>
                   <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
                 </constraints>
                 <properties>
-                  <enabled value="true"/>
+                  <text value="Remove"/>
                   <focusPainted value="true"/>
                   <focusable value="false"/>
+                  <enabled value="true"/>
                   <label value="Remove"/>
                   <margin top="2" left="2" bottom="2" right="2"/>
-                  <text value="Remove"/>
                 </properties>
               </component>
               <component id="61dd1" class="javax.swing.JCheckBox" binding="myShowCheckout">
                 <constraints>
-                  <xy x="208" y="50" width="70" height="22"/>
+                  <xy x="214" y="50" width="69" height="22"/>
                   <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
                 </constraints>
                 <properties>
+                  <text value="Check Out"/>
                   <focusable value="true"/>
                   <margin top="2" left="2" bottom="2" right="2"/>
-                  <text value="Checkout"/>
                 </properties>
               </component>
               <component id="bd056" class="javax.swing.JCheckBox" binding="myShowCommit">
                 <constraints>
-                  <xy x="420" y="50" width="60" height="22"/>
+                  <xy x="431" y="50" width="59" height="22"/>
                   <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
                 </constraints>
                 <properties>
-                  <margin top="2" left="2" bottom="2" right="2"/>
                   <text value="Commit"/>
+                  <margin top="2" left="2" bottom="2" right="2"/>
                 </properties>
               </component>
             </children>
           </grid>
         </children>
       </grid>
-      <grid id="d6fd" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="d6fd" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <xy x="0" y="360" width="556" height="84"/>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
+          <xy x="0" y="345" width="570" height="78"/>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3"/>
         </constraints>
         <properties/>
-        <border type="etched" title="Other settings:"/>
+        <border type="etched" title="Other Settings:"/>
         <children>
           <component id="94646" class="javax.swing.JCheckBox" binding="myMakeNewFilesReadOnly">
             <constraints>
-              <xy x="6" y="20" width="204" height="22"/>
+              <xy x="6" y="20" width="205" height="22"/>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
-              <label value="Use read-only flag for not edited files"/>
               <text value="Use read-only flag for not edited files"/>
+              <label value="Use read-only flag for not edited files"/>
             </properties>
           </component>
           <component id="d52c8" class="javax.swing.JCheckBox" binding="myShowOutput">
             <constraints>
-              <xy x="6" y="48" width="142" height="30"/>
+              <xy x="6" y="42" width="141" height="30"/>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
             </constraints>
             <properties>
-              <margin top="2" left="2" bottom="10" right="2"/>
               <text value="Show CVS server output"/>
+              <margin top="2" left="2" bottom="10" right="2"/>
             </properties>
           </component>
           <grid id="e2f6f" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
-              <xy x="220" y="20" width="330" height="23"/>
+              <xy x="226" y="20" width="338" height="22"/>
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="2" fill="1"/>
             </constraints>
             <properties/>
@@ -322,7 +322,7 @@
             <children>
               <component id="5962c" class="javax.swing.JComboBox" binding="myDefaultTextFileKeywordSubstitution">
                 <constraints>
-                  <xy x="210" y="0" width="120" height="23"/>
+                  <xy x="214" y="0" width="124" height="22"/>
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1">
                     <preferred-size width="120" height="-1"/>
                   </grid>
@@ -331,7 +331,7 @@
               </component>
               <component id="3a155" class="javax.swing.JLabel">
                 <constraints>
-                  <xy x="0" y="4" width="200" height="14"/>
+                  <xy x="0" y="4" width="204" height="14"/>
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>
                 </constraints>
                 <properties>