Skip to content

Commit 0995947

Browse files
AutismSupermanAutismSuperman
committed
feature: 修复样式问题
1 parent 5f0592b commit 0995947

File tree

5 files changed

+72
-64
lines changed

5 files changed

+72
-64
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
<toolTipText value=""/>
6363
</properties>
6464
</component>
65-
<component id="1b0a4" class="javax.swing.JRadioButton" binding="typeCheckboxRadioButton">
65+
<component id="1b0a4" class="javax.swing.JRadioButton" binding="typeComboboxRadioButton">
6666
<constraints>
6767
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
6868
</constraints>
6969
<properties>
70-
<text value="Checkbox"/>
70+
<text value="Combobox"/>
7171
</properties>
7272
</component>
7373
</children>

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

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.intellij.ui.JBIntSpinner;
99

1010
import javax.swing.*;
11+
import java.awt.event.ItemEvent;
1112
import java.util.List;
1213

1314
public class CentralSettingPanel {
@@ -16,7 +17,7 @@ public class CentralSettingPanel {
1617
private JPanel hiddenPanel;
1718
private JPanel typePanel;
1819
private JPanel skipCiPanel;
19-
private JRadioButton typeCheckboxRadioButton;
20+
private JRadioButton typeComboboxRadioButton;
2021
private JRadioButton typeRadioRadioButton;
2122
private JRadioButton typeMixingRadioButton;
2223
private JBIntSpinner typeDisplayNumberSpinner;
@@ -46,13 +47,13 @@ public CentralSettingPanel(GitCommitMessageHelperSettings settings) {
4647
skipCiPanel.setBorder(IdeBorderFactory.createTitledBorder(PluginBundle.get("setting.central.skip.ci.panel.title"), true));
4748
hiddenPanel.setBorder(IdeBorderFactory.createTitledBorder(PluginBundle.get("setting.central.hidden.panel.title"), true));
4849
ButtonGroup buttonGroup = new ButtonGroup();
49-
buttonGroup.add(typeCheckboxRadioButton);
50+
buttonGroup.add(typeComboboxRadioButton);
5051
buttonGroup.add(typeRadioRadioButton);
5152
buttonGroup.add(typeMixingRadioButton);
5253
typeDiskPlayStyleLabel.setText(PluginBundle.get("setting.central.type.style"));
5354
typeDisplayNumberLabel.setText(PluginBundle.get("setting.central.type.number"));
5455
typeDisplayNumberSpinner.setToolTipText(PluginBundle.get("setting.central.type.number.tooltip"));
55-
typeCheckboxRadioButton.setText(PluginBundle.get("setting.central.type.combobox.button"));
56+
typeComboboxRadioButton.setText(PluginBundle.get("setting.central.type.combobox.button"));
5657
typeRadioRadioButton.setText(PluginBundle.get("setting.central.type.radio.button"));
5758
typeMixingRadioButton.setText(PluginBundle.get("setting.central.type.mixing.button"));
5859
// Init skip ci option
@@ -66,14 +67,20 @@ public CentralSettingPanel(GitCommitMessageHelperSettings settings) {
6667
skipCiComboBox.addItem(skipCi);
6768
}
6869
// Init
69-
typeCheckboxRadioButton.addChangeListener(e -> {
70-
typeDisplayNumberSpinner.setEnabled(false);
70+
typeComboboxRadioButton.addItemListener(e -> {
71+
if (e.getStateChange() == ItemEvent.SELECTED) {
72+
typeDisplayNumberSpinner.setEnabled(false);
73+
}
7174
});
72-
typeRadioRadioButton.addChangeListener(e -> {
73-
typeDisplayNumberSpinner.setEnabled(true);
75+
typeRadioRadioButton.addItemListener(e -> {
76+
if (e.getStateChange() == ItemEvent.SELECTED) {
77+
typeDisplayNumberSpinner.setEnabled(true);
78+
}
7479
});
75-
typeMixingRadioButton.addChangeListener(e -> {
76-
typeDisplayNumberSpinner.setEnabled(true);
80+
typeMixingRadioButton.addItemListener(e -> {
81+
if (e.getStateChange() == ItemEvent.SELECTED) {
82+
typeDisplayNumberSpinner.setEnabled(true);
83+
}
7784
});
7885
// Init Component
7986
initComponent(settings);
@@ -83,7 +90,7 @@ public CentralSettingPanel(GitCommitMessageHelperSettings settings) {
8390
public GitCommitMessageHelperSettings getSettings() {
8491
// Type Display Style Option
8592
int number = typeDisplayNumberSpinner.getNumber();
86-
if (typeCheckboxRadioButton.isSelected()) {
93+
if (typeComboboxRadioButton.isSelected()) {
8794
settings.getCentralSettings().setTypeDisplayStyle(TypeDisplayStyleEnum.CHECKBOX);
8895
} else if (typeRadioRadioButton.isSelected()) {
8996
settings.getCentralSettings().setTypeDisplayStyle(TypeDisplayStyleEnum.RADIO);
@@ -117,13 +124,13 @@ public void reset(GitCommitMessageHelperSettings settings) {
117124
private void initComponent(GitCommitMessageHelperSettings settings) {
118125
// Type Display Style Option
119126
if (settings.getCentralSettings().getTypeDisplayStyle().equals(TypeDisplayStyleEnum.CHECKBOX)) {
120-
typeCheckboxRadioButton.setSelected(true);
127+
typeComboboxRadioButton.setSelected(true);
121128
} else if (settings.getCentralSettings().getTypeDisplayStyle().equals(TypeDisplayStyleEnum.RADIO)) {
122129
typeRadioRadioButton.setSelected(true);
123130
} else if (settings.getCentralSettings().getTypeDisplayStyle().equals(TypeDisplayStyleEnum.MIXING)) {
124131
typeMixingRadioButton.setSelected(true);
125132
} else {
126-
typeCheckboxRadioButton.setSelected(true);
133+
typeComboboxRadioButton.setSelected(true);
127134
}
128135
typeDisplayNumberSpinner.setNumber(settings.getCentralSettings().getTypeDisplayNumber());
129136
// Skip CI Option
@@ -145,7 +152,7 @@ private void initComponent(GitCommitMessageHelperSettings settings) {
145152
public boolean isModified(GitCommitMessageHelperSettings data) {
146153
boolean isModified = false;
147154
// Type Display Style Option
148-
if (typeCheckboxRadioButton.isSelected() != data.getCentralSettings().getTypeDisplayStyle()
155+
if (typeComboboxRadioButton.isSelected() != data.getCentralSettings().getTypeDisplayStyle()
149156
.equals(TypeDisplayStyleEnum.CHECKBOX)) {
150157
isModified = true;
151158
} else if (typeRadioRadioButton.isSelected() != data.getCentralSettings().getTypeDisplayStyle()

‎src/main/java/com/fulinlin/ui/commit/CommitPanel.java‎

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -172,67 +172,68 @@ private void settingHidden(CommitTemplate commitMessageTemplate) {
172172
}
173173
typePanel.add(changeType);
174174
}
175-
if (centralSettings.getHidden().getScope()) {
176-
scopeDescriptionLabel.setVisible(false);
177-
changeScope.setVisible(false);
178-
}
179-
if (centralSettings.getHidden().getBody()) {
180-
bodyDescriptionLabel.setVisible(false);
181-
longDescriptionScrollPane.setVisible(false);
182-
longDescription.setVisible(false);
183-
}
184-
if (centralSettings.getHidden().getChanges()) {
185-
changeDescriptionLabel.setVisible(false);
186-
breakingChangesScrollPane.setVisible(false);
187-
breakingChanges.setVisible(false);
175+
}
176+
if (centralSettings.getHidden().getScope()) {
177+
scopeDescriptionLabel.setVisible(false);
178+
changeScope.setVisible(false);
179+
}
180+
if (centralSettings.getHidden().getBody()) {
181+
bodyDescriptionLabel.setVisible(false);
182+
longDescriptionScrollPane.setVisible(false);
183+
longDescription.setVisible(false);
184+
}
185+
if (centralSettings.getHidden().getChanges()) {
186+
changeDescriptionLabel.setVisible(false);
187+
breakingChangesScrollPane.setVisible(false);
188+
breakingChanges.setVisible(false);
189+
}
190+
if (centralSettings.getHidden().getClosed()) {
191+
closedDescriptionLabel.setVisible(false);
192+
closedIssues.setVisible(false);
193+
}
194+
if (centralSettings.getHidden().getSkipCi()) {
195+
skipCiLabel.setVisible(false);
196+
skipCiComboBox.setVisible(false);
197+
approveCheckBox.setVisible(false);
198+
} else {
199+
if (!centralSettings.getSkipCiComboboxEnable()) {
200+
skipCiComboBox.setVisible(false);
188201
}
189-
if (centralSettings.getHidden().getClosed()) {
190-
closedDescriptionLabel.setVisible(false);
191-
closedIssues.setVisible(false);
202+
List<String> skipCis = settings.getDateSettings().getSkipCis();
203+
for (String skipCi : skipCis) {
204+
skipCiComboBox.addItem(skipCi);
192205
}
193-
if (centralSettings.getHidden().getSkipCi()) {
194-
skipCiLabel.setVisible(false);
195-
skipCiComboBox.setVisible(false);
196-
approveCheckBox.setVisible(false);
197-
} else {
198-
if (!centralSettings.getSkipCiComboboxEnable()) {
199-
skipCiComboBox.setVisible(false);
200-
}
201-
List<String> skipCis = settings.getDateSettings().getSkipCis();
202-
for (String skipCi : skipCis) {
203-
skipCiComboBox.addItem(skipCi);
204-
}
205-
if (settings.getCentralSettings().getSkipCiDefaultApprove()) {
206-
approveCheckBox.setSelected(true);
207-
}
208-
if (settings.getCentralSettings().getSkipCiDefaultValue() != null) {
209-
skipCiComboBox.setSelectedItem(settings.getCentralSettings().getSkipCiDefaultValue());
210-
}
206+
if (settings.getCentralSettings().getSkipCiDefaultApprove()) {
207+
approveCheckBox.setSelected(true);
211208
}
212-
if (commitMessageTemplate != null) {
213-
// with cache init
214-
changeScope.setText(commitMessageTemplate.getScope());
215-
shortDescription.setText(commitMessageTemplate.getSubject());
216-
longDescription.setText(commitMessageTemplate.getBody());
217-
breakingChanges.setText(commitMessageTemplate.getChanges());
218-
closedIssues.setText(commitMessageTemplate.getCloses());
209+
if (settings.getCentralSettings().getSkipCiDefaultValue() != null) {
210+
skipCiComboBox.setSelectedItem(settings.getCentralSettings().getSkipCiDefaultValue());
219211
}
220212
}
213+
if (commitMessageTemplate != null) {
214+
// with cache init
215+
changeScope.setText(commitMessageTemplate.getScope());
216+
shortDescription.setText(commitMessageTemplate.getSubject());
217+
longDescription.setText(commitMessageTemplate.getBody());
218+
breakingChanges.setText(commitMessageTemplate.getChanges());
219+
closedIssues.setText(commitMessageTemplate.getCloses());
220+
}
221221
}
222222

223+
223224
private void computePanelHeight() {
224225
int height = 0;
225226
if (changeType != null) {
226-
height += 30;
227+
height += 33;
227228
}
228229
if (buttonGroup != null) {
229-
height += 30 * buttonGroup.getButtonCount();
230+
height += 33 * buttonGroup.getButtonCount();
230231
}
231232
if (!settings.getCentralSettings().getHidden().getScope()) {
232-
height += 30;
233+
height += 33;
233234
}
234235
if (!settings.getCentralSettings().getHidden().getSubject()) {
235-
height += 30;
236+
height += 33;
236237
}
237238
if (!settings.getCentralSettings().getHidden().getBody()) {
238239
longDescriptionScrollPane.setPreferredSize(new Dimension(730, 130));
@@ -243,10 +244,10 @@ private void computePanelHeight() {
243244
height += 100;
244245
}
245246
if (!settings.getCentralSettings().getHidden().getClosed()) {
246-
height += 30;
247+
height += 43;
247248
}
248249
if (!settings.getCentralSettings().getHidden().getSkipCi()) {
249-
height += 30;
250+
height += 33;
250251
}
251252
mainPanel.setPreferredSize(new Dimension(730, height));
252253
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public TemplateEditPanel(GitCommitMessageHelperSettings settings) {
5757
//Get setting
5858
this.settings = settings.clone();
5959

60-
// Init description
60+
// Init description
6161
description.setText(PluginBundle.get("setting.description"));
6262
descriptionLabel.setText(PluginBundle.get("setting.template.description"));
6363
templateLabel.setText(PluginBundle.get("setting.template.edit"));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ setting.central.skip.ci.enable.default=默认值:
1313
setting.central.skip.ci.enable.selection=开启下拉:
1414
setting.central.skip.ci.enable.checkbox=开启
1515
setting.central.skip.ci.default.checked.checkbox=默认勾选
16-
setting.central.hidden.panel.title=显示设置
16+
setting.central.hidden.panel.title=隐藏设置
1717
# setting template panel
1818
setting.description=个性化 git 提交类型和模版
1919
setting.template.description=模版说明:

0 commit comments

Comments
 (0)