From d7b45f788a22b5ec737ab1725fbccb5ab950cc5a Mon Sep 17 00:00:00 2001 From: Hiromu Hota Date: Tue, 22 Nov 2016 10:47:45 -0800 Subject: [PATCH] Edit README&CHANGELOG, cleanup codes --- CHANGELOG.md | 6 ++++++ README.md | 14 +++++--------- ui/src/org/pentaho/di/ui/spoon/Spoon.java | 18 ++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6df03de6d248..58815eb34dba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 0.0.0.3 - 2016-11-22 +### Fixed +- Restore the missing menubar. +- Revert the type of menuitem from "checkbox" to "push_button" (a fix has been made to pentaho-xul-swt regarding this). +- Fix the issue #3 "Certain keys cannot be typed" by disabling shortcut keys. + ## 0.0.0.2 - 2016-11-09 ### Fixed - Fix the main Shell resizing: now the app area aligns with the browser window size. diff --git a/README.md b/README.md index a44be2990dd5..cddb57ee5eb1 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ webSpoon does not work with Java 7 since the dependent library (Eclipse RAP/RWT) The following procedures assume that Pentaho BI server (CE or EE) has already been installed and webSpoon is deployed to the Apache Tomcat shipped with them, but webSpoon can also be deployed to other Java Application server (e.g., Jetty). 1. Download the latest `spoon.war` from [here](https://github.com/HiromuHota/pentaho-kettle/releases). -2. Copy the downloaded `spoon.war` to the `webapps` folder, e.g., `biserver-ce/tomcat/webapps` for CE, `Pentaho/server/biserver-ee/tomcat/webapps/` for EE. +2. Copy the downloaded `spoon.war` to the `webapps` folder, e.g., `biserver-ce/tomcat/webapps` for CE, `Pentaho/server/biserver-ee/tomcat/webapps` for EE. 3. (Re)start the BI server. WebSpoon will sit next to the Pentaho User Console (i.e., `http://address:8080/spoon` when PUC is `http://address:8080/pentaho`). @@ -56,12 +56,6 @@ WebSpoon will sit next to the Pentaho User Console (i.e., `http://address:8080/s It is strongly recommended to use webSpoon with a Repository (can be Pentaho Repository, Kettle Database Repository, or Kettle File Repository), otherwise opening/saving files does not function as you would expect. The steps to connect to a Repository is described [here](https://help.pentaho.com/Documentation/6.1/0J0/0C0/015) and [here](https://help.pentaho.com/Documentation/6.1/0L0/0Y0/040). -Since webSpoon currently doesn't have the menubar, the repository dialog cannot be opened from the menu. -Luckily there is another way to open the dialog: enabling the "Show this dialog at startup" in the `$HOME/.kettle/.spoonrc` (if `user` runs the Java Application server, `$HOME` is `/home/user`) as follows: - -``` -ShowRepositoriesAtStartup=Y -``` A progress bar will appear when clicking a OK button after selecting a connection, typing username and password. Please remember to move the progress bar, otherwise it will not close. @@ -78,7 +72,10 @@ Place plugins into either one of the following two folders: ## JDBC drivers -Place jar files into `webapps/spoon/WEB-INF/lib`. +Place jar files into either one of the following folders: + +1. `biserver-ce/tomcat/lib` for CE or `Pentaho/server/biserver-ee/tomcat/lib` for EE. +2. `webapps/spoon/WEB-INF/lib`, but not recommended because this folder is overwritten when upgrading `spoon.war`. # How to use (end-user perspective) @@ -88,7 +85,6 @@ The detailed compatibility is described [here](http://www.eclipse.org/rap/notewo ## Known issues -- MenuBar is missing. - Welcome page does not show anything. - "Please Wait" dialog after the "Repository Connection" dialog won't close until it is manually moved or closed. - "Run Options" dialog after the "Run" button won't popup until the canvas area is clicked. diff --git a/ui/src/org/pentaho/di/ui/spoon/Spoon.java b/ui/src/org/pentaho/di/ui/spoon/Spoon.java index 365363aeea00..fa7503a3492a 100644 --- a/ui/src/org/pentaho/di/ui/spoon/Spoon.java +++ b/ui/src/org/pentaho/di/ui/spoon/Spoon.java @@ -870,6 +870,7 @@ public void init( TransMeta ti ) { shell.pack(); shell.setMaximized( true ); // Default = maximized! } + shell.setMaximized( true ); layout = new FormLayout(); layout.marginWidth = 0; @@ -880,7 +881,6 @@ public void init( TransMeta ti ) { data.grabExcessVerticalSpace = true; data.verticalAlignment = SWT.FILL; data.horizontalAlignment = SWT.FILL; - data.verticalSpan = 400; sashComposite.setLayoutData( data ); sashComposite.setLayout( layout ); @@ -1463,9 +1463,9 @@ public void copy() { boolean jobActive = jobMeta != null; Control focusControl = getDisplay().getFocusControl(); -// if ( focusControl instanceof StyledText ) { -// copyLogSelectedText( (StyledText) focusControl ); -// } else { + if ( focusControl instanceof Text ) { + copyLogSelectedText( (Text) focusControl ); + } else { if ( transActive ) { if ( transMeta.getSelectedSteps().size() > 0 ) { copySteps(); @@ -1479,7 +1479,7 @@ public void copy() { copyJob(); } } -// } + } } public void copyFile() { @@ -1642,9 +1642,9 @@ public boolean isExecutionResultsPaneVisible() { return ( transGraph != null ) && ( transGraph.isExecutionResultsPaneVisible() ); } -// public void copyLogSelectedText( StyledText text ) { -// toClipboard( text.getSelectionText() ); -// } + public void copyLogSelectedText( Text text ) { + toClipboard( text.getSelectionText() ); + } public void copyTransformation() { copyTransformation( getActiveTransformation() ); @@ -9253,7 +9253,6 @@ protected void createContents( Composite parent ) { shell = getShell(); init( null ); - loadLastUsedFiles(); // has to be after init. openSpoon(); @@ -9278,7 +9277,6 @@ protected void createContents( Composite parent ) { //getMenuBarManager().updateAll( true ); //return parent; - shell.setMaximized( true ); } @Override