-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
Add source to changes dialog #9533
Merged
Merged
Changes from 3 commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
633ac6e
Show source and preview for entry changes/deleted/added
Siedlerchr 8b3d26d
remove preview from EntryChanged, better to use the diff dialog
Siedlerchr f00bbe1
add changelog entry and make readonly
Siedlerchr 6d04e51
add padding, show previe and source also for entry change
Siedlerchr a194e2b
spaces...
Siedlerchr a4abb6d
remove from permit
Siedlerchr 3168b78
Hide and show rows
Siedlerchr 3511420
fix checkstlye
Siedlerchr a2649c8
Show/hide indifferent field rows
HoussemNasri 15b1eff
Merge branch 'main' into addSourceToChangesDialog
calixtus c4de530
Update FieldRowView.java
HoussemNasri d49b3ae
Merge remote-tracking branch 'upstream/main' into addSourceToChangesD…
Siedlerchr fe2385e
checkstyle
Siedlerchr d2b1f63
Add SplitPane to show both entries with preview together
Siedlerchr 1312241
Merge remote-tracking branch 'upstream/main' into addSourceToChangesD…
Siedlerchr fab0023
checkstyle
Siedlerchr f9400a3
Merge remote-tracking branch 'upstream/main' into addSourceToChangesD…
Siedlerchr c35de7b
Change boolean logic, default show all fields
Siedlerchr ce792af
remove virtualized scrollpane breaks mouse scrolling
Siedlerchr ae715ed
checkstyle
Siedlerchr 1d899b6
Add TODO for optimization
HoussemNasri 175e2ff
Fix typo
HoussemNasri cfa9e40
row.show() reads better than row.showRow()
HoussemNasri 4dd0b0b
Refactor code
HoussemNasri ef10a66
Merge remote-tracking branch 'upstream/main' into addSourceToChangesD…
Siedlerchr e970e88
Create PreviewView in advance at least for added and removed
Siedlerchr cc418bf
checkstyle
Siedlerchr 49f8b38
Merge remote-tracking branch 'upstream/main' into addSourceToChangesD…
Siedlerchr 4e2336a
Add label header for tab pane
Siedlerchr 2efa489
add css class
Siedlerchr 2a3a341
Store value of chekcbox in prefs
Siedlerchr 22899e7
remove tab chars
Siedlerchr ef6cfc3
make prefs inject private
Siedlerchr 74a653c
Update src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSou…
Siedlerchr 771b032
remove empty line
Siedlerchr 0291ed3
Merge remote-tracking branch 'upstream/addSourceToChangesDialog' into…
Siedlerchr 93dd7cf
empty line
Siedlerchr 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
25 changes: 0 additions & 25 deletions
25
src/main/java/org/jabref/gui/collab/entryadd/EntryAddDetailsView.java
This file was deleted.
Oops, something went wrong.
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
73 changes: 73 additions & 0 deletions
73
src/main/java/org/jabref/gui/collab/entrychange/EntryWithPreviewAndSourceDetailsView.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,73 @@ | ||
| package org.jabref.gui.collab.entrychange; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.StringWriter; | ||
|
|
||
| import javafx.scene.control.Tab; | ||
| import javafx.scene.control.TabPane; | ||
|
|
||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.gui.Globals; | ||
| import org.jabref.gui.StateManager; | ||
| import org.jabref.gui.collab.DatabaseChangeDetailsView; | ||
| import org.jabref.gui.preview.PreviewViewer; | ||
| import org.jabref.gui.theme.ThemeManager; | ||
| import org.jabref.logic.bibtex.BibEntryWriter; | ||
| import org.jabref.logic.bibtex.FieldWriter; | ||
| import org.jabref.logic.bibtex.FieldWriterPreferences; | ||
| import org.jabref.logic.exporter.BibWriter; | ||
| import org.jabref.logic.l10n.Localization; | ||
| import org.jabref.logic.util.OS; | ||
| import org.jabref.model.database.BibDatabaseContext; | ||
| import org.jabref.model.database.BibDatabaseMode; | ||
| import org.jabref.model.entry.BibEntry; | ||
| import org.jabref.preferences.PreferencesService; | ||
|
|
||
| import org.fxmisc.flowless.VirtualizedScrollPane; | ||
| import org.fxmisc.richtext.CodeArea; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public final class EntryWithPreviewAndSourceDetailsView extends DatabaseChangeDetailsView { | ||
|
|
||
| private static final Logger LOGGER = LoggerFactory.getLogger(EntryWithPreviewAndSourceDetailsView.class); | ||
|
|
||
| public EntryWithPreviewAndSourceDetailsView(BibEntry entry, BibDatabaseContext bibDatabaseContext, DialogService dialogService, StateManager stateManager, ThemeManager themeManager, PreferencesService preferencesService) { | ||
| PreviewViewer previewViewer = new PreviewViewer(bibDatabaseContext, dialogService, stateManager, themeManager); | ||
| previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout()); | ||
| previewViewer.setEntry(entry); | ||
|
|
||
| CodeArea codeArea = new CodeArea(); | ||
| codeArea.setWrapText(true); | ||
| codeArea.setDisable(true); | ||
|
|
||
| TabPane tabPanePreviewCode = new TabPane(); | ||
| Tab previewTab = new Tab(Localization.lang("Entry preview"), previewViewer); | ||
|
|
||
| try { | ||
| codeArea.appendText(getSourceString(entry, bibDatabaseContext.getMode(), preferencesService.getFieldWriterPreferences())); | ||
| } catch (IOException e) { | ||
| LOGGER.error("Error getting Bibtex", entry); | ||
| } | ||
| codeArea.setEditable(true); | ||
| VirtualizedScrollPane<CodeArea> scrollableCodeArea = new VirtualizedScrollPane<>(codeArea); | ||
| Tab codeTab = new Tab(Localization.lang("%0 source", bibDatabaseContext.getMode().getFormattedName()), scrollableCodeArea); | ||
|
|
||
| tabPanePreviewCode.getTabs().addAll(previewTab, codeTab); | ||
|
|
||
| setLeftAnchor(tabPanePreviewCode, 8d); | ||
| setTopAnchor(tabPanePreviewCode, 8d); | ||
| setRightAnchor(tabPanePreviewCode, 8d); | ||
| setBottomAnchor(tabPanePreviewCode, 8d); | ||
|
|
||
| getChildren().setAll(tabPanePreviewCode); | ||
| } | ||
|
|
||
| private String getSourceString(BibEntry entry, BibDatabaseMode type, FieldWriterPreferences fieldWriterPreferences) throws IOException { | ||
| StringWriter writer = new StringWriter(); | ||
| BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE); | ||
| FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldWriterPreferences); | ||
| new BibEntryWriter(fieldWriter, Globals.entryTypesManager).write(entry, bibWriter, type); | ||
| return writer.toString(); | ||
| } | ||
| } |
25 changes: 0 additions & 25 deletions
25
src/main/java/org/jabref/gui/collab/entrydelete/EntryDeleteDetailsView.java
This file was deleted.
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.
Why is the Preview removed in the change details view? Looks like a regression to me
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.
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.
And for entry change, the merge dialog is basically showing all relevant info