-
-
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.
Merge remote-tracking branch 'upstream/master' into fixdragandrop
* upstream/master: (33 commits) Fix display of checkboxes Fix Remove Spin comments Fix#3861_build_addneeded/deleteobsoleteproperties2 Fix#3861_build_addneeded/deleteobsoleteproperties Fix#3861_build Fix attach file does not relativize file path (#4252) Fix for issue koppor 254 (Auto cleanup url) (#4255) Fix#ReplaceString_ChangeConflict Fix#3861ReplaceString_solveConflict Fix#3861RS_conflicttest Fix#3861RS_conflicttest Remove changelog entries Fix#3861ReplaceString_checkStyle Fix#3861ReplaceString_Improvements Fix#3861ReplaceString_ContributeLog fix log4j slf4j dependency Update dependencies (#4251) Fix author list parser (#4169) (#4248) ReplaceStringMVVMPattern ... # Conflicts: # src/main/java/org/jabref/gui/BasePanel.java
- Loading branch information
Showing
59 changed files
with
1,282 additions
and
398 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <?import javafx.scene.control.*?> | ||
| <?import javafx.scene.layout.*?> | ||
|
|
||
| <DialogPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" | ||
| fx:controller="org.jabref.gui.ReplaceStringView"> | ||
| <content> | ||
| <BorderPane> | ||
| <center> | ||
| <BorderPane BorderPane.alignment="CENTER"> | ||
| <center> | ||
| <GridPane> | ||
| <columnConstraints> | ||
| <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/> | ||
| <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/> | ||
| <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/> | ||
| <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/> | ||
| <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/> | ||
| </columnConstraints> | ||
| <rowConstraints> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> | ||
| </rowConstraints> | ||
| <Label text="%Find and Replace"/> | ||
| <Label text="%Find:" GridPane.columnIndex="0" GridPane.rowIndex="1"/> | ||
| <TextField fx:id="findField" GridPane.columnIndex="1" GridPane.rowIndex="1" | ||
| GridPane.columnSpan="4"/> | ||
| <Label text="%Replace With:" wrapText="true" GridPane.columnIndex="0" GridPane.rowIndex="2"/> | ||
| <TextField fx:id="replaceField" GridPane.columnIndex="1" GridPane.rowIndex="2" | ||
| GridPane.columnSpan="4"/> | ||
| <CheckBox fx:id="selectFieldOnly" GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.columnSpan="2" | ||
| text="%Limit to Selected Entries"/> | ||
| <RadioButton fx:id="allReplace" GridPane.columnIndex="0" GridPane.rowIndex="5" GridPane.columnSpan="2" | ||
| selected="true" text="%All Field Replace"> | ||
| <toggleGroup> | ||
| <ToggleGroup fx:id="radioGroup"/> | ||
| </toggleGroup> | ||
| </RadioButton> | ||
| <RadioButton GridPane.columnIndex="0" GridPane.rowIndex="6" GridPane.columnSpan="2" | ||
| text="%Limit to Fields" toggleGroup="$radioGroup"/> | ||
| <TextField fx:id="limitFieldInput" GridPane.columnIndex="2" GridPane.rowIndex="6" | ||
| GridPane.columnSpan="3"/> | ||
| </GridPane> | ||
| </center> | ||
| </BorderPane> | ||
| </center> | ||
| </BorderPane> | ||
| </content> | ||
| <ButtonType fx:id="replaceButton" text="%Replace" buttonData="OK_DONE"/> | ||
| <ButtonType fx:constant="CANCEL"/> | ||
| </DialogPane> |
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,18 @@ | ||
| package org.jabref.gui; | ||
|
|
||
| import org.jabref.gui.actions.SimpleCommand; | ||
|
|
||
| public class ReplaceStringAction extends SimpleCommand | ||
| { | ||
| private BasePanel basePanel; | ||
|
|
||
| public ReplaceStringAction(BasePanel basePanel) { | ||
| this.basePanel = basePanel; | ||
| } | ||
|
|
||
| @Override | ||
| public void execute() { | ||
| ReplaceStringView dialog = new ReplaceStringView(basePanel); | ||
| dialog.showAndWait(); | ||
| } | ||
| } |
Oops, something went wrong.