ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject incubator-ignite git commit: # IGNITE-32 GUI: multiple selection on table views.
Date Wed, 28 Jan 2015 17:22:39 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-32 ce649bdf6 -> 61ac2c4e2


# IGNITE-32 GUI: multiple selection on table views.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/61ac2c4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/61ac2c4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/61ac2c4e

Branch: refs/heads/ignite-32
Commit: 61ac2c4e2bf3a1696da70020f75e357156cf9ae8
Parents: ce649bd
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Thu Jan 29 00:22:39 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Thu Jan 29 00:22:39 2015 +0700

----------------------------------------------------------------------
 modules/schema-load/src/main/java/media/style.css       |  1 +
 .../main/java/org/apache/ignite/schema/ui/Controls.java |  2 ++
 .../java/org/apache/ignite/schema/ui/SchemaLoadApp.java | 12 +++++++-----
 3 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/61ac2c4e/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 8e74d6f..89959f1 100644
--- a/modules/schema-load/src/main/java/media/style.css
+++ b/modules/schema-load/src/main/java/media/style.css
@@ -51,6 +51,7 @@
 }
 
 .tooltip {
+    -fx-font-size: 14;
     -fx-background-radius: 0 0 0 0;
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/61ac2c4e/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 1641c0f..ca12eb8 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
@@ -471,6 +471,8 @@ public class Controls {
         tbl.setMinHeight(70);
         tbl.setPlaceholder(text(placeholder, 0));
 
+        tbl.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+
         tbl.getColumns().addAll(cols);
 
         return tbl;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/61ac2c4e/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 225a52c..889a5ef 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
@@ -676,7 +676,8 @@ public class SchemaLoadApp extends Application {
             "If checked then this field will be part of key object");
 
         TableColumn<PojoField, Boolean> akCol = booleanColumn("AK", "affinityKey",
-            "If checked then this field will be marked with @CacheAffinityKeyMapped annotation
in generated POJO");
+            "Check to annotate filed with @CacheAffinityKeyMapped annotation in generated
POJO class\n" +
+            "Note that a class can have only one field annotated with @CacheAffinityKeyMapped
annotation");
 
         TableColumn<PojoField, String> dbNameCol = tableColumn("DB Name", "dbName",
"Field name in database");
 
@@ -1111,12 +1112,13 @@ public class SchemaLoadApp extends Application {
 
                         boolean isTbl = pojo.parent() != null;
 
-                        CheckBox ch = new CheckBox(isTbl ? pojo.table() : pojo.schema());
+                        CheckBox ch = new CheckBox();
+                        Label lb = new Label(isTbl ? pojo.table() : pojo.schema());
 
                         ch.setAllowIndeterminate(false);
-                        ch.setMnemonicParsing(false);
 
                         ch.indeterminateProperty().bindBidirectional(pojo.indeterminate());
+
                         ch.selectedProperty().bindBidirectional(pojo.useProperty());
 
                         ch.setOnMouseClicked(new EventHandler<MouseEvent>() {
@@ -1128,10 +1130,10 @@ public class SchemaLoadApp extends Application {
                             }
                         });
 
-                        Pane pnl = new HBox();
+                        Pane pnl = new HBox(5);
 
                         pnl.setPadding(new Insets(0, 0, 0, isTbl ? 25 : 5));
-                        pnl.getChildren().add(ch);
+                        pnl.getChildren().addAll(ch, lb);
 
                         setGraphic(pnl);
                     }


Mime
View raw message