Update arrows (#5787)

Update arrows
JabRef · Dec 26, 2019 · f033134 · f033134
2 parents e830f52 + 09fbfca
commit f033134
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
@@ -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;
@@ -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;
@@ -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"),
+                                                              "\uD83E\uDC44",
                                                               Localization.lang("None"),
-                                                              Localization.lang("Right"),
+                                                              "\uD83E\uDC46",
                                                               Localization.lang("Right entry"));
     private final Set<Field> identicalFields = new HashSet<>();
     private final Set<Field> differentFields = new HashSet<>();
@@ -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);
@@ -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);
@@ -383,7 +385,6 @@ public void setRightHeaderText(String rightHeaderText) {
     }
 
     public enum DiffMode {
-
         PLAIN,
         WORD,
         CHARACTER,

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -502,8 +502,6 @@ Language=Language
 Last\ modified=Last modified
 LaTeX\ AUX\ file\:=LaTeX AUX file\:
 
-Left=Left
-
 Link=Link
 Listen\ for\ remote\ operation\ on\ port=Listen for remote operation on port
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Load and Save preferences from/to jabref.xml on start-up (memory stick mode)
@@ -768,8 +766,6 @@ Review=Review
 Review\ changes=Review changes
 Review\ Field\ Migration=Review Field Migration
 
-Right=Right
-
 Save=Save
 Save\ all\ finished.=Save all finished.
 
@@ -2094,4 +2090,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