Pull request #9846: REPORT-73419 && REPORT-73510 服务器配置-工具栏背景色 渐变色、图案处的颜色选择器修改为 无主题色的面板; 调整水印弹窗尺寸

Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0

* commit '7b3c4128f9fe7b75bb3e469923128617636f5a51':
  REPORT-73510 服务器配置-工具栏背景色 渐变色、图案处的颜色选择器修改为 无主题色的面板
  REPORT-73419 调整水印弹窗尺寸

designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@@ -47,7 +47,7 @@ import java.awt.FlowLayout;
  * Created by plough on 2018/5/15.
  */
 public class WatermarkPane extends BasicPane {
-    private static final int MAX_WIDTH = 160;
+    private static final int MAX_WIDTH = 216;
 
     // 水印预览面板
     private WatermarkPreviewPane watermarkPreviewPane;

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@@ -72,7 +72,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     }
 
     public NewColorSelectPane(boolean isSupportTransparent) {
-        this(isSupportTransparent, true);
+        this(isSupportTransparent, !DesignerContext.getDesignerFrame().isServerConfig());
     }
 
     /**

designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties

@@ -21,3 +21,4 @@ com.fr.design.ds.column.sort.pane=250*180
 com.fr.design.sort.expand.header.pane=95*10
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
+com.fr.design.report.WatermarkSettingPane=720*600

designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties

@@ -20,3 +20,4 @@ com.fr.design.ds.column.sort.pane=250*165
 com.fr.design.sort.expand.header.pane=95*10
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
+com.fr.design.report.WatermarkSettingPane=720*600

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -20,3 +20,4 @@ com.fr.design.ds.column.sort.pane=250*180
 com.fr.design.sort.expand.header.pane=95*10
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
+com.fr.design.report.WatermarkSettingPane=720*600

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties

@@ -22,3 +22,4 @@ com.fr.design.ds.column.sort.pane=220*150
 com.fr.design.sort.expand.header.pane=108*10
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
+com.fr.design.report.WatermarkSettingPane=720*600

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties

@@ -20,3 +20,4 @@ com.fr.design.ds.column.sort.pane=220*150
 com.fr.design.sort.expand.header.pane=108*10
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
+com.fr.design.report.WatermarkSettingPane=720*600