Removed the IP type label. Selects metadata option when any option is…

… changed.
keeps · May 12, 2016 · 4d5e0f6 · 4d5e0f6
1 parent 802cf72
commit 4d5e0f6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/src/main/java/org/roda/rodain/inspection/InspectionPane.java b/src/main/java/org/roda/rodain/inspection/InspectionPane.java
@@ -1201,13 +1201,9 @@ public void updateItem(UIPair item, boolean empty) {
         }
       }
     });
+    contentType.setTooltip(new Tooltip(I18n.t("InspectionPane.sipTypeTooltip")));
 
-    HBox ipTypeWrapper = new HBox();
-    ipTypeWrapper.setAlignment(Pos.CENTER_LEFT);
-    Label ipType = new Label(I18n.t("InspectionPane.IPType"));
-    ipType.getStyleClass().add("top-subtitle");
-    ipTypeWrapper.getChildren().add(ipType);
-    top.getChildren().addAll(space, ipTypeWrapper, contentType);
+    top.getChildren().addAll(space, contentType);
 
     topSubtitle.getChildren().addAll(space, top);
 

diff --git a/src/main/java/org/roda/rodain/rules/ui/RuleModalPane.java b/src/main/java/org/roda/rodain/rules/ui/RuleModalPane.java
@@ -297,6 +297,10 @@ private HBox optionsSingleFile(List<UIPair> metaTypeList) {
     Label typeLabel = new Label(I18n.t("type") + ":");
     comboTypesSingleFile = new ComboBox<>(FXCollections.observableList(metaTypeList));
     comboTypesSingleFile.getSelectionModel().selectFirst();
+    comboTypesSingleFile.valueProperty().addListener(observable -> {
+      metaList.getSelectionModel().clearSelection();
+      metaList.getSelectionModel().select(cellSingleFile);
+    });
     HBox space = new HBox();
     HBox.setHgrow(space, Priority.ALWAYS);
 
@@ -310,10 +314,18 @@ private HBox optionsSameFolder(List<UIPair> metaTypeList) {
 
     Label lab = new Label(I18n.t("RuleModalPane.metadataPattern"));
     sameFolderTxtField = new TextField("metadata.xml");
+    sameFolderTxtField.textProperty().addListener(observable -> {
+      metaList.getSelectionModel().clearSelection();
+      metaList.getSelectionModel().select(cellSameFolder);
+    });
 
     Label typeLabel = new Label(I18n.t("type") + ":");
     comboTypesSameDir = new ComboBox<>(FXCollections.observableList(metaTypeList));
     comboTypesSameDir.getSelectionModel().selectFirst();
+    comboTypesSameDir.valueProperty().addListener(observable -> {
+      metaList.getSelectionModel().clearSelection();
+      metaList.getSelectionModel().select(cellSameFolder);
+    });
     HBox space = new HBox();
     HBox.setHgrow(space, Priority.ALWAYS);
 
@@ -342,6 +354,10 @@ private HBox optionsDiffFolder(List<UIPair> metaTypeList) {
     Label typeLabel = new Label(I18n.t("type") + ":");
     comboTypesDiffFolder = new ComboBox<>(FXCollections.observableList(metaTypeList));
     comboTypesDiffFolder.getSelectionModel().selectFirst();
+    comboTypesDiffFolder.valueProperty().addListener(observable -> {
+      metaList.getSelectionModel().clearSelection();
+      metaList.getSelectionModel().select(cellDiffFolder);
+    });
     HBox space = new HBox();
     HBox.setHgrow(space, Priority.ALWAYS);
 

diff --git a/src/main/resources/properties/lang.properties b/src/main/resources/properties/lang.properties
@@ -192,6 +192,7 @@ InspectionPane.IPType=IP type
 IPContentType.MIXED=Mixed
 IPContentType.OTHER=Other
 metadata.descDate=Description creation date
+InspectionPane.sipTypeTooltip=IP type
 
 
 
diff --git a/src/main/resources/properties/lang_en.properties b/src/main/resources/properties/lang_en.properties
@@ -211,6 +211,7 @@ InspectionPane.IPType=IP type
 IPContentType.MIXED=Mixed
 IPContentType.OTHER=Other
 metadata.descDate=Description creation date
+InspectionPane.sipTypeTooltip=IP type
 
 
 
diff --git a/src/main/resources/properties/lang_pt.properties b/src/main/resources/properties/lang_pt.properties
@@ -211,6 +211,7 @@ InspectionPane.IPType=Tipo de pacote
 IPContentType.MIXED=Misto
 IPContentType.OTHER=Outro
 metadata.descDate=Data da descrição
+InspectionPane.sipTypeTooltip=Tipo do pacote