You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/01/16 19:15:39 UTC
[incubator-hop] branch master updated: HOP-2421 "Open file" dialog
does not show expected files
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 1e3c309 HOP-2421 "Open file" dialog does not show expected files
new 5b4d0ab Merge pull request #558 from nadment/HOP-2421
1e3c309 is described below
commit 1e3c3096f5d4d7c67fc415541f332cc59bff6645
Author: nadment <na...@gmail.com>
AuthorDate: Sat Jan 16 15:54:40 2021 +0100
HOP-2421 "Open file" dialog does not show expected files
- Fix show all files
- Fix alignment of widgets
- Add SWT.BORDER to files table
---
.../hop/projects/environment/LifecycleEnvironmentDialog.java | 10 +++++-----
.../java/org/apache/hop/projects/project/ProjectDialog.java | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/plugins/misc/projects/src/main/java/org/apache/hop/projects/environment/LifecycleEnvironmentDialog.java b/plugins/misc/projects/src/main/java/org/apache/hop/projects/environment/LifecycleEnvironmentDialog.java
index a1e9b26..e6b6969 100644
--- a/plugins/misc/projects/src/main/java/org/apache/hop/projects/environment/LifecycleEnvironmentDialog.java
+++ b/plugins/misc/projects/src/main/java/org/apache/hop/projects/environment/LifecycleEnvironmentDialog.java
@@ -145,7 +145,7 @@ public class LifecycleEnvironmentDialog extends Dialog {
props.setLook( wPurpose );
FormData fdPurpose = new FormData();
fdPurpose.left = new FormAttachment( middle, margin );
- fdPurpose.right = new FormAttachment( 100, -margin );
+ fdPurpose.right = new FormAttachment( 100, 0 );
fdPurpose.top = new FormAttachment( wlPurpose, 0, SWT.CENTER );
wPurpose.setLayoutData( fdPurpose );
lastControl = wPurpose;
@@ -167,12 +167,12 @@ public class LifecycleEnvironmentDialog extends Dialog {
wProject.setLayoutData( fdProject );
lastControl = wProject;
- Label wlConfigFiles = new Label( shell, SWT.RIGHT );
+ Label wlConfigFiles = new Label( shell, SWT.LEFT );
props.setLook( wlConfigFiles );
wlConfigFiles.setText( "Configuration files: " );
FormData fdlConfigFiles = new FormData();
fdlConfigFiles.left = new FormAttachment( 0, 0 );
- fdlConfigFiles.right = new FormAttachment( middle, 0 );
+ fdlConfigFiles.right = new FormAttachment( 100, 0 );
fdlConfigFiles.top = new FormAttachment( lastControl, margin );
wlConfigFiles.setLayoutData( fdlConfigFiles );
@@ -199,7 +199,7 @@ public class LifecycleEnvironmentDialog extends Dialog {
};
columnInfo[ 0 ].setUsingVariables( true );
- wConfigFiles = new TableView( variables, shell, SWT.SINGLE, columnInfo, environment.getConfigurationFiles().size(), null, props );
+ wConfigFiles = new TableView( variables, shell, SWT.SINGLE | SWT.BORDER, columnInfo, environment.getConfigurationFiles().size(), null, props );
props.setLook( wConfigFiles );
FormData fdConfigFiles = new FormData();
fdConfigFiles.left = new FormAttachment( 0, 0 );
@@ -268,7 +268,7 @@ public class LifecycleEnvironmentDialog extends Dialog {
private void addConfigFile( Event event ) {
String configFile = BaseDialog.presentFileDialog( shell, null, variables,
- new String[] { "*.json", "*.*"},
+ new String[] { "*.json", "*"},
new String[] { "Config JSON files", "All files" },
true);
if (configFile!=null) {
diff --git a/plugins/misc/projects/src/main/java/org/apache/hop/projects/project/ProjectDialog.java b/plugins/misc/projects/src/main/java/org/apache/hop/projects/project/ProjectDialog.java
index 8f52e81..230c91a 100644
--- a/plugins/misc/projects/src/main/java/org/apache/hop/projects/project/ProjectDialog.java
+++ b/plugins/misc/projects/src/main/java/org/apache/hop/projects/project/ProjectDialog.java
@@ -308,12 +308,12 @@ public class ProjectDialog extends Dialog {
wEnforceHomeExecution.setLayoutData(fdEnforceHomeExecution);
lastControl = wEnforceHomeExecution;
- Label wlVariables = new Label(shell, SWT.RIGHT);
+ Label wlVariables = new Label(shell, SWT.LEFT);
props.setLook(wlVariables);
wlVariables.setText("Project variables to set : ");
FormData fdlVariables = new FormData();
fdlVariables.left = new FormAttachment(0, 0);
- fdlVariables.right = new FormAttachment(middle, 0);
+ fdlVariables.right = new FormAttachment(100, 0);
fdlVariables.top = new FormAttachment(lastControl, margin);
wlVariables.setLayoutData(fdlVariables);
@@ -331,7 +331,7 @@ public class ProjectDialog extends Dialog {
new TableView(
new Variables(),
shell,
- SWT.NONE,
+ SWT.BORDER,
columnInfo,
project.getDescribedVariables().size(),
null,