Skip to content

Commit 5f0592b

Browse files
AutismSupermanAutismSuperman
committed
feature: 完成模版设置重置按钮
1 parent 2b23e96 commit 5f0592b

File tree

7 files changed

+67
-30
lines changed

7 files changed

+67
-30
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ intellij {
3434
downloadSources = true
3535
updateSinceUntilBuild = false
3636
buildSearchableOptions.enabled = false
37-
plugins=["com.intellij.zh:203.392"]
37+
//plugins=["com.intellij.zh:203.392"]
3838
//plugins=["com.intellij.ja:203.392"]
3939

4040
runIde {

‎src/main/java/com/fulinlin/ui/central/CentralSettingPanel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public CentralSettingPanel(GitCommitMessageHelperSettings settings) {
5252
typeDiskPlayStyleLabel.setText(PluginBundle.get("setting.central.type.style"));
5353
typeDisplayNumberLabel.setText(PluginBundle.get("setting.central.type.number"));
5454
typeDisplayNumberSpinner.setToolTipText(PluginBundle.get("setting.central.type.number.tooltip"));
55-
typeCheckboxRadioButton.setText(PluginBundle.get("setting.central.type.dropdown.button"));
56-
typeRadioRadioButton.setText(PluginBundle.get("setting.central.type.selection.button"));
55+
typeCheckboxRadioButton.setText(PluginBundle.get("setting.central.type.combobox.button"));
56+
typeRadioRadioButton.setText(PluginBundle.get("setting.central.type.radio.button"));
5757
typeMixingRadioButton.setText(PluginBundle.get("setting.central.type.mixing.button"));
5858
// Init skip ci option
5959
skipCiDefaultValueLabel.setText(PluginBundle.get("setting.central.skip.ci.enable.default"));

‎src/main/java/com/fulinlin/ui/setting/TemplateEditPanel.form‎

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.fulinlin.ui.setting.TemplateEditPanel">
3-
<grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
3+
<grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
44
<margin top="0" left="0" bottom="0" right="0"/>
55
<constraints>
66
<xy x="19" y="36" width="1827" height="642"/>
@@ -39,9 +39,7 @@
3939
</grid>
4040
<tabbedpane id="a4674" binding="tabbedPane">
4141
<constraints>
42-
<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">
43-
<preferred-size width="200" height="200"/>
44-
</grid>
42+
<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"/>
4543
</constraints>
4644
<properties/>
4745
<border type="none"/>
@@ -67,13 +65,13 @@
6765
<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"/>
6866
</constraints>
6967
<properties>
70-
<text value="Description"/>
68+
<text value="Description:"/>
7169
</properties>
7270
</component>
7371
<grid id="b1e1e" binding="descriptionPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
7472
<constraints>
7573
<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">
76-
<preferred-size width="-1" height="200"/>
74+
<preferred-size width="380" height="200"/>
7775
</grid>
7876
</constraints>
7977
<properties/>
@@ -82,7 +80,7 @@
8280
</grid>
8381
</children>
8482
</grid>
85-
<grid id="3ea34" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
83+
<grid id="3ea34" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
8684
<margin top="0" left="0" bottom="0" right="0"/>
8785
<constraints>
8886
<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"/>
@@ -95,19 +93,42 @@
9593
<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"/>
9694
</constraints>
9795
<properties>
98-
<text value="Setting commit template"/>
96+
<text value="Setting commit template:"/>
9997
</properties>
10098
</component>
10199
<grid id="ccd4b" binding="templatePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
102100
<constraints>
103-
<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">
104-
<preferred-size width="-1" height="200"/>
101+
<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">
102+
<preferred-size width="380" height="200"/>
105103
</grid>
106104
</constraints>
107105
<properties/>
108106
<border type="none"/>
109107
<children/>
110108
</grid>
109+
<grid id="aa24" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
110+
<margin top="0" left="0" bottom="0" right="0"/>
111+
<constraints>
112+
<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"/>
113+
</constraints>
114+
<properties/>
115+
<border type="none"/>
116+
<children>
117+
<component id="69fd8" class="javax.swing.JButton" binding="restoreDefaultsButton">
118+
<constraints>
119+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
120+
</constraints>
121+
<properties>
122+
<text value="Restore defaults"/>
123+
</properties>
124+
</component>
125+
<hspacer id="8dfc6">
126+
<constraints>
127+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
128+
</constraints>
129+
</hspacer>
130+
</children>
131+
</grid>
111132
</children>
112133
</grid>
113134
<grid id="85cba" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -123,13 +144,13 @@
123144
<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"/>
124145
</constraints>
125146
<properties>
126-
<text value="Preview"/>
147+
<text value="Preview:"/>
127148
</properties>
128149
</component>
129150
<grid id="f0f48" binding="previewPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
130151
<constraints>
131152
<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">
132-
<preferred-size width="-1" height="200"/>
153+
<preferred-size width="380" height="200"/>
133154
</grid>
134155
</constraints>
135156
<properties/>
@@ -223,6 +244,11 @@
223244
</grid>
224245
</children>
225246
</tabbedpane>
247+
<hspacer id="ad0d4">
248+
<constraints>
249+
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
250+
</constraints>
251+
</hspacer>
226252
</children>
227253
</grid>
228254
</form>

‎src/main/java/com/fulinlin/ui/setting/TemplateEditPanel.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.fulinlin.ui.setting;
22

3+
import com.fulinlin.constant.GitCommitConstants;
34
import com.fulinlin.localization.PluginBundle;
45
import com.fulinlin.model.CommitTemplate;
56
import com.fulinlin.storage.GitCommitMessageHelperSettings;
@@ -49,6 +50,7 @@ public class TemplateEditPanel {
4950
private JCheckBox changesCheckBox;
5051
private JCheckBox closedCheckBox;
5152
private JCheckBox skipCiCheckBox;
53+
private JButton restoreDefaultsButton;
5254

5355

5456
public TemplateEditPanel(GitCommitMessageHelperSettings settings) {
@@ -62,6 +64,7 @@ public TemplateEditPanel(GitCommitMessageHelperSettings settings) {
6264
previewLabel.setText(PluginBundle.get("setting.template.preview"));
6365
tabbedPane.setTitleAt(0, PluginBundle.get("setting.tabbed.panel.template"));
6466
tabbedPane.setTitleAt(1, PluginBundle.get("setting.tabbed.panel.type"));
67+
restoreDefaultsButton.setText(PluginBundle.get("setting.template.restore.defaults"));
6568

6669
// Init descriptionPanel
6770
myDescriptionComponent = new JEditorPane();
@@ -137,6 +140,11 @@ public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
137140
templateEditor.getDocument().setText(template);
138141
myDescriptionComponent.setText(DescriptionRead.readHtmlFile());
139142
});
143+
restoreDefaultsButton.addActionListener(e -> {
144+
ApplicationManager.getApplication().runWriteAction(() -> {
145+
templateEditor.getDocument().setText(GitCommitConstants.DEFAULT_TEMPLATE);
146+
});
147+
});
140148
// Add DoubleClickListener
141149
new DoubleClickListener() {
142150
@Override

‎src/main/resources/i18n/info.properties‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ setting.central.type.panel.title=Type Display Style Option
55
setting.central.type.style=Type Display Style:
66
setting.central.type.number=Type Display Number:
77
setting.central.type.number.tooltip=Set to -1 to display all types
8-
setting.central.type.dropdown.button=Combobox
9-
setting.central.type.selection.button=Radio
8+
setting.central.type.combobox.button=Combobox
9+
setting.central.type.radio.button=Radio
1010
setting.central.type.mixing.button=Mixing
1111
setting.central.skip.ci.panel.title=Skip CI Option
1212
setting.central.skip.ci.enable.default=Default Value:
@@ -16,9 +16,10 @@ setting.central.skip.ci.default.checked.checkbox=Default approve
1616
setting.central.hidden.panel.title=Hidden Option
1717
# setting template panel
1818
setting.description=Personalize your git commit types and templates.
19-
setting.template.description=Description
20-
setting.template.preview=Preview
21-
setting.template.edit=Setting Commit Template
19+
setting.template.description=Description:
20+
setting.template.preview=Preview:
21+
setting.template.edit=Setting Commit Template:
22+
setting.template.restore.defaults=Restore defaults
2223
# setting template panel tabbed
2324
setting.tabbed.panel.type=Type
2425
setting.tabbed.panel.template=Template

‎src/main/resources/i18n/info_en.properties‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ setting.central.type.panel.title=Type Display Style Option
55
setting.central.type.style=Type Display Style:
66
setting.central.type.number=Type Display Number:
77
setting.central.type.number.tooltip=Set to -1 to display all types
8-
setting.central.type.dropdown.button=Combobox
9-
setting.central.type.selection.button=Radio
8+
setting.central.type.combobox.button=Combobox
9+
setting.central.type.radio.button=Radio
1010
setting.central.type.mixing.button=Mixing
1111
setting.central.skip.ci.panel.title=Skip CI Option
1212
setting.central.skip.ci.enable.default=Default Value:
@@ -16,9 +16,10 @@ setting.central.skip.ci.default.checked.checkbox=Default checked
1616
setting.central.hidden.panel.title=Hidden Option
1717
# setting template panel
1818
setting.description=Personalize your git commit types and templates.
19-
setting.template.description=Description
20-
setting.template.preview=Preview
21-
setting.template.edit=Setting Commit Template
19+
setting.template.description=Description:
20+
setting.template.preview=Preview:
21+
setting.template.edit=Setting Commit Template:
22+
setting.template.restore.defaults=Restore defaults
2223
# setting template panel tabbed
2324
setting.tabbed.panel.type=Type
2425
setting.tabbed.panel.template=Template

‎src/main/resources/i18n/info_zh.properties‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ setting.central.type.panel.title=Type 显示样式设置
55
setting.central.type.style=Type显示样式:
66
setting.central.type.number=Type选择模式显示数量:
77
setting.central.type.number.tooltip=设置-1可以显示所有type
8-
setting.central.type.dropdown.button=下拉
9-
setting.central.type.selection.button=选择
8+
setting.central.type.combobox.button=下拉
9+
setting.central.type.radio.button=选择
1010
setting.central.type.mixing.button=混合
1111
setting.central.skip.ci.panel.title=Skip CI 设置
1212
setting.central.skip.ci.enable.default=默认值:
@@ -16,9 +16,10 @@ setting.central.skip.ci.default.checked.checkbox=默认勾选
1616
setting.central.hidden.panel.title=显示设置
1717
# setting template panel
1818
setting.description=个性化 git 提交类型和模版
19-
setting.template.description=模版说明
20-
setting.template.preview=预览
21-
setting.template.edit=设置 git 提交模版
19+
setting.template.description=模版说明:
20+
setting.template.preview=预览:
21+
setting.template.edit=设置 git 提交模版:
22+
setting.template.restore.defaults=重置为默认
2223
# setting tabbed
2324
setting.tabbed.panel.type=类型
2425
setting.tabbed.panel.template=模版

0 commit comments

Comments
 (0)