Merge pull request #4153 from IllianiCBT/fontColor_ReplaceRed

SJuliez · web-flow · commit 7c140e187132 · 2024-06-06T17:19:37.000+02:00
Added Font Color Options to MHQ Options for Negative, Positive, and Warning Events
diff --git a/MekHQ/resources/mekhq/resources/GUI.properties b/MekHQ/resources/mekhq/resources/GUI.properties
@@ -646,6 +646,10 @@ optionPregnantBackground.text=Pregnant Background
 optionPaidRetirementForeground.text=Paid Retirement Foreground
 optionPaidRetirementBackground.text=Paid Retirement Background
 optionStratConHexCoordForeground.text=StratCon Hex Coordinate Foreground
+optionFontColorNegative.text=Font Color Negative Event
+optionFontColorWarning.text=Font Color Warning
+optionFontColorPositive.text=Font Color Positive Event
+
 ## Fonts Tab
 fontsTab.title=Fonts
 lblMedicalViewDialogHandwritingFont.text=Medical Dialog Handwriting Font
diff --git a/MekHQ/src/mekhq/MHQConstants.java b/MekHQ/src/mekhq/MHQConstants.java
@@ -114,8 +114,9 @@ public final class MHQConstants extends SuiteConstants {
     public static final String PAID_RETIREMENT_FOREGROUND = "paidRetirementForeground";
     public static final String PAID_RETIREMENT_BACKGROUND = "paidRetirementBackground";
     public static final String STRATCON_HEX_COORD_FOREGROUND = "stratconHexCoordForeground";
-    public static final String AUTO_AWARDS_FOREGROUND = "paidRetirementForeground";
-    public static final String AUTO_AWARDS_BACKGROUND = "paidRetirementBackground";
+    public static final String FONT_COLOR_NEGATIVE = "fontColorNegative";
+    public static final String FONT_COLOR_POSITIVE = "fontColorPositive";
+    public static final String FONT_COLOR_WARNING = "fontColorWarning";
     //endregion Colours
 
     //region Fonts
diff --git a/MekHQ/src/mekhq/MHQOptions.java b/MekHQ/src/mekhq/MHQOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022 - The MegaMek Team. All Rights Reserved.
+ * Copyright (c) 2020-2024 - The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MekHQ.
  *
@@ -442,6 +442,65 @@ public Color getStratConHexCoordForeground() {
     public void setStratConHexCoordForeground(Color value) {
         userPreferences.node(MHQConstants.DISPLAY_NODE).putInt(MHQConstants.STRATCON_HEX_COORD_FOREGROUND, value.getRGB());
     }
+
+    public Color getFontColorNegative() {
+        return new Color(userPreferences.node(MHQConstants.DISPLAY_NODE).getInt(MHQConstants.FONT_COLOR_NEGATIVE, Color.RED.getRGB()));
+    }
+
+    /**
+     * @return the hexadecimal color code for the negative event font color.
+     */
+    public String getFontColorNegativeHexColor() {
+        return convertFontColorToHexColor(getFontColorNegative());
+    }
+
+    public void setFontColorNegative(Color value) {
+        userPreferences.node(MHQConstants.DISPLAY_NODE).putInt(MHQConstants.FONT_COLOR_NEGATIVE, value.getRGB());
+    }
+
+    public Color getFontColorPositive() {
+        return new Color(userPreferences.node(MHQConstants.DISPLAY_NODE).getInt(MHQConstants.FONT_COLOR_POSITIVE, Color.GREEN.getRGB()));
+    }
+
+    /**
+     * @return the hexadecimal color code for the positive event font color.
+     */
+    public String getFontColorPositiveHexColor() {
+        return convertFontColorToHexColor(getFontColorPositive());
+    }
+
+    public void setFontColorPositive(Color value) {
+        userPreferences.node(MHQConstants.DISPLAY_NODE).putInt(MHQConstants.FONT_COLOR_POSITIVE, value.getRGB());
+    }
+
+    public Color getFontColorWarning() {
+        return new Color(userPreferences.node(MHQConstants.DISPLAY_NODE).getInt(MHQConstants.FONT_COLOR_WARNING, Color.ORANGE.getRGB()));
+    }
+
+    /**
+     * @return the hexadecimal color code for the warning event font color.
+     */
+    public String getFontColorWarningHexColor() {
+        return convertFontColorToHexColor(getFontColorWarning());
+    }
+
+    public void setFontColorWarning(Color value) {
+        userPreferences.node(MHQConstants.DISPLAY_NODE).putInt(MHQConstants.FONT_COLOR_WARNING, value.getRGB());
+    }
+
+    /**
+     * Converts the font color to a hexadecimal color representation.
+     *
+     * @param color the font color to convert
+     * @return the hexadecimal color representation of the font color
+     */
+    public String convertFontColorToHexColor(Color color) {
+        int red = color.getRed();
+        int green = color.getGreen();
+        int blue = color.getBlue();
+
+        return String.format("#%02x%02x%02x", red, green, blue);
+    }
     //endregion Colours
 
     //region Fonts
diff --git a/MekHQ/src/mekhq/campaign/CurrentLocation.java b/MekHQ/src/mekhq/campaign/CurrentLocation.java
@@ -22,14 +22,13 @@
 
 import megamek.common.Compute;
 import mekhq.MekHQ;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.event.LocationChangedEvent;
-import mekhq.campaign.event.NewDayEvent;
 import mekhq.campaign.event.TransitCompleteEvent;
 import mekhq.campaign.finances.enums.TransactionType;
 import mekhq.campaign.universe.Planet;
 import mekhq.campaign.universe.PlanetarySystem;
 import mekhq.campaign.universe.Systems;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/MekHQ/src/mekhq/campaign/force/UnitStub.java b/MekHQ/src/mekhq/campaign/force/UnitStub.java
@@ -23,9 +23,9 @@
 import megamek.codeUtilities.StringUtility;
 import megamek.common.icons.AbstractIcon;
 import megamek.common.icons.Portrait;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.unit.Unit;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/MekHQ/src/mekhq/campaign/market/ShoppingList.java b/MekHQ/src/mekhq/campaign/market/ShoppingList.java
@@ -24,14 +24,14 @@
 import megamek.common.Entity;
 import megamek.common.annotations.Nullable;
 import mekhq.MekHQ;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.event.ProcurementEvent;
 import mekhq.campaign.parts.Part;
 import mekhq.campaign.parts.Refit;
 import mekhq.campaign.parts.equipment.MissingEquipmentPart;
 import mekhq.campaign.unit.UnitOrder;
 import mekhq.campaign.work.IAcquisitionWork;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/MekHQ/src/mekhq/campaign/parts/AmmoStorage.java b/MekHQ/src/mekhq/campaign/parts/AmmoStorage.java
@@ -25,13 +25,13 @@
 import megamek.common.TargetRoll;
 import megamek.common.TechAdvancement;
 import megamek.common.annotations.Nullable;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.parts.equipment.EquipmentPart;
 import mekhq.campaign.parts.equipment.MissingEquipmentPart;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.work.IAcquisitionWork;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/MekHQ/src/mekhq/campaign/parts/Armor.java b/MekHQ/src/mekhq/campaign/parts/Armor.java
@@ -23,13 +23,13 @@
 import megamek.common.*;
 import megamek.common.annotations.Nullable;
 import megamek.common.equipment.ArmorType;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.parts.enums.PartRepairType;
 import mekhq.campaign.personnel.SkillType;
 import mekhq.campaign.work.IAcquisitionWork;
 import mekhq.campaign.work.WorkTime;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/MekHQ/src/mekhq/campaign/parts/MekLocation.java b/MekHQ/src/mekhq/campaign/parts/MekLocation.java
@@ -25,7 +25,6 @@
 import megamek.common.annotations.Nullable;
 import megamek.common.verifier.Structure;
 import megamek.common.verifier.TestEntity.Ceil;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.parts.enums.PartRepairType;
@@ -34,7 +33,7 @@
 import mekhq.campaign.personnel.SkillType;
 import mekhq.campaign.unit.Unit;
 import mekhq.campaign.work.WorkTime;
-
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -155,14 +154,14 @@ public double getTonnage() {
         // use MegaMek's implementation of internal structure weight calculation
         // assume rounding to nearest half-ton
         // superheavy flag is set if weight is more than 100
-        // assume movement mode is biped or tripod (technically mechs can have other movement modes but 
-        // that doesn't affect structure weight); currently impossible to tell whether a "loose" left leg is for a biped or tripod.        
-        EntityMovementMode movementMode = (getLoc() == Mech.LOC_CLEG) ? EntityMovementMode.TRIPOD : EntityMovementMode.BIPED;                
-        
-        double tonnage = Structure.getWeightStructure(structureType, getUnitTonnage(), Ceil.HALFTON, 
+        // assume movement mode is biped or tripod (technically mechs can have other movement modes but
+        // that doesn't affect structure weight); currently impossible to tell whether a "loose" left leg is for a biped or tripod.
+        EntityMovementMode movementMode = (getLoc() == Mech.LOC_CLEG) ? EntityMovementMode.TRIPOD : EntityMovementMode.BIPED;
+
+        double tonnage = Structure.getWeightStructure(structureType, getUnitTonnage(), Ceil.HALFTON,
                 (getUnitTonnage() > 100), movementMode);
-        
-        // determine the weight of the location; 
+
+        // determine the weight of the location;
         // if it's a "strange" location, then the rest of this is pointless.
         switch (loc) {
         case Mech.LOC_HEAD:
@@ -185,7 +184,7 @@ public double getTonnage() {
         default:
             return 0;
         }
-        
+
         return tonnage;
     }
 
diff --git a/MekHQ/src/mekhq/campaign/parts/MissingPart.java b/MekHQ/src/mekhq/campaign/parts/MissingPart.java
@@ -20,8 +20,6 @@
  */
 package mekhq.campaign.parts;
 
-import java.io.PrintWriter;
-
 import megamek.common.ITechnology;
 import megamek.common.TargetRoll;
 import megamek.common.annotations.Nullable;
@@ -32,6 +30,8 @@
 import mekhq.campaign.work.IAcquisitionWork;
 import mekhq.campaign.work.WorkTime;
 
+import java.io.PrintWriter;
+
 /**
  * A missing part is a placeholder on a unit to indicate that a replacement
  * task needs to be performed
diff --git a/MekHQ/src/mekhq/campaign/parts/OmniPod.java b/MekHQ/src/mekhq/campaign/parts/OmniPod.java
@@ -20,14 +20,14 @@
 
 import megamek.common.*;
 import megamek.common.annotations.Nullable;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.parts.equipment.EquipmentPart;
 import mekhq.campaign.parts.equipment.HeatSink;
 import mekhq.campaign.parts.equipment.JumpJet;
 import mekhq.campaign.parts.equipment.MASC;
 import mekhq.campaign.personnel.SkillType;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/MekHQ/src/mekhq/campaign/parts/Part.java b/MekHQ/src/mekhq/campaign/parts/Part.java
@@ -26,7 +26,6 @@
 import megamek.common.annotations.Nullable;
 import megamek.common.options.OptionsConstants;
 import mekhq.MekHQ;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.parts.enums.PartRepairType;
@@ -39,6 +38,7 @@
 import mekhq.campaign.work.IAcquisitionWork;
 import mekhq.campaign.work.IPartWork;
 import mekhq.campaign.work.WorkTime;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.NamedNodeMap;
diff --git a/MekHQ/src/mekhq/campaign/parts/ProtomekLocation.java b/MekHQ/src/mekhq/campaign/parts/ProtomekLocation.java
@@ -22,13 +22,13 @@
 
 import megamek.common.*;
 import megamek.common.annotations.Nullable;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.parts.enums.PartRepairType;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.personnel.SkillType;
 import mekhq.campaign.work.WorkTime;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/MekHQ/src/mekhq/campaign/parts/equipment/AmmoBin.java b/MekHQ/src/mekhq/campaign/parts/equipment/AmmoBin.java
@@ -23,7 +23,6 @@
 import megamek.common.*;
 import megamek.common.annotations.Nullable;
 import megamek.common.equipment.AmmoMounted;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.parts.AmmoStorage;
@@ -34,6 +33,7 @@
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.unit.Unit;
 import mekhq.campaign.work.IAcquisitionWork;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/MekHQ/src/mekhq/campaign/parts/equipment/LargeCraftAmmoBin.java b/MekHQ/src/mekhq/campaign/parts/equipment/LargeCraftAmmoBin.java
@@ -24,11 +24,11 @@
 import megamek.common.annotations.Nullable;
 import megamek.common.equipment.AmmoMounted;
 import megamek.common.equipment.WeaponMounted;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.parts.Part;
 import mekhq.campaign.parts.PartInventory;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/MekHQ/src/mekhq/campaign/unit/UnitOrder.java b/MekHQ/src/mekhq/campaign/unit/UnitOrder.java
@@ -22,12 +22,12 @@
 
 import megamek.common.*;
 import megamek.common.loaders.EntityLoadingException;
-import mekhq.utilities.MHQXMLUtility;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.parts.Availability;
 import mekhq.campaign.parts.Part;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.work.IAcquisitionWork;
+import mekhq.utilities.MHQXMLUtility;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/MekHQ/src/mekhq/gui/MekLabTab.java b/MekHQ/src/mekhq/gui/MekLabTab.java
@@ -32,13 +32,13 @@
 import megameklab.ui.combatVehicle.CVBuildTab;
 import megameklab.ui.combatVehicle.CVEquipmentTab;
 import megameklab.ui.combatVehicle.CVStructureTab;
-import megameklab.ui.infantry.CIStructureTab;
 import megameklab.ui.fighterAero.ASBuildTab;
 import megameklab.ui.fighterAero.ASEquipmentTab;
 import megameklab.ui.fighterAero.ASStructureTab;
 import megameklab.ui.generalUnit.FluffTab;
 import megameklab.ui.generalUnit.PreviewTab;
 import megameklab.ui.generalUnit.TransportTab;
+import megameklab.ui.infantry.CIStructureTab;
 import megameklab.ui.largeAero.DSStructureTab;
 import megameklab.ui.largeAero.LABuildTab;
 import megameklab.ui.largeAero.LAEquipmentTab;
diff --git a/MekHQ/src/mekhq/gui/dialog/AcquisitionsDialog.java b/MekHQ/src/mekhq/gui/dialog/AcquisitionsDialog.java
@@ -30,8 +30,8 @@
 import mekhq.campaign.unit.Unit;
 import mekhq.campaign.work.IAcquisitionWork;
 import mekhq.gui.CampaignGUI;
-import mekhq.gui.enums.MHQTabType;
 import mekhq.gui.RepairTab;
+import mekhq.gui.enums.MHQTabType;
 import mekhq.service.PartsAcquisitionService;
 import mekhq.service.PartsAcquisitionService.PartCountInfo;
 import org.apache.logging.log4j.LogManager;
diff --git a/MekHQ/src/mekhq/gui/dialog/MHQOptionsDialog.java b/MekHQ/src/mekhq/gui/dialog/MHQOptionsDialog.java
diff --git a/MekHQ/src/mekhq/gui/view/ForceViewPanel.java b/MekHQ/src/mekhq/gui/view/ForceViewPanel.java
diff --git a/MekHQ/src/mekhq/gui/view/MissionViewPanel.java b/MekHQ/src/mekhq/gui/view/MissionViewPanel.java
