Fix for issue 4682 : Restructuring the side pane structure having additional functionality and merging the remove group menus #7714
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,8 +15,10 @@ | |
| import javafx.beans.property.ObjectProperty; | ||
| import javafx.css.PseudoClass; | ||
| import javafx.fxml.FXML; | ||
| import javafx.scene.control.Button; | ||
| import javafx.scene.control.ContextMenu; | ||
| import javafx.scene.control.Control; | ||
| import javafx.scene.control.Menu; | ||
| import javafx.scene.control.MenuItem; | ||
| import javafx.scene.control.SelectionMode; | ||
| import javafx.scene.control.SeparatorMenuItem; | ||
|
|
@@ -64,6 +66,7 @@ public class GroupTreeView { | |
| @FXML private TreeTableColumn<GroupNodeViewModel, GroupNodeViewModel> numberColumn; | ||
| @FXML private TreeTableColumn<GroupNodeViewModel, GroupNodeViewModel> expansionNodeColumn; | ||
| @FXML private CustomTextField searchField; | ||
| @FXML private Button addNewGroup; | ||
|
|
||
| @Inject private StateManager stateManager; | ||
| @Inject private DialogService dialogService; | ||
|
|
@@ -101,6 +104,8 @@ public void initialize() { | |
| }); | ||
| searchField.textProperty().addListener((observable, oldValue, newValue) -> searchTask.restart()); | ||
|
|
||
| setNewGroupButtonStyle(groupTree); | ||
|
|
||
| groupTree.rootProperty().bind( | ||
| EasyBind.map(viewModel.rootGroupProperty(), | ||
| group -> { | ||
|
|
@@ -171,6 +176,7 @@ public void initialize() { | |
| groupTree.setRowFactory(treeTable -> { | ||
| TreeTableRow<GroupNodeViewModel> row = new TreeTableRow<>(); | ||
| row.treeItemProperty().addListener((ov, oldTreeItem, newTreeItem) -> { | ||
| setNewGroupButtonStyle(treeTable); | ||
| boolean isRoot = newTreeItem == treeTable.getRoot(); | ||
| row.pseudoClassStateChanged(rootPseudoClass, isRoot); | ||
|
|
||
|
|
@@ -322,7 +328,9 @@ private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(TreeItem<Group | |
| } | ||
|
|
||
| private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) { | ||
|
|
||
| ContextMenu menu = new ContextMenu(); | ||
| Menu removeGroup = new Menu(Localization.lang("Remove group")); | ||
|
|
||
| MenuItem editGroup = new MenuItem(Localization.lang("Edit group")); | ||
| editGroup.setOnAction(event -> { | ||
|
|
@@ -331,33 +339,43 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) { | |
| groupTree.refresh(); | ||
| }); | ||
|
|
||
| MenuItem removeGroupKeepSubgroups = new MenuItem(Localization.lang("Keep subgroups")); | ||
| removeGroupKeepSubgroups.setOnAction(event -> viewModel.removeGroupKeepSubgroups(group)); | ||
|
|
||
| MenuItem removeGroupAndSubgroups = new MenuItem(Localization.lang("Also remove subgroups")); | ||
| removeGroupAndSubgroups.setOnAction(event -> viewModel.removeGroupAndSubgroups(group)); | ||
|
|
||
| MenuItem addSubgroup = new MenuItem(Localization.lang("Add subgroup")); | ||
| addSubgroup.setOnAction(event -> { | ||
| menu.hide(); | ||
| viewModel.addNewSubgroup(group, false); | ||
| }); | ||
|
|
||
| MenuItem removeSubgroups = new MenuItem(Localization.lang("Remove subgroups")); | ||
| removeSubgroups.setOnAction(event -> { | ||
| viewModel.removeSubgroups(group); | ||
| }); | ||
|
|
||
| MenuItem sortSubgroups = new MenuItem(Localization.lang("Sort subgroups")); | ||
| sortSubgroups.setOnAction(event -> viewModel.sortAlphabeticallyRecursive(group)); | ||
|
|
||
| MenuItem addEntries = new MenuItem(Localization.lang("Add Selected Entries to this Group")); | ||
| addEntries.setOnAction(event -> viewModel.addSelectedEntries(group)); | ||
|
|
||
| MenuItem removeEntries = new MenuItem(Localization.lang("Remove Selected Entries from this Group")); | ||
| removeEntries.setOnAction(event -> viewModel.removeSelectedEntries(group)); | ||
|
|
||
| menu.getItems().add(editGroup); | ||
| removeGroup.getItems().add(removeGroupKeepSubgroups); | ||
| removeGroup.getItems().add(removeGroupAndSubgroups); | ||
| menu.getItems().add(removeGroup); | ||
| menu.getItems().add(new SeparatorMenuItem()); | ||
| menu.getItems().add(addSubgroup); | ||
| menu.getItems().add(removeSubgroups); | ||
| menu.getItems().add(sortSubgroups); | ||
| menu.getItems().add(new SeparatorMenuItem()); | ||
| menu.getItems().add(addEntries); | ||
| menu.getItems().add(removeEntries); | ||
|
|
||
| // TODO: Disable some actions under certain conditions | ||
| // if (group.canBeEdited()) { | ||
|
|
@@ -397,6 +415,21 @@ private void setupClearButtonField(CustomTextField customTextField) { | |
| } | ||
| } | ||
|
|
||
| private void setNewGroupButtonStyle(TreeTableView<GroupNodeViewModel> groupTree) { | ||
| if (groupTree.getRoot() != null) { | ||
| if (groupTree.getExpandedItemCount() <= 10) { | ||
| addNewGroup.setStyle("-fx-border-width: 0px; -fx-background-color: -jr-theme;" + | ||
| " -fx-padding: 0.5em; -fx-text-fill: -jr-white;"); | ||
| } else { | ||
| addNewGroup.setStyle("-fx-border-width: 0px; -fx-background-color: -jr-icon-background-active;" + | ||
| " -fx-padding: 0.5em; -fx-text-fill: -jr-black;"); | ||
| } | ||
| } else { | ||
| addNewGroup.setStyle("-fx-border-width: 0px; -fx-background-color: -jr-theme;" + | ||
| " -fx-padding: 0.5em; -fx-text-fill: -jr-white;"); | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Instead of hardcoding the css in the java file, please make this a pseudoclass in css, which should be very easy to implement. See There was a problem hiding this comment. Hi @calixtus , i've checked this There was a problem hiding this comment. The node should be the addNewGroup. |
||
|
|
||
| private static class DragExpansionHandler { | ||
| private static final long DRAG_TIME_BEFORE_EXPANDING_MS = 1000; | ||
| private TreeItem<GroupNodeViewModel> draggedItem; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Keep a blank line before and after a heading.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added a blank line after the heading "#Removed"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this case, Visual Studio Code helps - with following plugin: https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint
I am not aware of any similar plugin for IntelliJ.