Merge branch 'release/9.0' of http://cloud.finedevelop.com:2015/scm/~mango/m_design into release/9.0

designer/src/com/fr/design/actions/cell/style/ReportFontItalicAction.java

@@ -22,7 +22,7 @@ public class ReportFontItalicAction extends ReportFontBoldAction {
     public ReportFontItalicAction(ElementCasePane t) {
 		super(t);
 
-		this.setName(Inter.getLocText("FRFont-italic"));
+		this.setName(Inter.getLocText("FR-Designer-FRFont_Italic"));
 		this.setSmallIcon(ICONS, true);
 	}
 

designer_base/src/com/fr/design/extra/LoginWebPane.java

@@ -27,7 +27,7 @@ public class LoginWebPane extends JFXPanel {
                 LoginWebPane.this.setScene(scene);
                 WebView webView = new WebView();
                 WebEngine webEngine = webView.getEngine();
-                webEngine.load("file:///" + installHome + "/scripts/qqLogin/web/login.html");
+                webEngine.load("file:///" + installHome + "/scripts/login.html");
                 webEngine.setOnAlert(new EventHandler<WebEvent<String>>() {
                     @Override
                     public void handle(WebEvent<String> event) {

designer_base/src/com/fr/design/extra/QQLoginWebPane.java

@@ -62,7 +62,7 @@ public class QQLoginWebPane extends JFXPanel {
                 QQLoginWebPane.this.setScene(scene);
                 final WebView webView = new WebView();
                 webEngine = webView.getEngine();
-                url = "file:///" + installHome + "/scripts/qqLogin/web/qqLogin.html";
+                url = "file:///" + installHome + "/scripts/qqLogin.html";
                 webEngine.load(url);
 
                 final Stage primaryStage = new Stage();

designer_base/src/com/fr/design/extra/WebViewDlgHelper.java

@@ -37,7 +37,7 @@ public class WebViewDlgHelper {
 
     public static void createPluginDialog() {
         if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
-            String relativePath = "/scripts/store/web/index.html";
+            String relativePath = "/scripts/plugin.html";
             String mainJsPath = StableUtils.pathJoin(installHome, relativePath);
             File file = new File(mainJsPath);
             if (!file.exists()) {
@@ -52,7 +52,7 @@ public class WebViewDlgHelper {
                     downloadShopScripts(SHOP_SCRIPTS);
                 }
             } else {
-                String indexPath = "index.html";
+                String indexPath = "plugin.html";
                 String mainIndexPath = StableUtils.pathJoin(installHome, indexPath);
                 checkAndCopyMainFile(mainIndexPath, mainJsPath);
                 showPluginDlg(mainIndexPath);
@@ -73,7 +73,7 @@ public class WebViewDlgHelper {
     }
 
     /**
-     * 检查script文件夹中的index.html文件
+     * 检查script文件夹中的plugin.html文件
      *
      */
     public static void checkAndCopyMainFile(String indexPath, String mainJsPath){
@@ -84,7 +84,7 @@ public class WebViewDlgHelper {
     }
 
     /**
-     * 將script文件夹中的index.html文件复制到webreport下
+     * 將script文件夹中的plugin.html文件复制到webreport下
      *
      */
     public static void copyMainFile(String indexPath, String mainJsPath){
@@ -191,9 +191,9 @@ public class WebViewDlgHelper {
 
                 try {
                     if (get()) {
-                        String relativePath = "/scripts/store/web/index.html";
+                        String relativePath = "/scripts/plugin.html";
                         IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome);
-                        copyMainFile(StableUtils.pathJoin(installHome, "index.html"),  StableUtils.pathJoin(installHome, relativePath));
+                        copyMainFile(StableUtils.pathJoin(installHome, "plugin.html"),  StableUtils.pathJoin(installHome, relativePath));
                         // TODO: 2017/4/17 删除之前存放在安装目录下的script
                         PluginStoreConstants.refreshProps();    // 下载完刷新一下版本号等
                         JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Shop_Installed"), Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE);

designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java

@@ -76,6 +76,18 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{
 		super(icons[0], null, icons[1]);
 		setSelectedIcon(icons[1]);
 		setExtraPainted(true);
+		if (!needRelease) {
+			addActionListener(new AbstractAction() {
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					if (UIToggleButton.super.isSelected()) {
+						UIToggleButton.super.setSelected(false);
+					} else {
+						UIToggleButton.super.setSelected(true);
+					}
+				}
+			});
+		}
 		addMouseListener(getMouseListener());
 	}
 

designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java

@@ -94,6 +94,10 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
      */
     @Override
     public void paintCurrentValue(Graphics g, Rectangle bounds, boolean hasFocus) {
+        paintCurrentValue(g, bounds, hasFocus, 0);
+    }
+
+    public void paintCurrentValue(Graphics g, Rectangle bounds, boolean hasFocus, int paddingLeft) {
         ListCellRenderer renderer = comboBox.getRenderer();
         Component c;
 
@@ -142,7 +146,7 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
 
         int x = bounds.x, y = bounds.y, w = bounds.width, h = bounds.height;
 
-        currentValuePane.paintComponent(g, c, comboBox, x, y, w, h, shouldValidate);
+        currentValuePane.paintComponent(g, c, comboBox, x + paddingLeft, y, w, h, shouldValidate);
     }
 
     @Override

designer_base/src/com/fr/design/gui/style/AlignmentPane.java

@@ -83,12 +83,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         Icon[][] hAlignmentIconArray = {{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal_white.png")},
                 {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal_white.png")},
                 {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal_white.png")},
-                {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png")},
-                {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")}};
-//                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),
-//                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),
-//                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"),
-//                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")};
+                {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png")},
+                {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png")}};
         Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL};
         hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
         hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Right"),
@@ -96,9 +92,9 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
         vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
 
-        Icon[] vAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"),
-                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"),
-                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png")};
+        Icon[][] vAlignmentIconArray = {{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png")},
+                {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png")},
+                {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png")}};
         Integer[] vAlignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM};
         vAlignmentPane = new UIButtonGroup<Integer>(vAlignmentIconArray, vAlignment);
         vAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Top"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Bottom")});

designer_base/src/com/fr/design/gui/style/BorderPane.java

@@ -82,10 +82,10 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
                 new Component[]{null, null},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Color") + "    ", SwingConstants.LEFT), currentLineColorPane},
                 new Component[]{null, null},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_outBorder") + "    ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/out.png"))},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_outBorder") + "    ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/out.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)},
                 new Component[]{null, externalPane},
                 new Component[]{null, null},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_inBorder") + "    ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/in.png"))},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_inBorder") + "    ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/in.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)},
                 new Component[]{null, insidePane},
                 new Component[]{null, null}
         };
@@ -125,12 +125,12 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
     };
 
     private void initButtonsWithIcon() {
-        topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"));
-        leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"));
-        bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"));
-        rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"));
-        horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"));
-        verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"));
+        topToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/top_white.png")}, false);
+        leftToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/left_white.png")}, false);
+        bottomToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bottom_white.png")}, false);
+        rightToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/right_white.png")}, false);
+        horizontalToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/horizontal_white.png")}, false);
+        verticalToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/vertical_white.png")}, false);
         this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
         this.currentLineColorPane = new NewColorSelectBox(100);
     }

designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java

@@ -121,6 +121,11 @@ public class UITreeComboBox extends UIComboBox {
         protected ComboPopup createPopup() {
             return new TreePopup(comboBox);
         }
+
+        @Override
+        public void paintCurrentValue(Graphics g, Rectangle bounds, boolean hasFocus) {
+            paintCurrentValue(g, bounds, hasFocus, 3);
+        }
     }
 
     class MotifJTreeComboBoxUI extends MotifComboBoxUI{

designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@@ -238,12 +238,15 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     public void fireValueChanged() {
         XCreator creator = getXCreatorDedicated();
         creator.firePropertyChange();
-        designer.fireTargetModified();
+        firePropertyEdit();
     }
 
     public String getIconPath() {
         return StringUtils.EMPTY;
     }
 
+    public void firePropertyEdit() {
+        designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED);
+    }
 
 }