From ac4507af67085e5ba2e6d3bf93cfa86d3f5a03f8 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 26 Jun 2024 14:33:07 +0200 Subject: [PATCH 01/50] Update gradle wrapper validation action (#11431) --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4190bccfb94..e7de9fff028 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -329,7 +329,7 @@ jobs: - uses: actions/checkout@v4 with: show-progress: 'false' - - uses: gradle/wrapper-validation-action@v3 + - uses: gradle/actions/wrapper-validation@v3 # This ensures that no git merge conflict markers (<<<, ...) are contained merge_conflict_job: name: Find merge conflicts From 1c0e4ec283a4aadf88ed7b2470385b62c61d9922 Mon Sep 17 00:00:00 2001 From: Loay Ghreeb <52158423+LoayGhreeb@users.noreply.github.com> Date: Wed, 26 Jun 2024 18:36:49 +0300 Subject: [PATCH 02/50] Improve document viewer (#11432) * Improve document viewer * Update CHANGELOG.md * Update CHANGELOG.md * rewriteRun * Update CHANGELOG.md --------- Co-authored-by: Oliver Kopp --- CHANGELOG.md | 1 + .../gui/documentviewer/DocumentViewModel.java | 6 +- .../gui/documentviewer/DocumentViewer.fxml | 4 +- .../documentviewer/DocumentViewerView.java | 47 ++++++++++---- .../DocumentViewerViewModel.java | 48 +++++++-------- .../ShowDocumentViewerAction.java | 8 ++- .../FulltextSearchResultsTab.java | 61 +++++++++---------- 7 files changed, 99 insertions(+), 76 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4db46a1e94f..3b6c5291bcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv - We fixed an issue where the Pubmed/Medline Plain importer would not respect the user defined keyword separator [#11413](https://github.com/JabRef/jabref/issues/11413) - We fixed an issue where the value of "Override default font settings" was not applied on startup [#11344](https://github.com/JabRef/jabref/issues/11344) - We fixed an issue where DatabaseChangeDetailsView was not scrollable when reviewing external metadata changes [#11220](https://github.com/JabRef/jabref/issues/11220) +- We fixed an issue where clicking on a page number in the search results tab opens a wrong file in the document viewer. [#11432](https://github.com/JabRef/jabref/pull/11432) ### Removed diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java index 48bf3157521..9f8aaa3785a 100644 --- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java +++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java @@ -5,14 +5,10 @@ import javafx.collections.ObservableList; public abstract class DocumentViewModel { - private IntegerProperty maxPages = new SimpleIntegerProperty(); + private final IntegerProperty maxPages = new SimpleIntegerProperty(); public abstract ObservableList getPages(); - public int getMaxPages() { - return maxPages.get(); - } - public IntegerProperty maxPagesProperty() { return maxPages; } diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml b/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml index dd5572ddee7..0fca11e3873 100644 --- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml +++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml @@ -46,7 +46,7 @@ -