Browse Source

Merge branch 'dev' of http://www.finedevelop.com:2015/scm/BA/design into dev

# Conflicts:
#	designer_base/src/com/fr/design/locale/designer.properties
#	designer_base/src/com/fr/design/locale/designer_ja_JP.properties
#	designer_base/src/com/fr/design/locale/designer_ko_KR.properties
master
daniel 8 years ago
parent
commit
3de2580ad6
  1. 7
      designer/src/com/fr/design/actions/report/ReportBackgroundAction.java
  2. BIN
      designer_base/src/com/fr/design/images/gui/colorPicker/colorPicker16.png
  3. BIN
      designer_base/src/com/fr/design/images/gui/colorPicker/colorPicker18.png
  4. BIN
      designer_base/src/com/fr/design/images/gui/colorPicker/colorPickerFrame.png
  5. 2
      designer_base/src/com/fr/design/locale/designer.properties
  6. 2
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  7. 4
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  8. 4
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  9. 2
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  10. 2
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  11. 202
      designer_base/src/com/fr/design/style/color/ColorPicker.java
  12. 6
      designer_base/src/com/fr/design/style/color/ColorSelectDialog.java
  13. 26
      designer_base/src/com/fr/design/style/color/ColorSelectPane.java
  14. 302
      designer_base/src/com/fr/design/style/color/CustomChooserPanel.java
  15. 17
      designer_base/src/com/fr/design/style/color/NewColorSelectPane.java
  16. 46
      designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java
  17. 5
      designer_form/src/com/fr/design/designer/creator/XElementCase.java

7
designer/src/com/fr/design/actions/report/ReportBackgroundAction.java

@ -5,6 +5,7 @@ package com.fr.design.actions.report;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.design.actions.ReportComponentAction; import com.fr.design.actions.ReportComponentAction;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.ReportComponent; import com.fr.design.mainframe.ReportComponent;
import com.fr.design.menu.KeySetUtils; import com.fr.design.menu.KeySetUtils;
@ -36,14 +37,16 @@ public class ReportBackgroundAction extends ReportComponentAction<ReportComponen
} }
final ReportBackgroundPane bPane = new ReportBackgroundPane(); final ReportBackgroundPane bPane = new ReportBackgroundPane();
bPane.populate(ReportUtils.getReportSettings(reportPane.getTemplateReport())); bPane.populate(ReportUtils.getReportSettings(reportPane.getTemplateReport()));
bPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { BasicDialog bDialog = bPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@Override @Override
public void doOk() { public void doOk() {
bPane.update(reportPane.getTemplateReport().getReportSettings()); bPane.update(reportPane.getTemplateReport().getReportSettings());
reportPane.fireTargetModified(); reportPane.fireTargetModified();
} }
}).setVisible(true); });
bDialog.setModal(false);
bDialog.setVisible(true);
return false; return false;
} }
} }

BIN
designer_base/src/com/fr/design/images/gui/colorPicker/colorPicker16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

BIN
designer_base/src/com/fr/design/images/gui/colorPicker/colorPicker18.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

BIN
designer_base/src/com/fr/design/images/gui/colorPicker/colorPickerFrame.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

2
designer_base/src/com/fr/design/locale/designer.properties

@ -491,3 +491,5 @@ FR-Designer_Export_failed=Export failed
FR-Designer_Exported_successfully=Exported successfully FR-Designer_Exported_successfully=Exported successfully
FR-Designer_Exporting=Exporting FR-Designer_Exporting=Exporting
FR-Designer_Export-PDF=PDF FR-Designer_Export-PDF=PDF
FR-Designer_Button_OK=OK
FR-Designer_Button_Cancel=Cancel

2
designer_base/src/com/fr/design/locale/designer_en_US.properties

@ -491,3 +491,5 @@ FR-Designer_Exported_successfully=Exported successfully
FR-Designer_Exporting=Exporting FR-Designer_Exporting=Exporting
FR-Designer_Export-PDF=PDF FR-Designer_Export-PDF=PDF
FR-Designer_Properties_Mobile=MobileProperties FR-Designer_Properties_Mobile=MobileProperties
FR-Designer_Button_OK=OK
FR-Designer_Button_Cancel=Cancel

4
designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@ -469,4 +469,6 @@ FR-Designer_Properties=FR-Designer_Properties=\
FR-Designer_Export_failed=\u5C0E\u51FA\u306B\u5931\u6557\u3057\u307E\u3057\u305F FR-Designer_Export_failed=\u5C0E\u51FA\u306B\u5931\u6557\u3057\u307E\u3057\u305F
FR-Designer_Exported_successfully=\u5C0E\u51FA\u6210\u529F FR-Designer_Exported_successfully=\u5C0E\u51FA\u6210\u529F
FR-Designer_Exporting=\u5C0E\u51FA\u3057\u3066\u3044\u307E\u3059 FR-Designer_Exporting=\u5C0E\u51FA\u3057\u3066\u3044\u307E\u3059
FR-Designer_Export-PDF=PDF\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8 FR-Designer_Export-PDF=PDF\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8FR-Designer_Button_OK=FR-Designer_Button_OK=\u78BA\u5B9A
FR-Designer_Button_Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
\

4
designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@ -464,4 +464,6 @@ FR-Designer_Properties=\uFFFD
FR-Designer_Export_failed=\uB0B4\uBCF4\uB0B4\uAE30\uC2E4\uD328 FR-Designer_Export_failed=\uB0B4\uBCF4\uB0B4\uAE30\uC2E4\uD328
FR-Designer_Exported_successfully=\uB0B4\uBCF4\uB0B4\uAE30\uC131\uACF5 FR-Designer_Exported_successfully=\uB0B4\uBCF4\uB0B4\uAE30\uC131\uACF5
FR-Designer_Exporting=\uB0B4\uBCF4\uB0B4\uAE30\uC911 FR-Designer_Exporting=\uB0B4\uBCF4\uB0B4\uAE30\uC911
FR-Designer_Export-PDF=PDF\uC11C\uC2DD FR-Designer_Export-PDF=PDF\uC11C\uC2DDFR-Designer_Properties=\uFFFD
FR-Designer_Button_OK=\uD655\uC778FR-Designer_Button_Cancel=\uCDE8\uC18C
\

2
designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@ -495,3 +495,5 @@ FR-Designer_Exported_successfully=\u5BFC\u51FA\u6210\u529F
FR-Designer_Exporting=\u6B63\u5728\u5BFC\u51FA FR-Designer_Exporting=\u6B63\u5728\u5BFC\u51FA
FR-Designer_Export-PDF=PDF\u683C\u5F0F FR-Designer_Export-PDF=PDF\u683C\u5F0F
FR-Designer_Properties_Mobile=\u624B\u673A\u5C5E\u6027 FR-Designer_Properties_Mobile=\u624B\u673A\u5C5E\u6027
FR-Designer_Button_OK=\u786E\u5B9A
FR-Designer_Button_Cancel=\u53D6\u6D88

2
designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@ -483,3 +483,5 @@ FR-Designer_Exported_successfully=\u532F\u51FA\u6210\u529F
FR-Designer_Exporting=\u6B63\u5728\u532F\u51FA... FR-Designer_Exporting=\u6B63\u5728\u532F\u51FA...
FR-Designer_Export-PDF=PDF\u683C\u5F0F FR-Designer_Export-PDF=PDF\u683C\u5F0F
FR-Designer_Properties_Mobile=\u624B\u6A5F\u5C6C\u6027 FR-Designer_Properties_Mobile=\u624B\u6A5F\u5C6C\u6027
FR-Designer_Button_OK=\u78BA\u5B9A
FR-Designer_Button_Cancel=\u53D6\u6D88

202
designer_base/src/com/fr/design/style/color/ColorPicker.java

@ -0,0 +1,202 @@
package com.fr.design.style.color;
/**
* Created by plough on 2016/12/22.
*/
import com.fr.base.BaseUtils;
import java.awt.*;
import java.awt.event.*;
import java.awt.geom.Ellipse2D;
import java.awt.image.BufferedImage;
import javax.swing.*;
/**
* 取色框
*/
public class ColorPicker extends JDialog implements ActionListener
{
private Container container = getContentPane(); // 主容器
private int setCoordinateX; // 取色框x坐标
private int setCoordinateY; // 取色框y坐标
private int colorPickerSize = 190; // 取色框尺寸
private int scaleFactor = 16; // 放大倍数
private ColorPickerPanel colorPickerPanel = new ColorPickerPanel(scaleFactor); // 取色框内容面板
private Timer timer; // 用于定时重绘
private int FPS = 45; // 重绘取色器的频率
private int timeCycle = 1000 / FPS; // 时钟周期
private ColorSelectable colorSelectable;
private Point mousePos; // 鼠标的绝对坐标
private Color colorToSet; // 暂存要设置的颜色值
private Boolean setColorRealTime; // 实时设定颜色值
/**
* 构造函数创建一个取色框窗体
*/
public ColorPicker(ColorSelectable colorSelectable, Boolean setColorRealTime)
{
setUndecorated(true); // 去掉窗体边缘
setResizable(false);
Shape shape = new Ellipse2D.Double(0, 0, colorPickerSize, colorPickerSize);
setShape(shape);
container.add(colorPickerPanel);
addMouseListener(new MouseFunctions());
updateSize(colorPickerSize);
this.colorSelectable = colorSelectable;
this.setColorRealTime = setColorRealTime;
this.setAlwaysOnTop(true);
this.setVisible(true);
this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
}
public void start() {
timer = new Timer(timeCycle, this);
timer.start();
hideCursor();
// System.out.println(KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow());
}
/**
* 执行Timer要执行的部分
*/
@Override
public void actionPerformed(ActionEvent e) {
updateLocation();
colorToSet = colorPickerPanel.getPixelColor(mousePos);
if (setColorRealTime && !colorSelectable.getColor().equals(colorToSet)) {
colorSelectable.setColor(colorToSet);
}
}
public void updateLocation() {
mousePos = MouseInfo.getPointerInfo().getLocation();
setCoordinateX = mousePos.x - getSize().width/2;
setCoordinateY = mousePos.y- getSize().height/2;
colorPickerPanel.setMagnifierLocation(setCoordinateX,
setCoordinateY);
setLocation(setCoordinateX, setCoordinateY);
}
/**
* 更新窗体
*
* @param colorPickerSize 取色框尺寸
*/
public void updateSize(int colorPickerSize)
{
colorPickerPanel.setColorPickerSize(colorPickerSize);
setSize(colorPickerSize, colorPickerSize);
validate(); // 更新所有子控件
}
public void pickComplete() {
timer.stop();
colorSelectable.setColor(colorToSet);
this.dispose();
}
// 隐藏鼠标光标
public void hideCursor() {
Image imageCursor = Toolkit.getDefaultToolkit().getImage("");
Cursor cu = Toolkit.getDefaultToolkit().createCustomCursor(imageCursor, new Point(0,0), "cursor");
setCursor(cu);
}
private class MouseFunctions extends MouseAdapter
{
public void mousePressed(MouseEvent e)
{
pickComplete();
}
}
}
class ColorPickerPanel extends JPanel
{
private BufferedImage screenImage;
private Image colorPickerFrame; // 取色框的边框图案
private int colorPickerSize; // 取色框尺寸
private int locationX; // 取色框 x 坐标
private int locationY; // 取色框 y 坐标
private int scaleFactor; // 放大倍数
private Robot robot;
// getPixelColor 常数
private static int SHIFT_STEP = 8; // 比特位右移步长
private static int AND_R = 0xff0000;
private static int AND_G = 0xff00;
private static int AND_B = 0xff;
/**
* 带参数的构造函数
* @param scaleFactor 放大倍数
*/
public ColorPickerPanel(int scaleFactor)
{
try
{
robot = new Robot();
}
catch (AWTException e)
{
}
// 截屏幕
screenImage = robot.createScreenCapture(new Rectangle(0, 0, Toolkit
.getDefaultToolkit().getScreenSize().width, Toolkit
.getDefaultToolkit().getScreenSize().height));
colorPickerFrame = BaseUtils.readImage("/com/fr/design/images/gui/colorPicker/colorPickerFrame.png");
this.scaleFactor = scaleFactor;
}
/**
* 设置取色框的位置
* @param locationX x坐标
* @param locationY y坐标
*/
public void setMagnifierLocation(int locationX, int locationY)
{
this.locationX = locationX;
this.locationY = locationY;
repaint(); // 注意重画控件
}
public Color getPixelColor(Point mousePos) {
int rgb = screenImage.getRGB(mousePos.x, mousePos.y);
int R = (rgb & AND_R) >> SHIFT_STEP * 2;
int G = (rgb & AND_G) >> SHIFT_STEP;
int B = (rgb & AND_B);
return new Color(R, G, B);
}
public void setColorPickerSize(int colorPickerSize)
{
this.colorPickerSize = colorPickerSize;
}
public void paintComponent(Graphics g)
{
Graphics2D g2d = (Graphics2D) g;
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);
double pixelCount = (double)colorPickerSize / scaleFactor; // 取色器一条边上的放大后的像素点个数(可以是小数)
// 关键处理代码
g2d.drawImage(
screenImage, // 要画的图片
0, // 目标矩形的第一个角的x坐标
0, // 目标矩形的第一个角的y坐标
colorPickerSize, // 目标矩形的第二个角的x坐标
colorPickerSize, // 目标矩形的第二个角的y坐标
locationX + (int)((colorPickerSize - pixelCount) * 0.5) + 1, // 源矩形的第一个角的x坐标
locationY + (int)((colorPickerSize - pixelCount) * 0.5) + 1, // 源矩形的第一个角的y坐标
locationX + (int)((colorPickerSize + pixelCount) * 0.5) + 1, // 源矩形的第二个角的x坐标
locationY + (int)((colorPickerSize + pixelCount) * 0.5) + 1, // 源矩形的第二个角的y坐标
this
);
g2d.drawImage(colorPickerFrame, 0, 0, this);
}
}

6
designer_base/src/com/fr/design/style/color/ColorSelectDialog.java

@ -91,8 +91,8 @@ public class ColorSelectDialog extends MiddleChartDialog{
this.add(buttonPane, BorderLayout.SOUTH); this.add(buttonPane, BorderLayout.SOUTH);
ok = new UIButton(Inter.getLocText("OK")); ok = new UIButton(Inter.getLocText("FR-Designer_Button_OK"));
cancel = new UIButton(Inter.getLocText("Cancel")); cancel = new UIButton(Inter.getLocText("FR-Designer_Button_Cancel"));
buttonPane.add(ok); buttonPane.add(ok);
buttonPane.add(cancel); buttonPane.add(cancel);
@ -137,7 +137,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
public static void showDialog(Frame owner,ColorSelectDetailPane pane,Color initialColor,ColorSelectable selectePane){ public static void showDialog(Frame owner,ColorSelectDetailPane pane,Color initialColor,ColorSelectable selectePane){
ColorTracker okListener = new ColorTracker(pane); ColorTracker okListener = new ColorTracker(pane);
ColorSelectDialog dialog = new ColorSelectDialog(owner,pane,initialColor,okListener,selectePane); ColorSelectDialog dialog = new ColorSelectDialog(owner,pane,initialColor,okListener,selectePane);
dialog.setModal(true); // dialog.setModal(true);
dialog.show(); dialog.show();
} }

26
designer_base/src/com/fr/design/style/color/ColorSelectPane.java

@ -3,10 +3,7 @@
*/ */
package com.fr.design.style.color; package com.fr.design.style.color;
import java.awt.BorderLayout; import java.awt.*;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.GridLayout;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
@ -72,9 +69,7 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
this.add(centerPane, BorderLayout.CENTER); this.add(centerPane, BorderLayout.CENTER);
// 最近使用 centerPane.add(getRow1Pane());
UsedColorPane pane = new UsedColorPane(1, 8, ColorSelectConfigManager.getInstance().getColors(),this);
centerPane.add(pane.getPane());
JPanel menuColorPane1 = new JPanel(); JPanel menuColorPane1 = new JPanel();
centerPane.add(menuColorPane1); centerPane.add(menuColorPane1);
@ -104,6 +99,23 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
centerPane.add(centerPane1); centerPane.add(centerPane1);
} }
// 第一行,1个取色按钮 + 7个最近使用的颜色
private JPanel getRow1Pane() {
JPanel row1Pane = new JPanel(FRGUIPaneFactory.createBorderLayout());
row1Pane.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 0));
row1Pane.setPreferredSize(new Dimension(135, 24)); // 宽度为 16 * 8 + 7
// 取色按钮
UIButton pickColorButton = PickColorButtonFactory.getPickColorButton(this, PickColorButtonFactory.IconType.ICON16, true);
row1Pane.add(pickColorButton, BorderLayout.WEST);
// 最近使用
UsedColorPane usedColorPane = new UsedColorPane(1, 7, ColorSelectConfigManager.getInstance().getColors(),this);
usedColorPane.getPane().setBorder(BorderFactory.createEmptyBorder(0, 1, 0, 8));
row1Pane.add(usedColorPane.getPane());
return row1Pane;
}
protected Color[] getColorArray(){ protected Color[] getColorArray(){
return ColorFactory.MenuColors; return ColorFactory.MenuColors;
} }

302
designer_base/src/com/fr/design/style/color/CustomChooserPanel.java

@ -10,9 +10,7 @@ import java.awt.Graphics;
import java.awt.GridLayout; import java.awt.GridLayout;
import java.awt.Image; import java.awt.Image;
import java.awt.Point; import java.awt.Point;
import java.awt.event.MouseAdapter; import java.awt.event.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionListener;
import java.awt.image.MemoryImageSource; import java.awt.image.MemoryImageSource;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -21,7 +19,6 @@ import javax.swing.ButtonGroup;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.JColorChooser; import javax.swing.JColorChooser;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JSlider;
import javax.swing.SpinnerNumberModel; import javax.swing.SpinnerNumberModel;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import javax.swing.colorchooser.AbstractColorChooserPanel; import javax.swing.colorchooser.AbstractColorChooserPanel;
@ -32,6 +29,7 @@ import javax.swing.event.DocumentListener;
import javax.swing.text.BadLocationException; import javax.swing.text.BadLocationException;
import javax.swing.text.Document; import javax.swing.text.Document;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.islider.UISlider; import com.fr.design.gui.islider.UISlider;
@ -42,72 +40,113 @@ import com.fr.general.Inter;
/** /**
* 颜色选择器自定义面板 * 颜色选择器自定义面板
* @author focus
* *
* @author focus
*/
class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelectable {
/**
* The gradient image displayed.
*/ */
class CustomChooserPanel extends AbstractColorChooserPanel
{
/** The gradient image displayed. */
private transient Image gradientImage; private transient Image gradientImage;
/** The Panel that holds the gradient image. */ /**
* The Panel that holds the gradient image.
*/
private transient JPanel gradientPanel; private transient JPanel gradientPanel;
/** The track gradient image. */ /**
* The track gradient image.
*/
private transient Image trackImage; private transient Image trackImage;
/** The panel that holds the track. */ /**
* The panel that holds the track.
*/
private transient JPanel trackPanel; private transient JPanel trackPanel;
/** The slider for the locked HSB value. */ /**
* The slider for the locked HSB value.
*/
private transient UISlider slider; private transient UISlider slider;
/** The RadioButton that controls the Hue. */ /**
* The RadioButton that controls the Hue.
*/
private transient UIRadioButton hRadio; private transient UIRadioButton hRadio;
/** The RadioButton that controls the Saturation. */ /**
* The RadioButton that controls the Saturation.
*/
private transient UIRadioButton sRadio; private transient UIRadioButton sRadio;
/** The RadioButton that controls the Brightness. */ /**
* The RadioButton that controls the Brightness.
*/
private transient UIRadioButton bRadio; private transient UIRadioButton bRadio;
/** The UIBasicSpinner that controls the Hue. */ /**
* The UIBasicSpinner that controls the Hue.
*/
private transient UIBasicSpinner hSpinner; private transient UIBasicSpinner hSpinner;
/** The UIBasicSpinner that controls the Saturation. */ /**
* The UIBasicSpinner that controls the Saturation.
*/
private transient UIBasicSpinner sSpinner; private transient UIBasicSpinner sSpinner;
/** The UIBasicSpinner that controls the Brightness. */ /**
* The UIBasicSpinner that controls the Brightness.
*/
private transient UIBasicSpinner bSpinner; private transient UIBasicSpinner bSpinner;
/** The UIBasicSpinner that controls the Red. */ /**
* The UIBasicSpinner that controls the Red.
*/
private transient UIBasicSpinner rSpinner; private transient UIBasicSpinner rSpinner;
/** The UIBasicSpinner that controls the Green. */ /**
* The UIBasicSpinner that controls the Green.
*/
private transient UIBasicSpinner gSpinner; private transient UIBasicSpinner gSpinner;
/** The UIBasicSpinner that controls the Blue. */ /**
* The UIBasicSpinner that controls the Blue.
*/
private transient UIBasicSpinner bbSpinner; private transient UIBasicSpinner bbSpinner;
private transient UITextField field; private transient UITextField field;
// private transient PickColorButton pickColorButton;
/** The default width of the gradient image. */ /**
* The default width of the gradient image.
*/
private static final int IMG_WIDTH = 200; private static final int IMG_WIDTH = 200;
/** The default height of the gradient image. */ /**
* The default height of the gradient image.
*/
private static final int IMG_HEIGHT = 205; private static final int IMG_HEIGHT = 205;
/** The default width of the track gradient. */ /**
* The default width of the track gradient.
*/
private static final int TRACK_WIDTH = 20; private static final int TRACK_WIDTH = 20;
/** The UILabel for Red. */ /**
* The UILabel for Red.
*/
private static final UILabel R = new UILabel("R"); private static final UILabel R = new UILabel("R");
/** The UILabel for Green. */ /**
* The UILabel for Green.
*/
private static final UILabel G = new UILabel("G"); private static final UILabel G = new UILabel("G");
/** The UILabel for Blue. */ /**
* The UILabel for Blue.
*/
private static final UILabel B = new UILabel("B"); private static final UILabel B = new UILabel("B");
private static final int H_MAX = 365; private static final int H_MAX = 365;
@ -131,7 +170,9 @@ class CustomChooserPanel extends AbstractColorChooserPanel
private ImageRGBScrollListener rgbScroll = new ImageRGBScrollListener(); private ImageRGBScrollListener rgbScroll = new ImageRGBScrollListener();
/** The point that is displayed in the gradient image. */ /**
* The point that is displayed in the gradient image.
*/
private transient Point gradientPoint = new Point(); private transient Point gradientPoint = new Point();
/** /**
@ -140,19 +181,29 @@ class CustomChooserPanel extends AbstractColorChooserPanel
*/ */
private transient boolean internalChange = false; private transient boolean internalChange = false;
/** This indicates that the change to the spinner is triggered internally. */ /**
* This indicates that the change to the spinner is triggered internally.
*/
private transient boolean spinnerTrigger = false; private transient boolean spinnerTrigger = false;
/** This int identifies which spinner is currently locked. */ /**
* This int identifies which spinner is currently locked.
*/
private transient int locked = -1; private transient int locked = -1;
/** This value indicates that the Hue spinner is locked. */ /**
* This value indicates that the Hue spinner is locked.
*/
static final int HLOCKED = 0; static final int HLOCKED = 0;
/** This value indicates that the Saturation spinner is locked. */ /**
* This value indicates that the Saturation spinner is locked.
*/
static final int SLOCKED = 1; static final int SLOCKED = 1;
/** This value indicates that the Brightness spinner is locked. */ /**
* This value indicates that the Brightness spinner is locked.
*/
static final int BLOCKED = 2; static final int BLOCKED = 2;
/** /**
@ -168,6 +219,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
private static final String HEX_PATTERN = "([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$"; private static final String HEX_PATTERN = "([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$";
private Pattern pattern; private Pattern pattern;
private Matcher matcher; private Matcher matcher;
@Override @Override
public void insertUpdate(DocumentEvent e) { public void insertUpdate(DocumentEvent e) {
Document doc = e.getDocument(); Document doc = e.getDocument();
@ -205,16 +257,14 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This helper class handles mouse events on the gradient image. * This helper class handles mouse events on the gradient image.
*/ */
class MainGradientMouseListener extends MouseAdapter class MainGradientMouseListener extends MouseAdapter
implements MouseMotionListener implements MouseMotionListener {
{
/** /**
* This method is called when the mouse is pressed over the gradient * This method is called when the mouse is pressed over the gradient
* image. The JColorChooser is then updated with new HSB values. * image. The JColorChooser is then updated with new HSB values.
* *
* @param e The MouseEvent. * @param e The MouseEvent.
*/ */
public void mousePressed(MouseEvent e) public void mousePressed(MouseEvent e) {
{
gradientPoint = e.getPoint(); gradientPoint = e.getPoint();
update(e.getPoint()); update(e.getPoint());
} }
@ -225,8 +275,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @param e The MouseEvent. * @param e The MouseEvent.
*/ */
public void mouseDragged(MouseEvent e) public void mouseDragged(MouseEvent e) {
{
Point p = e.getPoint(); Point p = e.getPoint();
if (isMouseOutOfImage(p)) { if (isMouseOutOfImage(p)) {
return; return;
@ -245,8 +294,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @param e The MouseEvent. * @param e The MouseEvent.
*/ */
public void mouseMoved(MouseEvent e) public void mouseMoved(MouseEvent e) {
{
// Do nothing. // Do nothing.
} }
@ -255,8 +303,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @param p The Point where the MouseEvent occurred. * @param p The Point where the MouseEvent occurred.
*/ */
private void update(Point p) private void update(Point p) {
{
handlingMouse = true; handlingMouse = true;
if (hSpinner.isEnabled()) { if (hSpinner.isEnabled()) {
updateH(p); updateH(p);
@ -273,8 +320,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @param p The point where the MouseEvent occurred. * @param p The point where the MouseEvent occurred.
*/ */
private void updateH(Point p) private void updateH(Point p) {
{
float s = (IMG_WIDTH - p.x * 1f) / IMG_WIDTH; float s = (IMG_WIDTH - p.x * 1f) / IMG_WIDTH;
float b = (IMG_HEIGHT - p.y * 1f) / IMG_HEIGHT; float b = (IMG_HEIGHT - p.y * 1f) / IMG_HEIGHT;
@ -292,8 +338,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @param p The point where the MouseEvent occurred. * @param p The point where the MouseEvent occurred.
*/ */
private void updateS(Point p) private void updateS(Point p) {
{
float h = p.x * 1f / IMG_WIDTH; float h = p.x * 1f / IMG_WIDTH;
float b = (IMG_HEIGHT - p.y * 1f) / IMG_HEIGHT; float b = (IMG_HEIGHT - p.y * 1f) / IMG_HEIGHT;
@ -310,8 +355,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @param p The point where the MouseEvent occurred. * @param p The point where the MouseEvent occurred.
*/ */
private void updateB(Point p) private void updateB(Point p) {
{
float h = p.x * 1f / IMG_WIDTH; float h = p.x * 1f / IMG_WIDTH;
float s = (IMG_HEIGHT - p.y * 1f) / IMG_HEIGHT; float s = (IMG_HEIGHT - p.y * 1f) / IMG_HEIGHT;
@ -327,16 +371,14 @@ class CustomChooserPanel extends AbstractColorChooserPanel
/** /**
* This method listens for slider value changes. * This method listens for slider value changes.
*/ */
class SliderChangeListener implements ChangeListener class SliderChangeListener implements ChangeListener {
{
/** /**
* This method is called when the slider value changes. It should change * This method is called when the slider value changes. It should change
* the color of the JColorChooser. * the color of the JColorChooser.
* *
* @param e The ChangeEvent. * @param e The ChangeEvent.
*/ */
public void stateChanged(ChangeEvent e) public void stateChanged(ChangeEvent e) {
{
if (internalChange) { if (internalChange) {
return; return;
} }
@ -344,8 +386,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
Integer value = new Integer(slider.getValue()); Integer value = new Integer(slider.getValue());
switch (locked) switch (locked) {
{
case HLOCKED: case HLOCKED:
hSpinner.setValue(value); hSpinner.setValue(value);
break; break;
@ -364,29 +405,22 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This helper class determines the active UIBasicSpinner. * This helper class determines the active UIBasicSpinner.
*/ */
class RadioStateListener extends MouseAdapter class RadioStateListener extends MouseAdapter
implements MouseMotionListener implements MouseMotionListener {
{
/** /**
* This method is called when there is a new UIRadioButton that was * This method is called when there is a new UIRadioButton that was
* selected. As a result, it should activate the associated UIBasicSpinner. * selected. As a result, it should activate the associated UIBasicSpinner.
* *
* @param e The ChangeEvent. * @param e The ChangeEvent.
*/ */
public void mousePressed(MouseEvent e) public void mousePressed(MouseEvent e) {
{
UIBasicSpinner change; UIBasicSpinner change;
if (e.getSource() == hRadio) if (e.getSource() == hRadio) {
{
locked = HLOCKED; locked = HLOCKED;
change = hSpinner; change = hSpinner;
} } else if (e.getSource() == sRadio) {
else if (e.getSource() == sRadio)
{
locked = SLOCKED; locked = SLOCKED;
change = sSpinner; change = sSpinner;
} } else {
else
{
locked = BLOCKED; locked = BLOCKED;
change = bSpinner; change = bSpinner;
} }
@ -406,16 +440,14 @@ class CustomChooserPanel extends AbstractColorChooserPanel
/** /**
* hsl 监听 * hsl 监听
*/ */
class ImageScrollListener implements ChangeListener class ImageScrollListener implements ChangeListener {
{
/** /**
* This method is called whenever one of the UIBasicSpinner values change. The * This method is called whenever one of the UIBasicSpinner values change. The
* JColorChooser should be updated with the new HSB values. * JColorChooser should be updated with the new HSB values.
* *
* @param e The ChangeEvent. * @param e The ChangeEvent.
*/ */
public void stateChanged(ChangeEvent e) public void stateChanged(ChangeEvent e) {
{
if (internalChange) { if (internalChange) {
return; return;
} }
@ -427,16 +459,14 @@ class CustomChooserPanel extends AbstractColorChooserPanel
/** /**
* rgb 监听 * rgb 监听
*/ */
class ImageRGBScrollListener implements ChangeListener class ImageRGBScrollListener implements ChangeListener {
{
/** /**
* This method is called whenever one of the UIBasicSpinner values change. The * This method is called whenever one of the UIBasicSpinner values change. The
* JColorChooser should be updated with the new HSB values. * JColorChooser should be updated with the new HSB values.
* *
* @param e The ChangeEvent. * @param e The ChangeEvent.
*/ */
public void stateChanged(ChangeEvent e) public void stateChanged(ChangeEvent e) {
{
if (internalChange) { if (internalChange) {
return; return;
} }
@ -458,8 +488,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
/** /**
* Creates a new DefaultHSBChooserPanel object. * Creates a new DefaultHSBChooserPanel object.
*/ */
CustomChooserPanel() CustomChooserPanel() {
{
super(); super();
} }
@ -469,8 +498,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @return The name displayed in the JColorChooser tab. * @return The name displayed in the JColorChooser tab.
*/ */
public String getDisplayName() public String getDisplayName() {
{
return Inter.getLocText("FR-Designer_Custom"); return Inter.getLocText("FR-Designer_Custom");
} }
@ -479,8 +507,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* UIBasicSpinners, the JSlider, and the gradient image point) with updated * UIBasicSpinners, the JSlider, and the gradient image point) with updated
* values when the JColorChooser color value changes. * values when the JColorChooser color value changes.
*/ */
public void updateChooser() public void updateChooser() {
{
Color c = getColorSelectionModel().getSelectedColor(); Color c = getColorSelectionModel().getSelectedColor();
float[] hsbVals = Color.RGBtoHSB(c.getRed(), c.getGreen(), c.getBlue(), float[] hsbVals = Color.RGBtoHSB(c.getRed(), c.getGreen(), c.getBlue(),
null); null);
@ -502,20 +529,17 @@ class CustomChooserPanel extends AbstractColorChooserPanel
} }
private void adjustHSLValue(float[] hsbVals) { private void adjustHSLValue(float[] hsbVals) {
if (! spinnerTrigger) if (!spinnerTrigger) {
{
hSpinner.setValue(new Integer((int) (hsbVals[0] * HSPINNER_VALUE))); hSpinner.setValue(new Integer((int) (hsbVals[0] * HSPINNER_VALUE)));
sSpinner.setValue(new Integer((int) (hsbVals[1] * SSPINNER_VALUE))); sSpinner.setValue(new Integer((int) (hsbVals[1] * SSPINNER_VALUE)));
bSpinner.setValue(new Integer((int) (hsbVals[2] * LSPINNER_VALUE))); bSpinner.setValue(new Integer((int) (hsbVals[2] * LSPINNER_VALUE)));
} }
switch (locked) switch (locked) {
{
case HLOCKED: case HLOCKED:
if (slider != null) { if (slider != null) {
slider.setValue(((Number) hSpinner.getValue()).intValue()); slider.setValue(((Number) hSpinner.getValue()).intValue());
} }
if (! handlingMouse) if (!handlingMouse) {
{
gradientPoint.x = (int) ((1 gradientPoint.x = (int) ((1
- ((Number) sSpinner.getValue()).intValue() / SSPINNER_VALUE) * IMG_WIDTH); - ((Number) sSpinner.getValue()).intValue() / SSPINNER_VALUE) * IMG_WIDTH);
gradientPoint.y = (int) ((1 gradientPoint.y = (int) ((1
@ -526,8 +550,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
if (slider != null) { if (slider != null) {
slider.setValue(((Number) sSpinner.getValue()).intValue()); slider.setValue(((Number) sSpinner.getValue()).intValue());
} }
if (! handlingMouse) if (!handlingMouse) {
{
gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / HSPINNER_VALUE * IMG_WIDTH); gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / HSPINNER_VALUE * IMG_WIDTH);
gradientPoint.y = (int) ((1 gradientPoint.y = (int) ((1
- ((Number) bSpinner.getValue()).intValue() / LSPINNER_VALUE) * IMG_HEIGHT); - ((Number) bSpinner.getValue()).intValue() / LSPINNER_VALUE) * IMG_HEIGHT);
@ -537,8 +560,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
if (slider != null) { if (slider != null) {
slider.setValue(((Number) bSpinner.getValue()).intValue()); slider.setValue(((Number) bSpinner.getValue()).intValue());
} }
if (! handlingMouse) if (!handlingMouse) {
{
gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / HSPINNER_VALUE * IMG_WIDTH); gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / HSPINNER_VALUE * IMG_WIDTH);
gradientPoint.y = (int) ((1 gradientPoint.y = (int) ((1
- ((Number) sSpinner.getValue()).intValue() / SSPINNER_VALUE) * IMG_HEIGHT); - ((Number) sSpinner.getValue()).intValue() / SSPINNER_VALUE) * IMG_HEIGHT);
@ -556,8 +578,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
getColorSelectionModel().setSelectedColor(new Color(Color.HSBtoRGB(h, s, b))); getColorSelectionModel().setSelectedColor(new Color(Color.HSBtoRGB(h, s, b)));
spinnerTrigger = false; spinnerTrigger = false;
if (! handlingMouse && slider != null && ! slider.getValueIsAdjusting()) if (!handlingMouse && slider != null && !slider.getValueIsAdjusting()) {
{
updateImage(); updateImage();
updateTrack(); updateTrack();
} }
@ -569,8 +590,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
/** /**
* This method builds the DefaultHSBChooserPanel. * This method builds the DefaultHSBChooserPanel.
*/ */
protected void buildChooser() protected void buildChooser() {
{
setLayout(new BorderLayout()); setLayout(new BorderLayout());
add(buildRightPanel(), BorderLayout.EAST); add(buildRightPanel(), BorderLayout.EAST);
JPanel container = new JPanel(); JPanel container = new JPanel();
@ -604,15 +624,12 @@ class CustomChooserPanel extends AbstractColorChooserPanel
} }
private JPanel createGradientPanel() { private JPanel createGradientPanel() {
return new JPanel() return new JPanel() {
{ public Dimension getPreferredSize() {
public Dimension getPreferredSize()
{
return new Dimension(IMG_WIDTH, IMG_HEIGHT); return new Dimension(IMG_WIDTH, IMG_HEIGHT);
} }
public void paint(Graphics g) public void paint(Graphics g) {
{
if (gradientImage != null) { if (gradientImage != null) {
g.drawImage(gradientImage, 0, 0, this); g.drawImage(gradientImage, 0, 0, this);
} }
@ -626,15 +643,12 @@ class CustomChooserPanel extends AbstractColorChooserPanel
} }
private JPanel createTrackPanel() { private JPanel createTrackPanel() {
return new JPanel() return new JPanel() {
{ public Dimension getPreferredSize() {
public Dimension getPreferredSize()
{
return new Dimension(TRACK_WIDTH, IMG_HEIGHT); return new Dimension(TRACK_WIDTH, IMG_HEIGHT);
} }
public void paint(Graphics g) public void paint(Graphics g) {
{
if (trackImage != null) { if (trackImage != null) {
g.drawImage(trackImage, 0, 0, this); g.drawImage(trackImage, 0, 0, this);
} }
@ -648,8 +662,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @param chooser The JColorChooser to remove this panel from. * @param chooser The JColorChooser to remove this panel from.
*/ */
public void uninstallChooserPanel(JColorChooser chooser) public void uninstallChooserPanel(JColorChooser chooser) {
{
trackImage = null; trackImage = null;
gradientImage = null; gradientImage = null;
gradientPanel = null; gradientPanel = null;
@ -673,8 +686,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @return The right side panel. * @return The right side panel.
*/ */
private Container buildRightPanel() private Container buildRightPanel() {
{
JPanel container = new JPanel(); JPanel container = new JPanel();
container.setLayout(new FlowLayout(FlowLayout.RIGHT)); container.setLayout(new FlowLayout(FlowLayout.RIGHT));
@ -697,6 +709,8 @@ class CustomChooserPanel extends AbstractColorChooserPanel
hexPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 8, 0)); hexPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 8, 0));
hexPanel.add(new UILabel("#")); hexPanel.add(new UILabel("#"));
hexPanel.add(field); hexPanel.add(field);
UIButton pickColorButton = PickColorButtonFactory.getPickColorButton(this, PickColorButtonFactory.IconType.ICON18, true);
hexPanel.add(pickColorButton);
mainPanel.add(hslAndRgbPanel, BorderLayout.CENTER); mainPanel.add(hslAndRgbPanel, BorderLayout.CENTER);
mainPanel.add(hexPanel, BorderLayout.SOUTH); mainPanel.add(hexPanel, BorderLayout.SOUTH);
@ -802,8 +816,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @return The small display icon. * @return The small display icon.
*/ */
public Icon getSmallDisplayIcon() public Icon getSmallDisplayIcon() {
{
return null; return null;
} }
@ -812,8 +825,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* *
* @return The large display icon. * @return The large display icon.
*/ */
public Icon getLargeDisplayIcon() public Icon getLargeDisplayIcon() {
{
return null; return null;
} }
@ -821,14 +833,12 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This method updates the gradient image with a new one taking the Hue * This method updates the gradient image with a new one taking the Hue
* value as the constant. * value as the constant.
*/ */
private void updateHLockImage() private void updateHLockImage() {
{
int index = 0; int index = 0;
int[] pix = new int[IMG_WIDTH * IMG_HEIGHT]; int[] pix = new int[IMG_WIDTH * IMG_HEIGHT];
float hValue = ((Number) hSpinner.getValue()).intValue() / HSPINNER_VALUE; float hValue = ((Number) hSpinner.getValue()).intValue() / HSPINNER_VALUE;
for (int j = 0; j < IMG_HEIGHT; j++) for (int j = 0; j < IMG_HEIGHT; j++) {
{
for (int i = 0; i < IMG_WIDTH; i++) { for (int i = 0; i < IMG_WIDTH; i++) {
pix[index++] = Color.HSBtoRGB(hValue, (IMG_WIDTH - i * 1f) / IMG_WIDTH, pix[index++] = Color.HSBtoRGB(hValue, (IMG_WIDTH - i * 1f) / IMG_WIDTH,
(IMG_HEIGHT - j * 1f) / IMG_HEIGHT) | (BINARY_FOR_EIGHT << TWENTY_FOUR); (IMG_HEIGHT - j * 1f) / IMG_HEIGHT) | (BINARY_FOR_EIGHT << TWENTY_FOUR);
@ -843,8 +853,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This method updates the gradient image with a new one taking the * This method updates the gradient image with a new one taking the
* Brightness value as the constant. * Brightness value as the constant.
*/ */
private void updateBLockImage() private void updateBLockImage() {
{
int[] pix = new int[IMG_WIDTH * IMG_HEIGHT]; int[] pix = new int[IMG_WIDTH * IMG_HEIGHT];
float bValue = ((Number) bSpinner.getValue()).intValue() / LSPINNER_VALUE; float bValue = ((Number) bSpinner.getValue()).intValue() / LSPINNER_VALUE;
@ -864,8 +873,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This method updates the gradient image with a new one taking the * This method updates the gradient image with a new one taking the
* Saturation value as the constant. * Saturation value as the constant.
*/ */
private void updateSLockImage() private void updateSLockImage() {
{
int[] pix = new int[IMG_WIDTH * IMG_HEIGHT]; int[] pix = new int[IMG_WIDTH * IMG_HEIGHT];
float sValue = ((Number) sSpinner.getValue()).intValue() / SSPINNER_VALUE; float sValue = ((Number) sSpinner.getValue()).intValue() / SSPINNER_VALUE;
@ -885,10 +893,8 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This method calls the appropriate method to update the gradient image * This method calls the appropriate method to update the gradient image
* depending on which HSB value is constant. * depending on which HSB value is constant.
*/ */
private void updateImage() private void updateImage() {
{ switch (locked) {
switch (locked)
{
case HLOCKED: case HLOCKED:
updateHLockImage(); updateHLockImage();
break; break;
@ -904,8 +910,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
/** /**
* This method updates the TextFields with the correct RGB values. * This method updates the TextFields with the correct RGB values.
*/ */
private void updateTextFields() private void updateTextFields() {
{
int c = getColorSelectionModel().getSelectedColor().getRGB(); int c = getColorSelectionModel().getSelectedColor().getRGB();
removeRGBSpinnerChangeLisener(); removeRGBSpinnerChangeLisener();
@ -929,8 +934,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
bbSpinner.addChangeListener(rgbScroll); bbSpinner.addChangeListener(rgbScroll);
} }
private void updateHexFields() private void updateHexFields() {
{
Color color = getColorSelectionModel().getSelectedColor(); Color color = getColorSelectionModel().getSelectedColor();
String R = Integer.toHexString(color.getRed()); String R = Integer.toHexString(color.getRed());
@ -953,23 +957,19 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This method updates the slider in response to making a different HSB * This method updates the slider in response to making a different HSB
* property the constant. * property the constant.
*/ */
private void updateSlider() private void updateSlider() {
{
if (slider == null) { if (slider == null) {
return; return;
} }
slider.setMinimum(0); slider.setMinimum(0);
if (locked == HLOCKED) if (locked == HLOCKED) {
{
internalChange = true; internalChange = true;
slider.setValue(((Number) hSpinner.getValue()).intValue()); slider.setValue(((Number) hSpinner.getValue()).intValue());
slider.setMaximum(359); slider.setMaximum(359);
internalChange = false; internalChange = false;
slider.setInverted(true); slider.setInverted(true);
} } else {
else
{
slider.setInverted(false); slider.setInverted(false);
if (locked == SLOCKED) { if (locked == SLOCKED) {
slider.setValue(((Number) sSpinner.getValue()).intValue()); slider.setValue(((Number) sSpinner.getValue()).intValue());
@ -986,10 +986,8 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This method updates the track gradient image depending on which HSB * This method updates the track gradient image depending on which HSB
* property is constant. * property is constant.
*/ */
private void updateTrack() private void updateTrack() {
{ switch (locked) {
switch (locked)
{
case HLOCKED: case HLOCKED:
updateHTrack(); updateHTrack();
break; break;
@ -1006,8 +1004,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This method updates the track gradient image if the Hue value is allowed * This method updates the track gradient image if the Hue value is allowed
* to change (according to the UIRadioButtons). * to change (according to the UIRadioButtons).
*/ */
private void updateHTrack() private void updateHTrack() {
{
int trackIndex = 0; int trackIndex = 0;
int[] trackPix = new int[TRACK_WIDTH * IMG_HEIGHT]; int[] trackPix = new int[TRACK_WIDTH * IMG_HEIGHT];
@ -1026,8 +1023,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This method updates the track gradient image if the Saturation value is * This method updates the track gradient image if the Saturation value is
* allowed to change (according to the UIRadioButtons). * allowed to change (according to the UIRadioButtons).
*/ */
private void updateSTrack() private void updateSTrack() {
{
int[] trackPix = new int[TRACK_WIDTH * IMG_HEIGHT]; int[] trackPix = new int[TRACK_WIDTH * IMG_HEIGHT];
float hValue = ((Number) hSpinner.getValue()).intValue() / HSPINNER_VALUE; float hValue = ((Number) hSpinner.getValue()).intValue() / HSPINNER_VALUE;
@ -1050,8 +1046,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel
* This method updates the track gradient image if the Brightness value is * This method updates the track gradient image if the Brightness value is
* allowed to change (according to the UIRadioButtons). * allowed to change (according to the UIRadioButtons).
*/ */
private void updateBTrack() private void updateBTrack() {
{
int[] trackPix = new int[TRACK_WIDTH * IMG_HEIGHT]; int[] trackPix = new int[TRACK_WIDTH * IMG_HEIGHT];
float hValue = ((Number) hSpinner.getValue()).intValue() / HSPINNER_VALUE; float hValue = ((Number) hSpinner.getValue()).intValue() / HSPINNER_VALUE;
@ -1069,4 +1064,15 @@ class CustomChooserPanel extends AbstractColorChooserPanel
trackPix, 0, TRACK_WIDTH)); trackPix, 0, TRACK_WIDTH));
} }
public Color getColor() {
return getColorSelectionModel().getSelectedColor();
}
public void setColor(Color color) {
getColorSelectionModel().setSelectedColor(color);
}
public void colorSetted(ColorCell cc) {
}
} }

17
designer_base/src/com/fr/design/style/color/NewColorSelectPane.java

@ -79,9 +79,20 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
this.add(centerPane, BorderLayout.CENTER); this.add(centerPane, BorderLayout.CENTER);
// 第一行,1个取色按钮 + 7个最近使用的颜色
JPanel row1Pane = new JPanel(FRGUIPaneFactory.createBorderLayout());
row1Pane.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 0));
row1Pane.setPreferredSize(new Dimension(135, 16)); // 宽度为 16 * 8 + 7
centerPane.add(row1Pane);
// 取色按钮
UIButton pickColorButton = PickColorButtonFactory.getPickColorButton(this, PickColorButtonFactory.IconType.ICON16);
row1Pane.add(pickColorButton, BorderLayout.WEST);
// 最近使用 // 最近使用
usedColorPane = new UsedColorPane(1, 8, ColorSelectConfigManager.getInstance().getColors(),this); usedColorPane = new UsedColorPane(1, 7, ColorSelectConfigManager.getInstance().getColors(),this);
centerPane.add(usedColorPane.getPane()); usedColorPane.getPane().setBorder(BorderFactory.createEmptyBorder(0, 1, 0, 8));
row1Pane.add(usedColorPane.getPane());
JPanel menuColorPane1 = new JPanel(); JPanel menuColorPane1 = new JPanel();
centerPane.add(menuColorPane1); centerPane.add(menuColorPane1);
@ -204,4 +215,6 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
usedColorPane.updateUsedColor(); usedColorPane.updateUsedColor();
} }
} }

46
designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java

@ -0,0 +1,46 @@
package com.fr.design.style.color;
import com.fr.base.BaseUtils;
import com.fr.design.gui.ibutton.UIButton;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/**
* Created by plough on 2016/12/22.
*/
public class PickColorButtonFactory {
public static UIButton getPickColorButton(ColorSelectable colorSelectable, IconType iconType) {
return getPickColorButton(colorSelectable, iconType, false);
}
public static UIButton getPickColorButton(final ColorSelectable colorSelectable, IconType iconType, final Boolean setColorRealTime) {
UIButton pickColorButton = new UIButton();
if (iconType == IconType.ICON16) {
pickColorButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/gui/colorPicker/colorPicker16.png"));
pickColorButton.setPreferredSize(new Dimension(16, 16));
} else {
pickColorButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/gui/colorPicker/colorPicker18.png"));
pickColorButton.setPreferredSize(new Dimension(18, 18));
}
pickColorButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
pickColorButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
ColorPicker colorPicker = new ColorPicker(colorSelectable, setColorRealTime);
colorPicker.start();
}
});
return pickColorButton;
}
// 取色器按钮使用的图标
public enum IconType {
ICON16, ICON18
}
}

5
designer_form/src/com/fr/design/designer/creator/XElementCase.java

@ -100,7 +100,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
.setI18NName(Inter.getLocText("Form-EC_toolbar")) .setI18NName(Inter.getLocText("Form-EC_toolbar"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
}; };
resolveCompatible(propertyTableEditor); propertyTableEditor = resolveCompatible(propertyTableEditor);
FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getSingle(FormElementCaseEditorProcessor.MARK_STRING); FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getSingle(FormElementCaseEditorProcessor.MARK_STRING);
if (processor == null) { if (processor == null) {
return propertyTableEditor; return propertyTableEditor;
@ -122,7 +122,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
} }
private void resolveCompatible (CRPropertyDescriptor[] propertyTableEditor) { private CRPropertyDescriptor[] resolveCompatible (CRPropertyDescriptor[] propertyTableEditor) {
//这边有个插件兼容问题,之后还是要改回process才行 //这边有个插件兼容问题,之后还是要改回process才行
Set<FormElementCaseEditorProvider> set = ExtraDesignClassManager.getInstance().getArray(AbstractFormElementCaseEditorProvider.MARK_STRING); Set<FormElementCaseEditorProvider> set = ExtraDesignClassManager.getInstance().getArray(AbstractFormElementCaseEditorProvider.MARK_STRING);
for (FormElementCaseEditorProvider provider : set) { for (FormElementCaseEditorProvider provider : set) {
@ -135,6 +135,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
PropertyDescriptor[] extraEditor = provider.createPropertyDescriptor(this.data.getClass(), formProvider, elementCaseEditorProvider); PropertyDescriptor[] extraEditor = provider.createPropertyDescriptor(this.data.getClass(), formProvider, elementCaseEditorProvider);
propertyTableEditor = (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); propertyTableEditor = (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor);
} }
return propertyTableEditor;
} }
@Override @Override

Loading…
Cancel
Save