Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Temporary Fix for ColorPicker in Groups #5459

Merged
merged 1 commit into from
Oct 17, 2019
Merged

Temporary Fix for ColorPicker in Groups #5459

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/org/jabref/gui/groups/GroupDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import javafx.scene.control.Button;
import javafx.scene.control.ButtonType;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ColorPicker;
import javafx.scene.control.Label;
import javafx.scene.control.RadioButton;
import javafx.scene.control.ScrollPane;
Expand Down Expand Up @@ -68,7 +69,7 @@
import org.jabref.model.strings.StringUtil;
import org.jabref.preferences.JabRefPreferences;

import com.jfoenix.controls.JFXColorPicker;
// import com.jfoenix.controls.JFXColorPicker;

/**
* Dialog for creating or modifying groups. Operates directly on the Vector
Expand All @@ -85,7 +86,8 @@ class GroupDialog extends BaseDialog<AbstractGroup> {
// for all types
private final TextField nameField = new TextField();
private final TextField descriptionField = new TextField();
private final JFXColorPicker colorField = new JFXColorPicker();
//private final JFXColorPicker colorField = new JFXColorPicker();
private final ColorPicker colorField = new ColorPicker();
private final TextField iconField = new TextField();
private final RadioButton explicitRadioButton = new RadioButton(Localization.lang("Statically group entries by manual assignment"));
private final RadioButton keywordsRadioButton = new RadioButton(Localization.lang("Dynamically group entries by searching a field for a keyword"));
Expand Down