Skip to content

Commit d90770a

Browse files
authored
Merge pull request #7217 from IllianiBird/newPersonnelMarketCloseButton
Improvement: #7216 Added Close Dialog Button to New Personnel Market
2 parents d6985fc + 50ca1ed commit d90770a

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

MekHQ/resources/mekhq/resources/PersonnelMarket.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ title.personnelMarket.clan=++ACCESSING CASTE ASSIGNMENT TERMINAL++
44
title.personnelMarket.comStarOrWoB=++WELCOME {0}, PRAISE BLAKE++
55
title.personnelMarket.mercenary=++ACCESSING MERCNET RECRUITMENT SERVICES++
66
title.personnelMarket.normal=++ACCESSING PERSONNEL REQUISITIONS++
7-
button.personnelMarket.hire.normal=<html><b>Recruit</b></html>
7+
button.personnelMarket.close=Close
8+
button.personnelMarket.hire.normal=Recruit
89
button.personnelMarket.hire.gm=Recruit (GM)
910
button.personnelMarket.advanceDays=Advance Days
1011
checkbox.personnelMarket.goldenHello=Offer Golden Hello

MekHQ/src/mekhq/gui/dialog/markets/personnelMarket/PersonnelMarketDialog.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,10 @@ private JPanel initializeButtonPanel() {
341341
boolean isGM = campaign.isGM();
342342

343343
JPanel buttonPanel = new JPanel();
344+
JButton closeButton = new JButton(getTextAt(RESOURCE_BUNDLE, "button.personnelMarket.close"));
345+
closeButton.addActionListener(e -> closeAction());
346+
buttonPanel.add(closeButton);
347+
344348
JButton hireButton = new JButton(getTextAt(RESOURCE_BUNDLE, "button.personnelMarket.hire.normal"));
345349
hireButton.addActionListener(e -> hireActionListener(isGM));
346350
buttonPanel.add(hireButton);

0 commit comments

Comments
 (0)