-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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.
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
Fix Part of Issue#3861: Edit->Replace String #4227
Merged
+269
−263
Merged
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
9f5da55
Fix#3861_Edit_ReplaceString
marisuki 44a8efd
Fix#3861_Edit_ReplaceString_BUILD
marisuki 90800c3
Fix#3861_Edit_ReplaceString_BUILDS
marisuki b601ba6
FIX#3861ReplaceString_CheckStyle
marisuki d4f00ad
ReplaceStringMVVMPattern
marisuki 91420f2
Fix#3861ReplaceString_ContributeLog
marisuki 3300aa5
Fix#3861ReplaceString_Improvements
marisuki 3c89dee
Fix#3861ReplaceString_checkStyle
marisuki 6dad44f
Remove changelog entries
tobiasdiez cf7d6b8
Fix#3861RS_conflicttest
marisuki 609a065
Fix#3861RS_conflicttest
marisuki ff7dc5d
solvemerge
marisuki df86b62
Fix#3861ReplaceString_solveConflict
marisuki d055f98
Fix#ReplaceString_ChangeConflict
marisuki 8f39723
Fix#3861_conflictsRemoved
marisuki 48a4c31
Fix#3861_build
marisuki 6c65676
Fix#3861_build_addneeded/deleteobsoleteproperties
marisuki 45152d5
Fix#3861_build_addneeded/deleteobsoleteproperties2
marisuki b254487
Fix
marisuki File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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"/> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you missed this one ;) But all others look good There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah ;-) I miss it. Thank you for mention! :) |
||
<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(); | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
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.
You need to add a % sign in front of the label text, so that it will be recognized as translatable string.
That is probably one of the reasons why the l10n test fails