Browse Source

REPORT-113994 feat:TabPane组件实现

newui
Levy.Xie-解安森 4 months ago
parent
commit
4f0a24f5e7
  1. 15
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

15
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@ -14,6 +14,7 @@ import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.dialog.DialogActionListener;
import com.fr.design.editor.editor.IntegerEditor;
import com.fr.design.file.SaveSomeTemplatePane;
import com.fr.design.gui.frpane.FineTabbedPane;
import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIColorButton;
@ -53,6 +54,7 @@ import com.fr.io.attr.ImageExportAttr;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import com.fr.report.ReportConfigManager;
import com.fr.stable.ArrayUtils;
import com.fr.stable.Constants;
import com.fr.stable.os.OperatingSystem;
import com.fr.third.apache.logging.log4j.Level;
@ -284,8 +286,6 @@ public class PreferencePane extends BasicPane {
protected void initComponents() {
JPanel contentPane = this;
contentPane.setLayout(FRGUIPaneFactory.createBorderLayout());
UITabbedPane tabPane = new UITabbedPane();
contentPane.add(tabPane, BorderLayout.CENTER);
// 常用面板
JPanel generalPane = column(SETTING_V_GAP,
// 功能设置
@ -300,7 +300,6 @@ public class PreferencePane extends BasicPane {
cell(createStartupPagePane())
).weight(1).getComponent();
UIScrollPane generalScrollPane = patchScroll(generalPane);
tabPane.addTab(i18nText("Fine-Design_Basic_General"), generalScrollPane);
// 高级面板
JPanel advancePane = column(SETTING_V_GAP,
@ -329,7 +328,6 @@ public class PreferencePane extends BasicPane {
).weight(1).getComponent();
useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager"));
UIScrollPane adviceScrollPane = patchScroll(advancePane);
tabPane.addTab(i18nText("Fine-Design_Basic_Advanced"), adviceScrollPane);
// 版本管理面板
//初始化vcs总面板
@ -344,7 +342,14 @@ public class PreferencePane extends BasicPane {
UIScrollPane vcsScrollPane = patchScroll(vcsPane);
//配置面板作为vcs总面板的一张卡片
vcsParentPane.add(vcsScrollPane, VcsMovePanel.SETTING);
tabPane.addTab(i18nText("Fine-Design_Vcs_Title"), vcsParentPane);
FineTabbedPane tabbedPane = FineTabbedPane.builder()
.addTab(i18nText("Fine-Design_Basic_General"), generalScrollPane)
.addTab(i18nText("Fine-Design_Basic_Advanced"), adviceScrollPane)
.addTab(i18nText("Fine-Design_Vcs_Title"), vcsParentPane)
.build();
contentPane.add(tabbedPane, BorderLayout.CENTER);
}
private Component createDesignerStartupPane() {

Loading…
Cancel
Save