|
|
|
@ -1,6 +1,7 @@
|
|
|
|
|
package com.fr.design.style.color; |
|
|
|
|
|
|
|
|
|
import com.fr.base.FineColor; |
|
|
|
|
import com.fr.base.i18n.BidiUtils; |
|
|
|
|
import com.fr.base.theme.FineColorDeriveState; |
|
|
|
|
import com.fr.base.theme.TemplateTheme; |
|
|
|
|
import com.fr.design.DesignerEnvManager; |
|
|
|
@ -98,7 +99,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
|
|
|
|
|
|
|
|
|
|
JPanel standardColorPane = new JPanel(new BorderLayout(0, 5)); |
|
|
|
|
standardColorPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); |
|
|
|
|
standardColorPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Standard_Color")), BorderLayout.CENTER); |
|
|
|
|
standardColorPane.add(createColorSelectPaneLabel(Toolkit.i18nText("Fine-Design_Basic_Standard_Color")), BorderLayout.CENTER); |
|
|
|
|
centerPane.add(standardColorPane); |
|
|
|
|
JPanel colorSelectPane = createStandardColorPane(); |
|
|
|
|
standardColorPane.add(colorSelectPane, BorderLayout.SOUTH); |
|
|
|
@ -106,7 +107,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
|
|
|
|
|
// 增加最近使用 pane
|
|
|
|
|
JPanel row1Pane = new JPanel(new BorderLayout(0, 5)); |
|
|
|
|
row1Pane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); |
|
|
|
|
row1Pane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Used")), BorderLayout.CENTER); |
|
|
|
|
row1Pane.add(createColorSelectPaneLabel(Toolkit.i18nText("Fine-Design_Basic_Used")), BorderLayout.CENTER); |
|
|
|
|
centerPane.add(row1Pane); |
|
|
|
|
// 最近使用
|
|
|
|
|
usedColorPane = new NewUsedColorPane(9, this, selectRealTime()); |
|
|
|
@ -143,11 +144,17 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
|
|
|
|
|
return jPanel; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private UILabel createColorSelectPaneLabel(String name) { |
|
|
|
|
UILabel label = new UILabel(name); |
|
|
|
|
label.setHorizontalAlignment(BidiUtils.rtl() ? UILabel.LEFT : UILabel.RIGHT); |
|
|
|
|
return label; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private JPanel initThemeColorPane() { |
|
|
|
|
menuColorPane.removeAll(); |
|
|
|
|
JPanel themeColorPane = new JPanel(new BorderLayout(0, 5)); |
|
|
|
|
themeColorPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); |
|
|
|
|
themeColorPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Theme_Color")), BorderLayout.CENTER); |
|
|
|
|
themeColorPane.add(createColorSelectPaneLabel(Toolkit.i18nText("Fine-Design_Basic_Theme_Color")), BorderLayout.CENTER); |
|
|
|
|
|
|
|
|
|
themeColorPane.add(menuColorPane, BorderLayout.SOUTH); |
|
|
|
|
|
|
|
|
|