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

Update arrows #5787

Merged
merged 8 commits into from
Dec 26, 2019
Merged

Update arrows #5787

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
798d497
Fix parameter name
koppor Dec 26, 2019
0b62ff6
Remove obsolete newline
koppor Dec 26, 2019
f266af3
Fix localization
koppor Dec 26, 2019
241502c
Change arrows
koppor Dec 26, 2019
1432148
Fix checkstyle
koppor Dec 26, 2019
53a0b11
Center selection column
koppor Dec 26, 2019
55e2f23
Remove obsolete language keys
koppor Dec 26, 2019
09fbfca
Remove l10n from arrows
Siedlerchr Dec 26, 2019
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
13 changes: 7 additions & 6 deletions src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.stream.Collectors;

import javafx.collections.FXCollections;
import javafx.geometry.HPos;
import javafx.geometry.Insets;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
Expand All @@ -33,7 +34,6 @@
import org.jabref.gui.util.ViewModelListCellFactory;
import org.jabref.gui.util.component.DiffHighlightingTextPane;
import org.jabref.logic.l10n.Localization;
import org.jabref.model.database.BibDatabaseMode;
import org.jabref.model.entry.BibEntry;
import org.jabref.model.entry.field.Field;
import org.jabref.model.entry.field.FieldFactory;
Expand All @@ -50,9 +50,9 @@ public class MergeEntries extends BorderPane {
// Headings
private final List<String> columnHeadings = Arrays.asList(Localization.lang("Field"),
Localization.lang("Left entry"),
Localization.lang("Left"),
Localization.lang("\uD83E\uDC44"),
Localization.lang("None"),
Localization.lang("Right"),
Localization.lang("\uD83E\uDC46"),
Localization.lang("Right entry"));
private final Set<Field> identicalFields = new HashSet<>();
private final Set<Field> differentFields = new HashSet<>();
Expand All @@ -76,10 +76,10 @@ public class MergeEntries extends BorderPane {
* @param headingRight Heading for right entry
* @param defaultRadioButtonSelectionMode If the left or the right side of the radio button should be preselected
*/
public MergeEntries(BibEntry entryLeft, BibEntry entryRight, String headingLeft, String headingRight, DefaultRadioButtonSelectionMode defaultRadioButtonSelectMode) {
public MergeEntries(BibEntry entryLeft, BibEntry entryRight, String headingLeft, String headingRight, DefaultRadioButtonSelectionMode defaultRadioButtonSelectionMode) {
this.leftEntry = entryLeft;
this.rightEntry = entryRight;
this.defaultRadioButtonSelectionMode = defaultRadioButtonSelectMode;
this.defaultRadioButtonSelectionMode = defaultRadioButtonSelectionMode;

initialize();
setLeftHeaderText(headingLeft);
Expand Down Expand Up @@ -160,6 +160,8 @@ private void initialize() {
columnValues.setPercentWidth(40);
ColumnConstraints columnSelect = new ColumnConstraints();
columnSelect.setHgrow(Priority.NEVER);
columnSelect.setHalignment(HPos.CENTER);
// See columnHeadings variable for the headings: 1) field, 2) left content, 3) left arrow, 4) "none", 5) right arrow, 6) right content
mergePanel.getColumnConstraints().setAll(columnLabel, columnValues, columnSelect, columnSelect, columnSelect, columnValues);

setupHeadingRows(mergePanel);
Expand Down Expand Up @@ -383,7 +385,6 @@ public void setRightHeaderText(String rightHeaderText) {
}

public enum DiffMode {

PLAIN,
WORD,
CHARACTER,
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/JabRef_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2094,4 +2094,4 @@ Linked\ identifiers=Linked identifiers
Special\ field\ type\ %0\ is\ unknown.\ Using\ normal\ column\ type.=Special field type %0 is unknown. Using normal column type.

In\ JabRef=In JabRef
On\ Disk=On disk
On\ disk=On disk