Browse Source

Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~plough/design into release/9.0

master
plough 7 years ago
parent
commit
6dc4f5b947
  1. 12
      designer/src/com/fr/design/mainframe/SheetNameTabPane.java
  2. 17
      designer/src/com/fr/design/mainframe/alphafine/AlphaFineConstants.java
  3. 12
      designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
  4. 26
      designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
  5. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine1@2x.png
  6. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine2@2x.png
  7. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine3@2x.png
  8. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine4@2x.png
  9. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine5@2x.png
  10. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine_close@2x.png
  11. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/bigsearch@2x.png
  12. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/no_result@2x.png
  13. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/noresult@2x.png
  14. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/opening@2x.gif
  15. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/selected1@2x.png
  16. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/selected2@2x.png
  17. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/selected3@2x.png
  18. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/selected4@2x.png
  19. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/selected5@2x.png
  20. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/smallsearch@2x.png
  21. 5
      designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java
  22. 17
      designer/src/com/fr/design/present/CurrencyLinePane.java
  23. 1
      designer_base/src/com/fr/design/constants/UIConstants.java
  24. 10
      designer_base/src/com/fr/design/gui/ispinner/UISpinnerUI.java
  25. 297
      designer_base/src/com/fr/design/gui/itextfield/UISearchTextField.java
  26. 29
      designer_base/src/com/fr/design/gui/style/FormatPane.java
  27. BIN
      designer_base/src/com/fr/design/images/data/black_search.png
  28. BIN
      designer_base/src/com/fr/design/images/sheet/left_hover@1x.png
  29. BIN
      designer_base/src/com/fr/design/images/sheet/left_normal@1x.png
  30. BIN
      designer_base/src/com/fr/design/images/sheet/right_hover@1x.png
  31. BIN
      designer_base/src/com/fr/design/images/sheet/right_normal@1x.png
  32. 2
      designer_base/src/com/fr/design/mainframe/JSliderPane.java
  33. 591
      designer_chart/src/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java
  34. 39
      designer_chart/src/com/fr/design/chart/series/PlotStyle/ChartSelectDemoPane.java
  35. 7
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAccColorPane.java
  36. 2
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java
  37. 6
      designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java
  38. 26
      designer_chart/src/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java
  39. 4
      designer_chart/src/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
  40. 4
      designer_chart/src/com/fr/plugin/chart/column/VanChartColumnSeriesPane.java
  41. 2
      designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
  42. 1
      designer_chart/src/com/fr/plugin/chart/structure/desinger/style/StructureNodeStylePane.java

12
designer/src/com/fr/design/mainframe/SheetNameTabPane.java

@ -54,10 +54,10 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
private static final Icon WORK_SHEET_ICON = BaseUtils.readIcon("com/fr/base/images/oem/worksheet.png");
private static final Icon POLY_SHEET_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/polysheet.png");
private static final Image DESIGN_IMAGE = BaseUtils.readImage("com/fr/design/images/sheet/left_right_btn.png");
private static final Icon LEFT_ICON = BaseUtils.createIcon(DESIGN_IMAGE, 0, 0, 14, 14);
private static final Icon RIGHT_ICON = BaseUtils.createIcon(DESIGN_IMAGE, 14, 0, 14, 14);
private static final Icon DISABLED_LEFT_ICON = BaseUtils.createIcon(DESIGN_IMAGE, 0, 14, 14, 14);
private static final Icon DISABLED_RIGHT_ICON = BaseUtils.createIcon(DESIGN_IMAGE, 14, 14, 14, 14);
private static final Icon DISABLED_LEFT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/left_normal@1x.png");
private static final Icon DISABLED_RIGHT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/right_normal@1x.png");
private static final Icon LEFT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/left_hover@1x.png");
private static final Icon RIGHT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/right_hover@1x.png");
private static final int ICON_SEP_DISTANCE = 8;
private static final int TOOLBAR_HEIGHT = 16;
@ -407,7 +407,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
sheeticon.paintIcon(this, g2d, (int) textX + charWidth, 2);
// peter:画字符
g2d.setPaint(getForeground());
g2d.drawString(sheetName, (int) textX + charWidth + 14, textAscent);
GraphHelper.drawString(g2d, sheetName, (int) textX + charWidth + 14, textAscent);
}
/**
@ -423,7 +423,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
* @param i
*/
private void paintUnSelectedTab(Graphics2D g2d, Icon sheetIcon, double textHeight, double textX, String sheetName, int charWidth, int textAscent, int i, boolean isNeedPaintAuthority) {
Color tabBackground = UIConstants.SHEET_NORMAL;
Color tabBackground = UIConstants.COMBOBOX_BTN_NORMAL;
int width = widthArray[i];
double[] x = {textX, textX, textX + LEFT_CORNOR, textX + width - RIGHT_CORNOR, textX + width, textX + width};
double[] y = {0, textHeight - LEFT_CORNOR, textHeight, textHeight, textHeight - RIGHT_CORNOR, 0};

17
designer/src/com/fr/design/mainframe/alphafine/AlphaFineConstants.java

@ -66,24 +66,25 @@ public class AlphaFineConstants {
public static final Font GREATER_FONT = new Font("Song_TypeFace", 0, 20);
public static final String IMAGE_URL = "/com/fr/design/mainframe/alphafine/images/";
public static final String PLUGIN_SEARCH_URL = SiteCenter.getInstance().acquireUrlByKind("plugin.searchAPI");
public static final String PLUGIN_URL = "http://shop.finereport.com/plugin/";
public static final String PLUGIN_URL = SiteCenter.getInstance().acquireUrlByKind("af.plugin");
public static final String REUSE_URL = "http://shop.finereport.com/reuse/";
public static final String REUSE_URL = SiteCenter.getInstance().acquireUrlByKind("af.reuse");
public static final String DOCUMENT_DOC_URL = "http://help.finereport.com/doc-view-";
public static final String DOCUMENT_DOC_URL = SiteCenter.getInstance().acquireUrlByKind("af.doc_view");
public static final String DOCUMENT_SEARCH_URL = "http://help.finereport.com/?api-search-title-";
public static final String DOCUMENT_SEARCH_URL = SiteCenter.getInstance().acquireUrlByKind("af.doc_search");
public static final String DOCUMENT_INFORMATION_URL = "http://help.finereport.com/?api-search-did-";
public static final String DOCUMENT_INFORMATION_URL = SiteCenter.getInstance().acquireUrlByKind("af.doc_info");
public static final String PLUGIN_IMAGE_URL = "http://shopres.finereport.com/";
public static final String PLUGIN_IMAGE_URL = SiteCenter.getInstance().acquireUrlByKind("af.plugin_image");
public static final String CLOUD_SERVER_URL = "http://cloud.fanruan.com/api/monitor/record_of_afsearch/single";
public static final String CLOUD_SERVER_URL = SiteCenter.getInstance().acquireUrlByKind("af.record");
public static final String SEARCH_API = "http://cloud.fanruan.com/api/intelligence/search/recommend?searchKey=";
public static final String SEARCH_API = SiteCenter.getInstance().acquireUrlByKind("af.cloud_search");
}

12
designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java

@ -1,5 +1,6 @@
package com.fr.design.mainframe.alphafine.cell.render;
import com.bulenkov.iconloader.IconLoader;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.alphafine.AlphaFineConstants;
import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
@ -15,6 +16,9 @@ import java.awt.*;
*/
public class ContentCellRender implements ListCellRenderer<Object> {
private static final int OFFSET = 45;
private static final String SELECTED_PATH = AlphaFineConstants.IMAGE_URL + "selected";
private static final String CELL_PATH = AlphaFineConstants.IMAGE_URL + "alphafine";
private static final String SUFFIX = ".png";
@Override
public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
@ -30,13 +34,13 @@ public class ContentCellRender implements ListCellRenderer<Object> {
titleLabel.setText(" " + model.getName());
if (model.hasAction()) {
if (isSelected) {
String iconUrl = "/com/fr/design/mainframe/alphafine/images/selected" + model.getType().getTypeValue() + ".png";
String iconUrl = SELECTED_PATH + model.getType().getTypeValue() + SUFFIX;
panel.setBackground(AlphaFineConstants.BLUE);
titleLabel.setForeground(Color.WHITE);
titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl)));
titleLabel.setIcon(IconLoader.getIcon(iconUrl));
} else {
String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getTypeValue() + ".png";
titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl)));
String iconUrl = CELL_PATH + model.getType().getTypeValue() + SUFFIX;
titleLabel.setIcon(IconLoader.getIcon(iconUrl));
titleLabel.setForeground(AlphaFineConstants.BLACK);
}

26
designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@ -1,5 +1,6 @@
package com.fr.design.mainframe.alphafine.component;
import com.bulenkov.iconloader.IconLoader;
import com.fr.base.ConfigManager;
import com.fr.base.FRContext;
import com.fr.design.DesignerEnvManager;
@ -21,12 +22,16 @@ import com.fr.design.mainframe.alphafine.preview.DocumentPreviewPane;
import com.fr.design.mainframe.alphafine.preview.FilePreviewPane;
import com.fr.design.mainframe.alphafine.preview.NoResultPane;
import com.fr.design.mainframe.alphafine.preview.PluginPreviewPane;
import com.fr.design.mainframe.alphafine.search.manager.*;
import com.fr.design.mainframe.alphafine.search.manager.ActionSearchManager;
import com.fr.design.mainframe.alphafine.search.manager.DocumentSearchManager;
import com.fr.design.mainframe.alphafine.search.manager.FileSearchManager;
import com.fr.design.mainframe.alphafine.search.manager.PluginSearchManager;
import com.fr.design.mainframe.alphafine.search.manager.RecentSearchManager;
import com.fr.design.mainframe.alphafine.search.manager.RecommendSearchManager;
import com.fr.form.main.Form;
import com.fr.form.main.FormIO;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger;
import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.general.http.HttpClient;
import com.fr.io.TemplateWorkBookIO;
@ -44,7 +49,13 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.AWTEventListener;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.net.URL;
@ -134,7 +145,7 @@ public class AlphaFineDialog extends UIDialog {
private void initComponents() {
initSearchTextField();
JPanel topPane = new JPanel(new BorderLayout());
UILabel iconLabel = new UILabel(new ImageIcon(getClass().getResource("/com/fr/design/mainframe/alphafine/images/bigsearch.png")));
UILabel iconLabel = new UILabel(IconLoader.getIcon(AlphaFineConstants.IMAGE_URL + "bigsearch.png"));
iconLabel.setPreferredSize(AlphaFineConstants.ICON_LABEL_SIZE);
iconLabel.setOpaque(true);
iconLabel.setBackground(Color.WHITE);
@ -149,7 +160,7 @@ public class AlphaFineDialog extends UIDialog {
}
};
closeButton.setPreferredSize(AlphaFineConstants.CLOSE_BUTTON_SIZE);
closeButton.setIcon(new ImageIcon(getClass().getResource("/com/fr/design/mainframe/alphafine/images/alphafine_close.png")));
closeButton.setIcon(IconLoader.getIcon(AlphaFineConstants.IMAGE_URL + "alphafine_close.png"));
closeButton.set4ToolbarButton();
closeButton.setBorderPainted(false);
closeButton.setRolloverEnabled(false);
@ -345,7 +356,7 @@ public class AlphaFineDialog extends UIDialog {
*/
private void removeLeftPane() {
if (searchListModel.isEmpty() && defaultPane == null) {
defaultPane = new NoResultPane(Inter.getLocText("FR-Designer-AlphaFine_NO_Result"), IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/no_result.png"));
defaultPane = new NoResultPane(Inter.getLocText("FR-Designer-AlphaFine_NO_Result"), AlphaFineConstants.IMAGE_URL + "no_result.png");
searchResultPane.remove(leftSearchResultPane);
searchResultPane.add(defaultPane, BorderLayout.WEST);
refreshContainer();
@ -556,7 +567,7 @@ public class AlphaFineDialog extends UIDialog {
break;
case ACTION:
rightSearchResultPane.removeAll();
rightSearchResultPane.add(new NoResultPane(Inter.getLocText("FR-Designer_NoResult"), IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/noresult.png")));
rightSearchResultPane.add(new NoResultPane(Inter.getLocText("FR-Designer_NoResult"), AlphaFineConstants.IMAGE_URL + "noresult.png"));
validate();
repaint();
break;
@ -698,6 +709,7 @@ public class AlphaFineDialog extends UIDialog {
/**
* 处理搜索结果
*
* @param selectedValue
*/
private void dealWithSearchResult(AlphaCellModel selectedValue) {

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine1@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 738 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine2@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 618 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine3@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine4@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine5@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 323 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine_close@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 371 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/bigsearch@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 871 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/no_result@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
designer/src/com/fr/design/mainframe/alphafine/images/noresult@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
designer/src/com/fr/design/mainframe/alphafine/images/opening@2x.gif

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 KiB

BIN
designer/src/com/fr/design/mainframe/alphafine/images/selected1@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 528 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/selected2@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/selected3@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/selected4@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 430 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/selected5@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/smallsearch@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

5
designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java

@ -1,5 +1,6 @@
package com.fr.design.mainframe.alphafine.preview;
import com.bulenkov.iconloader.IconLoader;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.alphafine.AlphaFineConstants;
import com.fr.general.FRFont;
@ -11,14 +12,14 @@ import java.awt.*;
* Created by XiaXiang on 2017/8/14.
*/
public class NoResultPane extends JPanel {
public NoResultPane(String title, Icon icon) {
public NoResultPane(String title, String iconUrl) {
setLayout(new BorderLayout());
setBackground(Color.white);
setPreferredSize(new Dimension(AlphaFineConstants.LEFT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT));
UILabel image = new UILabel();
image.setPreferredSize(new Dimension(150, 111));
image.setHorizontalAlignment(SwingConstants.CENTER);
image.setIcon(icon);
image.setIcon(IconLoader.getIcon(iconUrl));
image.setBorder(BorderFactory.createEmptyBorder(100,0,0,0));
UILabel description = new UILabel(title);
description.setForeground(AlphaFineConstants.MEDIUM_GRAY);

17
designer/src/com/fr/design/present/CurrencyLinePane.java

@ -6,6 +6,7 @@ import com.fr.design.constants.LayoutConstants;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
@ -33,8 +34,8 @@ public class CurrencyLinePane extends FurtherBasicBeanPane<CurrencyLinePresent>
private static final int VS_NUM = 4;
private static final int VG_NUM = 6;
private static final Dimension NORMAL_DIMENSION = new Dimension(155, 20);
private UIBasicSpinner intPartSpinner;
private UIBasicSpinner deciPartSpinner;
private UISpinner intPartSpinner;
private UISpinner deciPartSpinner;
private UITextField textField;
private CurrencyLinePreviewPane CurrencyLinePreviewPane;
private int intPart = 9;
@ -73,11 +74,11 @@ public class CurrencyLinePane extends FurtherBasicBeanPane<CurrencyLinePresent>
protected void initComponents() {
// 整数位选择
intPartSpinner = new UIBasicSpinner(new SpinnerNumberModel(9, 1, 20, 1));
intPartSpinner = new UISpinner(1, 20, 1, 9);
intPartSpinner.setPreferredSize(NORMAL_DIMENSION);
// 小数位选择
deciPartSpinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 10, 1));
deciPartSpinner = new UISpinner(1, 10, 1, 2);
deciPartSpinner.setPreferredSize(NORMAL_DIMENSION);
// 预览区域
textField = new UITextField(10);
@ -132,8 +133,8 @@ public class CurrencyLinePane extends FurtherBasicBeanPane<CurrencyLinePresent>
*/
public CurrencyLineAttr update() {
CurrencyLineAttr currencylineAttr = new CurrencyLineAttr();
currencylineAttr.setintPart(((Integer) this.intPartSpinner.getValue()).intValue());
currencylineAttr.setdeciPart(((Integer) this.deciPartSpinner.getValue()).intValue());
currencylineAttr.setintPart((int) this.intPartSpinner.getValue());
currencylineAttr.setdeciPart((int) this.deciPartSpinner.getValue());
return currencylineAttr;
}
@ -225,8 +226,8 @@ public class CurrencyLinePane extends FurtherBasicBeanPane<CurrencyLinePresent>
@Override
public CurrencyLinePresent updateBean() {
CurrencyLineAttr currencylineAttr = new CurrencyLineAttr();
currencylineAttr.setintPart(((Integer) this.intPartSpinner.getValue()).intValue());
currencylineAttr.setdeciPart(((Integer) this.deciPartSpinner.getValue()).intValue());
currencylineAttr.setintPart((int) this.intPartSpinner.getValue());
currencylineAttr.setdeciPart((int) this.deciPartSpinner.getValue());
return new CurrencyLinePresent(currencylineAttr);
}

1
designer_base/src/com/fr/design/constants/UIConstants.java

@ -161,6 +161,7 @@ public interface UIConstants {
public static final Icon DELETE_ICON = BaseUtils.readIcon("com/fr/design/images/m_file/close.png");
public static final Icon EDIT_ICON = BaseUtils.readIcon("com/fr/design/images/m_file/edit.png");
public static final Icon SEARCH_ICON = BaseUtils.readIcon("/com/fr/design/images/data/search.png");
public static final Icon BLACK_SEARCH_ICON = BaseUtils.readIcon("/com/fr/design/images/data/black_search.png");
public static final Icon CLEAR_ICON = BaseUtils.readIcon("/com/fr/design/images/data/source/delete.png");
public static final Icon LIST_EDIT_ICON = BaseUtils.readIcon("/com/fr/design/images/control/edit.png");
public static final Icon LIST_EDIT_WHITE_ICON = BaseUtils.readIcon("/com/fr/design/images/control/edit_white.png");

10
designer_base/src/com/fr/design/gui/ispinner/UISpinnerUI.java

@ -5,7 +5,9 @@
package com.fr.design.gui.ispinner;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ibutton.SpecialUIButton;
import com.fr.design.gui.ibutton.UIButton;
import javax.swing.*;
import javax.swing.plaf.ComponentUI;
@ -42,8 +44,8 @@ public class UISpinnerUI extends BasicSpinnerUI {
}
protected Component createPreviousButton() {
JButton b = new SpecialUIButton(new UISpinnerButtonUI(SwingConstants.SOUTH));
// JButton b = new SpecialUIButton(new UISpinnerButtonUI(SwingConstants.SOUTH));
JButton b = new UIButton(UIConstants.ARROW_DOWN_ICON);
b.putClientProperty("isSpinnerButton", Boolean.TRUE);
b.setFocusable(false);
b.addActionListener(PREVIOUS_BUTTON_HANDLER);
@ -53,8 +55,8 @@ public class UISpinnerUI extends BasicSpinnerUI {
}
protected Component createNextButton() {
JButton b = new SpecialUIButton(new UISpinnerButtonUI(SwingConstants.NORTH));
// JButton b = new SpecialUIButton(new UISpinnerButtonUI(SwingConstants.NORTH));
JButton b = new UIButton(UIConstants.ARROW_UP_ICON);
b.putClientProperty("isSpinnerButton", Boolean.TRUE);
b.setFocusable(false);
b.addActionListener(NEXT_BUTTON_HANDLER);

297
designer_base/src/com/fr/design/gui/itextfield/UISearchTextField.java

File diff suppressed because one or more lines are too long

29
designer_base/src/com/fr/design/gui/style/FormatPane.java

@ -9,6 +9,8 @@ import com.fr.data.core.FormatField.FormatContents;
import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.constants.UIConstants;
import com.fr.design.event.GlobalNameListener;
import com.fr.design.event.GlobalNameObserver;
import com.fr.design.gui.icombobox.TextFontComboBox;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.icombobox.UIComboBoxRenderer;
@ -34,7 +36,7 @@ import java.text.SimpleDateFormat;
* @author zhou
* @since 2012-5-24上午10:57:00
*/
public class FormatPane extends AbstractBasicStylePane {
public class FormatPane extends AbstractBasicStylePane implements GlobalNameObserver {
private static final long serialVersionUID = 724330854437726751L;
private static final int LABLE_X = 4;
@ -61,7 +63,7 @@ public class FormatPane extends AbstractBasicStylePane {
private FRFontPane frFontPane;
private boolean isRightFormate;
private boolean isDate = false;
private boolean isFormat = false;
private GlobalNameListener globalNameListener = null;
/**
* Constructor.
@ -87,13 +89,14 @@ public class FormatPane extends AbstractBasicStylePane {
UIComboBoxRenderer render = createComBoxRender();
typeComboBox.setRenderer(render);
typeComboBox.addItemListener(itemListener);
typeComboBox.setGlobalName("typeComboBox");
contentPane.add(sampleLabel, BorderLayout.NORTH);
txtCenterPane = new JPanel(new BorderLayout());
textField = new TextFontComboBox();
// textField.setItemArray(FormatField.getInstance().getFormatArray(getFormatContents()));
textField.addItemListener(textFieldItemListener);
textField.setEditable(true);
textField.setGlobalName("textField");
txtCenterPane.add(textField, BorderLayout.NORTH);
contentPane.add(txtCenterPane, BorderLayout.CENTER);
@ -333,7 +336,6 @@ public class FormatPane extends AbstractBasicStylePane {
centerPane.setPreferredSize(new Dimension(270, 65));
cardLayout.show(centerPane, "show");
}
isFormat = true;
}
}
@ -343,7 +345,6 @@ public class FormatPane extends AbstractBasicStylePane {
@Override
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
isFormat = true;
refreshPreviewLabel();
}
}
@ -355,7 +356,6 @@ public class FormatPane extends AbstractBasicStylePane {
*/
public void populateBean(Style style) {
this.populateBean(style.getFormat());
isFormat = false;
this.frFontPane.populateBean(style.getFRFont());
}
@ -364,8 +364,7 @@ public class FormatPane extends AbstractBasicStylePane {
* update
*/
public Style update(Style style) {
if (isFormat) {
isFormat = false;
if (ComparatorUtils.equals(globalNameListener.getGlobalName(), "textField") || ComparatorUtils.equals(globalNameListener.getGlobalName(), "typeComboBox")) {
return style.deriveFormat(this.update());
} else {
return style.deriveFRFont(this.frFontPane.update(style.getFRFont()));
@ -424,4 +423,18 @@ public class FormatPane extends AbstractBasicStylePane {
}
}
@Override
public void registerNameListener(GlobalNameListener listener) {
globalNameListener = listener;
}
@Override
public boolean shouldResponseNameListener() {
return false;
}
@Override
public void setGlobalName(String name) {
}
}

BIN
designer_base/src/com/fr/design/images/data/black_search.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 374 B

BIN
designer_base/src/com/fr/design/images/sheet/left_hover@1x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 B

BIN
designer_base/src/com/fr/design/images/sheet/left_normal@1x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 B

BIN
designer_base/src/com/fr/design/images/sheet/right_hover@1x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

BIN
designer_base/src/com/fr/design/images/sheet/right_normal@1x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 244 B

2
designer_base/src/com/fr/design/mainframe/JSliderPane.java

@ -8,6 +8,7 @@ import com.fr.design.gui.ibutton.UISliderButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.islider.UISlider;
import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.gui.ispinner.UISpinnerUI;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
@ -132,6 +133,7 @@ public class JSliderPane extends JPanel {
return new Point(event.getX(), event.getY() - TOOLTIP_Y);
}
};
showValSpinner.setUI(new UISpinnerUI());
showValSpinner.setEnabled(true);
showValSpinner.addChangeListener(showValSpinnerChangeListener);
showValSpinner.setPreferredSize(new Dimension(SPINNER_WIDTH, SPINNER_HEIGHT));

591
designer_chart/src/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java

File diff suppressed because one or more lines are too long

39
designer_chart/src/com/fr/design/chart/series/PlotStyle/ChartSelectDemoPane.java

@ -1,19 +1,17 @@
package com.fr.design.chart.series.PlotStyle;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.ArrayList;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import com.fr.design.dialog.BasicPane;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.dialog.BasicPane;
import com.fr.stable.ArrayUtils;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.ArrayList;
/**
* 图表选中demo的类. 用于 选中点击, 悬浮状态, 可以继承, 改变画的内容.
* @author kunsnat E-mail:kunsnat@gmail.com
@ -27,7 +25,7 @@ public class ChartSelectDemoPane extends BasicPane implements UIObserver, MouseL
// 所有统一参与的点击状态类. 相当于Group
protected ChartSelectDemoPane[] demoList = new ChartSelectDemoPane[0];
private boolean isRollOver;
protected boolean isRollOver;
private ArrayList<ChangeListener> changeListeners = new ArrayList<ChangeListener>();
public void setDemoGroup(ChartSelectDemoPane[] demos) {
@ -56,7 +54,7 @@ public class ChartSelectDemoPane extends BasicPane implements UIObserver, MouseL
fireStateChange();
for (int i = 0; i < ArrayUtils.getLength(demoList); i++) {
demoList[i].checkBackground();
demoList[i].checkBorder();
demoList[i].repaint();
}
}
@ -102,7 +100,7 @@ public class ChartSelectDemoPane extends BasicPane implements UIObserver, MouseL
isRollOver = true;
for (int i = 0; i < ArrayUtils.getLength(demoList); i++) {
demoList[i].checkBackground();
demoList[i].checkBorder();
demoList[i].repaint();
}
}
@ -126,7 +124,7 @@ public class ChartSelectDemoPane extends BasicPane implements UIObserver, MouseL
}
for (int i = 0; i < ArrayUtils.getLength(demoList); i++) {
demoList[i].checkBackground();
demoList[i].checkBorder();
demoList[i].repaint();
}
}
@ -159,15 +157,10 @@ public class ChartSelectDemoPane extends BasicPane implements UIObserver, MouseL
}
/**
* 修改背景颜色
* 修改边框颜色
*/
public void checkBackground() {
if (!isRollOver && !isPressing) {
this.setBackground(null);
} else if(isRollOver && !isPressing){
this.setBackground(new Color(182, 217, 253));
} else {
this.setBackground(new Color(164, 192, 220));
}
public void checkBorder() {
this.setBorder(null);
}
}

7
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAccColorPane.java

@ -16,7 +16,6 @@ import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.geom.Rectangle2D;
/**
* 图表颜色填充--32种精确颜色选择界面.
@ -66,10 +65,8 @@ public class ChartAccColorPane extends BasicPane implements MouseListener, UIObs
Graphics2D g2d = (Graphics2D) g;
super.repaint();
Rectangle2D bounds = this.getBounds();
if(bounds == null) {
return;
}
this.setLayout(null);
this.setBounds(0,0,WIDTH*ROWCOUNT, WIDTH*4);
Paint oldPaint = g2d.getPaint();
g2d.setPaint(new Color(212, 212, 216));
g2d.fillRect(0, 0, WIDTH*ROWCOUNT, WIDTH*4);

2
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java

@ -94,7 +94,7 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
}
protected void initLayout() {
customPane.setPreferredSize(new Dimension(200, 130));
customPane.setPreferredSize(new Dimension(200, 100));
colorGradient.setPreferredSize(new Dimension(120, 30));

6
designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java

@ -128,7 +128,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
int iconLen = iconPaths.length;
int tipLen = tipNames.length;
for(int i = 0, len = Math.min(iconLen, tipLen); i < len; i++) {
boolean isDrawRightLine = (i == len - 1 || (i + 1) % ONE_LINE_NUM == 0);
boolean isDrawRightLine = (i != len - 1 || (i + 1) % ONE_LINE_NUM != 0);
ChartImagePane imagePane = new ChartImagePane(iconPaths[i], tipNames[i], isDrawRightLine);
imagePane.isPressing = (i == 0);
list.add(imagePane);
@ -208,13 +208,13 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
protected void checkDemosBackground() {
if(this.styleList != null && !styleList.isEmpty()){
for(int i = 0; i < styleList.size(); i++) {
styleList.get(i).checkBackground();
styleList.get(i).checkBorder();
styleList.get(i).repaint();
}
}
for(int i = 0; i < typeDemo.size(); i++) {
typeDemo.get(i).checkBackground();
typeDemo.get(i).checkBorder();
typeDemo.get(i).repaint();
}
}

26
designer_chart/src/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java

@ -11,6 +11,9 @@ import java.awt.event.MouseEvent;
public class ChartImagePane extends ChartSelectDemoPane {
private static final long serialVersionUID = -2785128245790568603L;
private static final int IMAGE_WIDTH = 58;
private static final int IMAGE_HIGTH = 50;
private static final Color ENTER_COLOR = new Color(216, 242, 253);
private boolean isDrawRightLine = false;
public boolean isDoubleClicked = false;
@ -21,7 +24,9 @@ public class ChartImagePane extends ChartSelectDemoPane {
addMouseListener(this);
this.setToolTipText(tipName);
this.setBorder(BorderFactory.createMatteBorder(1, 1, 1, isDrawRightLine ? 1 : 0, UIConstants.LINE_COLOR));
this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, UIConstants.SELECT_TAB));
this.setBackground(UIConstants.TOOLBARUI_BACKGROUND);
this.setPreferredSize(new Dimension(IMAGE_WIDTH, IMAGE_HIGTH));
}
public ChartImagePane(String fullIconPath, String tipName, boolean isDrawRightLine){
@ -38,7 +43,10 @@ public class ChartImagePane extends ChartSelectDemoPane {
this.setToolTipText(tipName);
this.setBorder(BorderFactory.createMatteBorder(1, 1, 1, isDrawRightLine ? 1 : 0, UIConstants.LINE_COLOR));
this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, UIConstants.SELECT_TAB));
this.setBackground(UIConstants.TOOLBARUI_BACKGROUND);
this.setPreferredSize(new Dimension(IMAGE_WIDTH, IMAGE_HIGTH));
}
/**
@ -53,4 +61,18 @@ public class ChartImagePane extends ChartSelectDemoPane {
}
super.mouseClicked(e);
}
/**
* 修改边框颜色
*/
public void checkBorder() {
if (!isRollOver && !isPressing) {
this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, UIConstants.SELECT_TAB));
} else if (isRollOver && !isPressing) {
this.setBorder(BorderFactory.createMatteBorder(2, 2, 2, 2, ENTER_COLOR));
} else {
this.setBorder(BorderFactory.createMatteBorder(2, 2, 2, 2, UIConstants.FLESH_BLUE));
}
}
}

4
designer_chart/src/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java

@ -163,8 +163,8 @@ public class GisMapPlotPane extends AbstractChartTypePane{
styleList.get(BAIDU).isPressing =false;
keyInput.setText(plot.getGoogleKey());
}
styleList.get(GOOGLE).checkBackground();
styleList.get(BAIDU).checkBackground();
styleList.get(GOOGLE).checkBorder();
styleList.get(BAIDU).checkBorder();
}
/**

4
designer_chart/src/com/fr/plugin/chart/column/VanChartColumnSeriesPane.java

@ -122,7 +122,9 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
}
private void checkColumnWidth() {
columnWidth.setVisible(isFixedWidth.getSelectedIndex() == 0);
boolean b = isFixedWidth.getSelectedIndex() == 0;
columnWidth.setVisible(b);
seriesGap.setEnabled(!b);
}
private void checkImagePane() {

2
designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java

@ -92,7 +92,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
formatPane = createFormatPane();
}
Point comPoint = formatButton.getLocationOnScreen();
Point arrowPoint = new Point(comPoint.x, comPoint.y + formatButton.getHeight());
Point arrowPoint = new Point(comPoint.x +formatButton.getWidth() - 25, comPoint.y + formatButton.getHeight());
UIBubbleFloatPane<Style> pane = new UIBubbleFloatPane(Constants.LEFT, arrowPoint, formatPane, 258, 209) {
@Override

1
designer_chart/src/com/fr/plugin/chart/structure/desinger/style/StructureNodeStylePane.java

@ -65,6 +65,7 @@ public class StructureNodeStylePane extends BasicBeanPane<AttrNode> {
useImage = new UIButtonGroup<Integer>(new String[]{Inter.getLocText("Plugin-ChartF_YES"),
Inter.getLocText("Plugin-ChartF_NO")});
imagePane = new ImageBackgroundQuickPane(false);
imagePane.setBorder(BorderFactory.createEmptyBorder(0,(int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Filled_With_Image")),useImage},
};

Loading…
Cancel
Save