[WIP] Groups JavaFX Rework #1438
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright (C) 2003-2016 JabRef contributors. | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along | ||
| * with this program; if not, write to the Free Software Foundation, Inc., | ||
| * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| */ | ||
|
|
||
| package net.sf.jabref.gui; | ||
|
|
||
| import net.sf.jabref.logic.l10n.Localization; | ||
|
|
||
| import com.airhacks.afterburner.views.FXMLView; | ||
|
|
||
| public class GroupTreeView extends FXMLView { | ||
|
|
||
| public GroupTreeView() { | ||
| super(); | ||
| bundle = Localization.getMessages(); | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,316 @@ | ||
| /* Copyright (C) 2016 JabRef contributors. | ||
| This program is free software; you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation; either version 2 of the License, or | ||
| (at your option) any later version. | ||
|
|
||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
|
|
||
| You should have received a copy of the GNU General Public License along | ||
| with this program; if not, write to the Free Software Foundation, Inc., | ||
| 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| */ | ||
| package net.sf.jabref.gui; | ||
|
|
||
| import javafx.beans.property.SimpleObjectProperty; | ||
| import javafx.beans.value.ObservableValue; | ||
| import javafx.css.PseudoClass; | ||
| import javafx.fxml.FXML; | ||
| import javafx.scene.Node; | ||
| import javafx.scene.control.Control; | ||
| import javafx.scene.control.Tooltip; | ||
| import javafx.scene.control.TreeItem; | ||
| import javafx.scene.control.TreeTableCell; | ||
| import javafx.scene.control.TreeTableColumn; | ||
| import javafx.scene.control.TreeTableRow; | ||
| import javafx.scene.control.TreeTableView; | ||
| import javafx.scene.layout.StackPane; | ||
| import javafx.scene.text.Text; | ||
|
|
||
| import com.sun.javafx.scene.control.skin.TreeTableRowSkin; | ||
|
|
||
| public class GroupTreeViewModel { | ||
|
|
||
| @FXML | ||
| private TreeTableView<NewGroupNodeViewModel> groupTree; | ||
|
|
||
| @FXML | ||
| private TreeTableColumn<NewGroupNodeViewModel,NewGroupNodeViewModel> mainColumn; | ||
|
|
||
| @FXML | ||
| private TreeTableColumn<NewGroupNodeViewModel,Integer> numberColumn; | ||
|
|
||
| @FXML | ||
| private TreeTableColumn<NewGroupNodeViewModel,NewGroupNodeViewModel> disclosureNodeColumn; | ||
|
|
||
| @FXML | ||
| public void initialize() { | ||
| TreeItem<NewGroupNodeViewModel> root = new TreeItem<>(new NewGroupNodeViewModel("All Entries", true, 30000, | ||
| IconTheme.JabRefIcon.CLOSE, false)); | ||
| root.setExpanded(true); | ||
|
|
||
| TreeItem<NewGroupNodeViewModel> authors = new TreeItem<>(new NewGroupNodeViewModel("Authors", false, 300, | ||
| IconTheme.JabRefIcon.PRIORITY, false)); | ||
| authors.setExpanded(true); | ||
| authors.getChildren().addAll( | ||
| new TreeItem<>(new NewGroupNodeViewModel("Ethan", false, 100, true)), | ||
| new TreeItem<>(new NewGroupNodeViewModel("Isabella", false, 40, true)), | ||
| new TreeItem<>(new NewGroupNodeViewModel("Emma", false, 50, IconTheme.JabRefIcon.HELP, true)), | ||
| new TreeItem<>(new NewGroupNodeViewModel("Michael", false, 30, true))); | ||
|
|
||
| TreeItem<NewGroupNodeViewModel> journals = new TreeItem<>(new NewGroupNodeViewModel("Journals", false, 300, | ||
| IconTheme.JabRefIcon.MAKE_KEY, false)); | ||
| journals.setExpanded(true); | ||
| journals.getChildren().addAll( | ||
| new TreeItem<>(new NewGroupNodeViewModel("JabRef", false, 295, true)), | ||
| new TreeItem<>(new NewGroupNodeViewModel("Java", false, 1, IconTheme.JabRefIcon.PREFERENCES, true)), | ||
| new TreeItem<>(new NewGroupNodeViewModel("JavaFX", false, 1, true)), | ||
| new TreeItem<>(new NewGroupNodeViewModel("FXML", false, 1, true))); | ||
|
|
||
| TreeItem<NewGroupNodeViewModel> keywords = new TreeItem<>( | ||
| new NewGroupNodeViewModel("keywords", false, 300, IconTheme.JabRefIcon.MAKE_KEY, false)); | ||
| keywords.setExpanded(true); | ||
| TreeItem<NewGroupNodeViewModel> keywordSub = new TreeItem<>( | ||
| new NewGroupNodeViewModel("deeper", false, 20, IconTheme.JabRefIcon.SOURCE, false)); | ||
| keywordSub.setExpanded(true); | ||
| keywordSub.getChildren().addAll(new TreeItem<>(new NewGroupNodeViewModel("JabRef", false, 295, true)), | ||
| new TreeItem<>(new NewGroupNodeViewModel("Java", false, 1, IconTheme.JabRefIcon.PREFERENCES, true)) | ||
| ); | ||
| keywords.getChildren().addAll( | ||
| new TreeItem<>(new NewGroupNodeViewModel("JabRef", false, 295, true)), | ||
| new TreeItem<>(new NewGroupNodeViewModel("Java", false, 1, IconTheme.JabRefIcon.PREFERENCES, true)), | ||
| keywordSub, | ||
| new TreeItem<>(new NewGroupNodeViewModel("JavaFX", false, 1, true)), | ||
| new TreeItem<>(new NewGroupNodeViewModel("FXML", false, 1, true)) | ||
| ); | ||
|
|
||
| root.getChildren().addAll(authors, journals, keywords); | ||
|
|
||
| PseudoClass rootPseudoClass = PseudoClass.getPseudoClass("root"); | ||
| PseudoClass subElementPseudoClass = PseudoClass.getPseudoClass("sub"); | ||
| mainColumn.setPrefWidth(150); | ||
| mainColumn.setCellValueFactory(cellData -> cellData.getValue().valueProperty()); | ||
| mainColumn.setCellFactory(column -> { | ||
| TreeTableCell<NewGroupNodeViewModel, NewGroupNodeViewModel> cell = new TreeTableCell<NewGroupNodeViewModel, NewGroupNodeViewModel>() { | ||
|
|
||
| @Override | ||
| protected void updateItem(NewGroupNodeViewModel item, boolean empty) { | ||
| super.updateItem(item, empty); | ||
| if (empty || item == null) { | ||
| setText(null); | ||
| } else { | ||
| setText(item.getName()); | ||
| if (item.isRoot()) { | ||
| this.pseudoClassStateChanged(rootPseudoClass, true); | ||
| } | ||
| setTooltip(new Tooltip(item.getDescription())); | ||
| Text graphic = new Text(item.getIconCode()); | ||
| graphic.getStyleClass().add("icon"); | ||
| setGraphic(graphic); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| /* | ||
| cell.tableRowProperty().get().treeItemProperty().addListener((obs, oldTreeItem, newTreeItem) -> { | ||
| cell.pseudoClassStateChanged(subElementPseudoClass, | ||
| newTreeItem != null && newTreeItem.getParent() != cell.getTreeTableView().getRoot()); | ||
| }); | ||
| */ | ||
| return cell; | ||
| }); | ||
|
|
||
| numberColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().getHits()); | ||
| numberColumn.setCellFactory(column -> { | ||
| TreeTableCell<NewGroupNodeViewModel, Integer> cell = new TreeTableCell<NewGroupNodeViewModel, Integer>() { | ||
|
|
||
| @Override | ||
| protected void updateItem(Integer hits, boolean empty) { | ||
| super.updateItem(hits, empty); | ||
| if (empty) { | ||
| setGraphic(null); | ||
| } else { | ||
| final StackPane node = new StackPane(); | ||
| node.getStyleClass().setAll("hits"); | ||
| Text text = new Text(hits.toString()); | ||
| text.getStyleClass().setAll("text"); | ||
| node.getChildren().add(text); | ||
| node.setMaxWidth(Control.USE_PREF_SIZE); | ||
|
|
||
| setGraphic(node); | ||
| } | ||
| } | ||
| }; | ||
| return cell; | ||
| }); | ||
|
|
||
| disclosureNodeColumn.setCellValueFactory(cellData -> cellData.getValue().valueProperty()); | ||
| disclosureNodeColumn.setCellFactory(column -> { | ||
| TreeTableCell<NewGroupNodeViewModel, NewGroupNodeViewModel> cell = new TreeTableCell<NewGroupNodeViewModel, NewGroupNodeViewModel>() { | ||
|
|
||
| @Override | ||
| protected void updateItem(NewGroupNodeViewModel item, boolean empty) { | ||
| super.updateItem(item, empty); | ||
| if (empty || item == null) { | ||
| setGraphic(null); | ||
| } else if (!item.isLeaf()) { | ||
| final StackPane disclosureNode = new StackPane(); | ||
| disclosureNode.getStyleClass().setAll("tree-disclosure-node"); | ||
|
|
||
| final StackPane disclosureNodeArrow = new StackPane(); | ||
| disclosureNodeArrow.getStyleClass().setAll("arrow"); | ||
| disclosureNode.getChildren().add(disclosureNodeArrow); | ||
|
|
||
| setGraphic(disclosureNode); | ||
| } | ||
| } | ||
| }; | ||
| return cell; | ||
| }); | ||
|
|
||
| //groupTree.setTreeColumn(disclosureNodeColumn); | ||
|
|
||
| final Node disclosureNode; | ||
| groupTree.setRowFactory(treeTable -> { | ||
| TreeTableRow<NewGroupNodeViewModel> row = new TreeTableRow(); | ||
| /*TreeTableRow row = new TreeTableRow<NewGroupNodeViewModel>() { | ||
|
|
||
| @Override | ||
| protected Skin<?> createDefaultSkin() { | ||
| return new CheckBoxTreeTableRowSkin<>(this); | ||
| } | ||
| }; | ||
| */ | ||
| row.treeItemProperty().addListener((ov, oldTreeItem, newTreeItem) -> { | ||
| boolean isRoot = newTreeItem == treeTable.getRoot(); | ||
| row.pseudoClassStateChanged(rootPseudoClass, isRoot); | ||
|
|
||
| boolean isFirstLevel = newTreeItem != null && newTreeItem.getParent() == treeTable.getRoot(); | ||
| row.pseudoClassStateChanged(subElementPseudoClass, !isRoot && !isFirstLevel); | ||
|
|
||
| }); | ||
| // Remove disclosure node: | ||
| // simply setting to null is not enough since it would be replaced by the default node in this case | ||
| row.setDisclosureNode(null); | ||
| row.disclosureNodeProperty().addListener((observable, oldValue, newValue) -> row.setDisclosureNode(null)); | ||
| return row; | ||
| }); | ||
|
|
||
| groupTree.setRoot(root); | ||
| } | ||
|
|
||
| public static class CheckBoxTreeTableRowSkin<S> extends TreeTableRowSkin<S> { | ||
|
|
||
| public CheckBoxTreeTableRowSkin(TreeTableRow<S> control) { | ||
| super(control); | ||
| } | ||
|
|
||
| @Override | ||
| protected Node getDisclosureNode() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| protected void layoutChildren(double x, double y, double w, double h) { | ||
| getSkinnable().getDisclosureNode().setVisible(false); | ||
| super.layoutChildren(x, y, w, h); | ||
| } | ||
| /* | ||
| @Override | ||
| protected void layoutChildren(double x, double y, double w, double h) { | ||
| super.layoutChildren(x, y, w, h); | ||
|
|
||
| TreeTableRow<S> control = getSkinnable(); | ||
|
|
||
| // Determine indention | ||
| int indentationLevel = getIndentationLevel(control); | ||
| if (! isShowRoot()) indentationLevel--; | ||
| final double indentationPerLevel = getIndentationPerLevel(); | ||
| double leftMargin = indentationLevel * indentationPerLevel; | ||
|
|
||
| for (int column = 0, max = cells.size(); column < max; column++) { | ||
| TreeTableCell<S, ?> tableCell = cells.get(column); | ||
|
|
||
| TableColumnBase<?,?> treeColumn = getTreeColumn(); | ||
| int indentationColumnIndex = treeColumn == null ? 0 : getVisibleLeafColumns().indexOf(treeColumn); | ||
| indentationColumnIndex = indentationColumnIndex < 0 ? 0 : indentationColumnIndex; | ||
|
|
||
| // Add left margin to first column | ||
| if(column == 0) { | ||
|
|
||
| } | ||
|
|
||
| // Remove left margin from disclosure node | ||
| if(column == indentationColumnIndex) { | ||
| Node disclosureNode = getSkinnable().getDisclosureNode(); | ||
|
|
||
| // We need to fade in since the super class may faded the node out if there was not enough space | ||
| // to display it together with the left margin. | ||
| disclosureNode.setVisible(true); | ||
| final FadeTransition fader = new FadeTransition(Duration.millis(200), disclosureNode); | ||
| fader.setToValue(1.0); | ||
| fader.play(); | ||
| final double defaultDisclosureWidth = 10; | ||
| disclosureNode.resize(defaultDisclosureWidth, disclosureNode.prefHeight(defaultDisclosureWidth)); | ||
|
|
||
| // Relocate | ||
| disclosureNode.relocate(x, y + tableCell.getPadding().getTop()); | ||
| disclosureNode.toFront(); | ||
| } | ||
|
|
||
| x += tableCell.getWidth(); | ||
| } | ||
| } | ||
| */ | ||
| } | ||
|
|
||
| public static class NewGroupNodeViewModel { | ||
|
There was a problem hiding this comment. New class should be in a new file |
||
|
|
||
| private final String name; | ||
| private final boolean isRoot; | ||
| private ObservableValue<Integer> hits; | ||
| private String iconCode; | ||
| private boolean isLeaf; | ||
|
|
||
| private NewGroupNodeViewModel(String name, boolean isRoot, int hits, boolean isLeaf) { | ||
| this(name, isRoot, hits, IconTheme.JabRefIcon.QUALITY, isLeaf); | ||
| } | ||
| private NewGroupNodeViewModel(String name, boolean isRoot, int hits, IconTheme.JabRefIcon icon, boolean isLeaf) { | ||
| this(name, isRoot, hits, icon.getCode(), isLeaf); | ||
| } | ||
| private NewGroupNodeViewModel(String name, boolean isRoot, int hits, String iconCode, boolean isLeaf) { | ||
| this.name = name; | ||
| this.isRoot = isRoot; | ||
| this.iconCode = iconCode; | ||
| this.isLeaf = isLeaf; | ||
| this.hits = new SimpleObjectProperty<>(hits); | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public boolean isRoot() { | ||
| return isRoot; | ||
| } | ||
|
|
||
| public String getDescription() { | ||
| return "Some group named " + getName(); | ||
| } | ||
|
|
||
| public ObservableValue<Integer> getHits() { | ||
| return hits; | ||
| } | ||
|
|
||
| public String getIconCode() { | ||
| return iconCode; | ||
| } | ||
|
|
||
| public boolean isLeaf() { | ||
| return isLeaf; | ||
| } | ||
| } | ||
| } | ||
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
Oops, something went wrong.
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.
New class should be in a new file