* commit 'eccf8d8e1d0f0562296e4efaaccce6d39e6c0f68': REPORT-2897 9.0设计器修改 国际化 REPORT-2897 9.0设计器修改 缩放条部分视觉优化 REPORT-2897 9.0设计器修改 修改换行符 REPORT-2897 9.0设计器修改 代码质量 REPORT-2897 9.0设计器修改 去除不必要强转 REPORT-2897 9.0设计器修改 换行符修改 REPORT-2897 9.0设计器修改 REPORT-2897 9.0设计器修改 缩放条tooltip部分视觉优化 pr修改 REPORT-2897 9.0设计器修改 缩放条部分视觉优化 REPORT-2897 9.0设计器修改 缩放条部分视觉png REPORT-2897 9.0设计器修改 权限编辑、缩放条部分视觉优化 REPORT-2897 9.0设计器修改 权限编辑、缩放条部分视觉优化master
After Width: | Height: | Size: 219 B |
After Width: | Height: | Size: 198 B |
After Width: | Height: | Size: 344 B |
After Width: | Height: | Size: 232 B |
After Width: | Height: | Size: 221 B |
After Width: | Height: | Size: 197 B |
After Width: | Height: | Size: 326 B |
After Width: | Height: | Size: 235 B |
After Width: | Height: | Size: 118 B |
After Width: | Height: | Size: 166 B |
@ -1 +1,85 @@
|
||||
package com.fr.design.mainframe;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.designer.TargetComponent;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.general.Inter;
import javax.swing.*;
import java.awt.*;
/**
* Author : daisy
* Date: 13-9-12
* Time: 下午6:21
*/
public abstract class AuthorityEditPane extends JPanel {
protected static final int TOP_GAP = 11;
protected static final int LEFT_GAP = 8;
protected static final int ALIGNMENT_GAP = -3;
protected UILabel type = null;
protected UILabel name = null;
protected JPanel checkPane = null;
private TargetComponent target;
public AuthorityEditPane(TargetComponent target) {
this.target = target;
setLayout(new BorderLayout());
type = new UILabel();
name = new UILabel();
checkPane = new JPanel();
checkPane.setLayout(new BorderLayout());
this.add(layoutText(), BorderLayout.WEST);
this.add(layoutPane(), BorderLayout.CENTER);
this.setBorder(BorderFactory.createEmptyBorder(TOP_GAP, LEFT_GAP, 0, 0));
}
private JPanel layoutText() {
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("Type") + ":", SwingConstants.RIGHT)},
new Component[]{new UILabel(Inter.getLocText("WF-Name") + ":", SwingConstants.RIGHT)},
new Component[]{new UILabel(Inter.getLocText("DashBoard-Potence") + ":", SwingConstants.RIGHT)},
};
double[] rowSize = {p, p, p};
double[] columnSize = {p};
int[][] rowCount = {{1}, {1}, {1}};
return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
}
private JPanel layoutPane() {
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{type},
new Component[]{name},
new Component[]{checkPane},
};
double[] rowSize = {p, p, p};
double[] columnSize = {f};
int[][] rowCount = {{1}, {1}, {1}};
return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
}
/**
* 更新权限编辑面板的具体内容:类型、名称、权限面板
*/
public void populateDetials() {
populateType();
populateName();
checkPane.removeAll();
populateCheckPane();
checkPane.setBorder(BorderFactory.createEmptyBorder(ALIGNMENT_GAP, 0, 0, 0));
}
public abstract void populateType();
public abstract void populateName();
public abstract JPanel populateCheckPane();
} |
||||
package com.fr.design.mainframe; |
||||
|
||||
import com.fr.design.constants.LayoutConstants; |
||||
import com.fr.design.designer.TargetComponent; |
||||
import com.fr.design.gui.ilable.UILabel; |
||||
import com.fr.design.layout.TableLayout; |
||||
import com.fr.design.layout.TableLayoutHelper; |
||||
import com.fr.general.Inter; |
||||
|
||||
import javax.swing.*; |
||||
import java.awt.*; |
||||
|
||||
/** |
||||
* Author : daisy |
||||
* Date: 13-9-12 |
||||
* Time: 下午6:21 |
||||
*/ |
||||
public abstract class AuthorityEditPane extends JPanel { |
||||
protected static final int TOP_GAP = 11; |
||||
protected static final int LEFT_GAP = 4; |
||||
protected static final int RIGHT_GAP = 10; |
||||
protected static final int ALIGNMENT_GAP = -3; |
||||
protected static final int LEFT_CHECKPANE = 3; |
||||
|
||||
protected UILabel type = null; |
||||
protected UILabel name = null; |
||||
protected JPanel checkPane = null; |
||||
private TargetComponent target; |
||||
private JPanel typePane; |
||||
private JPanel namePane; |
||||
|
||||
public AuthorityEditPane(TargetComponent target) { |
||||
this.target = target; |
||||
setLayout(new BorderLayout()); |
||||
type = new UILabel(); |
||||
typePane = new JPanel(new BorderLayout()); |
||||
typePane.add(type, BorderLayout.CENTER); |
||||
type.setBorder(BorderFactory.createEmptyBorder(0,LEFT_GAP,0,0)); |
||||
typePane.setBorder(BorderFactory.createLineBorder(Color.lightGray)); |
||||
name = new UILabel(); |
||||
namePane = new JPanel(new BorderLayout()); |
||||
namePane.add(name, BorderLayout.CENTER); |
||||
name.setBorder(BorderFactory.createEmptyBorder(0,LEFT_GAP,0,0)); |
||||
namePane.setBorder(BorderFactory.createLineBorder(Color.lightGray)); |
||||
checkPane = new JPanel(); |
||||
checkPane.setLayout(new BorderLayout()); |
||||
// this.add(layoutText(), BorderLayout.WEST);
|
||||
// this.add(layoutPane(), BorderLayout.CENTER);
|
||||
this.add(centerPane(), BorderLayout.NORTH); |
||||
this.setBorder(BorderFactory.createEmptyBorder(TOP_GAP, LEFT_GAP, 0, RIGHT_GAP)); |
||||
} |
||||
|
||||
private JPanel centerPane() { |
||||
double f = TableLayout.FILL; |
||||
double p = TableLayout.PREFERRED; |
||||
double[] rowSize = {p, p, p}; |
||||
double[] columnSize = {p, f}; |
||||
int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; |
||||
Component[][] components = new Component[][]{ |
||||
new Component[]{new UILabel(" " + Inter.getLocText("FR-Designer_Type") + " ", SwingConstants.LEFT), typePane}, |
||||
new Component[]{new UILabel(" " + Inter.getLocText("FR-Designer_WF_Name") + " ", SwingConstants.LEFT), namePane}, |
||||
new Component[]{checkPane, null}, |
||||
}; |
||||
|
||||
return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM); |
||||
} |
||||
|
||||
/** |
||||
* 更新权限编辑面板的具体内容:类型、名称、权限面板 |
||||
*/ |
||||
public void populateDetials() { |
||||
populateType(); |
||||
populateName(); |
||||
checkPane.removeAll(); |
||||
populateCheckPane(); |
||||
checkPane.setBorder(BorderFactory.createEmptyBorder(0, LEFT_CHECKPANE, 0, 0)); |
||||
} |
||||
|
||||
public abstract void populateType(); |
||||
|
||||
public abstract void populateName(); |
||||
|
||||
public abstract JPanel populateCheckPane(); |
||||
|
||||
} |
@ -1 +1,49 @@
|
||||
package com.fr.design.mainframe;
import com.fr.design.constants.UIConstants;
import com.fr.design.designer.TargetComponent;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Inter;
import javax.swing.*;
import java.awt.*;
/**
* Author : daisy
* Date: 13-9-12
* Time: 下午6:14
*/
public class AuthorityPropertyPane extends JPanel {
private static final int TITLE_HEIGHT = 19;
private AuthorityEditPane authorityEditPane = null;
public AuthorityPropertyPane(TargetComponent t) {
this.setLayout(new BorderLayout());
this.setBorder(null);
UILabel authorityTitle = new UILabel(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})) {
@Override
public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);
}
};
authorityTitle.setHorizontalAlignment(SwingConstants.CENTER);
authorityTitle.setVerticalAlignment(SwingConstants.CENTER);
JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
northPane.add(authorityTitle, BorderLayout.CENTER);
northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR));
this.add(northPane, BorderLayout.NORTH);
authorityEditPane = t.createAuthorityEditPane();
UIScrollPane scrollPane = new UIScrollPane(authorityEditPane);
scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
this.add(scrollPane, BorderLayout.CENTER);
}
public void populate() {
authorityEditPane.populateDetials();
}
} |
||||
package com.fr.design.mainframe; |
||||
|
||||
import com.fr.design.constants.UIConstants; |
||||
import com.fr.design.designer.TargetComponent; |
||||
import com.fr.design.gui.icontainer.UIScrollPane; |
||||
import com.fr.design.gui.ilable.UILabel; |
||||
import com.fr.design.layout.FRGUIPaneFactory; |
||||
import com.fr.general.Inter; |
||||
|
||||
import javax.swing.*; |
||||
import java.awt.*; |
||||
|
||||
/** |
||||
* Author : daisy |
||||
* Date: 13-9-12 |
||||
* Time: 下午6:14 |
||||
*/ |
||||
public class AuthorityPropertyPane extends JPanel { |
||||
private static final int TITLE_HEIGHT = 19; |
||||
private AuthorityEditPane authorityEditPane = null; |
||||
|
||||
public AuthorityPropertyPane(TargetComponent t) { |
||||
this.setLayout(new BorderLayout()); |
||||
this.setBorder(null); |
||||
UILabel authorityTitle = new UILabel(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})) { |
||||
@Override |
||||
public Dimension getPreferredSize() { |
||||
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); |
||||
} |
||||
}; |
||||
authorityTitle.setHorizontalAlignment(SwingConstants.CENTER); |
||||
authorityTitle.setVerticalAlignment(SwingConstants.CENTER); |
||||
JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); |
||||
northPane.add(authorityTitle, BorderLayout.CENTER); |
||||
northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR)); |
||||
// this.add(northPane, BorderLayout.NORTH);
|
||||
authorityEditPane = t.createAuthorityEditPane(); |
||||
UIScrollPane scrollPane = new UIScrollPane(authorityEditPane); |
||||
scrollPane.setBorder(null); |
||||
scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); |
||||
this.add(scrollPane, BorderLayout.CENTER); |
||||
} |
||||
|
||||
public void populate() { |
||||
authorityEditPane.populateDetials(); |
||||
} |
||||
|
||||
|
||||
} |
@ -1 +1,62 @@
|
||||
package com.fr.design.mainframe;
import com.fr.design.constants.UIConstants;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Inter;
import javax.swing.*;
import java.awt.*;
/**
* Author : daisy
* Date: 13-9-22
* Time: 上午10:05
*/
public class NoSupportAuthorityEdit extends AuthorityEditPane {
private static final int TITLE_HEIGHT = 19;
public NoSupportAuthorityEdit() {
super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
this.setLayout(new BorderLayout());
this.setBorder(null);
UILabel title = new UILabel(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})) {
@Override
public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);
}
};
title.setHorizontalAlignment(SwingConstants.CENTER);
title.setVerticalAlignment(SwingConstants.CENTER);
JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
northPane.add(title, BorderLayout.CENTER);
northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR));
this.add(northPane, BorderLayout.NORTH);
this.add(createTextPane(), BorderLayout.CENTER);
}
private JPanel createTextPane() {
JPanel panel = new JPanel(new BorderLayout());
UILabel uiLabel = new UILabel(Inter.getLocText("not_support_authority_edit"));
uiLabel.setHorizontalAlignment(SwingConstants.CENTER);
uiLabel.setVerticalAlignment(SwingConstants.CENTER);
panel.add(uiLabel, BorderLayout.CENTER);
return panel;
}
@Override
public void populateType() {
}
@Override
public void populateName() {
}
@Override
public JPanel populateCheckPane() {
return null;
}
} |
||||
package com.fr.design.mainframe; |
||||
|
||||
import com.fr.design.constants.UIConstants; |
||||
import com.fr.design.file.HistoryTemplateListPane; |
||||
import com.fr.design.gui.ilable.UILabel; |
||||
import com.fr.design.layout.FRGUIPaneFactory; |
||||
import com.fr.general.Inter; |
||||
|
||||
import javax.swing.*; |
||||
import java.awt.*; |
||||
|
||||
/** |
||||
* Author : daisy |
||||
* Date: 13-9-22 |
||||
* Time: 上午10:05 |
||||
*/ |
||||
public class NoSupportAuthorityEdit extends AuthorityEditPane { |
||||
|
||||
private static final int TITLE_HEIGHT = 19; |
||||
|
||||
public NoSupportAuthorityEdit() { |
||||
super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); |
||||
this.setLayout(new BorderLayout()); |
||||
this.setBorder(null); |
||||
UILabel title = new UILabel(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})) { |
||||
@Override |
||||
public Dimension getPreferredSize() { |
||||
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); |
||||
} |
||||
}; |
||||
title.setHorizontalAlignment(SwingConstants.CENTER); |
||||
title.setVerticalAlignment(SwingConstants.CENTER); |
||||
JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); |
||||
northPane.add(title, BorderLayout.CENTER); |
||||
northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR)); |
||||
// this.add(northPane, BorderLayout.NORTH);
|
||||
this.add(createTextPane(), BorderLayout.CENTER); |
||||
} |
||||
|
||||
|
||||
private JPanel createTextPane() { |
||||
JPanel panel = new JPanel(new BorderLayout()); |
||||
UILabel uiLabel = new UILabel(Inter.getLocText("not_support_authority_edit")); |
||||
uiLabel.setHorizontalAlignment(SwingConstants.CENTER); |
||||
uiLabel.setVerticalAlignment(SwingConstants.CENTER); |
||||
panel.add(uiLabel, BorderLayout.CENTER); |
||||
return panel; |
||||
} |
||||
|
||||
@Override |
||||
public void populateType() { |
||||
} |
||||
|
||||
@Override |
||||
public void populateName() { |
||||
} |
||||
|
||||
@Override |
||||
public JPanel populateCheckPane() { |
||||
return null; |
||||
} |
||||
} |