MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

some ui improvements in svn4ideaOld

Browse Source
This commit is contained in:
Evgeny Zakrevsky
2012-01-23 20:38:10 +04:00
parent 47d08bf370
commit 0daa5cc79c
6 changed files with 103 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/SvnBundle.properties
+1 -1
View File
@@ -402,7 +402,7 @@ integrate.configuration.source1.label=Source 1:
integrate.configuration.description.label=Integrate differences between sources into working copy (compare Source 2 to Source 1)
source.url.could.not.be.empty.error.message=Source url could not be empty
no.differences.between.sources.error.message=There are no differences between source and the same source
configure.revision.specified.radio=Specified
configure.revision.specified.radio=Specified\:
configure.revision.head.radio=HEAD
update.configuration.specific.url=Update/Switch to specific &url:
progress.text.import=Importing {0}
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/browser/CheckoutOptionsDialog.form
+16 -31
View File
@@ -2,14 +2,15 @@
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.svn.dialogs.browser.CheckoutOptionsDialog">
<grid id="c0dc8" binding="myTopPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<xy x="10" y="10" width="437" height="149"/>
<xy x="10" y="10" width="532" height="175"/>
</constraints>
<properties/>
<border type="none">
<size top="8" left="8" bottom="8" right="8"/>
</border>
<children>
<grid id="a4d4a" layout-manager="GridBagLayout">
<grid id="a4d4a" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
@@ -17,25 +18,14 @@
<component id="ae8b2" 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"/>
<gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="checkout.options.checkout.label"/>
</properties>
</component>
<component id="ce44e" class="javax.swing.JLabel" binding="myUrlLabel">
<constraints>
<grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
<gridbag top="2" left="2" bottom="2" right="2" weightx="1.0" weighty="0.0"/>
</constraints>
<properties>
<font style="1"/>
</properties>
</component>
<component id="1f691" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="checkout.options.destination.label"/>
@@ -43,38 +33,27 @@
</component>
<component id="a1fdf" class="javax.swing.JCheckBox" binding="myExternalsCheckbox">
<constraints>
<grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
<grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<selected value="true"/>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="checkout.options.externals.label"/>
</properties>
</component>
<component id="c374f" class="javax.swing.JSeparator">
<constraints>
<grid row="5" column="0" row-span="1" col-span="3" vsize-policy="6" hsize-policy="6" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
<gridbag top="2" left="2" bottom="2" right="2" weightx="1.0" weighty="1.0"/>
</constraints>
<properties/>
</component>
<nested-form id="20d59" form-file="org/jetbrains/idea/svn/revision/SvnSelectRevisionPanel.form" binding="svnSelectRevisionPanel">
<constraints>
<grid row="2" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
<grid row="2" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</nested-form>
<component id="13941" class="org.jetbrains.idea.svn.DepthCombo" binding="myDepthCombo" custom-create="true">
<constraints>
<grid row="3" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="63e0b" class="javax.swing.JLabel" binding="myDepthLabel">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag top="2" left="2" bottom="2" right="2" weightx="0.0" weighty="0.0"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="label.depth.text"/>
@@ -83,8 +62,7 @@
</component>
<scrollpane id="cd7a3" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
<grid row="1" column="1" 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"/>
@@ -99,11 +77,18 @@
</scrollpane>
<component id="2c58d" class="com.intellij.openapi.ui.FixedSizeButton" binding="mySelectTarget" custom-create="true">
<constraints>
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="14fbe" class="javax.swing.JLabel" binding="myUrlLabel">
<constraints>
<grid row="0" column="1" 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="Label"/>
</properties>
</component>
</children>
</grid>
</children>
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/revision/SvnSelectRevisionPanel.form
+3 -3
View File
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.svn.revision.SvnSelectRevisionPanel">
<grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" 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="20" y="20" width="321" height="30"/>
<xy x="20" y="20" width="528" height="36"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<nested-form id="c7b37" form-file="org/jetbrains/idea/svn/update/SvnRevisionPanel.form" binding="mySvnRevisionPanel" default-binding="true">
<constraints>
<grid row="0" column="1" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
</nested-form>
<component id="5afef" class="javax.swing.JLabel">
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/update/SvnRevisionPanel.form
+1 -1
View File
@@ -3,7 +3,7 @@
<grid id="d1b7e" binding="myPanel" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="29" y="29" width="342" height="26"/>
<xy x="29" y="29" width="347" height="32"/>
</constraints>
<properties/>
<border type="none"/>
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/update/SvnUpdatePanel.form
+7 -7
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.svn.update.SvnUpdatePanel">
<grid id="56dff" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="56dff" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" 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="19" y="24" width="434" height="132"/>
@@ -10,13 +10,13 @@
<children>
<vspacer id="d36da">
<constraints>
<grid row="4" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<xy id="9013a" binding="myConfigureRootsPanel" layout-manager="XYLayout" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -24,13 +24,13 @@
</xy>
<component id="3f0c3" class="org.jetbrains.idea.svn.DepthCombo" binding="myDepthCombo" custom-create="true">
<constraints>
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="e151" class="javax.swing.JLabel" binding="myDepthLabel">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="label.depth.text"/>
@@ -39,7 +39,7 @@
</component>
<component id="1abb2" class="javax.swing.JCheckBox" binding="myForceBox">
<constraints>
<grid row="2" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="&amp;Force update"/>
@@ -47,7 +47,7 @@
</component>
<component id="e86c1" class="javax.swing.JCheckBox" binding="myLockOnDemand" custom-create="true">
<constraints>
<grid row="3" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="action.Subversion.update.use.locks.on.demand.text"/>
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.form
+75 -55
View File
@@ -3,12 +3,12 @@
<grid id="f589c" binding="myPanel" layout-manager="GridLayoutManager" row-count="2" 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="29" y="50" width="455" height="152"/>
<xy x="29" y="50" width="455" height="195"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="3b3aa" layout-manager="GridLayoutManager" row-count="5" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="3b3aa" 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="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -16,72 +16,92 @@
<properties/>
<border type="none"/>
<children>
<component id="a1f16" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myURLText">
<constraints>
<grid row="2" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="b284f" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myBranchField">
<constraints>
<grid row="1" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="ac746" class="javax.swing.JCheckBox" binding="myRevisionBox">
<constraints>
<grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="checkbox.update.switch.configurable.to.specific.revision"/>
</properties>
</component>
<component id="9dc1a" class="javax.swing.JCheckBox" binding="myUpdateToSpecificUrl">
<constraints>
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<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>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="update.configuration.specific.url"/>
</properties>
</component>
<hspacer id="39492">
<component id="228a0" class="javax.swing.JLabel" binding="myCopyType">
<constraints>
<grid row="3" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<component id="ef5e7" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myRevisionText">
<constraints>
<grid row="3" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
<minimum-size width="100" height="-1"/>
<preferred-size width="100" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
<component id="badcd" class="javax.swing.JLabel" binding="myUrlLabel">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Url:" noi18n="true"/>
</properties>
</component>
<component id="bb7fe" class="javax.swing.JLabel" binding="myBranchLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="update.switch.to.branch.text"/>
</properties>
</component>
<component id="3e3c3" class="javax.swing.JLabel" binding="myCopyType">
<constraints>
<grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text value=""/>
</properties>
</component>
<grid id="86d86" layout-manager="GridLayoutManager" row-count="2" 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>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="a1f16" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myURLText">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="b284f" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myBranchField">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="badcd" class="javax.swing.JLabel" binding="myUrlLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text value="URL:" noi18n="true"/>
</properties>
</component>
<component id="bb7fe" class="javax.swing.JLabel" binding="myBranchLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="update.switch.to.branch.text"/>
</properties>
</component>
</children>
</grid>
<grid id="1ebd1" layout-manager="GridLayoutManager" row-count="1" column-count="3" 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="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="ac746" class="javax.swing.JCheckBox" binding="myRevisionBox">
<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>
<text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="checkbox.update.switch.configurable.to.specific.revision"/>
</properties>
</component>
<hspacer id="39492">
<constraints>
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<component id="ef5e7" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myRevisionText">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false">
<minimum-size width="100" height="-1"/>
<preferred-size width="100" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
</children>
</grid>
</children>
</grid>
<vspacer id="120cd">