-
-
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 issue #9306: Move "Open only one instance of JabRef" preference option to somewhere else #10602
Conversation
…ence option to somewhere else
issue#9306.patch
Outdated
diff --git a/CHANGELOG.md b/CHANGELOG.md | ||
index 6e5a785389..b7136d7689 100644 | ||
--- a/CHANGELOG.md | ||
+++ b/CHANGELOG.md |
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.
Pleaes delete this file or at least do not commmit it
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.
Sorry, this is my oversight, I will delete this file!
src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
Show resolved
Hide resolved
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.
see my comments
Thank you very much for your advice! I have committed my changes. :) |
@@ -127,10 +136,18 @@ public void initialize() { | |||
backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty()); | |||
backupDirectory.disableProperty().bind(viewModel.createBackupProperty().not()); | |||
|
|||
ActionFactory actionFactory1 = new ActionFactory(Globals.getKeyPrefs()); |
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 can remove this, as there is already an instance of ActionFactory
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.
OK!:)
CHANGELOG.md
Outdated
@@ -16,6 +16,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv | |||
|
|||
### Changed | |||
|
|||
- We changed the location of the 'Open only one instance of JabRef' preference option.[#9306](https://github.com/JabRef/jabref/issues/9306) |
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.
- We changed the location of the 'Open only one instance of JabRef' preference option.[#9306](https://github.com/JabRef/jabref/issues/9306) | |
- We moved the location of the 'Open only one instance of JabRef' preference option from "Network" to "General" .[#9306](https://github.com/JabRef/jabref/issues/9306) |
@@ -52,7 +52,7 @@ | |||
|
|||
<CheckBox fx:id="fontOverride" text="%Override default font settings" | |||
GridPane.rowIndex="4" GridPane.columnIndex="0"/> | |||
<HBox alignment="CENTER_LEFT" spacing="4.0" disable="${!fontOverride.selected}" |
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.
Is there a reason why this was deleted? If not then revert
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.
It's my negligence. I'm sorry to cause you trouble!
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.
No worries, you are here to learn something by contributing to a real open source project and it's part of our mission statement to guide students
PS: May I ask from which class/university etc you are?
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.
No worries, you are here to learn something by contributing to a real open source project and it's part of our mission statement to guide students
PS: May I ask from which class/university etc you are?
Thank you. I am a student from NEU of China. I found the test failed and I'm fixing it now.
src/main/resources/build.properties
Outdated
@@ -6,3 +6,5 @@ springerNatureAPIKey=${springerNatureAPIKey} | |||
astrophysicsDataSystemAPIKey=${astrophysicsDataSystemAPIKey} | |||
ieeeAPIKey=${ieeeAPIKey} | |||
biodiversityHeritageApiKey=${biodiversityHeritageApiKey} | |||
Single\ instance=???? |
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.
Ah, that is some issue with intellij. We need to refine our guides.
https://devdocs.jabref.org/code-howtos/localization.html
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.
I made a simple modification, but I don't know if I can pass the test. My knowledge is too shallow, I am new to open source, I really appreciate your help.
src/main/resources/build.properties
Outdated
@@ -6,3 +6,5 @@ springerNatureAPIKey=${springerNatureAPIKey} | |||
astrophysicsDataSystemAPIKey=${astrophysicsDataSystemAPIKey} | |||
ieeeAPIKey=${ieeeAPIKey} | |||
biodiversityHeritageApiKey=${biodiversityHeritageApiKey} | |||
Single instance=???? |
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.
The Problem is that IntelliJ suggests the wrong file:
You need to put these strings into src/main/resources/l10n/en.properties
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.
Should I modify it in GeneralTab.class?
From the test output:
|
Unfortunately, the test failed, I will continue to improve. |
Thank you very much for your help! It passed the test. May I ask whether this modification result meets the expectation of issue? |
now all is green |
Yes, we do! Thank you very much! :) |
Thank you for your advice. I have made the requested changes to the PR and performed a self-check to ensure that other issues have been fixed. Now, I look forward to your reevaluation of my PR. Given that my homework is due within the next day, I kindly request your prompt review. Your timely attention to this matter would be greatly appreciated, as it will help me meet the deadline for my homework. If everything meets your expectations, could you please consider merging it? Thank you very much for your time and assistance, and I eagerly await your feedback.:) |
@DiamondMyK Tested it and just pushed one last commit, you only need one action factory. Creating a new object of ActionFactory just sets the KeybindingRepository so one instance can be reused |
@@ -16,6 +16,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv | |||
|
|||
### Changed | |||
|
|||
- We move the location of the 'Open only one instance of JabRef' preference option from "Network" to "General" .[#9306](https://github.com/JabRef/jabref/issues/9306) |
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.
I fixed grammar and spaces in dc2b649.
* upstream/main: Fix CHANGELOG.md Bump commons-cli:commons-cli from 1.5.0 to 1.6.0 (JabRef#10607) Fix issue JabRef#9306: Move "Open only one instance of JabRef" preference option to somewhere else (JabRef#10602) Update README.md (JabRef#10604) Bump me.champeau.jmh from 0.7.1 to 0.7.2 Bump org.beryx.jlink from 3.0.0 to 3.0.1 Bump com.dlsc.gemsfx:gemsfx from 1.82.0 to 1.84.0 Bump org.apache.logging.log4j:log4j-to-slf4j from 2.21.0 to 2.21.1 # Conflicts: # src/main/resources/l10n/JabRef_en.properties
* upstream/main: (419 commits) Fix CHANGELOG.md Bump commons-cli:commons-cli from 1.5.0 to 1.6.0 (JabRef#10607) Fix issue JabRef#9306: Move "Open only one instance of JabRef" preference option to somewhere else (JabRef#10602) Update README.md (JabRef#10604) Bump me.champeau.jmh from 0.7.1 to 0.7.2 Bump org.beryx.jlink from 3.0.0 to 3.0.1 Bump com.dlsc.gemsfx:gemsfx from 1.82.0 to 1.84.0 Bump org.apache.logging.log4j:log4j-to-slf4j from 2.21.0 to 2.21.1 Synchronize scrollbars in the change resolver dialog (JabRef#10587) Add button for a user to reset the cite command to the default value. (JabRef#10580) openrerwrite Update .github/PULL_REQUEST_TEMPLATE.md Update PULL_REQUEST_TEMPLATE.md Update .github/PULL_REQUEST_TEMPLATE.md Update PULL_REQUEST_TEMPLATE.md Replace "fixes" by "resolves" Change JavaDoc to annotation (JabRef#10571) Fix link (JabRef#10575) Enable collecting GitHub build artifacts for forks (JabRef#10574) Fix file field merging (JabRef#10573) ... # Conflicts: # src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java # src/main/java/org/jabref/logic/importer/WebFetchers.java
* upstream/main: (1565 commits) Enable journal information fetcher directly in popup (#10598) Make generate button wider (#10588) make openRewrite stable again Rename cleanup_pr.yml to cleanup-pr.yml Changelog Fix failing fetcher tests (#10613) ShortDoi Fix CHANGELOG.md Bump commons-cli:commons-cli from 1.5.0 to 1.6.0 (#10607) Fix issue #9306: Move "Open only one instance of JabRef" preference option to somewhere else (#10602) Update README.md (#10604) Bump me.champeau.jmh from 0.7.1 to 0.7.2 Bump org.beryx.jlink from 3.0.0 to 3.0.1 Bump com.dlsc.gemsfx:gemsfx from 1.82.0 to 1.84.0 Bump org.apache.logging.log4j:log4j-to-slf4j from 2.21.0 to 2.21.1 Synchronize scrollbars in the change resolver dialog (#10587) Add button for a user to reset the cite command to the default value. (#10580) openrerwrite Update .github/PULL_REQUEST_TEMPLATE.md Update PULL_REQUEST_TEMPLATE.md ... # Conflicts: # .devcontainer/devcontainer.json # build.gradle # src/main/java/org/jabref/gui/DefaultInjector.java # src/main/java/org/jabref/gui/libraryproperties/general/GeneralProperties.fxml # src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java # src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java # src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java # src/main/java/org/jabref/logic/importer/util/MetaDataParser.java # src/main/java/org/jabref/model/metadata/MetaData.java # src/main/java/org/jabref/preferences/JabRefPreferences.java
* upstream/main: (44 commits) change codecov (JabRef#10616) Add entry based on ISSN number JabRef#10124 (JabRef#10178) Enable journal information fetcher directly in popup (JabRef#10598) Make generate button wider (JabRef#10588) make openRewrite stable again Rename cleanup_pr.yml to cleanup-pr.yml Changelog Fix failing fetcher tests (JabRef#10613) ShortDoi Fix CHANGELOG.md Bump commons-cli:commons-cli from 1.5.0 to 1.6.0 (JabRef#10607) Fix issue JabRef#9306: Move "Open only one instance of JabRef" preference option to somewhere else (JabRef#10602) Update README.md (JabRef#10604) Bump me.champeau.jmh from 0.7.1 to 0.7.2 Bump org.beryx.jlink from 3.0.0 to 3.0.1 Bump com.dlsc.gemsfx:gemsfx from 1.82.0 to 1.84.0 Bump org.apache.logging.log4j:log4j-to-slf4j from 2.21.0 to 2.21.1 Synchronize scrollbars in the change resolver dialog (JabRef#10587) Add button for a user to reset the cite command to the default value. (JabRef#10580) openrerwrite ...
Closes #9306
Describe
I have moved the "Open only one instance of JabRef" preference option to a new location("General"). This change was made to improve the user experience and make the option more accessible.
Mandatory checks
CHANGELOG.md
described in a way that is understandable for the average user (if applicable)Screenshots
Before:
After:
Additional Note
I am a student, and this contribution is part of my assignment related to open-source technology. My teacher will be evaluating the completed work. I kindly request a timely review of this PR to meet the assignment deadline. Your assistance is greatly appreciated.