-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "[WIP] [GSOC22] Improve the external changes resolver dialog" (#…
- Loading branch information
1 parent
6178ccb
commit 0a62304
Showing
17 changed files
with
179 additions
and
308 deletions.
There are no files selected for viewing
114 changes: 114 additions & 0 deletions
114
src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java
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,114 @@ | ||
| package org.jabref.gui.collab; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import javafx.collections.FXCollections; | ||
| import javafx.scene.control.Button; | ||
| import javafx.scene.control.ButtonBar; | ||
| import javafx.scene.control.ButtonBar.ButtonData; | ||
| import javafx.scene.control.ButtonType; | ||
| import javafx.scene.control.CheckBox; | ||
| import javafx.scene.control.Label; | ||
| import javafx.scene.control.ListView; | ||
| import javafx.scene.control.ScrollPane; | ||
| import javafx.scene.control.SplitPane; | ||
| import javafx.scene.layout.BorderPane; | ||
| import javafx.scene.layout.Region; | ||
| import javafx.scene.layout.VBox; | ||
|
|
||
| import org.jabref.gui.undo.NamedCompound; | ||
| import org.jabref.gui.util.BaseDialog; | ||
| import org.jabref.logic.l10n.Localization; | ||
| import org.jabref.model.database.BibDatabaseContext; | ||
|
|
||
| import com.tobiasdiez.easybind.EasyBind; | ||
|
|
||
| class ChangeDisplayDialog extends BaseDialog<Boolean> { | ||
|
|
||
| private final ListView<DatabaseChangeViewModel> changesList; | ||
| private final BorderPane infoPanel = new BorderPane(); | ||
| private final CheckBox cb = new CheckBox(Localization.lang("Accept change")); | ||
|
|
||
| public ChangeDisplayDialog(BibDatabaseContext database, List<DatabaseChangeViewModel> changes) { | ||
| this.setTitle(Localization.lang("External changes")); | ||
| this.getDialogPane().setPrefSize(800, 600); | ||
|
|
||
| changesList = new ListView<>(FXCollections.observableArrayList(changes)); | ||
| changesList.setPrefWidth(200); | ||
| EasyBind.subscribe(changesList.getSelectionModel().selectedItemProperty(), this::selectedChangeChanged); | ||
|
|
||
| SplitPane pane = new SplitPane(); | ||
| pane.setDividerPositions(0.2); | ||
|
|
||
| Button selectAllChangesFromDisk = new Button(Localization.lang("Mark all changes as accepted")); | ||
| selectAllChangesFromDisk.setMinWidth(Region.USE_PREF_SIZE); | ||
| selectAllChangesFromDisk.setOnAction(evt -> { | ||
| for (DatabaseChangeViewModel change : changes) { | ||
| change.setAccepted(true); | ||
| } | ||
| }); | ||
| Button unselectAllAcceptChanges = new Button(Localization.lang("Unmark all changes")); | ||
| unselectAllAcceptChanges.setOnAction(evt -> { | ||
| for (DatabaseChangeViewModel change : changes) { | ||
| change.setAccepted(false); | ||
| } | ||
| }); | ||
|
|
||
| VBox leftContent = new VBox(changesList, | ||
| selectAllChangesFromDisk, | ||
| unselectAllAcceptChanges); | ||
|
|
||
| ScrollPane leftScroll = new ScrollPane(leftContent); | ||
| leftScroll.setFitToHeight(true); | ||
| leftScroll.setFitToWidth(true); | ||
|
|
||
| pane.getItems().addAll(leftScroll, infoPanel); | ||
| SplitPane.setResizableWithParent(leftScroll, false); | ||
|
|
||
| getDialogPane().setContent(pane); | ||
|
|
||
| Label rootInfo = new Label(Localization.lang("Select the tree nodes to view and accept or reject changes") + '.'); | ||
| infoPanel.setCenter(rootInfo); | ||
| changesList.getSelectionModel().selectFirst(); | ||
|
|
||
| ButtonType dismissChanges = new ButtonType(Localization.lang("Dismiss"), ButtonData.CANCEL_CLOSE); | ||
|
|
||
| getDialogPane().getButtonTypes().setAll(new ButtonType(Localization.lang("Accept changes"), ButtonBar.ButtonData.APPLY), | ||
| dismissChanges); | ||
|
|
||
| setResultConverter(button -> { | ||
| if (button == dismissChanges) { | ||
| return false; | ||
| } else { | ||
| // Perform all accepted changes | ||
| NamedCompound ce = new NamedCompound(Localization.lang("Merged external changes")); | ||
| for (DatabaseChangeViewModel change : changes) { | ||
| if (change instanceof EntryChangeViewModel) { | ||
| // We don't have a checkbox for accept and always get the correct merged entry, the accept property in this special case only controls the radio buttons selection | ||
| change.makeChange(database, ce); | ||
| } else if (change.isAccepted()) { | ||
| change.makeChange(database, ce); | ||
| } | ||
| } | ||
| ce.end(); | ||
| // TODO: panel.getUndoManager().addEdit(ce); | ||
|
|
||
| return true; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private void selectedChangeChanged(DatabaseChangeViewModel currentChange) { | ||
| if (currentChange != null) { | ||
| infoPanel.setCenter(currentChange.description()); | ||
|
|
||
| if (!(currentChange instanceof EntryChangeViewModel)) { | ||
| cb.setManaged(true); | ||
| infoPanel.setBottom(cb); | ||
| cb.selectedProperty().bindBidirectional(currentChange.acceptedProperty()); | ||
| } else { | ||
| cb.setManaged(false); | ||
| } | ||
| } | ||
| } | ||
| } |
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
46 changes: 0 additions & 46 deletions
46
src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.fxml
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.