Add git support #10586
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,74 @@ | ||
| package org.jabref.gui.git; | ||
|
|
||
| import javafx.fxml.FXML; | ||
| import javafx.scene.control.ButtonBar; | ||
| import javafx.scene.control.ButtonType; | ||
| import javafx.scene.control.DialogPane; | ||
| import javafx.scene.control.Label; | ||
| import javafx.scene.control.PasswordField; | ||
| import javafx.scene.control.TextArea; | ||
| import javafx.scene.control.TextField; | ||
| import javafx.scene.layout.VBox; | ||
|
|
||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.gui.util.BaseDialog; | ||
| import org.jabref.logic.git.GitCredential; | ||
| import org.jabref.logic.l10n.Localization; | ||
|
|
||
| import com.airhacks.afterburner.injection.Injector; | ||
|
|
||
| public class GitCredentialsDialogView extends BaseDialog<Void> { | ||
|
|
||
| @FXML private ButtonType copyVersionButton; | ||
| @FXML private TextArea textAreaVersions; | ||
| private DialogService dialogService; | ||
| private DialogPane pane; | ||
|
|
||
| private ButtonType acceptButton; | ||
| private ButtonType cancelButton; | ||
| private TextField inputGitUsername; | ||
| private PasswordField inputGitPassword; | ||
|
|
||
| public GitCredentialsDialogView() { | ||
| this.setTitle(Localization.lang("Git credentials")); | ||
| this.dialogService = Injector.instantiateModelOrService(DialogService.class); | ||
|
|
||
| this.pane = new DialogPane(); | ||
| VBox vBox = new VBox(); | ||
| this.inputGitUsername = new TextField(); | ||
| this.inputGitPassword = new PasswordField(); | ||
| this.acceptButton = new ButtonType(Localization.lang("Accept"), ButtonBar.ButtonData.APPLY); | ||
| this.cancelButton = new ButtonType(Localization.lang("Cancel"), ButtonBar.ButtonData.CANCEL_CLOSE); | ||
|
|
||
| vBox.getChildren().add(new Label(Localization.lang("Git username"))); | ||
| vBox.getChildren().add(this.inputGitUsername); | ||
| vBox.getChildren().add(new Label(Localization.lang("Git password"))); | ||
| vBox.getChildren().add(this.inputGitPassword); | ||
|
|
||
| this.pane.setContent(vBox); | ||
| } | ||
|
|
||
| public void showGitCredentialsDialog() { | ||
| dialogService.showCustomDialogAndWait(Localization.lang("Git credentials"), this.pane, this.acceptButton, this.cancelButton); | ||
| } | ||
|
|
||
| public GitCredential getCredentials() { | ||
| dialogService.showCustomDialogAndWait(Localization.lang("Git credentials"), this.pane, this.acceptButton, this.cancelButton); | ||
| GitCredential gitCredentials = new GitCredential(this.inputGitUsername.getText(), this.inputGitPassword.getText()); | ||
|
|
||
| return gitCredentials; | ||
| } | ||
|
|
||
| public String getGitPassword() { | ||
| return this.inputGitPassword.getText(); | ||
| } | ||
|
|
||
| public String getGitUsername() { | ||
| return this.inputGitUsername.getText(); | ||
| } | ||
|
|
||
| @FXML | ||
| private void initialize() { | ||
| this.setResizable(false); | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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,25 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <?import javafx.scene.control.Label?> | ||
| <?import javafx.scene.control.TextField?> | ||
| <?import javafx.scene.layout.HBox?> | ||
| <?import javafx.scene.layout.VBox?> | ||
| <?import javafx.scene.control.PasswordField?> | ||
| <?import javafx.scene.control.CheckBox?> | ||
| <fx:root spacing="10.0" type="VBox" | ||
| xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" | ||
| fx:controller="org.jabref.gui.preferences.git.GitTab"> | ||
| <Label styleClass="titleHeader" text="%Git"/> | ||
| <Label styleClass="sectionHeader" text="%Credential"/> | ||
| <HBox alignment="CENTER_LEFT" spacing="10.0"> | ||
| <Label text="%Email"/> | ||
| <TextField fx:id="username" minWidth="150.0" HBox.hgrow="ALWAYS"/> | ||
| <Label text="%Password"/> | ||
| <PasswordField fx:id="password" minWidth="150.0" HBox.hgrow="ALWAYS"/> | ||
| </HBox> | ||
| <HBox alignment="CENTER_LEFT" spacing="10.0"> | ||
| <CheckBox fx:id="autoCommit" text="%Enable git auto commit" /> | ||
| </HBox> | ||
| <HBox alignment="CENTER_LEFT" spacing="10.0"> | ||
| <CheckBox fx:id="autoSync" text="%Enable git auto push and merge" /> | ||
| </HBox> | ||
| </fx:root> |
This file contains hidden or 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,41 @@ | ||
| package org.jabref.gui.preferences.git; | ||
|
|
||
| import javafx.fxml.FXML; | ||
| import javafx.scene.control.CheckBox; | ||
| import javafx.scene.control.PasswordField; | ||
| import javafx.scene.control.TextField; | ||
|
|
||
| import org.jabref.gui.preferences.AbstractPreferenceTabView; | ||
| import org.jabref.logic.l10n.Localization; | ||
|
|
||
| import com.airhacks.afterburner.views.ViewLoader; | ||
|
|
||
| public class GitTab extends AbstractPreferenceTabView<GitTabViewModel> { | ||
|
|
||
| @FXML private TextField username; | ||
| @FXML private PasswordField password; | ||
| @FXML private CheckBox autoCommit; | ||
| @FXML private CheckBox autoSync; | ||
|
|
||
| public GitTab() { | ||
| ViewLoader.view(this) | ||
| .root(this) | ||
| .load(); | ||
| initialize(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getTabName() { | ||
| return Localization.lang("Git"); | ||
| } | ||
|
|
||
| @FXML | ||
| private void initialize() { | ||
| viewModel = new GitTabViewModel(preferencesService.getGitPreferences()); | ||
|
|
||
| username.textProperty().bindBidirectional(viewModel.getUsernameProperty()); | ||
| password.textProperty().bindBidirectional(viewModel.getPasswordProperty()); | ||
| autoCommit.selectedProperty().bindBidirectional(viewModel.getAutoCommitProperty()); | ||
| autoSync.selectedProperty().bindBidirectional(viewModel.getAutoSyncProperty()); | ||
| } | ||
| } |
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.
I think, all exceptions can be merged into one, because there is no "real" different behavior.
Please use notifications instead of dialogs. Reason: The flow of the user should not be disturbed while working with git.