Browse Source

REPORT-3163 合作开发9.0设计器=>弹窗=》超级链接=>JavaScript

master
plough 7 years ago
parent
commit
e32b177d9c
  1. 1
      designer_base/src/com/fr/design/constants/UIConstants.java
  2. 1
      designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
  3. 5
      designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java
  4. 3
      designer_base/src/com/fr/design/scrollruler/ModLineBorder.java

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

@ -100,6 +100,7 @@ public interface UIConstants {
public static final Color RULER_SCALE_COLOR = new Color(0x4e504f); public static final Color RULER_SCALE_COLOR = new Color(0x4e504f);
public static final Color PROPERTY_PANE_BACKGROUND = new Color(0xdadadd); public static final Color PROPERTY_PANE_BACKGROUND = new Color(0xdadadd);
public static final Color SPLIT_LINE = new Color(201, 198, 184); public static final Color SPLIT_LINE = new Color(201, 198, 184);
public static final Color TITLED_BORDER_COLOR = new Color(0xededee);
public static final BufferedImage DRAG_BAR = BaseUtils.readImage("com/fr/design/images/control/bar.png"); public static final BufferedImage DRAG_BAR = BaseUtils.readImage("com/fr/design/images/control/bar.png");

1
designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java

@ -49,6 +49,7 @@ public class UITableEditorPane<T> extends BasicPane {
UILabel l = new UILabel(leftLabelName); UILabel l = new UILabel(leftLabelName);
editTable = tableModel.createTable(); editTable = tableModel.createTable();
editTable.getTableHeader().setBackground(UIConstants.DEFAULT_BG_RULER);
UIScrollPane scrollPane = new UIScrollPane(editTable); UIScrollPane scrollPane = new UIScrollPane(editTable);
scrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); scrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));

5
designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java

@ -73,16 +73,17 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane<JavaScriptImpl> {
}; };
importedJsPane = new UITableEditorPane<String>(model); importedJsPane = new UITableEditorPane<String>(model);
importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("ReportServerP-Import_JavaScript"))); importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("ReportServerP-Import_JavaScript")));
importedJsPane.setPreferredSize(new Dimension(400, 150)); importedJsPane.setPreferredSize(new Dimension(265, 150));
jsPane = new JSContentPane(args); jsPane = new JSContentPane(args);
jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("FR-Designer_JavaScript"))); jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("FR-Designer_JavaScript")));
parameterPane.setPreferredSize(new Dimension(200, 150)); parameterPane.setPreferredSize(new Dimension(265, 150));
JPanel topPane = GUICoreUtils.createBorderLayoutPane( JPanel topPane = GUICoreUtils.createBorderLayoutPane(
importedJsPane, BorderLayout.CENTER, importedJsPane, BorderLayout.CENTER,
parameterPane, BorderLayout.EAST parameterPane, BorderLayout.EAST
); );
topPane.setPreferredSize(new Dimension(300, 150)); topPane.setPreferredSize(new Dimension(300, 150));
topPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 12, 0));
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.add(topPane,BorderLayout.NORTH) ; this.add(topPane,BorderLayout.NORTH) ;

3
designer_base/src/com/fr/design/scrollruler/ModLineBorder.java

@ -7,6 +7,7 @@ import java.awt.Insets;
import javax.swing.border.AbstractBorder; import javax.swing.border.AbstractBorder;
import com.fr.design.constants.UIConstants;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
/** /**
@ -31,7 +32,7 @@ public class ModLineBorder extends AbstractBorder {
* @param modifiers modifiers * @param modifiers modifiers
*/ */
public ModLineBorder(int modifiers) { public ModLineBorder(int modifiers) {
this(modifiers, GUICoreUtils.getTitleLineBorderColor(), 1); this(modifiers, UIConstants.TITLED_BORDER_COLOR, 1);
} }
/** /**

Loading…
Cancel
Save