Merge pull request #626 in BA/design from ~LEE/design:dev to dev

* commit '11abf16bb8352e57316b12aa4f520d1d4f4179fd':
  REPORT-576 tab删除提示框功能添加

designer_base/src/com/fr/design/locale/designer.properties

@@ -508,3 +508,5 @@ FR-Designer_Form_Basic_Properties=
 FR-Designer_DS_Dictionary=
 FR-Designer_Create_Tree=
 FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -508,4 +508,5 @@ FR-Designer_Form_Basic_Properties=Basic Property
 FR-Designer_DS_Dictionary=Data Dictionary
 FR-Designer_Create_Tree=Build Tree
 FR-Designer_Set_Callback_Function=Set Callback Function
-
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -486,4 +486,6 @@ FR-Designer_Form_Editing_Listeners=
 FR-Designer_Form_Basic_Properties=
 FR-Designer_DS_Dictionary=
 FR-Designer_Create_Tree=
-FR-Designer_Set_Callback_Function=
+FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -481,4 +481,6 @@ FR-Designer_Form_Editing_Listeners=
 FR-Designer_Form_Basic_Properties=
 FR-Designer_DS_Dictionary=
 FR-Designer_Create_Tree=
-FR-Designer_Set_Callback_Function=
+FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -512,3 +512,5 @@ FR-Designer_Form_Basic_Properties=\u57FA\u672C\u5C5E\u6027
 FR-Designer_DS_Dictionary=\u6570\u636E\u5B57\u5178
 FR-Designer_Create_Tree=\u6784\u5EFA\u6811
 FR-Designer_Set_Callback_Function=\u8BBE\u7F6E\u56DE\u8C03\u51FD\u6570
+FR-Designer_ConfirmDialog_Content=\u662F\u5426\u786E\u5B9A\u5220\u9664tab\u63A7\u4EF6
+FR-Designer_ConfirmDialog_Title=FineReport 8.0

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -499,4 +499,6 @@ FR-Designer_Form_Editing_Listeners=
 FR-Designer_Form_Basic_Properties=
 FR-Designer_DS_Dictionary=
 FR-Designer_Create_Tree=
-FR-Designer_Set_Callback_Function=
+FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=

designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java

@@ -11,7 +11,7 @@ import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Rectangle2D;
 
-import javax.swing.Icon;
+import javax.swing.*;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.background.ColorBackground;
@@ -33,6 +33,7 @@ import com.fr.form.ui.WidgetTitle;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
 import com.fr.general.Background;
 import com.fr.general.FRFont;
+import com.fr.general.Inter;
 
 /**
  *
@@ -146,6 +147,12 @@ public class XCardSwitchButton extends XButton {
 	
 	//删除card，同时修改其他switchbutton和tabfit的index
 	private void deleteCard(XCardSwitchButton button,int index){
+		String titleName = button.getContentLabel().getText();
+		int value = JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Designer_ConfirmDialog_Content") + "“" + titleName + "”",
+				Inter.getLocText("FR-Designer_ConfirmDialog_Title"),JOptionPane.YES_NO_OPTION);
+		if (value != JOptionPane.OK_OPTION) {
+			return;
+		}
 		tagLayout.remove(button);
 		// 先清除该tab内部组件，否在再显示上有样式的残留
 		XWTabFitLayout tabLayout = (XWTabFitLayout)cardLayout.getComponent(index);