Repository: incubator-ignite Updated Branches: refs/heads/ignite-32 d902a9bb8 -> d62123b2f
# IGNITE-32 WIP: UI - minor changes after review. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d62123b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d62123b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d62123b2 Branch: refs/heads/ignite-32 Commit: d62123b2f50eb97ee0308639af89bb8ce13ccccd Parents: d902a9b Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Dec 30 08:37:47 2014 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Dec 30 08:37:47 2014 +0700 ---------------------------------------------------------------------- .../schema-load/src/main/java/media/style.css | 17 +++++-- .../org/apache/ignite/schema/ui/Controls.java | 9 ++++ .../org/apache/ignite/schema/ui/GridPaneEx.java | 2 +- .../apache/ignite/schema/ui/SchemaLoadApp.java | 52 +++++++++++++------- 4 files changed, 56 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d62123b2/modules/schema-load/src/main/java/media/style.css ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/media/style.css b/modules/schema-load/src/main/java/media/style.css index 9eb0dfb..ac3f760 100644 --- a/modules/schema-load/src/main/java/media/style.css +++ b/modules/schema-load/src/main/java/media/style.css @@ -1,18 +1,22 @@ +.button { + -fx-font-size: 14; +} + .label { - -fx-font-size: 16; + -fx-font-size: 14; } .check-box { - -fx-font-size: 16; + -fx-font-size: 14; } .text-area { - -fx-font-size: 16; + -fx-font-size: 14; -fx-strikethrough: true; } .text-field { - -fx-font-size: 16; + -fx-font-size: 14; } .tooltip { @@ -22,3 +26,8 @@ .page-corner { -fx-shape: " "; } + +#banner { + -fx-font-size: 20px; + -fx-font-weight: bold; +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d62123b2/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java index e66606b..73ffd3e 100644 --- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java +++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java @@ -25,6 +25,15 @@ public class Controls { public static final Insets DFLT_PADDING = new Insets(10, 10, 10, 10); /** + * Create grid pane with default padding. + * + * @return New grid pane instance. + */ + public static GridPaneEx paneEx() { + return new GridPaneEx(DFLT_PADDING); + } + + /** * Create new {@code HBox} with default padding. * * @param spacing Amount of horizontal space between each child. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d62123b2/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java index e7e42e8..3a63c77 100644 --- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java +++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java @@ -30,7 +30,7 @@ public class GridPaneEx extends GridPane { public GridPaneEx(Insets padding) { setAlignment(Pos.TOP_LEFT); setPadding(padding); - setHgap(10); + setHgap(5); setVgap(10); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d62123b2/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java index 2122bda..fdcbe2a 100644 --- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java +++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java @@ -33,7 +33,7 @@ import static org.apache.ignite.schema.ui.Controls.*; * Schema load application. */ public class SchemaLoadApp extends Application { - /** TODO: remove later */ + /** TODO: IGNITE 32 remove before release */ private static final String PATH = "C:/Temp/ignite"; /** */ @@ -189,7 +189,7 @@ public class SchemaLoadApp extends Application { HBox hb = hBox(0); titleLb = new Label(""); - titleLb.setFont(Font.font("Tahoma", FontWeight.NORMAL, 20)); + titleLb.setId("banner"); hb.getChildren().add(titleLb); @@ -249,19 +249,11 @@ public class SchemaLoadApp extends Application { generate(); } - /** {@inheritDoc} */ - @Override public void start(Stage primaryStage) { - owner = primaryStage; - - primaryStage.setTitle("Schema Load"); - - primaryStage.getIcons() - .addAll(image("branch", 16), image("branch", 32), image("branch", 48), image("branch", 128)); - - rootPane = new BorderPane(); - - // Connection pane. - connPnl = new GridPaneEx(DFLT_PADDING); + /** + * Create connection pane with controls. + */ + private void createConnectionPane() { + connPnl = paneEx(); connPnl.addColumn(); connPnl.addColumn(100, 100, Double.MAX_VALUE, Priority.ALWAYS); @@ -278,13 +270,17 @@ public class SchemaLoadApp extends Application { pwdTf = connPnl.addLabeled("Password:", new PasswordField()); connPnl.add(new Text("Put JDBC driver jar file into '/drivers' folder."), 2); + } - // Generation pane. - genPnl = new GridPaneEx(DFLT_PADDING); + /** + * Create generate pane with controls. + */ + private void createGeneratePane() { + genPnl = paneEx(); genPnl.addColumn(); genPnl.addColumn(100, 100, Double.MAX_VALUE, Priority.ALWAYS); - genPnl.addColumn(30); + genPnl.addColumn(35, 35, 35, Priority.NEVER); genPnl.addRow(100, 100, Double.MAX_VALUE, Priority.ALWAYS); genPnl.addRow(100, 100, 100, Priority.NEVER); @@ -341,6 +337,23 @@ public class SchemaLoadApp extends Application { xmlSingleFileCh = genPnl.add(checkBox("Write all configurations to a single file", "" + "If selected then all configuration will be saved into file 'ignite.xml'", true), 3); + } + + + /** {@inheritDoc} */ + @Override public void start(Stage primaryStage) { + owner = primaryStage; + + primaryStage.setTitle("Schema Load"); + + primaryStage.getIcons() + .addAll(image("branch", 16), image("branch", 32), image("branch", 48), image("branch", 128)); + + rootPane = new BorderPane(); + + createConnectionPane(); + + createGeneratePane(); rootPane.setTop(createHeaderPane()); rootPane.setCenter(connPnl); @@ -356,7 +369,7 @@ public class SchemaLoadApp extends Application { primaryStage.setWidth(w); primaryStage.setMinWidth(w); - int h = 500; + int h = 540; primaryStage.setHeight(h); primaryStage.setMinHeight(h); @@ -369,6 +382,7 @@ public class SchemaLoadApp extends Application { * Schema load utility launcher. */ private static void sampleDb() { + // TODO: IGNITE 32 remove before release try { Class.forName("org.h2.Driver");
