|
|
|
@ -44,8 +44,14 @@ import com.fr.general.act.BorderPacker;
|
|
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
|
import com.fr.report.core.ReportUtils; |
|
|
|
|
|
|
|
|
|
import javax.swing.*; |
|
|
|
|
import java.awt.*; |
|
|
|
|
import javax.swing.BorderFactory; |
|
|
|
|
import javax.swing.DefaultComboBoxModel; |
|
|
|
|
import javax.swing.JPanel; |
|
|
|
|
import javax.swing.SwingUtilities; |
|
|
|
|
import java.awt.BorderLayout; |
|
|
|
|
import java.awt.Component; |
|
|
|
|
import java.awt.Dimension; |
|
|
|
|
import java.awt.Rectangle; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Created by ibm on 2017/8/2. |
|
|
|
@ -200,7 +206,7 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
|
|
|
|
|
themePane.supportFollowingTheme(ob.supportThemed()); |
|
|
|
|
themePane.setFollowingTheme(ob.isBorderStyleFollowingTheme()); |
|
|
|
|
stylePane.populateBean((LayoutBorderStyle) ob.getBorderStyle()); |
|
|
|
|
watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplate(getCurrentIOFile())); |
|
|
|
|
watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplateAndGlobal(getCurrentIOFile())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private XLayoutContainer selectedBodyLayout(FormDesigner formDesigner) { |
|
|
|
|