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

Merge branch 'fbp/release' of ssh://code.fineres.com:7999/~renekton/design into fbp/release

fbp/merge
renekton 4 months ago
parent
7b08ede652 0ad213d6b8
commit
3708a2213b
4 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java
  2. 2
      designer-base/src/main/resources/com/fr/env/jarVersion.properties
  3. 4
      designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
  4. 4
      designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

2
designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java
Unescape View File

@ -413,7 +413,7 @@ public class StartupPageWorkspacePanel extends JPanel {
} }
selectWorkspacePanel.setPreferredSize(SELECT_WORKSPACE_DIMENSION); selectWorkspacePanel.setPreferredSize(SELECT_WORKSPACE_DIMENSION);
workspaceItemDesc.add(selectWorkspacePanel, BorderLayout.WEST); workspaceItemDesc.add(selectWorkspacePanel, BorderLayout.CENTER);
} }
private void layoutSelectAndCreatePanel(StartupWorkspaceBean workspaceInfo, JPanel workspaceItemDesc) { private void layoutSelectAndCreatePanel(StartupWorkspaceBean workspaceInfo, JPanel workspaceItemDesc) {

2
designer-base/src/main/resources/com/fr/env/jarVersion.properties vendored
Unescape View File

@ -1 +1 @@
report-engine-key=fine-report-engine-1.0.jar report-engine-key=fine-report-engine-1.0.0.jar

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

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

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

@ -158,8 +158,8 @@ public class WebJsPane extends BasicPane {
private ActionListener chooseFileListener = new ActionListener() { private ActionListener chooseFileListener = new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
FILEChooserPane fileChooser = FILEChooserPane.getInstanceWithDesignatePath(ProjectConstants.RESOURCES_NAME , FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true,
new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")), ProjectConstants.RESOURCES_NAME); new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE(); final FILE file = fileChooser.getSelectedFILE();

Write Preview
Loading…
Cancel
Save