From 8de0b44c6175289b0f604a869f0dc84fe67a3432 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Tue, 24 Aug 2021 17:25:46 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-57952=20=E3=80=90=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E3=80=91=E6=96=B0=E5=BB=BA=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=A0=87=E9=A2=98=E6=98=BE=E7=A4=BA=E6=9C=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
按照主题详情面板的类型分别显示不同的对话框标题

【改动思路】
同上
---
 .../com/fr/design/mainframe/theme/FormThemeProfilePane.java | 6 ++++++
 .../fr/design/mainframe/theme/ReportThemeProfilePane.java   | 5 +++++
 .../fr/design/mainframe/theme/TemplateThemeProfilePane.java | 2 +-
 .../mainframe/theme/dialog/TemplateThemeProfileDialog.java  | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java
index b06119b6c..8f3e3171f 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java
@@ -5,6 +5,7 @@ import com.fr.base.theme.TemplateThemeConfig;
 import com.fr.base.theme.FormTheme;
 import com.fr.base.theme.settings.ThemedComponentStyle;
 import com.fr.base.theme.settings.ThemedFormBodyStyle;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.theme.edit.ComponentStyleEditPane;
 import com.fr.design.mainframe.theme.edit.FormBodyStyleEditPane;
 import com.fr.design.mainframe.theme.preview.FormThemePreviewPane;
@@ -87,4 +88,9 @@ public class FormThemeProfilePane extends TemplateThemeProfilePane<FormTheme> {
         ThemedComponentStyle componentStyle = componentStyleSettingPane.updateBean();
         theme.setComponentStyle(componentStyle);
     }
+
+    @Override
+    public String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Form_Theme_Profile_Dialog_Title");
+    }
 }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java
index bcc50a8d3..437302943 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java
@@ -66,4 +66,9 @@ public class ReportThemeProfilePane extends TemplateThemeProfilePane<ReportTheme
     public void updateBean(ReportTheme theme) {
         theme.setBodyStyle(this.reportBodyStyleSettingPane.updateBean());
     }
+
+    @Override
+    public String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Report_Theme_Profile_Dialog_Title");
+    }
 }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java
index 718469c06..81915c770 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java
@@ -122,7 +122,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
 
     @Override
     public String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Predefined_Style_Edit");
+        return Toolkit.i18nText("Fine-Design_Template_Theme_Profile_Dialog_Title");
     }
 
     private JPanel createLeftPane() {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/dialog/TemplateThemeProfileDialog.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/dialog/TemplateThemeProfileDialog.java
index 31d00043d..84853943b 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/dialog/TemplateThemeProfileDialog.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/dialog/TemplateThemeProfileDialog.java
@@ -40,7 +40,7 @@ public class TemplateThemeProfileDialog<T extends TemplateTheme> extends Templat
     public static final int CONTENT_HEIGHT = 570;
 
     public TemplateThemeProfileDialog(Window parent, TemplateThemeProfilePane<T> profilePane) {
-        super(parent, Toolkit.i18nText("Fine-Design_Template_Theme_Profile_Dialog_Title"), CONTENT_WIDTH, CONTENT_HEIGHT);
+        super(parent, profilePane.getTitle(), CONTENT_WIDTH, CONTENT_HEIGHT);
 
         JPanel content = FRGUIPaneFactory.createBorderLayout_S_Pane();
         content.setPreferredSize(new Dimension(CONTENT_WIDTH, CONTENT_HEIGHT));