Skip to content
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.

Sign up for GitHub

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

Updated Tooltips for the Marriageable & Trying to Conceive Flags #4082

Merged
merged 2 commits into from
May 16, 2024
Merged

Updated Tooltips for the Marriageable & Trying to Conceive Flags #4082

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c18b4eb
Updated tooltip behavior in PersonnelTableMouseAdapter.
IllianiCBT May 15, 2024
77ad875
Updated tooltip text formatting for marriageability
IllianiCBT May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MekHQ/resources/mekhq/resources/GUI.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ miFounder.toolTipText=If this is selected then the person is a founding member o
miImmortal.text=Immortal
miImmortal.toolTipText=If this is selected then the person will not be processed during random death \n(standard checks still apply)
miMarriageable.text=Marriageable
miMarriageable.toolTipText=If this is selected then the person will be included as a potential spouse for marriages \n(standard checks still apply, so married personnel will not be included even if this flag is selected)
miMarriageable.toolTipText=If this is selected, then the person will be included as a potential spouse for marriages (married personnel will not be included even if this flag is selected, nor will characters under 0 years old)
miTryingToConceive.text=Trying to Conceive
miTryingToConceive.toolTipText=If this is selected the person has a chance to have children created through random procreation. \n(standard checks still apply)
miTryingToConceive.toolTipText=If this is selected, the person has a chance to have children created through random procreation (this flag is ignored for personnel under 18 years old).
### Randomization Menu
randomizationMenu.text=Randomization
miRandomName.single.text=Randomize Name
Expand Down
5 changes: 3 additions & 2 deletions MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2165,7 +2165,8 @@ protected Optional<JPopupMenu> createPopupMenu() {
|| !gui.getCampaign().getCampaignOptions().getRandomMarriageMethod().isNone())
&& Stream.of(selected).allMatch(p -> p.isMarriageable() == person.isMarriageable())) {
cbMenuItem = new JCheckBoxMenuItem(resources.getString("miMarriageable.text"));
cbMenuItem.setToolTipText(resources.getString("miMarriageable.toolTipText"));
cbMenuItem.setToolTipText(MultiLineTooltip.splitToolTip(resources.getString("miMarriageable.toolTipText")
IllianiCBT marked this conversation as resolved.
Show resolved Hide resolved
.replaceAll("0", String.valueOf(gui.getCampaign().getCampaignOptions().getMinimumMarriageAge())), 100));
cbMenuItem.setName("miMarriageable");
cbMenuItem.setSelected(person.isMarriageable());
cbMenuItem.addActionListener(evt -> {
Expand All @@ -2180,7 +2181,7 @@ protected Optional<JPopupMenu> createPopupMenu() {
&& Stream.of(selected).allMatch(p -> p.getGender().isFemale())
&& Stream.of(selected).allMatch(p -> p.isTryingToConceive() == person.isTryingToConceive())) {
cbMenuItem = new JCheckBoxMenuItem(resources.getString("miTryingToConceive.text"));
cbMenuItem.setToolTipText(resources.getString("miTryingToConceive.toolTipText"));
cbMenuItem.setToolTipText(MultiLineTooltip.splitToolTip(resources.getString("miTryingToConceive.toolTipText"), 100));
cbMenuItem.setName("miTryingToConceive");
cbMenuItem.setSelected(person.isTryingToConceive());
cbMenuItem.addActionListener(evt -> {
Expand Down
Loading