fanruan
/
design
6
0
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Revert "Revert "REPORT-91839 模板版本管理二期 补充按钮交互，消除冗余代码"" 

This reverts commit 58b1b29cbf.
feature/x
Destiny.Lin 1 year ago
parent
4868bef9ad
commit
3e0f7cf210
2 changed files with 86 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  2. 95
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java

23
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
Unescape View File

@ -220,6 +220,9 @@ public class PreferencePane extends BasicPane {
private UICheckBox saveCommitCheckBox; private UICheckBox saveCommitCheckBox;
private UICheckBox useIntervalCheckBox; private UICheckBox useIntervalCheckBox;
private VcsMovePanel movePanel; private VcsMovePanel movePanel;
private JPanel saveIntervalPane;
private JPanel autoCleanPane;
private UICheckBox startupPageEnabledCheckBox; private UICheckBox startupPageEnabledCheckBox;
private IntegerEditor saveIntervalEditor; private IntegerEditor saveIntervalEditor;
private UICheckBox gcEnableCheckBox; private UICheckBox gcEnableCheckBox;
@ -392,7 +395,7 @@ public class PreferencePane extends BasicPane {
private void createVcsSettingPane(JPanel generalPane,JPanel parentPane, CardLayout cardLayout) { private void createVcsSettingPane(JPanel generalPane,JPanel parentPane, CardLayout cardLayout) {
//迁移面板 //迁移面板
movePanel = new VcsMovePanel(cardLayout, parentPane); movePanel = createMovePane(cardLayout, parentPane);
generalPane.add(movePanel, BorderLayout.NORTH); generalPane.add(movePanel, BorderLayout.NORTH);
JPanel savePane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Vcs_Save_Setting")); JPanel savePane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Vcs_Save_Setting"));
JPanel vcsPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Vcs_Clean_Setting")); JPanel vcsPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Vcs_Clean_Setting"));
@ -404,7 +407,7 @@ public class PreferencePane extends BasicPane {
remindVcsLabel.setVisible(!VcsHelper.getInstance().needInit()); remindVcsLabel.setVisible(!VcsHelper.getInstance().needInit());
vcsEnableCheckBox = new UICheckBox(i18nText("Fine-Design_Vcs_SaveAuto")); vcsEnableCheckBox = new UICheckBox(i18nText("Fine-Design_Vcs_SaveAuto"));
JPanel saveIntervalPane = createSaveIntervalPane(); saveIntervalPane = createSaveIntervalPane();
saveCommitCheckBox = new UICheckBox(i18nText("Fine-Design_Vcs_No_Delete")); saveCommitCheckBox = new UICheckBox(i18nText("Fine-Design_Vcs_No_Delete"));
saveIntervalEditor = new IntegerEditor(60); saveIntervalEditor = new IntegerEditor(60);
useIntervalCheckBox = new UICheckBox(); useIntervalCheckBox = new UICheckBox();
@ -423,7 +426,7 @@ public class PreferencePane extends BasicPane {
intervalPanel.add(everyLabel); intervalPanel.add(everyLabel);
intervalPanel.add(saveIntervalEditor); intervalPanel.add(saveIntervalEditor);
intervalPanel.add(delayLabel); intervalPanel.add(delayLabel);
JPanel autoCleanPane = createAutoCleanPane(); autoCleanPane = createAutoCleanPane();
vcsEnableCheckBox.addChangeListener(new ChangeListener() { vcsEnableCheckBox.addChangeListener(new ChangeListener() {
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
@ -447,12 +450,24 @@ public class PreferencePane extends BasicPane {
vcsPane.add(intervalPanel); vcsPane.add(intervalPanel);
vcsPane.add(saveCommitCheckBox); vcsPane.add(saveCommitCheckBox);
vcsPane.add(autoCleanPane); vcsPane.add(autoCleanPane);
saveIntervalPane.setVisible(!VcsHelper.getInstance().isLegacyMode());
autoCleanPane.setVisible(!VcsHelper.getInstance().isLegacyMode());
if (VcsHelper.getInstance().isLegacyMode()) { if (VcsHelper.getInstance().isLegacyMode()) {
// 老版本时才显示gc选项 // 老版本时才显示gc选项
vcsPane.add(gcControlPane); vcsPane.add(gcControlPane);
} }
} }
private VcsMovePanel createMovePane(CardLayout cardLayout, JPanel parentPane) {
return new VcsMovePanel(cardLayout, parentPane, new VcsMovePanel.MoveCallBack(){
@Override
public void doCallBack(boolean visible) {
saveIntervalPane.setVisible(visible);
autoCleanPane.setVisible(visible);
}
});
};
private JPanel createAutoCleanPane() { private JPanel createAutoCleanPane() {
JPanel autoCleanPane = new JPanel(FRGUIPaneFactory.createLeftZeroLayout()); JPanel autoCleanPane = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
useVcsAutoCleanScheduleCheckBox = new UICheckBox(); useVcsAutoCleanScheduleCheckBox = new UICheckBox();
@ -467,6 +482,7 @@ public class PreferencePane extends BasicPane {
autoCleanPane.add(autoCleanRetainIntervalComboBox); autoCleanPane.add(autoCleanRetainIntervalComboBox);
autoCleanPane.add(new UILabel(i18nText("Fine-Design_Vcs_Auto_Clean_Last"))); autoCleanPane.add(new UILabel(i18nText("Fine-Design_Vcs_Auto_Clean_Last")));
useVcsAutoCleanScheduleCheckBox.setEnabled(!VcsHelper.getInstance().isLegacyMode()); useVcsAutoCleanScheduleCheckBox.setEnabled(!VcsHelper.getInstance().isLegacyMode());
autoCleanPane.setVisible(false);
return autoCleanPane; return autoCleanPane;
} }
@ -479,6 +495,7 @@ public class PreferencePane extends BasicPane {
saveIntervalPane.add(autoSaveIntervalEditor); saveIntervalPane.add(autoSaveIntervalEditor);
saveIntervalPane.add(new UILabel(i18nText("Fine-Design_Vcs_Save_Delay"))); saveIntervalPane.add(new UILabel(i18nText("Fine-Design_Vcs_Save_Delay")));
useVcsAutoSaveScheduleCheckBox.setEnabled(!VcsHelper.getInstance().isLegacyMode()); useVcsAutoSaveScheduleCheckBox.setEnabled(!VcsHelper.getInstance().isLegacyMode());
saveIntervalPane.setVisible(false);
return saveIntervalPane; return saveIntervalPane;
} }

95
designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java
Unescape View File

@ -32,6 +32,8 @@ import javax.swing.JProgressBar;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.SwingWorker; import javax.swing.SwingWorker;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.List; import java.util.List;
@ -102,12 +104,19 @@ public class VcsMovePanel extends BasicPane {
private UISpinner spinner; private UISpinner spinner;
private MoveCallBack callBack;
public VcsMovePanel(CardLayout cardLayout, JPanel parentPane) { private JPanel updatePane;
private boolean visible = false;
public VcsMovePanel(CardLayout cardLayout, JPanel parentPane, MoveCallBack callBack) {
this.parentCard = cardLayout; this.parentCard = cardLayout;
this.parentPane = parentPane; this.parentPane = parentPane;
this.callBack = callBack;
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
JPanel updatePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); updatePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
updatePane.setBackground(BACK_GROUND_COLOR); updatePane.setBackground(BACK_GROUND_COLOR);
//初始化迁移的面板 //初始化迁移的面板
initVcsLabel(updatePane); initVcsLabel(updatePane);
@ -261,25 +270,37 @@ public class VcsMovePanel extends BasicPane {
JPanel successPane = new JPanel(); JPanel successPane = new JPanel();
JPanel body = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); JPanel body = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
successButton = new UIButton(Toolkit.i18nText("Fine-Design_Vcs_Move_Success_Go")); successButton = new UIButton(Toolkit.i18nText("Fine-Design_Vcs_Move_Success_Go"));
initSuccessButtonListener();
iconLabel = new UILabel(IconUtils.readIcon("/com/fr/design/vcs/move_success.svg")); iconLabel = new UILabel(IconUtils.readIcon("/com/fr/design/vcs/move_success.svg"));
successLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Success")); successLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Success"));
successLabel.setFont(FONT); successLabel.setFont(FONT);
successTipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Success_Tip")); successTipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Success_Tip"));
successTipLabel.setForeground(TIP_COLOR); initStatusPane(successTipLabel, iconLabel, successLabel, successButton, body, SUCCESS, successPane);
body.add(iconLabel); }
body.add(new UILabel(StringUtils.BLANK));
body.add(successLabel); private void initSuccessButtonListener() {
body.add(new UILabel(StringUtils.BLANK)); successButton.addActionListener(new ActionListener() {
body.add(successTipLabel); @Override
body.add(new UILabel(StringUtils.BLANK)); public void actionPerformed(ActionEvent e) {
body.add(successButton); doAfterMove();
successPane.add(body); }
successPane.setLayout(FRGUIPaneFactory.createCenterLayout(body, 0.5f, 0.5f)); });
parentPane.add(successPane, SUCCESS); }
iconLabel.setAlignmentX(CENTER_ALIGNMENT);
successLabel.setAlignmentX(CENTER_ALIGNMENT); private void initFailedButtonListener() {
successButton.setAlignmentX(CENTER_ALIGNMENT); failedButton.addActionListener(new ActionListener() {
successTipLabel.setAlignmentX(CENTER_ALIGNMENT); @Override
public void actionPerformed(ActionEvent e) {
doAfterMove();
}
});
}
private void doAfterMove() {
visible = !VcsHelper.getInstance().isLegacyMode();
updatePane.setVisible(!visible);
callBack.doCallBack(visible);
parentCard.show(parentPane, SETTING);
} }
@ -300,25 +321,30 @@ public class VcsMovePanel extends BasicPane {
JPanel failedPane = new JPanel(); JPanel failedPane = new JPanel();
JPanel body = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); JPanel body = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
failedButton = new UIButton(Toolkit.i18nText("Fine-Design_Vcs_Move_Failed_Go")); failedButton = new UIButton(Toolkit.i18nText("Fine-Design_Vcs_Move_Failed_Go"));
initFailedButtonListener();
failedIconLabel = new UILabel(IconUtils.readIcon("/com/fr/design/vcs/move_failed.svg")); failedIconLabel = new UILabel(IconUtils.readIcon("/com/fr/design/vcs/move_failed.svg"));
failedLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Failed")); failedLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Failed"));
failedLabel.setFont(FONT); failedLabel.setFont(FONT);
failedTipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Failed_Tip")); failedTipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Failed_Tip"));
failedTipLabel.setForeground(TIP_COLOR); initStatusPane(failedTipLabel, failedIconLabel, failedLabel, failedButton, body, FAILED, failedPane);
body.add(failedIconLabel); }
private void initStatusPane(UILabel tipLabel, UILabel iconLabel, UILabel label, UIButton button, JPanel body, String tag,JPanel statusPane) {
tipLabel.setForeground(TIP_COLOR);
body.add(iconLabel);
body.add(new UILabel(StringUtils.BLANK)); body.add(new UILabel(StringUtils.BLANK));
body.add(failedLabel); body.add(label);
body.add(new UILabel(StringUtils.BLANK)); body.add(new UILabel(StringUtils.BLANK));
body.add(failedTipLabel); body.add(tipLabel);
body.add(new UILabel(StringUtils.BLANK)); body.add(new UILabel(StringUtils.BLANK));
body.add(failedButton); body.add(button);
failedPane.add(body); statusPane.add(body);
failedPane.setLayout(FRGUIPaneFactory.createCenterLayout(body, 0.5f, 0.5f)); statusPane.setLayout(FRGUIPaneFactory.createCenterLayout(body, 0.5f, 0.5f));
parentPane.add(failedPane, FAILED); parentPane.add(statusPane, tag);
failedIconLabel.setAlignmentX(CENTER_ALIGNMENT); iconLabel.setAlignmentX(CENTER_ALIGNMENT);
failedLabel.setAlignmentX(CENTER_ALIGNMENT); label.setAlignmentX(CENTER_ALIGNMENT);
failedButton.setAlignmentX(CENTER_ALIGNMENT); button.setAlignmentX(CENTER_ALIGNMENT);
failedTipLabel.setAlignmentX(CENTER_ALIGNMENT); tipLabel.setAlignmentX(CENTER_ALIGNMENT);
} }
@ -377,4 +403,15 @@ public class VcsMovePanel extends BasicPane {
} }
/**
* 迁移回调事件
*
*/
public static class MoveCallBack {
/**
* 处理回调
*/
public void doCallBack(boolean visible){}
}
} }

Write Preview
Loading…
Cancel
Save