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

fix git forms

Browse Source 
GitOrigin-RevId: d3c96a85bb7934f095a6c811d5a45798aa6f47b6
This commit is contained in:
Sergey Ignatov
2020-01-08 21:34:39 +00:00
committed by intellij-monorepo-bot
parent 5b4fa2a13a
commit 7ff9fbcddf
6 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitMergeDialog.form
+7 -7
View File
@@ -22,7 +22,7 @@
<grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="common.git.root.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="common.git.root.tooltip"/>
</properties>
</component>
<component id="80a58" class="javax.swing.JLabel">
@@ -55,7 +55,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="merge.no.commit"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="merge.no.commit.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="merge.no.commit.tooltip"/>
</properties>
</component>
<component id="bc48b" class="javax.swing.JCheckBox" binding="myNoFastForwardCheckBox" default-binding="true">
@@ -64,7 +64,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="merge.no.fast.forward"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="merge.no.fast.forward.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="merge.no.fast.forward.tooltip"/>
</properties>
</component>
<component id="de8fb" class="javax.swing.JCheckBox" binding="mySquashCommitCheckBox" default-binding="true">
@@ -73,7 +73,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="merge.squash.commit"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="merge.squash.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="merge.squash.tooltip"/>
</properties>
</component>
<hspacer id="5babc">
@@ -87,7 +87,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="merge.add.log.information"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="merge.add.log.information.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="merge.add.log.information.tooltip"/>
</properties>
</component>
</children>
@@ -98,7 +98,7 @@
</constraints>
<properties>
<text value=""/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="common.current.branch.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="common.current.branch.tooltip"/>
</properties>
</component>
<grid id="6a98a" binding="myBranchToMergeContainer" layout-manager="GridBagLayout">
@@ -135,7 +135,7 @@
</grid>
</constraints>
<properties>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="merge.commit.message.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="merge.commit.message.tooltip"/>
</properties>
</component>
<component id="3bcd7" class="javax.swing.JComboBox" binding="myStrategy">
plugins/git4idea/src/git4idea/merge/GitPullDialog.form
+8 -8
View File
@@ -39,7 +39,7 @@
</constraints>
<properties>
<text value=" "/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="common.current.branch.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="common.current.branch.tooltip"/>
</properties>
</component>
<component id="90684" class="javax.swing.JLabel">
@@ -78,7 +78,7 @@
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="merge.strategy.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="merge.strategy.tooltip"/>
</properties>
</component>
<grid id="f2617" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -95,7 +95,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="merge.no.commit"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="merge.no.commit.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="merge.no.commit.tooltip"/>
</properties>
</component>
<component id="1b781" class="javax.swing.JCheckBox" binding="mySquashCommitCheckBox" default-binding="true">
@@ -104,7 +104,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="merge.squash.commit"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="merge.squash.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="merge.squash.tooltip"/>
</properties>
</component>
<component id="57f47" class="javax.swing.JCheckBox" binding="myNoFastForwardCheckBox" default-binding="true">
@@ -113,7 +113,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="merge.no.fast.forward"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="merge.no.fast.forward.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="merge.no.fast.forward.tooltip"/>
</properties>
</component>
<component id="97b6f" class="javax.swing.JCheckBox" binding="myAddLogInformationCheckBox" default-binding="true">
@@ -122,7 +122,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="merge.add.log.information"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="merge.add.log.information.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="merge.add.log.information.tooltip"/>
</properties>
</component>
<hspacer id="3d16e">
@@ -146,7 +146,7 @@
</constraints>
<properties>
<editable value="false"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="pull.remote.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="pull.remote.tooltip"/>
</properties>
</component>
<component id="c7c6b" class="javax.swing.JButton" binding="myGetBranchesButton" default-binding="true">
@@ -155,7 +155,7 @@
</constraints>
<properties>
<text value=""/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="pull.get.branches.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="pull.get.branches.tooltip"/>
</properties>
</component>
</children>
plugins/git4idea/src/git4idea/rebase/GitRebaseDialog.form
+8 -8
View File
@@ -27,7 +27,7 @@
<grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="common.git.root.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="common.git.root.tooltip"/>
</properties>
</component>
<component id="141cd" class="javax.swing.JLabel">
@@ -62,7 +62,7 @@
</constraints>
<properties>
<editable value="true"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="rebase.onto.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="rebase.onto.tooltip"/>
</properties>
</component>
<component id="ddd04" class="javax.swing.JButton" binding="myOntoValidateButton">
@@ -71,7 +71,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="rebase.onto.validate"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="rebase.valdate.onto.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="rebase.valdate.onto.tooltip"/>
</properties>
</component>
<component id="4aaae" class="javax.swing.JLabel">
@@ -89,7 +89,7 @@
</constraints>
<properties>
<editable value="true"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="rebase.from.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="rebase.from.tooltip"/>
</properties>
</component>
<component id="775c4" class="javax.swing.JButton" binding="myFromValidateButton">
@@ -98,7 +98,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="rebase.validate.from"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="rebase.validate.from.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="rebase.validate.from.tooltip"/>
</properties>
</component>
<grid id="63e88" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -121,7 +121,7 @@
<properties>
<selected value="false"/>
<text resource-bundle="messages/GitBundle" key="rebase.preserve.merges"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="rebase.preserve.merges.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="rebase.preserve.merges.tooltip"/>
</properties>
</component>
<component id="281fe" class="javax.swing.JCheckBox" binding="myInteractiveCheckBox" default-binding="true">
@@ -132,7 +132,7 @@
<enabled value="true"/>
<selected value="true"/>
<text resource-bundle="messages/GitBundle" key="rebase.interactive"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="rebase.interactive.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="rebase.interactive.tooltip"/>
</properties>
</component>
</children>
@@ -151,7 +151,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="regase.show.tags"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="rebase.show.tags.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="rebase.show.tags.tooltip"/>
</properties>
</component>
<hspacer id="b158">
plugins/git4idea/src/git4idea/ui/GitStashDialog.form
+3 -3
View File
@@ -27,7 +27,7 @@
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="common.git.root.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="common.git.root.tooltip"/>
</properties>
</component>
<component id="29f64" class="javax.swing.JLabel">
@@ -63,7 +63,7 @@
</grid>
</constraints>
<properties>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="stash.message.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="stash.message.tooltip"/>
</properties>
</component>
<component id="be5c8" class="javax.swing.JCheckBox" binding="myKeepIndexCheckBox" default-binding="true">
@@ -72,7 +72,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="stash.keep.index"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="stash.keep.index.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="stash.keep.index.tooltip"/>
</properties>
</component>
</children>
plugins/git4idea/src/git4idea/ui/GitTagDialog.form
+6 -6
View File
@@ -22,7 +22,7 @@
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="common.git.root.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="common.git.root.tooltip"/>
</properties>
</component>
<component id="698b5" class="javax.swing.JLabel">
@@ -39,7 +39,7 @@
</constraints>
<properties>
<text value=""/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="common.current.branch.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="common.current.branch.tooltip"/>
</properties>
</component>
<component id="37f27" class="javax.swing.JLabel">
@@ -82,7 +82,7 @@
<constraints/>
<properties>
<rows value="4"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="tag.message.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="tag.message.tooltip"/>
</properties>
</component>
</children>
@@ -103,7 +103,7 @@
<properties>
<enabled value="false"/>
<text resource-bundle="messages/GitBundle" key="tag.force"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="tag.force.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="tag.force.tooltip"/>
</properties>
</component>
<grid id="76386" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -121,7 +121,7 @@
</grid>
</constraints>
<properties>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="tag.commit.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="tag.commit.tooltip"/>
</properties>
</component>
<component id="7e7bc" class="javax.swing.JButton" binding="myValidateButton" default-binding="true">
@@ -130,7 +130,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="tag.validate"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="tag.validate.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="tag.validate.tooltip"/>
</properties>
</component>
</children>
plugins/git4idea/src/git4idea/ui/GitUnstashDialog.form
+7 -7
View File
@@ -22,7 +22,7 @@
<grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="common.git.root.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="common.git.root.tooltip"/>
</properties>
</component>
<component id="e28bb" class="javax.swing.JLabel">
@@ -39,7 +39,7 @@
</constraints>
<properties>
<text value=" "/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="common.current.branch.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="common.current.branch.tooltip"/>
</properties>
</component>
<component id="98b09" class="javax.swing.JLabel">
@@ -79,7 +79,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="unstash.drop"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="unstash.drop.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="unstash.drop.tooltip"/>
</properties>
</component>
<component id="13ded" class="javax.swing.JButton" binding="myClearButton" default-binding="true">
@@ -88,7 +88,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="unstash.clear"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="unstash.clear.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="unstash.clear.tooltip"/>
</properties>
</component>
</children>
@@ -109,7 +109,7 @@
</grid>
</constraints>
<properties>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="unstash.branch.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="unstash.branch.tooltip"/>
</properties>
</component>
<scrollpane class="com.intellij.ui.components.JBScrollPane" id="d9f56">
@@ -141,7 +141,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="unstash.pop.stash"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="unstash.pop.stash.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="unstash.pop.stash.tooltip"/>
</properties>
</component>
<component id="d6650" class="javax.swing.JCheckBox" binding="myReinstateIndexCheckBox" default-binding="true">
@@ -150,7 +150,7 @@
</constraints>
<properties>
<text resource-bundle="messages/GitBundle" key="unstash.reinstate.index"/>
<toolTipText resource-bundle="git4idea/messages/GitBundle" key="unstash.reinstate.index.tooltip"/>
<toolTipText resource-bundle="messages/GitBundle" key="unstash.reinstate.index.tooltip"/>
</properties>
</component>
<hspacer id="4b946">