Skip to content

Commit

Permalink
Restored confirmation dialog for starting a new campaign
Browse files Browse the repository at this point in the history
Introduced a NewCampaignConfirmationDialog to prompt users before starting a new campaign, enhancing user decision control. Updated relevant GUI logic in CampaignGUI and added corresponding copyright updates for 2024.
  • Loading branch information
IllianiCBT committed Dec 13, 2024
1 parent c8797d7 commit 974f563
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 4 deletions.
5 changes: 5 additions & 0 deletions MekHQ/src/mekhq/gui/CampaignGUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,11 @@ private void initMenu() {
* </p>
*/
private void handleInAppNewCampaign() {
int decision = new NewCampaignConfirmationDialog().YesNoOption();
if (decision != JOptionPane.YES_OPTION) {
return;
}

// Prompt the user to save
int savePrompt = JOptionPane.showConfirmDialog(null,
resourceMap.getString("savePrompt.text"),
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/src/mekhq/gui/dialog/CampaignOptionsDialog.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009-2022 - The MegaMek Team. All Rights Reserved.
* Copyright (c) 2009-2024 - The MegaMek Team. All Rights Reserved.
*
* This file is part of MekHQ.
*
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009-2022 - The MegaMek Team. All Rights Reserved.
* Copyright (c) 2009-2024 - The MegaMek Team. All Rights Reserved.
*
* This file is part of MekHQ.
*
Expand Down
30 changes: 30 additions & 0 deletions MekHQ/src/mekhq/gui/dialog/NewCampaignConfirmationDialog.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright (c) 2021-2024 - The MegaMek Team. All Rights Reserved.
*
* This file is part of MekHQ.
*
* MekHQ is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* MekHQ is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with MekHQ. If not, see <http://www.gnu.org/licenses/>.
*/
package mekhq.gui.dialog;

import javax.swing.*;

public class NewCampaignConfirmationDialog {
public int YesNoOption() {
return JOptionPane.showConfirmDialog(null,
"Are you sure you want to start a new campaign?",
"Start New Campaign?",
JOptionPane.YES_NO_OPTION);
}
}
3 changes: 1 addition & 2 deletions MekHQ/src/mekhq/gui/panels/StartupScreenPanel.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 - The MegaMek Team. All Rights Reserved.
* Copyright (c) 2022-2024 - The MegaMek Team. All Rights Reserved.
*
* This file is part of MekHQ.
*
Expand Down Expand Up @@ -45,7 +45,6 @@
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FilenameFilter;
import java.util.Arrays;
import java.util.List;

public class StartupScreenPanel extends AbstractMHQPanel {
Expand Down

0 comments on commit 974f563

Please sign in to comment.