From 7f38f831d98545ba4cfccfa1123a06c905efed17 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 1 Sep 2020 11:44:04 +0200 Subject: [PATCH 01/55] Make template more explicit --- docs/adr/template.md | 88 +++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 47 deletions(-) diff --git a/docs/adr/template.md b/docs/adr/template.md index b07f46e2eb0..b4974469854 100644 --- a/docs/adr/template.md +++ b/docs/adr/template.md @@ -1,73 +1,67 @@ -# \[short title of solved problem and solution\] +# MADR Templae -* Status: \[proposed \| rejected \| accepted \| deprecated \| … \| superseded by [ADR-0005](0005-fully-support-utf8-only-for-latex-files.md)\] -* Deciders: \[list everyone involved in the decision\] -* Date: \[YYYY-MM-DD when the decision was last updated\] +The template of [MADR](https://adr.github.io/madr/) is available at . +You can omit the `<-- optional -->` parts, which lead to a very minimal ADR: -Technical Story: \[description \| ticket/issue URL\] +```markdown +# [short title of solved problem and solution] ## Context and Problem Statement -\[Describe the context and problem statement, e.g., in free form using two to three sentences. You may want to articulate the problem in form of a question.\] - -## Decision Drivers - -* \[driver 1, e.g., a force, facing concern, …\] -* \[driver 2, e.g., a force, facing concern, …\] -* … +[Describe the context and problem statement, e.g., in free form using two to three sentences. You may want to articulate the problem in form of a question.] ## Considered Options -* \[option 1\] -* \[option 2\] -* \[option 3\] -* … +* [option 1] +* [option 2] +* [option 3] +* … ## Decision Outcome -Chosen option: "\[option 1\]", because \[justification. e.g., only option, which meets k.o. criterion decision driver \| which resolves force force \| … \| comes out best \(see below\)\]. - -### Positive Consequences +Chosen option: "[option 1]", because [justification. e.g., only option, which meets k.o. criterion decision driver | which resolves force force | … ]. +``` -* \[e.g., improvement of quality attribute satisfaction, follow-up decisions required, …\] -* … +In case you want to include the pros and cons of the options, the template is as follows: -### Negative Consequences +```markdown +# [short title of solved problem and solution] -* \[e.g., compromising quality attribute, follow-up decisions required, …\] -* … - -## Pros and Cons of the Options +## Context and Problem Statement -### \[option 1\] +[Describe the context and problem statement, e.g., in free form using two to three sentences. You may want to articulate the problem in form of a question.] -\[example \| description \| pointer to more information \| …\] +## Considered Options -* Good, because \[argument a\] -* Good, because \[argument b\] -* Bad, because \[argument c\] -* … +* [option 1] +* [option 2] +* [option 3] +* … -### \[option 2\] +## Decision Outcome -\[example \| description \| pointer to more information \| …\] +Chosen option: "[option 1]", because comes out best (see below). -* Good, because \[argument a\] -* Good, because \[argument b\] -* Bad, because \[argument c\] -* … +## Pros and Cons of the Options -### \[option 3\] +### [option 1] -\[example \| description \| pointer to more information \| …\] +* Good, because [argument a] +* Good, because [argument b] +* Bad, because [argument c] +* … -* Good, because \[argument a\] -* Good, because \[argument b\] -* Bad, because \[argument c\] -* … +### [option 2] -## Links +* Good, because [argument a] +* Good, because [argument b] +* Bad, because [argument c] +* … -* \[Link type\] \[Link to ADR\] -* … +### [option 3] +* Good, because [argument a] +* Good, because [argument b] +* Bad, because [argument c] +* … +``` From bf6047597d408e4b1aa55aa1a2993e48d060f79b Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 1 Sep 2020 12:20:57 +0200 Subject: [PATCH 02/55] Fix link --- docs/adr/0003-use-gradle-as-build-tool.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adr/0003-use-gradle-as-build-tool.md b/docs/adr/0003-use-gradle-as-build-tool.md index 81000f31444..5dac1018032 100644 --- a/docs/adr/0003-use-gradle-as-build-tool.md +++ b/docs/adr/0003-use-gradle-as-build-tool.md @@ -38,7 +38,7 @@ Chosen option: "Gradle", because it is lean and fits our development style. * Good, because [it offers custom dependency scopes](https://gradle.org/maven-vs-gradle/) * Good, because [it has good community support](https://linuxhint.com/ant-vs-maven-vs-gradle/) * Good, because [its performance can be 100 times more than maven's performance](https://gradle.org/gradle-vs-maven-performance/). -* Bad, because [not that many plugins are available/maintained yet](https://blog.philipphauer.de/moving-back-from-gradle-to-maven/) +* Bad, because [not that many plugins are available/maintained yet](https://phauer.com/2018/moving-back-from-gradle-to-maven/) * Bad, because [it lacks a wide variety of application server integrations](http://pages.zeroturnaround.com/rs/zeroturnaround/images/java-build-tools-part-2.pdf) * Bad, because [it has a medium popularity](http://pages.zeroturnaround.com/rs/zeroturnaround/images/java-build-tools-part-2.pdf) * Bad, because [it allows custom build scripts which need to be debugged](https://www.softwareyoga.com/10-reasons-why-we-chose-maven-over-gradle/) From 26870b74ebef112106a1ee7be0a5a32bf83d34c8 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Tue, 1 Sep 2020 12:36:39 +0200 Subject: [PATCH 03/55] Apply css files correctly to dialogs (#6828) * Apply css files correctly to dialogs Fixes #6039. * Update CHANGELOG.md --- CHANGELOG.md | 2 ++ src/main/java/org/jabref/gui/util/BaseDialog.java | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d12ff9edf47..442771bce92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve ### Fixed +- We fixed the wrong behavior that font size changes are not reflected in dialogs. [#6039](https://github.com/JabRef/jabref/issues/6039) + ### Removed diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java index 1995d34ce7d..d0c46ef6935 100644 --- a/src/main/java/org/jabref/gui/util/BaseDialog.java +++ b/src/main/java/org/jabref/gui/util/BaseDialog.java @@ -2,6 +2,7 @@ import java.util.Optional; +import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.ButtonType; import javafx.scene.control.Dialog; @@ -14,6 +15,8 @@ import org.jabref.gui.keyboard.KeyBinding; import org.jabref.gui.keyboard.KeyBindingRepository; +import com.tobiasdiez.easybind.EasyBind; + public class BaseDialog extends Dialog implements org.jabref.gui.Dialog { protected BaseDialog() { @@ -36,7 +39,10 @@ protected BaseDialog() { setDialogIcon(IconTheme.getJabRefImageFX()); setResizable(true); - Globals.prefs.getTheme().installCss(getDialogPane().getScene()); + + EasyBind.wrapNullable(dialogPaneProperty()) + .mapObservable(Node::sceneProperty) + .subscribeToValues(scene -> Globals.prefs.getTheme().installCss(scene)); } private Optional