Browse Source

Merge pull request #1169 in DESIGN/design from ~LUCIAN.CHEN/design:bugfix/10.0 to bugfix/10.0

* commit '2f8ac776ce36323f62adf72a14b769937c273434':
  REPORT-22410 10.0删除tab时弹窗写的Finereport8.0
bugfix/10.0
Lucian.Chen 5 years ago
parent
commit
73f605ac0a
  1. 5
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java

5
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java

@ -32,6 +32,7 @@ import com.fr.general.ComparatorUtils;
import com.fr.general.FRFont; import com.fr.general.FRFont;
import com.fr.general.cardtag.TemplateStyle; import com.fr.general.cardtag.TemplateStyle;
import com.fr.stable.ProductConstants;
import com.fr.stable.unit.PT; import com.fr.stable.unit.PT;
import javax.swing.Action; import javax.swing.Action;
@ -221,7 +222,7 @@ public class XCardSwitchButton extends XButton {
private void deleteCard(XCardSwitchButton button, int index){ private void deleteCard(XCardSwitchButton button, int index){
String titleName = button.getContentLabel().getText(); String titleName = button.getContentLabel().getText();
int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”", int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ConfirmDialog_Title"), JOptionPane.YES_NO_OPTION); ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_OPTION);
if (value != JOptionPane.OK_OPTION) { if (value != JOptionPane.OK_OPTION) {
return; return;
} }
@ -363,7 +364,7 @@ public class XCardSwitchButton extends XButton {
private void deleteTabLayout(SelectionModel selectionModel, FormDesigner designer){ private void deleteTabLayout(SelectionModel selectionModel, FormDesigner designer){
String titleName = this.getContentLabel().getText(); String titleName = this.getContentLabel().getText();
int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”", int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ConfirmDialog_Title"),JOptionPane.YES_NO_OPTION); ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_OPTION);
if (value != JOptionPane.OK_OPTION) { if (value != JOptionPane.OK_OPTION) {
return; return;
} }

Loading…
Cancel
Save