Skip to content

Commit fa0c0bd

Browse files
committed
Rename Annotated Objects tree label, remove rounded popover border.
1 parent 8110f6f commit fa0c0bd

4 files changed

Lines changed: 13 additions & 8 deletions

File tree

src/main/java/com/github/mfl28/boundingboxeditor/controller/Controller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@ private void setUpModelListeners() {
12361236
+ "\nCurrently there " +
12371237
(nrExistingBoundingShapes == 1 ? "is " : "are ") +
12381238
nrExistingBoundingShapes
1239-
+ " annotated object" +
1239+
+ " object" +
12401240
(nrExistingBoundingShapes == 1 ? " " : "s ") +
12411241
"with the category \"" + category.getName() + "\".",
12421242
stage);

src/main/java/com/github/mfl28/boundingboxeditor/ui/EditorsSplitPaneView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class EditorsSplitPaneView extends SplitPane implements View {
4141
private static final String SEARCH_CATEGORY_PROMPT_TEXT = "Search Category";
4242
private static final String OBJECT_CATEGORY_ADD_BUTTON_TEXT = "Add";
4343
private static final String OBJECT_CATEGORY_COLOR_PICKER_STYLE = "category-color-picker";
44-
private static final String OBJECT_SELECTOR_LABEL_TEXT = "Annotated Objects";
44+
private static final String OBJECT_SELECTOR_LABEL_TEXT = "Objects";
4545
private static final String CATEGORY_INPUT_FIELD_PROMPT_TEXT = "Category Name";
4646
private static final String CATEGORY_INPUT_FIELD_ID = "category-input-field";
4747
private static final String ADD_BUTTON_ID = "add-button";

src/main/java/com/github/mfl28/boundingboxeditor/ui/ObjectTreeElementCell.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,7 @@ class ObjectTreeElementCell extends TreeCell<Object> {
103103
nameText.getStyleClass().add(NAME_TEXT_STYLE);
104104
additionalInfoText.setId(INFO_TEXT_ID);
105105

106-
popOver.setAutoHide(true);
107-
popOver.setHideOnEscape(true);
108-
popOver.setArrowLocation(PopOver.ArrowLocation.LEFT_CENTER);
109-
popOver.setContentNode(popOverImageView);
110-
popOverImageView.setPreserveRatio(true);
106+
setUpPopOver();
111107

112108
setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
113109
setUpInternalListeners();
@@ -263,6 +259,15 @@ void setHighlightStatusIncludingChildren(boolean highlightStatus) {
263259
}
264260
}
265261

262+
private void setUpPopOver() {
263+
popOver.setAutoHide(true);
264+
popOver.setHideOnEscape(true);
265+
popOver.setArrowLocation(PopOver.ArrowLocation.LEFT_CENTER);
266+
popOver.setContentNode(popOverImageView);
267+
popOver.setCornerRadius(0);
268+
popOverImageView.setPreserveRatio(true);
269+
}
270+
266271
private MenuItem createShowAllBoundingShapesMenuItem() {
267272
final CustomMenuItem showAllMenuItem = new CustomMenuItem(new Label(SHOW_ALL_MENU_ITEM_TEXT));
268273
showAllMenuItem.setId(SHOW_ALL_CONTEXT_MENU_ID);

src/main/java/com/github/mfl28/boundingboxeditor/ui/settings/UISettingsView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class UISettingsView extends GridPane implements ApplyButtonChangeProvide
3232
private static final String GRID_PANE_STYLE_CLASS = "grid-pane";
3333
private static final String SHOW_OBJECT_POPOVER_LABEL_TEXT = "Show object popover";
3434
private static final String SHOW_POPOVER_TOOLTIP =
35-
"Show an image popover when hovering objects in the Annotated Objects tree.";
35+
"Show an image popover when hovering objects in the Objects tree.";
3636
private final CheckBox showObjectPopoverControl = new CheckBox();
3737

3838
public UISettingsView() {

0 commit comments

Comments
 (0)