From e33d7e49c8729ab322dfc22253a819e6dc24aaaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:09:00 +0000 Subject: [PATCH 01/16] Bump org.antlr:antlr4-runtime from 4.13.1 to 4.13.2 (#11580) Bumps [org.antlr:antlr4-runtime](https://github.com/antlr/antlr4) from 4.13.1 to 4.13.2. - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/dev/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.13.1...4.13.2) --- updated-dependencies: - dependency-name: org.antlr:antlr4-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dcdc107f4fa..b2bb9330ba9 100644 --- a/build.gradle +++ b/build.gradle @@ -187,7 +187,7 @@ dependencies { implementation 'com.github.javakeyring:java-keyring:1.0.4' antlr4 'org.antlr:antlr4:4.13.1' - implementation 'org.antlr:antlr4-runtime:4.13.1' + implementation 'org.antlr:antlr4-runtime:4.13.2' implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.10.0.202406032230-r' From 6896228e4bde280e028308b959d1ff31bf6c982b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:09:05 +0000 Subject: [PATCH 02/16] Bump org.glassfish.jersey.containers:jersey-container-grizzly2-http (#11581) Bumps org.glassfish.jersey.containers:jersey-container-grizzly2-http from 3.1.7 to 3.1.8. --- updated-dependencies: - dependency-name: org.glassfish.jersey.containers:jersey-container-grizzly2-http dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b2bb9330ba9..85186e95479 100644 --- a/build.gradle +++ b/build.gradle @@ -294,7 +294,7 @@ dependencies { // testImplementation 'org.glassfish.hk2:hk2-junitrunner:3.0.4' // HTTP server // implementation 'org.glassfish.jersey.containers:jersey-container-netty-http:3.1.1' - implementation 'org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.7' + implementation 'org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.8' testImplementation 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:3.1.7' // Allow objects "magically" to be mapped to JSON using GSON // implementation 'org.glassfish.jersey.media:jersey-media-json-gson:3.1.1' From 206637324c27512be265d4d074d9f2431f1e7b2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:14:28 +0000 Subject: [PATCH 03/16] Bump org.openrewrite.recipe:rewrite-recipe-bom from 2.15.0 to 2.16.0 (#11582) Bumps [org.openrewrite.recipe:rewrite-recipe-bom](https://github.com/openrewrite/rewrite-recipe-bom) from 2.15.0 to 2.16.0. - [Release notes](https://github.com/openrewrite/rewrite-recipe-bom/releases) - [Commits](https://github.com/openrewrite/rewrite-recipe-bom/compare/v2.15.0...v2.16.0) --- updated-dependencies: - dependency-name: org.openrewrite.recipe:rewrite-recipe-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 85186e95479..f01d94e15ae 100644 --- a/build.gradle +++ b/build.gradle @@ -331,7 +331,7 @@ dependencies { xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2' xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2' - rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.15.0")) + rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.16.0")) rewrite("org.openrewrite.recipe:rewrite-static-analysis") rewrite("org.openrewrite.recipe:rewrite-logging-frameworks") rewrite("org.openrewrite.recipe:rewrite-testing-frameworks") From 189f239fced60c5f069ce933f89879dc6d1ea805 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:21:29 +0000 Subject: [PATCH 04/16] Bump org.openrewrite.rewrite from 6.16.4 to 6.17.1 (#11584) Bumps org.openrewrite.rewrite from 6.16.4 to 6.17.1. --- updated-dependencies: - dependency-name: org.openrewrite.rewrite dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f01d94e15ae..f9022fcfb76 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ plugins { id 'idea' - id 'org.openrewrite.rewrite' version '6.16.4' + id 'org.openrewrite.rewrite' version '6.17.1' } // Enable following for debugging From cbeb254e9792a8051d9393042e2ed5d0bb33f3b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:43:30 +0000 Subject: [PATCH 05/16] Bump org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2 (#11583) Bumps org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2 from 3.1.7 to 3.1.8. --- updated-dependencies: - dependency-name: org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f9022fcfb76..c866f245365 100644 --- a/build.gradle +++ b/build.gradle @@ -295,7 +295,7 @@ dependencies { // HTTP server // implementation 'org.glassfish.jersey.containers:jersey-container-netty-http:3.1.1' implementation 'org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.8' - testImplementation 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:3.1.7' + testImplementation 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:3.1.8' // Allow objects "magically" to be mapped to JSON using GSON // implementation 'org.glassfish.jersey.media:jersey-media-json-gson:3.1.1' From fd12a26a0d116ef5a8c12ae7646001b5cfccb43c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:46:42 +0000 Subject: [PATCH 06/16] Bump src/main/resources/csl-styles from `e111543` to `df939b8` (#11585) Bumps [src/main/resources/csl-styles](https://github.com/citation-style-language/styles) from `e111543` to `df939b8`. - [Release notes](https://github.com/citation-style-language/styles/releases) - [Commits](https://github.com/citation-style-language/styles/compare/e111543b181950a1db5d4fcf91d50467eb825925...df939b87950c9f22a98e7a8188bbeabbc307bb42) --- updated-dependencies: - dependency-name: src/main/resources/csl-styles dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/main/resources/csl-styles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/csl-styles b/src/main/resources/csl-styles index e111543b181..df939b87950 160000 --- a/src/main/resources/csl-styles +++ b/src/main/resources/csl-styles @@ -1 +1 @@ -Subproject commit e111543b181950a1db5d4fcf91d50467eb825925 +Subproject commit df939b87950c9f22a98e7a8188bbeabbc307bb42 From a28cfd20979cd099d88a3116dd7a6a145d3c3a77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:50:53 +0000 Subject: [PATCH 07/16] Bump gradle/actions from 3 to 4 (#11586) Bumps [gradle/actions](https://github.com/gradle/actions) from 3 to 4. - [Release notes](https://github.com/gradle/actions/releases) - [Commits](https://github.com/gradle/actions/compare/v3...v4) --- updated-dependencies: - dependency-name: gradle/actions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deployment-arm64.yml | 2 +- .github/workflows/deployment-jdk-ea.yml | 2 +- .github/workflows/deployment.yml | 2 +- .github/workflows/tests-fetchers.yml | 2 +- .github/workflows/tests.yml | 16 ++++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml index eca11cf1b66..a160ec1c244 100644 --- a/.github/workflows/deployment-arm64.yml +++ b/.github/workflows/deployment-arm64.yml @@ -98,7 +98,7 @@ jobs: create-keychain: false keychain-password: jabref - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Prepare merged jars and modules dir (macOS) diff --git a/.github/workflows/deployment-jdk-ea.yml b/.github/workflows/deployment-jdk-ea.yml index 7aa67643dac..9bc7e1e3ddc 100644 --- a/.github/workflows/deployment-jdk-ea.yml +++ b/.github/workflows/deployment-jdk-ea.yml @@ -191,7 +191,7 @@ jobs: java-version: 21 distribution: 'temurin' - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Prepare merged jars and modules dir diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 6aa9ca9bfdf..7bd460fd4d6 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -93,7 +93,7 @@ jobs: java-version: 21.0.2 distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Prepare merged jars and modules dir (macOS) diff --git a/.github/workflows/tests-fetchers.yml b/.github/workflows/tests-fetchers.yml index 9e5329f5220..00768f2b03b 100644 --- a/.github/workflows/tests-fetchers.yml +++ b/.github/workflows/tests-fetchers.yml @@ -51,7 +51,7 @@ jobs: java-version: 21.0.2 distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Run fetcher tests diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 00aa01080d3..84e0197456d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -47,7 +47,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} checkstyle_config: 'config/checkstyle/checkstyle_reviewdog.xml' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Run checkstyle using gradle @@ -82,7 +82,7 @@ jobs: java-version: 21.0.2 distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Run OpenRewrite @@ -117,7 +117,7 @@ jobs: java-version: 21.0.2 distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Run modernizer @@ -237,7 +237,7 @@ jobs: java-version: 21.0.2 distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Run tests @@ -280,7 +280,7 @@ jobs: java-version: 21.0.2 distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Run tests on PostgreSQL @@ -321,7 +321,7 @@ jobs: java-version: 21.0.2 distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Run GUI tests @@ -371,7 +371,7 @@ jobs: java-version: 21.0.2 distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: gradle-home-cache-cleanup: true - name: Update test coverage metrics @@ -400,7 +400,7 @@ jobs: - uses: actions/checkout@v4 with: show-progress: 'false' - - uses: gradle/actions/wrapper-validation@v3 + - uses: gradle/actions/wrapper-validation@v4 # This ensures that no git merge conflict markers (<<<, ...) are contained merge_conflict_job: From 21f0f223a4bef62c23a3092d53aadfab221c941c Mon Sep 17 00:00:00 2001 From: Loay Ghreeb <52158423+LoayGhreeb@users.noreply.github.com> Date: Tue, 6 Aug 2024 10:47:52 +0300 Subject: [PATCH 08/16] Update main table colors (#11579) * Update Base.css * Reorder a bit -fill before -text-fill * Fix hovering for :odd * Use -jr-blue-gray-3 colors simple-search-library.bib - Search for "S" - Select group "g" * Swap odd and even * "Fix" derive * Proposal for Blueberry-based theme * Use -jr-theme * Remove wrong comment * Fix color for focused entry * Fix double click behavior * Final double click fix --------- Co-authored-by: Oliver Kopp --- src/main/java/org/jabref/gui/Base.css | 74 ++++++---- .../org/jabref/gui/maintable/MainTable.css | 134 ++++++++++++++++++ .../testbib/simple-search-library.bib | 70 +++++++++ 3 files changed, 248 insertions(+), 30 deletions(-) create mode 100644 src/test/resources/testbib/simple-search-library.bib diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css index 409b582b5fb..206e0608257 100644 --- a/src/main/java/org/jabref/gui/Base.css +++ b/src/main/java/org/jabref/gui/Base.css @@ -32,6 +32,16 @@ -jr-gray-3: #404040; -jr-black: #000; + /* Some blueish greys - currently not used */ + -jr-blue-gray-1: #c8d6e5; + -jr-blue-gray-1-darker: derive(-jr-blue-gray-1, -5%); + -jr-blue-gray-2: #8395a7; + -jr-blue-gray-2-darker: derive(-jr-blue-gray-2, -5%); + -jr-blue-gray-3: #576574; + -jr-blue-gray-3-darker: derive(-jr-blue-gray-3, -5%); + -jr-blue-gray-4: #222f3e; + -jr-blue-gray-4-darker: derive(-jr-blue-gray-4, -5%); + /* Highlights */ -jr-blue: #0abde3; -jr-light-blue: #48dbfb; @@ -44,12 +54,6 @@ -jr-yellow: #feca57; -jr-orange: #ff9f43; - /* Some blueish greys */ - -jr-blue-gray-1: #c8d6e5; - -jr-blue-gray-2: #8395a7; - -jr-blue-gray-3: #576574; - -jr-blue-gray-4: #222f3e; - /* Background specs */ -jr-background-alt: -fx-background; -jr-text-area-background: derive(-jr-base, 80%); @@ -252,6 +256,34 @@ /* Consistent size for headers of tab-pane and side-panels*/ -jr-header-height: 3em; + + /* region: maintable base colors **/ + + -jr-match-1: -jr-white; + -jr-match-1-even: -jr-base; + -jr-match-1-text-color: -fx-mid-text-color; + -jr-match-1-hover: -jr-hover; + -jr-match-1-text-color-hover: -fx-mid-text-color; + + -jr-match-2: derive(-jr-theme, 100%); + -jr-match-2-even: derive(-jr-match-2, 10%); + -jr-match-2-text-color: -fx-mid-text-color; + -jr-match-2-hover: -jr-hover; + -jr-match-2-text-color-hover: -fx-mid-text-color; + + -jr-match-3: derive(-jr-theme, 50%); + -jr-match-3-even: derive(-jr-match-3, 10%); + -jr-match-3-text-color: derive(-jr-accent, 30%); + -jr-match-3-hover: -jr-hover; + -jr-match-3-text-color-hover: -fx-mid-text-color; + + -jr-match-4: -jr-theme; + -jr-match-4-even: derive(-jr-match-4, 10%); + -jr-match-4-text-color: -jr-accent; + -jr-match-4-hover: -jr-hover; + -jr-match-4-text-color-hover: -fx-mid-text-color; + + /* endregion */ } .unchanged { @@ -270,7 +302,6 @@ -rtfx-background-color: rgba(255, 107, 107, 0.55); } - #frame { -fx-background-color: -jr-background-alt; } @@ -584,8 +615,8 @@ TextFlow > .tooltip-text-monospaced { } .tab-pane > .tab-header-area > .headers-region > .tab:selected .glyph-icon { - -fx-text-fill: -fx-mid-text-color; -fx-fill: -fx-mid-text-color; + -fx-text-fill: -fx-mid-text-color; } .tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator { @@ -611,13 +642,13 @@ TextFlow > .tooltip-text-monospaced { .tab-pane > .tab-header-area > .headers-region > .tab .glyph-icon { -glyph-size: 13px; - -fx-text-fill: -fx-mid-text-color; -fx-fill: -fx-mid-text-color; + -fx-text-fill: -fx-mid-text-color; } .tab-pane > .tab-header-area > .headers-region > .tab:selected .glyph-icon { - -fx-text-fill: -jr-theme-text; -fx-fill: -jr-theme-text; + -fx-text-fill: -jr-theme-text; } .tab-pane > .tab-header-area { @@ -648,30 +679,14 @@ TextFlow > .tooltip-text-monospaced { -fx-padding: 0 .5 0 .5; } -.table-row-cell:matching-search-and-groups { - -fx-background-color: white; -} - -.table-row-cell:matching-search-not-groups { - -fx-background-color: rgba(180, 180, 180, 0.86); -} - -.table-row-cell:matching-groups-not-search { - -fx-background-color: rgba(140, 140, 140, 0.86); -} - -.table-row-cell:not-matching-search-and-groups { - -fx-opacity: 60%; -} - .table-row-cell:hover, +.table-row-cell:hover:even, .tree-table-row-cell:hover { -fx-background-color: -jr-hover; -fx-text-fill: -fx-focused-text-base-color; -fx-fill: -fx-focused-text-base-color; } -.table-row-cell:hover, .tree-table-row-cell:selected > .tree-table-cell > .glyph-icon { -fx-fill: white; -fx-text-fill: white; @@ -1162,12 +1177,11 @@ We want to have a look that matches our icons in the tool-bar */ .table-cell, .tree-table-cell, -.table-cell .glyph-icon, .tree-table-cell .glyph-icon { - -fx-padding: 0.5em 1em 0.5em 1em; -fx-cell-size: 4.0em; - -fx-text-fill: -fx-text-background-color; + -fx-padding: 0.5em 1em 0.5em 1em; -fx-fill: -fx-text-background-color; + -fx-text-fill: -fx-text-background-color; } /* Drag and drop colored indicator */ diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.css b/src/main/java/org/jabref/gui/maintable/MainTable.css index b52b7ef79c8..edb77689301 100644 --- a/src/main/java/org/jabref/gui/maintable/MainTable.css +++ b/src/main/java/org/jabref/gui/maintable/MainTable.css @@ -37,6 +37,140 @@ -fx-padding: -2 0 0 0; } +/** even and odd are swapped around somehow. Below "odd" matches lines 2, 4, ... **/ + +.table-row-cell:matching-search-and-groups { + -fx-background-color: -jr-match-1; +} +.table-row-cell:matching-search-and-groups:hover { + -fx-background-color: -jr-match-1-hover; +} +.table-row-cell:matching-search-and-groups > .table-cell { + -fx-text-fill: -jr-match-1-text-color; +} +.table-row-cell:matching-search-and-groups:focused > .table-cell { + -fx-text-fill: -fx-focused-text-base-color; +} +.table-row-cell:matching-search-and-groups:hover > .table-cell { + -fx-text-fill: -jr-match-1-text-color-hover; +} +.table-row-cell:matching-search-and-groups > .table-cell > .ikonli-font-icon { + -fx-text-fill: -jr-match-1-text-color; +} +.table-row-cell:matching-search-and-groups:hover > .table-cell > .ikonli-font-icon { + -fx-text-fill: -jr-match-1-text-color-hover; +} +.table-row-cell:matching-search-and-groups:odd { + -fx-background-color: -jr-match-1-even; +} +.table-row-cell:matching-search-and-groups:odd:focused, +.table-row-cell:matching-search-and-groups:odd:focused:hover, +.table-row-cell:matching-search-and-groups:focused:hover { + -fx-background-color: -jr-selected; +} +.table-row-cell:matching-search-and-groups:odd:hover { + -fx-background-color: -jr-match-1-hover; +} + +.table-row-cell:matching-search-not-groups { + -fx-background-color: -jr-match-2; +} +.table-row-cell:matching-search-not-groups:hover { + -fx-background-color: -jr-match-2-hover; +} +.table-row-cell:matching-search-not-groups > .table-cell { + -fx-text-fill: -jr-match-2-text-color; +} +.table-row-cell:matching-search-not-groups:focused > .table-cell { + -fx-text-fill: -fx-focused-text-base-color; +} +.table-row-cell:matching-search-not-groups:hover > .table-cell { + -fx-text-fill: -jr-match-2-text-color-hover; +} +.table-row-cell:matching-search-not-groups > .table-cell > .ikonli-font-icon { + -fx-text-fill: -jr-match-2-text-color; +} +.table-row-cell:matching-search-not-groups:hover > .table-cell > .ikonli-font-icon { + -fx-text-fill: -jr-match-2-text-color-hover; +} +.table-row-cell:matching-search-not-groups:odd { + -fx-background-color: -jr-match-2-even; +} +.table-row-cell:matching-search-not-groups:odd:focused, +.table-row-cell:matching-search-not-groups:odd:focused:hover, +.table-row-cell:matching-search-not-groups:focused:hover { + -fx-background-color: -jr-selected; +} +.table-row-cell:matching-search-not-groups:odd:hover { + -fx-background-color: -jr-match-2-hover; +} + +.table-row-cell:matching-groups-not-search { + -fx-background-color: -jr-match-3; +} +.table-row-cell:matching-groups-not-search:hover { + -fx-background-color: -jr-match-3-hover; +} +.table-row-cell:matching-groups-not-search > .table-cell { + -fx-text-fill: -jr-match-3-text-color; +} +.table-row-cell:matching-groups-not-search:focused > .table-cell { + -fx-text-fill: -fx-focused-text-base-color; +} +.table-row-cell:matching-groups-not-search:hover > .table-cell { + -fx-text-fill: -jr-match-3-text-color-hover; +} +.table-row-cell:matching-groups-not-search > .table-cell > .ikonli-font-icon { + -fx-icon-color: -jr-match-3-text-color; +} +.table-row-cell:matching-groups-not-search:hover > .table-cell > .ikonli-font-icon { + -fx-icon-color: -jr-match-3-text-color-hover; +} +.table-row-cell:matching-groups-not-search:odd { + -fx-background-color: -jr-match-3-even; +} +.table-row-cell:matching-groups-not-search:odd:focused, +.table-row-cell:matching-groups-not-search:odd:focused:hover, +.table-row-cell:matching-groups-not-search:focused:hover { + -fx-background-color: -jr-selected; +} +.table-row-cell:matching-groups-not-search:odd:hover { + -fx-background-color: -jr-hover; +} + +.table-row-cell:not-matching-search-and-groups { + -fx-background-color: -jr-match-4; +} +.table-row-cell:not-matching-search-and-groups:hover { + -fx-background-color: -jr-match-4-hover; +} +.table-row-cell:not-matching-search-and-groups > .table-cell { + -fx-text-fill: -jr-match-4-text-color; +} +.table-row-cell:not-matching-search-and-groups:focused > .table-cell { + -fx-text-fill: -fx-focused-text-base-color; +} +.table-row-cell:not-matching-search-and-groups:hover > .table-cell { + -fx-text-fill: -jr-match-4-text-color-hover; +} +.table-row-cell:not-matching-search-and-groups > .table-cell > .ikonli-font-icon { + -fx-icon-color: -jr-match-4-text-color; +} +.table-row-cell:not-matching-search-and-groups:hover > .table-cell > .ikonli-font-icon { + -fx-icon-color: -jr-match-4-text-color-hover; +} +.table-row-cell:not-matching-search-and-groups:odd { + -fx-background-color: -jr-match-4-even; +} +.table-row-cell:not-matching-search-and-groups:odd:focused, +.table-row-cell:not-matching-search-and-groups:odd:focused:hover, +.table-row-cell:not-matching-search-and-groups:focused:hover { + -fx-background-color: -jr-selected; +} +.table-row-cell:not-matching-search-and-groups:odd:hover { + -fx-background-color: -jr-match-4-hover; +} + .rating > .container { -fx-spacing: 2; } diff --git a/src/test/resources/testbib/simple-search-library.bib b/src/test/resources/testbib/simple-search-library.bib new file mode 100644 index 00000000000..9d4d58d4a7c --- /dev/null +++ b/src/test/resources/testbib/simple-search-library.bib @@ -0,0 +1,70 @@ +@Article{, + title = {S2}, +} + +@Article{, + title = {g2}, +} + +@Article{, + title = {n4}, +} + +@Article{, + title = {Sg}, +} + +@Article{, + title = {Sg3}, +} + +@Article{, + title = {Sg2}, +} + +@Article{, + title = {S}, +} + +@Article{, + title = {S4}, +} + +@Article{, + title = {g}, +} + +@Article{, + title = {g4}, +} + +@Article{, + title = {n}, +} + +@Article{, + title = {n3}, +} + +@Article{, + title = {Sg4}, +} + +@Article{, + title = {S3}, +} + +@Article{, + title = {g3}, +} + +@Article{, + title = {n2}, +} + +@Comment{jabref-meta: databaseType:bibtex;} + +@Comment{jabref-meta: grouping: +0 AllEntriesGroup:; +1 SearchGroup:g\;0\;g\;0\;0\;1\;\;\;\;; +} From 18785336898166c8bcdc1fc9d4e8f6a6bfe7d57f Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 6 Aug 2024 13:04:17 +0200 Subject: [PATCH 09/16] Sort privacy services alphabetically - and fix typo (#11588) --- PRIVACY.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PRIVACY.md b/PRIVACY.md index 9a7e6b0390f..e1ba61f9a95 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -1,6 +1,6 @@ # Privacy Policy -Last updated: 2023-08-24 +Last updated: 2024-08-06 Your privacy is a fundamental right JabRef e.V. respects and supports. By using JabRef and its related online services, you choose to share some of your personal information. @@ -58,6 +58,7 @@ These third-party services are the following: | [IACR](https://www.iacr.org/) | | | [IEEEXplore](https://ieeexplore.ieee.org/Xplore/home.jsp) | | | [INSPIRE](https://inspirehep.net/) | | +| [ISIDORE](https://isidore.science/) | | | [JSTOR](https://www.jstor.org/) | | | [Library of Congress](https://lccn.loc.gov/) | | | [National Library of Medicine](https://www.ncbi.nlm.nih.gov/) | | @@ -73,9 +74,8 @@ These third-party services are the following: | [The SAO/NASA Astrophysics Data System](https://ui.adsabs.harvard.edu/) | | | [Unpaywall](https://unpaywall.org/) | | | [zbMATH Open](https://www.zbmath.org) | | -| [ISIDORE](https://isidore.science/) | | -[1]: *Note: The Mr. DLib service is used for the related articles tab in the entry editor and collects also your language, your browser and operating system (by default*disabled*).* +[1]: *Note: The Mr. DLib service is used for the related articles tab in the entry editor and collects also your language, your browser and operating system (*disabled* by default).* ## JabRef Browser Extension From 95a81e8bd7837a1b0b7fa4ae252ea3b816ad8cb9 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 6 Aug 2024 17:12:01 +0200 Subject: [PATCH 10/16] Fix dark mode for table (#11591) - Use very dark colors - Highlight searches - Cleanup Base.css and MainTable.css - introduce -jr-hover-text --- src/main/java/org/jabref/gui/Base.css | 31 +++++---- src/main/java/org/jabref/gui/Dark.css | 18 ++++- .../org/jabref/gui/maintable/MainTable.css | 66 ++++++++++++------- 3 files changed, 73 insertions(+), 42 deletions(-) diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css index 206e0608257..ad0e867d5de 100644 --- a/src/main/java/org/jabref/gui/Base.css +++ b/src/main/java/org/jabref/gui/Base.css @@ -1,4 +1,3 @@ - .root { -jr-row-odd-background: -fx-control-inner-background-alt; -jr-row-even-background: -fx-control-inner-background; @@ -14,13 +13,17 @@ work nicely with this base color */ - /* This theme is the original JabRef dark blue color */ + /* original JabRef dark blue color */ -jr-theme: #50618F; + -jr-accent: #a3b7e6; -jr-transparent-accent: rgba(163, 183, 230, 0.16); - -jr-selected: -jr-accent; -jr-checked: -jr-theme; + + -jr-selected: -jr-accent; + -jr-hover: #0002; + -jr-hover-text: -fx-focused-text-base-color; /* The base gray. Most gray-tones in the application are derived from this color. */ -jr-base: #ebebeb; @@ -259,29 +262,23 @@ /* region: maintable base colors **/ - -jr-match-1: -jr-white; - -jr-match-1-even: -jr-base; + -jr-match-1: -jr-row-odd-background; + -jr-match-1-even: -jr-row-even-background; -jr-match-1-text-color: -fx-mid-text-color; - -jr-match-1-hover: -jr-hover; - -jr-match-1-text-color-hover: -fx-mid-text-color; -jr-match-2: derive(-jr-theme, 100%); -jr-match-2-even: derive(-jr-match-2, 10%); -jr-match-2-text-color: -fx-mid-text-color; - -jr-match-2-hover: -jr-hover; - -jr-match-2-text-color-hover: -fx-mid-text-color; -jr-match-3: derive(-jr-theme, 50%); -jr-match-3-even: derive(-jr-match-3, 10%); -jr-match-3-text-color: derive(-jr-accent, 30%); - -jr-match-3-hover: -jr-hover; - -jr-match-3-text-color-hover: -fx-mid-text-color; -jr-match-4: -jr-theme; -jr-match-4-even: derive(-jr-match-4, 10%); -jr-match-4-text-color: -jr-accent; - -jr-match-4-hover: -jr-hover; - -jr-match-4-text-color-hover: -fx-mid-text-color; + + -jr-maintable-focused-hover-text: -jr-white; /* endregion */ } @@ -683,8 +680,8 @@ TextFlow > .tooltip-text-monospaced { .table-row-cell:hover:even, .tree-table-row-cell:hover { -fx-background-color: -jr-hover; - -fx-text-fill: -fx-focused-text-base-color; - -fx-fill: -fx-focused-text-base-color; + -fx-fill: -jr-hover-text; + -fx-text-fill: -jr-hover-text; } .tree-table-row-cell:selected > .tree-table-cell > .glyph-icon { @@ -752,7 +749,9 @@ TextFlow > .tooltip-text-monospaced { -fx-table-cell-border-color: transparent; } -/* Selected when control is not focused */ +/* Selected when control is not focused + * In the context of the MainTable: an element is focused at a double click. A single click "just" selects it. + */ .list-cell:filled:selected, .tree-cell:filled:selected, .table-row-cell:filled:selected, diff --git a/src/main/java/org/jabref/gui/Dark.css b/src/main/java/org/jabref/gui/Dark.css index 0e426159450..0e5aecf4d61 100644 --- a/src/main/java/org/jabref/gui/Dark.css +++ b/src/main/java/org/jabref/gui/Dark.css @@ -52,7 +52,7 @@ -jr-scrollbar-thumb: -fx-light-text-color; -jr-scrollbar-track: derive(-fx-control-inner-background, -90%); - -fx-focused-text-base-color: -fx-dark-text-color; + -fx-focused-text-base-color: -fx-light-text-color; -jr-tooltip-fg: derive(-fx-light-text-color, 50%); @@ -61,6 +61,22 @@ -js-summary-text-color: derive(-fx-light-text-color, 70%); -js-summary-text-color-selected: derive( -fx-dark-text-color, 70%); + + -jr-match-1: -jr-row-odd-background; + -jr-match-1-even: -jr-row-even-background; + -jr-match-1-text-color: -fx-mid-text-color; + + -jr-match-2: derive(-jr-theme, -60%); + -jr-match-2-even: derive(-jr-match-2, 4%); + -jr-match-2-text-color: -fx-mid-text-color; + + -jr-match-3: derive(-jr-theme, -70%); + -jr-match-3-even: derive(-jr-match-3, 4%); + -jr-match-3-text-color: derive(-jr-accent, 30%); + + -jr-match-4: derive(-jr-black, 10%); + -jr-match-4-even: -jr-background-alt; + -jr-match-4-text-color: derive(-jr-match-3-text-color, -15%); } .unchanged { diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.css b/src/main/java/org/jabref/gui/maintable/MainTable.css index edb77689301..31fb65ce21b 100644 --- a/src/main/java/org/jabref/gui/maintable/MainTable.css +++ b/src/main/java/org/jabref/gui/maintable/MainTable.css @@ -42,93 +42,105 @@ .table-row-cell:matching-search-and-groups { -fx-background-color: -jr-match-1; } -.table-row-cell:matching-search-and-groups:hover { - -fx-background-color: -jr-match-1-hover; -} .table-row-cell:matching-search-and-groups > .table-cell { -fx-text-fill: -jr-match-1-text-color; } .table-row-cell:matching-search-and-groups:focused > .table-cell { -fx-text-fill: -fx-focused-text-base-color; } +.table-row-cell:matching-search-and-groups:focused:hover > .table-cell { + -fx-text-fill: -jr-maintable-focused-hover-text; +} +.table-row-cell:matching-search-and-groups:focused:hover > .table-cell > .ikonli-font-icon { + -fx-icon-color: -jr-maintable-focused-hover-text; +} .table-row-cell:matching-search-and-groups:hover > .table-cell { - -fx-text-fill: -jr-match-1-text-color-hover; + -fx-text-fill: -jr-hover-text; } .table-row-cell:matching-search-and-groups > .table-cell > .ikonli-font-icon { - -fx-text-fill: -jr-match-1-text-color; + -fx-icon-color: -jr-match-1-text-color; } .table-row-cell:matching-search-and-groups:hover > .table-cell > .ikonli-font-icon { - -fx-text-fill: -jr-match-1-text-color-hover; + -fx-icon-color: -jr-hover-text; } .table-row-cell:matching-search-and-groups:odd { -fx-background-color: -jr-match-1-even; } +.table-row-cell:matching-search-and-groups:odd:selected, .table-row-cell:matching-search-and-groups:odd:focused, .table-row-cell:matching-search-and-groups:odd:focused:hover, .table-row-cell:matching-search-and-groups:focused:hover { -fx-background-color: -jr-selected; } .table-row-cell:matching-search-and-groups:odd:hover { - -fx-background-color: -jr-match-1-hover; + -fx-background-color: -jr-hover; } .table-row-cell:matching-search-not-groups { -fx-background-color: -jr-match-2; } -.table-row-cell:matching-search-not-groups:hover { - -fx-background-color: -jr-match-2-hover; -} .table-row-cell:matching-search-not-groups > .table-cell { -fx-text-fill: -jr-match-2-text-color; } .table-row-cell:matching-search-not-groups:focused > .table-cell { -fx-text-fill: -fx-focused-text-base-color; } +.table-row-cell:matching-search-not-groups:focused:hover > .table-cell { + -fx-text-fill: -jr-maintable-focused-hover-text; +} +.table-row-cell:matching-search-not-groups:focused:hover > .table-cell > .ikonli-font-icon { + -fx-icon-color: -jr-maintable-focused-hover-text; +} .table-row-cell:matching-search-not-groups:hover > .table-cell { - -fx-text-fill: -jr-match-2-text-color-hover; + -fx-text-fill: -jr-hover-text; } .table-row-cell:matching-search-not-groups > .table-cell > .ikonli-font-icon { - -fx-text-fill: -jr-match-2-text-color; + -fx-icon-color: -jr-match-2-text-color; } .table-row-cell:matching-search-not-groups:hover > .table-cell > .ikonli-font-icon { - -fx-text-fill: -jr-match-2-text-color-hover; + -fx-icon-color: -jr-hover-text; } .table-row-cell:matching-search-not-groups:odd { -fx-background-color: -jr-match-2-even; } +.table-row-cell:matching-search-not-groups:odd:selected, .table-row-cell:matching-search-not-groups:odd:focused, .table-row-cell:matching-search-not-groups:odd:focused:hover, .table-row-cell:matching-search-not-groups:focused:hover { -fx-background-color: -jr-selected; } .table-row-cell:matching-search-not-groups:odd:hover { - -fx-background-color: -jr-match-2-hover; + -fx-background-color: -jr-hover; } .table-row-cell:matching-groups-not-search { -fx-background-color: -jr-match-3; } -.table-row-cell:matching-groups-not-search:hover { - -fx-background-color: -jr-match-3-hover; -} .table-row-cell:matching-groups-not-search > .table-cell { -fx-text-fill: -jr-match-3-text-color; } .table-row-cell:matching-groups-not-search:focused > .table-cell { -fx-text-fill: -fx-focused-text-base-color; } +.table-row-cell:matching-groups-not-search:focused:hover > .table-cell { + -fx-text-fill: -jr-maintable-focused-hover-text; +} +.table-row-cell:matching-groups-not-search:focused:hover > .table-cell > .ikonli-font-icon { + -fx-icon-color: -jr-maintable-focused-hover-text; +} .table-row-cell:matching-groups-not-search:hover > .table-cell { - -fx-text-fill: -jr-match-3-text-color-hover; + -fx-text-fill: -jr-hover-text; } .table-row-cell:matching-groups-not-search > .table-cell > .ikonli-font-icon { -fx-icon-color: -jr-match-3-text-color; } .table-row-cell:matching-groups-not-search:hover > .table-cell > .ikonli-font-icon { - -fx-icon-color: -jr-match-3-text-color-hover; + -fx-icon-color: -jr-hover-text; } .table-row-cell:matching-groups-not-search:odd { -fx-background-color: -jr-match-3-even; } +.table-row-cell:matching-groups-not-search:odd:selected, .table-row-cell:matching-groups-not-search:odd:focused, .table-row-cell:matching-groups-not-search:odd:focused:hover, .table-row-cell:matching-groups-not-search:focused:hover { @@ -141,34 +153,38 @@ .table-row-cell:not-matching-search-and-groups { -fx-background-color: -jr-match-4; } -.table-row-cell:not-matching-search-and-groups:hover { - -fx-background-color: -jr-match-4-hover; -} .table-row-cell:not-matching-search-and-groups > .table-cell { -fx-text-fill: -jr-match-4-text-color; } .table-row-cell:not-matching-search-and-groups:focused > .table-cell { -fx-text-fill: -fx-focused-text-base-color; } +.table-row-cell:not-matching-search-and-groups:focused:hover > .table-cell { + -fx-text-fill: -jr-maintable-focused-hover-text; +} +.table-row-cell:not-matching-search-and-groups:focused:hover > .table-cell > .ikonli-font-icon { + -fx-icon-color: -jr-maintable-focused-hover-text; +} .table-row-cell:not-matching-search-and-groups:hover > .table-cell { - -fx-text-fill: -jr-match-4-text-color-hover; + -fx-text-fill: -jr-hover-text; } .table-row-cell:not-matching-search-and-groups > .table-cell > .ikonli-font-icon { -fx-icon-color: -jr-match-4-text-color; } .table-row-cell:not-matching-search-and-groups:hover > .table-cell > .ikonli-font-icon { - -fx-icon-color: -jr-match-4-text-color-hover; + -fx-icon-color: -jr-hover-text; } .table-row-cell:not-matching-search-and-groups:odd { -fx-background-color: -jr-match-4-even; } +.table-row-cell:not-matching-search-and-groups:odd:selected, .table-row-cell:not-matching-search-and-groups:odd:focused, .table-row-cell:not-matching-search-and-groups:odd:focused:hover, .table-row-cell:not-matching-search-and-groups:focused:hover { -fx-background-color: -jr-selected; } .table-row-cell:not-matching-search-and-groups:odd:hover { - -fx-background-color: -jr-match-4-hover; + -fx-background-color: -jr-hover; } .rating > .container { From 3c02efda805ea323647a8e138c95d1fcda2e4a33 Mon Sep 17 00:00:00 2001 From: Kunal Sikka <83248197+Kunal77689@users.noreply.github.com> Date: Tue, 6 Aug 2024 13:57:58 -0230 Subject: [PATCH 11/16] Add a method to create a new file link manually (#11539) * Add a method to create a new link manually #11017 Manual File Entry Creation: Modified add button functionality so that rather than opening the file explorer, it opens a dialog box for manual file creation. [#11017] * Updated CHANGELOG.md * Added a method to create a new link manually #11017 - Deleted fxml and java files which were handling edit and add action separately and added a unified way which handles edit and add action dynamically * Added a method to create a new link manually #11017 - Overloaded the constructor so that one will take a LinkedFile for editing, another will not take any argument. * Added a method to create a new link manually #11017 - Removed extra blank line in LinkedFilesEditorViewModel -Added link to the pr in the CHANGELOG.md * Added a method to create a new link manually #11017 - Fixed checkstyle erorrs * Added a method to create a new link manually #11017 - Fixed checkstyle erorrs * Added a method to create a new link manually #11017 - Fixed findObsoleteLocalizationKeys() error by removing unwanted keys. - Fixed findMissingLocalizationKeys() by adding "Add file link" as a key * Added a method to create a new link manually #11017 - Renamed files from controller->view - Made sure both edit and add dialog boxes follow same layout - The add dialog box will have pdf as the default option - fixed minor bugs in some places where some "%" were removed in some of the previous commits, restored those symbols - on hover, rather than showing open, it will show add * Use Java 8 Optional * Fix class names * Fix name (again) * Fix method name and reuse code * Fix double dialog initialization * Fix PDF type * Remove generated JavaDoc * Remove dead code * Re-add missing localizations --------- Co-authored-by: Oliver Kopp --- CHANGELOG.md | 1 + .../gui/fieldeditors/LinkedFileViewModel.java | 4 +- .../gui/fieldeditors/LinkedFilesEditor.fxml | 2 +- .../gui/fieldeditors/LinkedFilesEditor.java | 5 ++- .../LinkedFilesEditorViewModel.java | 10 +++-- .../gui/linkedfile/AttachFileAction.java | 2 +- .../gui/linkedfile/LinkedFileEditDialog.fxml | 3 +- ...logView.java => LinkedFileEditDialog.java} | 37 ++++++++++++++----- ...ava => LinkedFileEditDialogViewModel.java} | 12 +++--- src/main/resources/l10n/JabRef_en.properties | 5 ++- 10 files changed, 54 insertions(+), 27 deletions(-) rename src/main/java/org/jabref/gui/linkedfile/{LinkedFileEditDialogView.java => LinkedFileEditDialog.java} (63%) rename src/main/java/org/jabref/gui/linkedfile/{LinkedFilesEditDialogViewModel.java => LinkedFileEditDialogViewModel.java} (93%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f24776931cc..4a11c51e6d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv - The dialog for [adding an entry using reference text](https://docs.jabref.org/collect/newentryfromplaintext) is now filled with the clipboard contents as default. [#11565](https://github.com/JabRef/jabref/pull/11565) - Added minimal support for [biblatex data annotation](https://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf#subsection.3.7) fields in `.layout` files. [#11505](https://github.com/JabRef/jabref/issues/11505) - Added saving of selected options in the [Lookup -> Search for unlinked local files dialog](https://docs.jabref.org/collect/findunlinkedfiles#link-the-pdfs-to-your-bib-library). [#11439](https://github.com/JabRef/jabref/issues/11439) +- We enabled creating a new file link manually. [#11017](https://github.com/JabRef/jabref/issues/11017) - We added a toggle button to invert the selected groups. [#9073](https://github.com/JabRef/jabref/issues/9073) - We reintroduced the floating search in the main table. [#4237](https://github.com/JabRef/jabref/issues/4237) - We fixed an issue where the selection of an entry in the table lost after searching for a group. [#3176](https://github.com/JabRef/jabref/issues/3176) diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java index 8e468cc6b41..beaecd3acf8 100644 --- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java +++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java @@ -29,7 +29,7 @@ import org.jabref.gui.icon.JabRefIcon; import org.jabref.gui.linkedfile.DeleteFileAction; import org.jabref.gui.linkedfile.DownloadLinkedFileAction; -import org.jabref.gui.linkedfile.LinkedFileEditDialogView; +import org.jabref.gui.linkedfile.LinkedFileEditDialog; import org.jabref.gui.mergeentries.MultiMergeEntriesView; import org.jabref.gui.util.ControlHelper; import org.jabref.gui.util.TaskExecutor; @@ -375,7 +375,7 @@ public boolean delete() { } public void edit() { - Optional editedFile = dialogService.showCustomDialogAndWait(new LinkedFileEditDialogView(this.linkedFile)); + Optional editedFile = dialogService.showCustomDialogAndWait(new LinkedFileEditDialog(this.linkedFile)); editedFile.ifPresent(file -> { this.linkedFile.setLink(file.getLink()); this.linkedFile.setDescription(file.getDescription()); diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml index 1fecf35204b..cbe2d08cc96 100644 --- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml +++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml @@ -17,7 +17,7 @@ - +