Browse Source

CHART-1343 修改取消轮播箭头的设置,让它符合设计的要求

master
Qin Xiaofu 7 years ago
parent
commit
b742b1dfea
  1. 1
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  2. 17
      designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
  3. 2
      designer_chart/src/com/fr/plugin/chart/DownloadOnlineSourcesHelper.java
  4. 7
      designer_chart/src/com/fr/plugin/chart/DownloadSourcesEvent.java

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

@ -117,6 +117,7 @@ FR-Designer_Forum=\u8BBA\u575B
FR-Designer_Get-Cube=\u6B63\u5728\u83B7\u53D6cube FR-Designer_Get-Cube=\u6B63\u5728\u83B7\u53D6cube
FR-Designer_Help=\u5E2E\u52A9 FR-Designer_Help=\u5E2E\u52A9
FR-Designer_Hide=\u9690\u85CF FR-Designer_Hide=\u9690\u85CF
FR-Designer_Show=\u663E\u793A
FR-Designer_Hyperlink=\u8D85\u7EA7\u94FE\u63A5 FR-Designer_Hyperlink=\u8D85\u7EA7\u94FE\u63A5
FR-Designer_Hyperlink-Form_link=\u5F53\u524D\u8868\u5355\u5BF9\u8C61 FR-Designer_Hyperlink-Form_link=\u5F53\u524D\u8868\u5355\u5BF9\u8C61
FR-Designer_IDCard=\u8EAB\u4EFD\u8BC1 FR-Designer_IDCard=\u8EAB\u4EFD\u8BC1

17
designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java

@ -11,7 +11,6 @@ import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
@ -46,8 +45,9 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
//轮播切换方式配置接界面 //轮播切换方式配置接界面
private JPanel carouselConfigPane; private JPanel carouselConfigPane;
protected UISpinner timeInterval; protected UISpinner timeInterval;
protected UICheckBox arrowCheckbox;
private ColorSelectBoxWithOutTransparent colorSelectBox4carousel; private ColorSelectBoxWithOutTransparent colorSelectBox4carousel;
private UIButtonGroup switchStyleGroup;
public ChangeConfigPane(){ public ChangeConfigPane(){
initButtonGroup(); initButtonGroup();
@ -97,14 +97,15 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] columnSize = {p, f}; double[] columnSize = {p, f};
double[] rowSize = {p,p,p}; double[] rowSize = {p, p, p};
timeInterval = new UISpinner(MIN_TIME, MAX_TIME, 1, 0); timeInterval = new UISpinner(MIN_TIME, MAX_TIME, 1, 0);
colorSelectBox4carousel = new ColorSelectBoxWithOutTransparent(WIDTH); colorSelectBox4carousel = new ColorSelectBoxWithOutTransparent(WIDTH);
arrowCheckbox = new UICheckBox(Inter.getLocText("FR-Base_TurnOn")); switchStyleGroup = new UIButtonGroup(new String[]{Inter.getLocText("FR-Designer_Show"), Inter.getLocText("FR-Designer_Hide")});
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Arrow_Style")), switchStyleGroup},
new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), timeInterval}, new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), timeInterval},
new Component[]{new UILabel(Inter.getLocText("Background")),colorSelectBox4carousel}, new Component[]{new UILabel(Inter.getLocText("Background")),colorSelectBox4carousel}
new Component[] {new UILabel(Inter.getLocText("Plugin-ChartF_Arrow_Style")), arrowCheckbox}
}; };
return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
@ -181,7 +182,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
//轮播切换界面 //轮播切换界面
timeInterval.setValue(changeConfigAttr.getTimeInterval()); timeInterval.setValue(changeConfigAttr.getTimeInterval());
colorSelectBox4carousel.setSelectObject(changeConfigAttr.getCarouselColor()); colorSelectBox4carousel.setSelectObject(changeConfigAttr.getCarouselColor());
arrowCheckbox.setSelected(changeConfigAttr.isShowArrow()); switchStyleGroup.setSelectedIndex(changeConfigAttr.isShowArrow() ? 0 : 1);
checkCardPane(); checkCardPane();
@ -205,7 +206,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
changeConfigAttr.setButtonColor(colorSelectBox4button.getSelectObject()); changeConfigAttr.setButtonColor(colorSelectBox4button.getSelectObject());
changeConfigAttr.setTimeInterval((int) timeInterval.getValue()); changeConfigAttr.setTimeInterval((int) timeInterval.getValue());
changeConfigAttr.setCarouselColor(colorSelectBox4carousel.getSelectObject()); changeConfigAttr.setCarouselColor(colorSelectBox4carousel.getSelectObject());
changeConfigAttr.setShowArrow(arrowCheckbox.isSelected()); changeConfigAttr.setShowArrow(switchStyleGroup.getSelectedIndex() == 0);
} }
@Override @Override

2
designer_chart/src/com/fr/plugin/chart/DownloadOnlineSourcesHelper.java

@ -26,7 +26,7 @@ import java.util.List;
/** /**
* Created by shine on 2017/8/21. * Created by shine on 2017/8/21.
*/ */
public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent{ public class DownloadOnlineSourcesHelper {
// 定义加载窗口大小 // 定义加载窗口大小
private static final int LOAD_WIDTH = 455; private static final int LOAD_WIDTH = 455;
private static final int INCIDENT_HEIGHT = 15; private static final int INCIDENT_HEIGHT = 15;

7
designer_chart/src/com/fr/plugin/chart/DownloadSourcesEvent.java

@ -1,7 +0,0 @@
package com.fr.plugin.chart;
/**
* Created by Napoleon on 2017/8/25.
*/
public interface DownloadSourcesEvent {
}
Loading…
Cancel
Save