fanruan
/
design
6
0
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容

research/10.0
3dot141 6 years ago
parent
f94f843d77
commit
53dc93c96e
67 changed files with 216 additions and 229 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java
  2. 4
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  3. 32
      designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
  4. 8
      designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
  5. 6
      designer-base/src/main/java/com/fr/design/constants/UIConstants.java
  6. 4
      designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
  7. 2
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java
  8. 4
      designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java
  9. 6
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
  10. 8
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
  11. 4
      designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
  12. 5
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
  13. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
  14. 13
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/OneListTableModel.java
  15. 6
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java
  16. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java
  17. 4
      designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java
  18. 4
      designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
  19. 4
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
  20. 4
      designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java
  21. 8
      designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java
  22. 2
      designer-base/src/main/java/com/fr/design/gui/NameInspector.java
  23. 4
      designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java
  24. 4
      designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java
  25. 4
      designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java
  26. 4
      designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java
  27. 4
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
  28. 5
      designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java
  29. 4
      designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java
  30. 4
      designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
  31. 4
      designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java
  32. 4
      designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java
  33. 8
      designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
  34. 4
      designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java
  35. 8
      designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
  36. 6
      designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java
  37. 14
      designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java
  38. 4
      designer-base/src/main/java/com/fr/design/style/BorderPane.java
  39. 4
      designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java
  40. 4
      designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
  41. 4
      designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
  42. 4
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
  43. 4
      designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
  44. 4
      designer-base/src/main/java/com/fr/start/BaseDesigner.java
  45. 16
      designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java
  46. 6
      designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java
  47. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
  48. 10
      designer-form/src/main/java/com/fr/design/designer/creator/XButton.java
  49. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java
  50. 6
      designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java
  51. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java
  52. 4
      designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java
  53. 6
      designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java
  54. 6
      designer-form/src/main/java/com/fr/design/widget/ui/designer/MultiFileEditorPane.java
  55. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java
  56. 6
      designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java
  57. 8
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  58. 23
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java
  59. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java
  60. 2
      designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
  61. 4
      designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
  62. 4
      designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java
  63. 10
      designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
  64. 4
      designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
  65. 55
      designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
  66. 4
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
  67. 2
      designer-realize/src/main/java/com/fr/start/Designer.java

4
designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java
Unescape View File

@ -18,7 +18,7 @@ public class ExitAuthorityEditAction extends TemplateComponentAction {
public ExitAuthorityEditAction(TargetComponent t) {
super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status_Exit"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status_Exit"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit.png"));
}
@ -60,4 +60,4 @@ public class ExitAuthorityEditAction extends TemplateComponentAction {
}
}
}
}
}

4
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
Unescape View File

@ -198,7 +198,7 @@ public class PreferencePane extends BasicPane {
private void createEditPane(JPanel generalPane) {
//samuel:编辑器设置
JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Editor_Preference"));
JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Editor_Preference"));
generalPane.add(editPane);
//设置是否支持将字符串编辑为公式
@ -667,4 +667,4 @@ public class PreferencePane extends BasicPane {
}
});
}
}
}

32
designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
Unescape View File

@ -1,13 +1,10 @@
package com.fr.design.actions.help;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.stable.ProductConstants;
import javax.swing.AbstractAction;
import javax.swing.ActionMap;
@ -16,13 +13,14 @@ import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JPanel;
import javax.swing.KeyStroke;
import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.stable.ProductConstants;
import com.fr.design.utils.gui.GUICoreUtils;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
/**
* Dialog displaying information about the application.
@ -48,7 +46,7 @@ public class AboutDialog extends JDialog implements ActionListener {
tabbedPane = new UITabbedPane();
sysPane = new SystemInfoPane();
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("About"), aboutPanel);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About"), aboutPanel);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("System"), sysPane);
buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
@ -97,4 +95,4 @@ public class AboutDialog extends JDialog implements ActionListener {
private JPanel buttonPanel;
private UITabbedPane tabbedPane;
private UIButton okButton;
}
}

8
designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
Unescape View File

@ -96,7 +96,7 @@ public class FeedBackPane extends BasicPane {
public FeedBackPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
initDetailArea();
UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("feedback_info"));
UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Info"));
tip.setBorder(TIP_BORDER);
this.add(tip, BorderLayout.NORTH);
UIScrollPane scrollPane = new UIScrollPane(initDetailPane());
@ -135,7 +135,7 @@ public class FeedBackPane extends BasicPane {
}
};
this.detailField.setForeground(Color.gray);
this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("feedback_tip"));
this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Tip"));
detailField.addKeyListener(new KeyAdapter() {
@Override
@ -156,7 +156,7 @@ public class FeedBackPane extends BasicPane {
detailField.setForeground(Color.black);
String text = detailField.getText();
// 判断在中文输入状态是否还包含提示符 要删掉
String tip = com.fr.design.i18n.Toolkit.i18nText("feedback_tip");
String tip = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Tip");
if (text.contains(tip)) {
text = text.substring(0, text.indexOf(tip));
detailField.setText(text);
@ -348,4 +348,4 @@ public class FeedBackPane extends BasicPane {
}
}
}
}

6
designer-base/src/main/java/com/fr/design/constants/UIConstants.java
Unescape View File

@ -219,7 +219,7 @@ public interface UIConstants {
@Override
public String toString() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "...";
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading") + "...";
}
};
/**
@ -228,7 +228,7 @@ public interface UIConstants {
public static final Object CONNECTION_FAILED = new Object() {
public String toString() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed") + "!";
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed") + "!";
}
};
@ -236,4 +236,4 @@ public interface UIConstants {
* 自动补全的默认快捷键，一般来说是 alt + /.
*/
public static final String DEFAULT_AUTO_COMPLETE = "alt + SLASH";
}
}

4
designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
Unescape View File

@ -455,7 +455,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
}
if (!connect) {
DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"),
JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Failed"), JOptionPane.INFORMATION_MESSAGE);
failedToFindTable();
return null;
@ -631,4 +631,4 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
}
}
}
}

2
designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java
Unescape View File

@ -126,4 +126,4 @@ public class TableDataCreatorProducer {
}
return (TableDataNameObjectCreator[])ArrayUtils.addAll(creators, list.toArray(new TableDataNameObjectCreator[list.size()]));
}
}
}

4
designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java
Unescape View File

@ -40,7 +40,7 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean {
rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER));
UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Database"), UILabel.LEFT);
UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Model"), UILabel.LEFT);
UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Select_Table"), UILabel.LEFT);
UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), UILabel.LEFT);
if (labelSize > 0) {
Dimension pSize = new Dimension(labelSize, 20);
@ -66,4 +66,4 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean {
initDsNameComboBox();
}
}
}

6
designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
Unescape View File

@ -43,7 +43,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
String tempName = getEditingName();
if (StringUtils.isEmpty(tempName)) {
nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Empty_Name"));
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name"));
setIllegalIndex(editingIndex);
isNamePermitted = false;
return;
@ -52,7 +52,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
&& isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) {
isNamePermitted = false;
nameableList.stopEditing();
String message = Toolkit.i18nText("Fine-Design_Connection_Duplicate_Name", tempName);
String message = Toolkit.i18nText("Fine-Design_Basic_Connection_Duplicate_Name", tempName);
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message);
setIllegalIndex(editingIndex);
}
@ -158,4 +158,4 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
connectionConfig.addConnection(nameObject.getName(), (Connection) nameObject.getObject());
}
}
}
}

8
designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
Unescape View File

@ -335,15 +335,15 @@ public class JDBCDefPane extends JPanel {
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_ACTIVE") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_IDLE") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MIN_IDLE") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_VALIDATION_QUERY") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_BORROW") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_RETURN") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_WHILE_IDLE") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
DBCP_TIMEBETWEENEVICTIONRUNSMILLS},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_NUM_TEST_PER_EVCTION_RUN") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT),
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT),
DBCP_MINEVICTABLEIDLETIMEMILLIS}};
JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);
@ -374,4 +374,4 @@ public class JDBCDefPane extends JPanel {
private String driver;
private String url;
}
}
}

4
designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
Unescape View File

@ -362,7 +362,7 @@ public class PreviewTablePane extends BasicPane {
boolean status = DataOperator.getInstance().testConnection(((DBTableData) tableData).getDatabase());
if (!status) {
connectionBar.close();
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
}
}
connectionBar.close();
@ -485,4 +485,4 @@ public class PreviewTablePane extends BasicPane {
fireLoadedListener();
}
}
}

5
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
Unescape View File

@ -25,7 +25,6 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
private UITextField classNameTextField;
@ -93,7 +92,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), reportletNamePane},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Function-The_class_must_implement_the_interface") + "\"com.fr.data.Tabledata\"")},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")},
{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))}
{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))}
};
JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
this.add(northPane, BorderLayout.NORTH);
@ -174,4 +173,4 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
}
}
}

4
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
Unescape View File

@ -221,7 +221,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
FRContext.getLogger().error(e.getMessage(), e);
}
if (in == null) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"),
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
null, 0, UIManager.getIcon("OptionPane.errorIcon"));
} else {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully"));
@ -1012,4 +1012,4 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
}
}
}
}

13
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/OneListTableModel.java
Unescape View File

@ -1,17 +1,16 @@
package com.fr.design.data.tabledata.tabledatapane;
import java.awt.Component;
import java.awt.event.ActionEvent;
import com.fr.design.gui.itableeditorpane.UITableEditAction;
import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
import com.fr.design.mainframe.DesignerContext;
import com.fr.file.FILE;
import com.fr.file.FILEChooserPane;
import com.fr.file.filter.ChooseFileFilter;
import com.fr.stable.CoreConstants;
import java.awt.Component;
import java.awt.event.ActionEvent;
//august：按理说，这个只有一列 就不该用jtable。不过这样总比之前用ArrayTableModel好
public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
@ -64,7 +63,7 @@ public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
@Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("File")));
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE();
if(file == null) {
@ -90,7 +89,7 @@ public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
@Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("File")));
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE();
if(file == null) {
@ -108,4 +107,4 @@ public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
}
}
}
}

6
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java
Unescape View File

@ -196,7 +196,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
warningLabel.setText(StringUtils.EMPTY);
} catch (Exception ex) {
if (ex instanceof SQLException) {
warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
} else {
warningLabel.setText(ex.getMessage());
}
@ -319,7 +319,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
storeProcedureContext.setText(procedureText);
warningLabel.setText("");
} catch (Exception e) {
warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
storeProcedureContext.setText("");
editorPane.populate(new StoreProcedureParameter[0]);
}
@ -369,4 +369,4 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
public void checkEnabled() {
}
}
}
}

4
designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java
Unescape View File

@ -194,7 +194,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
connectionBar.close();
// bug 61345 预览失败时，关闭窗口
dialog.setVisible(false);
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
}
connectionBar.close();
storeProcedure.resetDataModelList();
@ -306,4 +306,4 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
}
}
}

4
designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java
Unescape View File

@ -28,7 +28,7 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
protected String[] columnNames;
public ColumnSelectedEditor() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DS_Column"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Column"));
this.setLayout(FRGUIPaneFactory.createLeftZeroLayout());
tableDataComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
columnNames = new String[0];
@ -107,4 +107,4 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
tableDataComboBox.setSelectedItem(null);
columnNameComboBox.setSelectedItem(null);
}
}
}

4
designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
Unescape View File

@ -175,7 +175,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
FileNodeFILE nodeFile = new FileNodeFILE(new FileNode(StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath), false));
if (nodeFile.isLocked()) {
if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("fileLocked_undeleted"),
if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FileLocked_Undeleted"),
com.fr.design.i18n.Toolkit.i18nText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) {
refreshDockingView();
}
@ -286,4 +286,4 @@ public class TemplateTreePane extends JPanel implements FileOperations {
}
}
}
}
}

4
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
Unescape View File

@ -933,7 +933,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"),
variableResolver.resolveCurReportVariables()).createMutableTreeNode());
rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Source_Type_Tabledata"),
rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Tabledata"),
BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"),
variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode());
@ -1026,4 +1026,4 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
}
FRContext.getLogger().debug(buffer.toString());
}
}
}

4
designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java
Unescape View File

@ -129,7 +129,7 @@ public abstract class FunctionConstants {
new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Array"), Function.ARRAY),
new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Report"), Function.REPORT),
new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Other"), Function.OTHER),
new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Function_Type_Hierarchy"), Function.HA)
new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Type_Hierarchy"), Function.HA)
};
public static FunctionGroup ALL = new FunctionGroup() {
@ -261,4 +261,4 @@ public abstract class FunctionConstants {
}
}
}
}
}

8
designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java
Unescape View File

@ -90,7 +90,7 @@ public class JavaEditorPane extends BasicPane {
this.add(jt, BorderLayout.CENTER);
UILabel label = new UILabel();
label.setText("<html><font color='red'>" +
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Compile_Save_Attention") +
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Save_Attention") +
"</font></html>");
label.setPreferredSize(new Dimension(label.getWidth(),label.getHeight() + 20));
this.add(label, BorderLayout.SOUTH);
@ -157,11 +157,11 @@ public class JavaEditorPane extends BasicPane {
}
try {
WorkContext.getWorkResource().write(StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, getJavaPath()), text.getBytes(EncodeConstants.ENCODING_UTF_8));
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Successfully") + "！");
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Successfully") + "！");
fireSaveActionListener();
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Failed") + "！");
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Failed") + "！");
}
}
@ -282,4 +282,4 @@ public class JavaEditorPane extends BasicPane {
" }\n" +
"}\n";
}
}

2
designer-base/src/main/java/com/fr/design/gui/NameInspector.java
Unescape View File

@ -4,5 +4,5 @@ import com.fr.design.i18n.Toolkit;
public class NameInspector {
public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Illegal_Name_Tips");
public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Basic_Illegal_Name_Tips");
}

4
designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java
Unescape View File

@ -55,7 +55,7 @@ public abstract class LoadingBasicPane extends BasicPane {
card = new CardLayout();
setLayout(card);
JPanel loadingDisPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading_And_Waiting") , SwingConstants.CENTER);
UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_And_Waiting") , SwingConstants.CENTER);
loadingDisPane.add(loadingPane, BorderLayout.CENTER);
progressBar = new JProgressBar();
progressBar.setIndeterminate(true);
@ -94,4 +94,4 @@ public abstract class LoadingBasicPane extends BasicPane {
}
}
}

4
designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java
Unescape View File

@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException;
public abstract class LazyComboBox extends UIComboBox implements PopupMenuListener {
private static final int NUM = 80;
private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "..."};
private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."};
/**
* 是否加载完成
@ -189,4 +189,4 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen
filtering = false;
}
}
}
}

4
designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java
Unescape View File

@ -99,7 +99,7 @@ public class TableViewList extends UIList {
count--;
}
if (!status) {
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
}
TableViewList.this.setModel(processDataInAnotherThread(databaseName, searchFilter, typesFilter));
return null;
@ -278,4 +278,4 @@ public class TableViewList extends UIList {
}
}
}
}

4
designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java
Unescape View File

@ -16,7 +16,7 @@ public class UIScrollMenuDemo extends JFrame {
UIMenuBar menuBar = new UIMenuBar();
// File Menu, F - Mnemonic
JMenu fileMenu = new JMenu("File");
JMenu fileMenu = new JMenu("Fine-Design_Basic_File");
fileMenu.setMnemonic(KeyEvent.VK_F);
menuBar.add(fileMenu);
@ -68,4 +68,4 @@ public class UIScrollMenuDemo extends JFrame {
}
});
}
}
}

4
designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
Unescape View File

@ -235,7 +235,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
public void actionPerformed(ActionEvent e) {
int[] selectedRow = table.getSelectedRows();
if (ismultiSelected()) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Multiple_Select_Warn_Text"));
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Multiple_Select_Warn_Text"));
return;
}
if (table.getCellEditor() != null) {
@ -327,4 +327,4 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
}
}
}
}

5
designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java
Unescape View File

@ -6,7 +6,6 @@ import com.fr.design.gui.itree.checkboxtree.CheckBoxTree;
import com.fr.design.i18n.Toolkit;
import com.fr.general.ComparatorUtils;
import com.fr.general.NameObject;
import com.fr.locale.InterProviderFactory;
import com.fr.stable.StringUtils;
import javax.swing.Icon;
@ -37,7 +36,7 @@ public abstract class RefreshableJTree extends CheckBoxTree {
@Override
public String toString() {
return Toolkit.i18nText("Fine-Design_Loading") + "...";
return Toolkit.i18nText("Fine-Design_Basic_Loading") + "...";
}
};
@ -301,4 +300,4 @@ public abstract class RefreshableJTree extends CheckBoxTree {
tip.setOpaque(false);
return tip;
}
}
}

4
designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java
Unescape View File

@ -164,7 +164,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
double p = TableLayout.PREFERRED;
double[] rowSize = {p, p, p};
double[] columnSize = {p, TableLayout.FILL};
showParameterInterface = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_UI_Display"));
showParameterInterface = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_UI_Display"));
JPanel showParameterPanel = new JPanel();
showParameterPanel.add(new UILabel());
showParameterPanel.add(showParameterInterface);
@ -181,4 +181,4 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
}
}
}

4
designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
Unescape View File

@ -62,7 +62,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
}
if (tempSet.contains(list.get(i).toString())) {
list.remove(i);
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Duplicate_Name") + "!");
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Duplicate_Name") + "!");
parameterChanger(list);
return;
}
@ -228,4 +228,4 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
public boolean accept(Object ob) {
return ob instanceof JavaScriptImpl;
}
}
}

4
designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java
Unescape View File

@ -22,7 +22,7 @@ public class AuthorityPropertyPane extends JPanel {
public AuthorityPropertyPane(TargetComponent t) {
this.setLayout(new BorderLayout());
this.setBorder(null);
UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) {
UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Privilege_Preference")) {
@Override
public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);
@ -46,4 +46,4 @@ public class AuthorityPropertyPane extends JPanel {
}
}
}

4
designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java
Unescape View File

@ -22,7 +22,7 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane {
super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
this.setLayout(new BorderLayout());
this.setBorder(null);
UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) {
UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Privilege_Preference")) {
@Override
public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);
@ -59,4 +59,4 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane {
public JPanel populateCheckPane() {
return null;
}
}
}

8
designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
Unescape View File

@ -86,11 +86,11 @@ public class DesignerLogHandler {
caption.clearMessage();
}
};
showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Info"), true);
showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Info"), true);
showInfo.addItemListener(itemlistener);
showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Warn"), true);
showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Warn"), true);
showError.addItemListener(itemlistener);
showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Error"), true);
showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Error"), true);
showServer.addItemListener(itemlistener);
caption.addSetListener(new ActionListener() {
@ -320,4 +320,4 @@ public class DesignerLogHandler {
public void printLoggingEvent(LoggingEvent event) {
logHandlerArea.printStackTrace(event);
}
}
}

4
designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java
Unescape View File

@ -24,7 +24,7 @@ public class DataTableEditor extends Editor<DataTableConfig> {
public DataTableEditor() {
this.initCompontents();
this.setName(com.fr.design.i18n.Toolkit.i18nText("FieldBinding"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FieldBinding"));
}
private void initCompontents() {
@ -81,4 +81,4 @@ public class DataTableEditor extends Editor<DataTableConfig> {
return "bind_ds_column";
}
}
}

8
designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
Unescape View File

@ -4,13 +4,9 @@
package com.fr.design.menu;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
import javax.swing.*;
import java.awt.event.KeyEvent;
import java.util.Locale;
import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
@ -678,7 +674,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status");
}
@Override
@ -1041,4 +1037,4 @@ public class KeySetUtils {
}
}

6
designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java
Unescape View File

@ -36,7 +36,7 @@ public class ParameterArrayPane extends JListControlPane {
String tempName = getEditingName();
if (StringUtils.isEmpty(tempName)) {
nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Empty_Parameter_Name"));
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name"));
setIllegalIndex(editingIndex);
return;
}
@ -44,7 +44,7 @@ public class ParameterArrayPane extends JListControlPane {
&& isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) {
nameableList.stopEditing();
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Duplicate_Parameter_Name"));
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name"));
setIllegalIndex(editingIndex);
}
}
@ -92,4 +92,4 @@ public class ParameterArrayPane extends JListControlPane {
return res_array;
}
}
}

14
designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java
Unescape View File

@ -142,7 +142,7 @@ public class UserManagerPane extends BasicPane {
sync2AddedMembersFormAdded();
// 不需要重复更新右侧列表显示 但是更新一下计数显示
countLabel.setText(
Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count",
Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count",
String.valueOf(addedMembers.size())
)
);
@ -211,7 +211,7 @@ public class UserManagerPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return Toolkit.i18nText("Fine-Design_Remote_Design_Add_Member");
return Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Add_Member");
}
private JPanel createLeftPanel() {
@ -221,7 +221,7 @@ public class UserManagerPane extends BasicPane {
BorderFactory.createCompoundBorder(
new EmptyBorder(6, 0, 0, 0),
UITitledBorder.createBorderWithTitle(
Toolkit.i18nText("Fine-Design_Remote_Design_Decision_Member")
Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member")
)
)
);
@ -233,7 +233,7 @@ public class UserManagerPane extends BasicPane {
keyField.requestFocus();
keyField.addKeyListener(keyFieldKeyListener);
keyField.getDocument().addDocumentListener(documentListener);
keyButton.setText(Toolkit.i18nText("Fine-Design_Remote_Design_Search"));
keyButton.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Search"));
keyButton.addActionListener(keyButtonActionListener);
searchPanel.add(keyField);
searchPanel.add(keyButton);
@ -279,14 +279,14 @@ public class UserManagerPane extends BasicPane {
content.setBorder(
BorderFactory.createCompoundBorder(
new EmptyBorder(6, 0, 0, 0),
UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member")
UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member")
)
)
);
// 计数
countLabel.setText(
Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count",
Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count",
String.valueOf(addedMembers.size()))
);
countLabel.setBorder(BorderFactory.createEmptyBorder(7, 12, 8, 0));
@ -332,7 +332,7 @@ public class UserManagerPane extends BasicPane {
addedList.revalidate();
addedList.repaint();
countLabel.setText(
Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count",
Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count",
String.valueOf(addedMembers.size())
));
}

4
designer-base/src/main/java/com/fr/design/style/BorderPane.java
Unescape View File

@ -106,7 +106,7 @@ public class BorderPane extends BasicPane {
borderAllControlPane.add(createVerButtonPane(NO_BORDERS, com.fr.design.i18n.Toolkit.i18nText("No")));
// Button setting all borders to active with
// current color and current style excepting inside borders
borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("External")));
borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External")));
borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Inside")));
@ -728,4 +728,4 @@ public class BorderPane extends BasicPane {
}
}
}
}
}

4
designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java
Unescape View File

@ -32,7 +32,7 @@ public class ButtonConstants {
com.fr.design.i18n.Toolkit.i18nText("Custom"),
com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Row"),
com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Row"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Type_Parameter_Submit"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"),
com.fr.design.i18n.Toolkit.i18nText("Widget-TreeNode")
};
@ -44,4 +44,4 @@ public class ButtonConstants {
StableFactory.getMarkedClass(BridgeMark.SUBMIT_BUTTON, Widget.class),
StableFactory.getMarkedClass(BridgeMark.TREE_NODE_TOGGLE_BUTTON, Widget.class)
};
}
}

4
designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
Unescape View File

@ -3,7 +3,6 @@ package com.fr.design.widget.component;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
@ -16,7 +15,6 @@ import com.fr.stable.StringUtils;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.text.DefaultFormatter;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -77,7 +75,7 @@ public class NumberEditorValidatePane extends JPanel {
JPanel errorMsgBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
errorMsgBorderPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L1, 0));
errorMsgBorderPane.add(errorMsgTextFieldPane, BorderLayout.CENTER);
UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits"));
UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits"));
limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
limitNumberPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0));
double f = TableLayout.FILL;

4
designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
Unescape View File

@ -93,7 +93,7 @@ public abstract class CustomJobPane extends BasicBeanPane {
this.add(objectProperiesPane, BorderLayout.CENTER);
UITextArea area = new UITextArea(2, 1);
area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Extend_Class", "com.fr.data.AbstractSubmitTask"));
area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask"));
JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
dsPane.add(area);
dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Job_Description"), null));
@ -137,4 +137,4 @@ public abstract class CustomJobPane extends BasicBeanPane {
this.classNameTextField.setText(null);
this.checkAddButtonEnable();
}
}
}

4
designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
Unescape View File

@ -477,7 +477,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) {
Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") };
returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Cover_Tips", keyColumnNameValueList.get(j).cn.name),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_Tips", keyColumnNameValueList.get(j).cn.name),
"", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]);
// Richie:全部覆盖
if (returnValue == 0) {
@ -1095,4 +1095,4 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
return this;
}
}
}
}

4
designer-base/src/main/java/com/fr/env/RemoteEnvPane.java vendored
Unescape View File

@ -66,7 +66,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
private JDialog dialog;
private UILabel message = new UILabel();
private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK"));
private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_Cancel"));
private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel"));
private UILabel uiLabel = new UILabel();
/**
@ -661,4 +661,4 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
fileChooserButton.setEnabled(isHttps);
updateHttpsConfigPanel();
}
}
}

4
designer-base/src/main/java/com/fr/start/BaseDesigner.java
Unescape View File

@ -41,7 +41,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
private void init(String[] args) {
//初始化
EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Initializing"));
EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Basic_Initializing"));
// 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西，预加载时也要用到
DesignUtils.initLookAndFeel();
// 初始化Log Handler
@ -156,4 +156,4 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
protected void collectUserInformation() {
}
}
}

16
designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java
Unescape View File

@ -88,7 +88,7 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
JPanel lineStylePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
alertLinePane.add(lineStylePane);
lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Line_Style") + ":"));
lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style") + ":"));
lineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
lineStylePane.add(lineCombo);
@ -130,10 +130,10 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
double[] rowSize = {t, t, t, t, t};
double[] columnSize = {0.1, 0.2, 0.5, 0.2};
Component[][] components= {
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Content") + ":"), contentField = new UITextField(3)},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font") + ":"), fontNameBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font_Size") + ":"), fontSizeBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content") + ":"), contentField = new UITextField(3)},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font") + ":"), fontNameBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Size") + ":"), fontSizeBox},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())},
{null, null, rightButton = new UIRadioButton(getRightName())},
};
@ -148,11 +148,11 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
}
protected String getLeftName() {// 居左 居右
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Left");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_The_Left");
}
protected String getRightName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Right");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_The_Right");
}
@Override
@ -226,4 +226,4 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
chartAlertValue.setAlertPosition(Constants.RIGHT);
}
}
}
}

6
designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java
Unescape View File

@ -31,9 +31,9 @@ public class MinMaxValuePane extends JPanel {
protected UITextField secUnitField;
public MinMaxValuePane() {
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Min_Value"));
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Min_Value"));
minValueField = new UITextField(6);
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Max_Value"));
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value"));
maxValueField = new UITextField(6);
isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Graduation_Unit"));
mainUnitField = new UITextField(6);
@ -201,4 +201,4 @@ public class MinMaxValuePane extends JPanel {
axis.setCustomSecUnit(false);
}
}
}
}

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
Unescape View File

@ -33,7 +33,7 @@ public class ChartAxisLineStylePane extends BasicPane{
axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS);
axisLineColor = new ColorSelectBox(100);
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")};
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")};
Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE};
Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"),
BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"),
@ -88,4 +88,4 @@ public class ChartAxisLineStylePane extends BasicPane{
}
}
}
}

10
designer-form/src/main/java/com/fr/design/designer/creator/XButton.java
Unescape View File

@ -90,9 +90,9 @@ public class XButton extends XWidgetCreator {
protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{
CRPropertyDescriptor[] crPropertyDescriptors = {
new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Style")).setEditorClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass(
ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue(
@ -162,7 +162,7 @@ public class XButton extends XWidgetCreator {
protected CRPropertyDescriptor[] getisnotCustomStyle() throws IntrospectionException {
return new CRPropertyDescriptor[]{
new CRPropertyDescriptor("text", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Name"))
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() {
@ -172,7 +172,7 @@ public class XButton extends XWidgetCreator {
}
}),
new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Style")).setEditorClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass(
ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() {
@ -309,4 +309,4 @@ public class XButton extends XWidgetCreator {
}
}
}

4
designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java
Unescape View File

@ -33,7 +33,7 @@ public class XFileUploader extends XFieldEditor {
super.supportedDescriptor(),
new CRPropertyDescriptor[]{
new CRPropertyDescriptor("allowTypes", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files"))
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
});
}
@ -55,4 +55,4 @@ public class XFileUploader extends XFieldEditor {
protected String getIconName() {
return "file_up.png";
}
}
}

6
designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java
Unescape View File

@ -40,10 +40,10 @@ public class XMultiFileUploader extends XFieldEditor {
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("SINGLE_FILE_UPLOAD"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("accept", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files"))
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("maxSize", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-File_Size_Limit"))
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
});
}
@ -99,4 +99,4 @@ public class XMultiFileUploader extends XFieldEditor {
public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
return new WidgetPropertyUIProvider[]{ new MultiFileUploaderPropertyUI(this)};
}
}
}

4
designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java
Unescape View File

@ -53,7 +53,7 @@ public class XNumberEditor extends XWrapperedFieldEditor {
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Decimals"))
.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
CRPropertyDescriptor decimalLength = new CRPropertyDescriptor("maxDecimalLength", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits"))
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits"))
.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, ((NumberEditor)this.data).isAllowDecimals() ?
new CRPropertyDescriptor[] {allowDecimal, decimalLength} : new CRPropertyDescriptor[] {allowDecimal});
@ -104,4 +104,4 @@ public class XNumberEditor extends XWrapperedFieldEditor {
return "number_field_16.png";
}
}
}

4
designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java
Unescape View File

@ -40,10 +40,10 @@ public class FormWebWidgetConstants {
Next.class);
// 导出成Excel 分页导出
public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"),
public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page"),
IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class);
// 导出成Excel 原样导出
public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"),
public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Simple"),
IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class);
// 导出
public static final WidgetOption EXPORT = WidgetOptionFactory

6
designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java
Unescape View File

@ -26,14 +26,14 @@ public class HyperlinkGroupWrapper implements Encoder, Decoder {
@Override
public String encode(Object v) {
if (v == null) {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Hyperlink_Undefined");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hyperlink_Undefined");
}
NameJavaScriptGroup group = (NameJavaScriptGroup)v;
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Hyperlink_Group_Count", group.size());
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hyperlink_Group_Count", group.size());
}
@Override
public void validate(String txt) throws ValidationException {
}
}
}

6
designer-form/src/main/java/com/fr/design/widget/ui/designer/MultiFileEditorPane.java
Unescape View File

@ -54,8 +54,8 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{singleFileCheckBox, null },
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")), acceptType},
new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("File-File_Size_Limit")), fileSizePane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")), acceptType},
new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit")), fileSizePane},
new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")), fontSizeField}
};
double[] rowSize = {p, p, p, p};
@ -87,4 +87,4 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
return ob;
}
}
}

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java
Unescape View File

@ -169,10 +169,10 @@ public class ParameterTreeComboBox extends FRTreeComboBox {
}
}
if (!ArrayUtils.isEmpty(parameters)) {
groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Source_Type_Server"), parameters));
groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Server"), parameters));
}
return groupList.toArray(new ParameterGroup[0]);
}
}
}

6
designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java
Unescape View File

@ -20,14 +20,14 @@ public class DSColumnConditionAction extends AbstractCellElementAction {
public DSColumnConditionAction() {
super();
this.setName(com.fr.design.i18n.Toolkit.i18nText("Filter"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"));
this.setMnemonic('E');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif"));
}
public DSColumnConditionAction(ElementCasePane t) {
super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Filter"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"));
this.setMnemonic('E');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif"));
}
@ -48,4 +48,4 @@ public class DSColumnConditionAction extends AbstractCellElementAction {
protected void updateBasicPane(BasicPane bp, TemplateCellElement cellElement) {
((DSColumnConditionsPane) bp).update(cellElement);
}
}
}

8
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
Unescape View File

@ -80,7 +80,7 @@ public class DSColumnAdvancedPane extends BasicPane {
JPanel multiNumPane = null;
if (setting > DSColumnPane.SETTING_DSRELATED) {
multiNumPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fill_blank_Data"));
multiNumPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill_Blank_Data"));
useMultiplyNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Column_Multiple"));
multiNumPane.add(useMultiplyNumCheckBox);
multiNumPane.add(new UILabel(InsetText));
@ -338,10 +338,10 @@ public class DSColumnAdvancedPane extends BasicPane {
+ " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT);
JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{
serialTextField, new UILabel(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__")
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__")
)
}, FlowLayout.LEFT);
serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Format") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")");
serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Format") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")");
selectCountCardPane.add(undefinedPane, "UNDEFINE");
selectCountCardPane.add(topFormulaPane, "TOP");
selectCountCardPane.add(bottomFormulaPane, "BOTTOM");
@ -537,4 +537,4 @@ public class DSColumnAdvancedPane extends BasicPane {
multiNumSpinner.setEnabled(false);
}
}
}
}

23
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java
Unescape View File

@ -1,24 +1,21 @@
package com.fr.design.dscolumn;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel;
import com.fr.design.data.DesignTableDataManager;
import com.fr.data.TableDataSource;
import com.fr.design.condition.DSColumnLiteConditionPane;
import com.fr.design.condition.DSColumnSimpleLiteConditionPane;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicPane;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.data.Condition;
import com.fr.report.cell.CellElement;
import com.fr.report.cell.cellattr.core.group.DSColumn;
import com.fr.design.utils.gui.GUICoreUtils;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
public class DSColumnConditionsPane extends BasicPane {
//peter: Lite Condition.
@ -65,7 +62,7 @@ public class DSColumnConditionsPane extends BasicPane {
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Filter");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter");
}
public void populate(TableDataSource tds, CellElement cellElement) {
@ -103,4 +100,4 @@ public class DSColumnConditionsPane extends BasicPane {
}
}
}
}

4
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java
Unescape View File

@ -101,7 +101,7 @@ public class DSColumnPane extends BasicPane {
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Basic"), basicPane);
conditionPane = new DSColumnConditionsPane(setting);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Filter"), conditionPane);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"), conditionPane);
advancedPane = new DSColumnAdvancedPane(setting);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Advanced"), advancedPane);
@ -171,4 +171,4 @@ public class DSColumnPane extends BasicPane {
public void putCellElement(TemplateCellElement tplCE) {
basicPane.putCellElement(tplCE);
}
}
}

2
designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
Unescape View File

@ -116,7 +116,7 @@ class CptApp extends AbstractWorkBookApp {
}
});
UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_No"));
UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_No"));
noButton.addActionListener(new ActionListener() {
@Override

4
designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
Unescape View File

@ -878,7 +878,7 @@ public class PageSetupPane extends BasicPane {
this.add(defaultPane, BorderLayout.NORTH);
// page order
JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Page_Order"));
JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Order"));
JPanel pageOrderPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
outpageOrderPane.add(pageOrderPane);
defaultPane.add(outpageOrderPane);
@ -1033,4 +1033,4 @@ public class PageSetupPane extends BasicPane {
}
}
}
}

4
designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java
Unescape View File

@ -18,8 +18,8 @@ import java.awt.*;
public class ValueVerifierEditPane extends JPanel {
private UITableEditorPane<Object[]> tableEditorPane;
private final String[] columnNames = new String[] {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify_Warn_Text") };
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Verify"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Verify_Warn_Text") };
public ValueVerifierEditPane() {
// ben:UITableEditorPane；

10
designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
Unescape View File

@ -89,17 +89,17 @@ public class ReportWebWidgetConstants {
// 导出成Excel 分页导出
public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"),
public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class);
// 导出成Excel 原样导出
public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"),
public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Simple"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class);
// 导出成Excel 分页分Sheet导出
public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page_To_Sheet"),
public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page_To_Sheet"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelS.class);
// 导出成Word
public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class);
public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class);
// 页面设置
public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class);
// 导出
@ -172,4 +172,4 @@ public class ReportWebWidgetConstants {
//Excel导入_增量
public static final WidgetOption IMPORTEXCEL_APPEND= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Excel_Import_Append"),
BaseUtils.readIcon("/com/fr/web/images/excel.png"), ImExcelAppend.class);
}
}

4
designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
Unescape View File

@ -72,7 +72,7 @@ public class WebCssPane extends BasicPane {
@Override
public void actionPerformed(ActionEvent e) {
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true,
new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("File")));
new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE();
@ -122,4 +122,4 @@ public class WebCssPane extends BasicPane {
}
}
}
}

55
designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
Unescape View File

@ -1,40 +1,41 @@
package com.fr.design.webattr;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.*;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import com.fr.base.FRContext;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.frpane.EditingStringListPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.gui.frpane.EditingStringListPane;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.dialog.BasicPane;
import com.fr.file.FILE;
import com.fr.file.FILEChooserPane;
import com.fr.file.filter.ChooseFileFilter;
import com.fr.stable.CoreConstants;
import com.fr.stable.StringUtils;
import com.fr.web.attr.ReportWebAttr;
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
public class WebJsPane extends BasicPane {
private UITextField localText;
private UITextField urlText;
@ -160,7 +161,7 @@ public class WebJsPane extends BasicPane {
@Override
public void actionPerformed(ActionEvent e) {
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true,
new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("File")));
new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE();
@ -197,7 +198,7 @@ public class WebJsPane extends BasicPane {
FRContext.getLogger().error(e.getMessage(), e);
}
if (in == null) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
} else {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully"));
try {
@ -283,4 +284,4 @@ public class WebJsPane extends BasicPane {
}
}
}
}

4
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
Unescape View File

@ -575,7 +575,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
//补充空白数据
JPanel multiNumPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
useMultiNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fill_blank_Data"));
useMultiNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill_Blank_Data"));
JPanel checkBoxPane = new JPanel(new BorderLayout());
checkBoxPane.add(useMultiNumCheckBox, BorderLayout.WEST);
multiNumPane.add(checkBoxPane);
@ -1215,4 +1215,4 @@ public class CellDSColumnEditor extends CellQuickEditor {
public Object getComboBoxSelected() {
return ActionFactory.createAction(DSColumnCellAction.class);
}
}
}

2
designer-realize/src/main/java/com/fr/start/Designer.java
Unescape View File

@ -391,7 +391,7 @@ public class Designer extends BaseDesigner {
if (DesignerMode.isAuthorityEditing()) {
if (plus instanceof JWorkBook && plus.toolbars4Target() == null) {
//聚合块编辑
return super.polyToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Poly_Block_Edit"));
return super.polyToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Privilege_Poly_Block_Edit"));
} else {
return plus.toolBar4Authority();
}

Write Preview
Loading…
Cancel
Save