Skip to content

Commit

Permalink
Merge pull request #2678 from Windchild292/dev_Windchild_GUIEnums
Browse files Browse the repository at this point in the history 
GUI Enums
  • Loading branch information
@Windchild292
Windchild292 authored Jun 5, 2021
2 parents 4157255 + 7042b48 commit 31e8ff4
Show file tree
Hide file tree
Showing 10 changed files with 637 additions and 263 deletions.
141 changes: 141 additions & 0 deletions MekHQ/resources/mekhq/resources/GUI.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,147 @@ CustomRankSystemCreationDialog.DuplicateCode.text=The entered rank system code c



#### Enums
### LayeredForceIcon Enum
LayeredForceIcon.TYPE.text=Types
LayeredForceIcon.TYPE.toolTipText=This tab contains the various types that a force icon can be made from.
LayeredForceIcon.FORMATION.text=Formations
LayeredForceIcon.FORMATION.toolTipText=This tab contains formation describing pieces for the force icon.
LayeredForceIcon.ADJUSTMENT.text=Adjustments
LayeredForceIcon.ADJUSTMENT.toolTipText=This tab contains type adjustments for the force icon.
LayeredForceIcon.ALPHANUMERIC.text=Alphanumerics
LayeredForceIcon.ALPHANUMERIC.toolTipText=This tab contains alphanumerics that can be added to the force icon.
LayeredForceIcon.SPECIAL_MODIFIER.text=Special
LayeredForceIcon.SPECIAL_MODIFIER.toolTipText=This tab contains special modifiers that can be added to the force icon.
LayeredForceIcon.BACKGROUND.text=Backgrounds
LayeredForceIcon.BACKGROUND.toolTipText=This tab contains backgrounds for the force icon.
LayeredForceIcon.FRAME.text=Frames
LayeredForceIcon.FRAME.toolTipText=This tab contains frames, which are the outer layer of the force icon.
LayeredForceIcon.LOGO.text=Logos
LayeredForceIcon.LOGO.toolTipText=This tab contains canon faction logos that can be added to the center of a force icon.

### PersonnelFilter Enum
PersonnelFilter.ALL.text=All Personnel
PersonnelFilter.ALL.toolTipText=Display all personnel
PersonnelFilter.ACTIVE.text=Active Personnel
PersonnelFilter.ACTIVE.toolTipText=Display all active personnel
PersonnelFilter.COMBAT.text=Combat Personnel
PersonnelFilter.COMBAT.toolTipText=Display all active combat personnel
PersonnelFilter.SUPPORT.text=Support Personnel
PersonnelFilter.SUPPORT.toolTipText=Display all active support personnel
PersonnelFilter.MECHWARRIORS.text=MechWarriors
PersonnelFilter.MECHWARRIORS.toolTipText=Display all active MechWarriors and LAM pilots.
PersonnelFilter.MECHWARRIOR.text=MechWarriors
PersonnelFilter.MECHWARRIOR.toolTipText=Display all active MechWarriors
PersonnelFilter.LAM_PILOT.text=LAM Pilots
PersonnelFilter.LAM_PILOT.toolTipText=Display all active LAM pilots
PersonnelFilter.VEHICLE_CREWMEMBER.text=Vehicle Crews
PersonnelFilter.VEHICLE_CREWMEMBER.toolTipText=Display all active vehicle crew
PersonnelFilter.GROUND_VEHICLE_DRIVER.text=Vehicle Drivers
PersonnelFilter.GROUND_VEHICLE_DRIVER.toolTipText=Display active ground vehicle drivers
PersonnelFilter.NAVAL_VEHICLE_DRIVER.text=Naval Drivers
PersonnelFilter.NAVAL_VEHICLE_DRIVER.toolTipText=Display active naval vehicle drivers
PersonnelFilter.VTOL_PILOT.text=VTOL Pilots
PersonnelFilter.VTOL_PILOT.toolTipText=Display active VTOL pilots
PersonnelFilter.VEHICLE_GUNNER.text=Vehicle Gunners
PersonnelFilter.VEHICLE_GUNNER.toolTipText=Display active vehicle gunners
PersonnelFilter.VEHICLE_CREW.text=Vehicle Crew
PersonnelFilter.VEHICLE_CREW.toolTipText=Display active vehicle crewmembers
PersonnelFilter.AEROSPACE_PILOT.text=Aerospace Pilots
PersonnelFilter.AEROSPACE_PILOT.toolTipText=Display active aerospace pilots
PersonnelFilter.CONVENTIONAL_AIRCRAFT_PILOT.text=Conventional Pilots
PersonnelFilter.CONVENTIONAL_AIRCRAFT_PILOT.toolTipText=Display active conventional aircraft pilots
PersonnelFilter.PROTOMECH_PILOT.text=ProtoMech Pilots
PersonnelFilter.PROTOMECH_PILOT.toolTipText=Display active ProtoMech pilots
PersonnelFilter.BATTLE_ARMOUR.text=Battle Armor
PersonnelFilter.BATTLE_ARMOUR.toolTipText=Display active battle armor pilots and elementals
PersonnelFilter.SOLDIER.text=Soldiers
PersonnelFilter.SOLDIER.toolTipText=Display active soldiers
PersonnelFilter.VESSEL_CREWMEMBER.text=Large Vessel Crews
PersonnelFilter.VESSEL_CREWMEMBER.toolTipText=Display active large vessel crews
PersonnelFilter.VESSEL_PILOT.text=Vessel Pilots
PersonnelFilter.VESSEL_PILOT.toolTipText=Display active vessel pilots
PersonnelFilter.VESSEL_GUNNER.text=Vessel Gunners
PersonnelFilter.VESSEL_GUNNER.toolTipText=Display active vessel gunners
PersonnelFilter.VESSEL_CREW.text=Vessel Crew
PersonnelFilter.VESSEL_CREW.toolTipText=Display active vessel crew
PersonnelFilter.VESSEL_NAVIGATOR.text=Hyperspace Navigators
PersonnelFilter.VESSEL_NAVIGATOR.toolTipText=Display active hyperspace navigators
PersonnelFilter.TECH.text=Techs
PersonnelFilter.TECH.toolTipText=Display active techs
PersonnelFilter.MECH_TECH.text=Mech Techs
PersonnelFilter.MECH_TECH.toolTipText=Display active mech techs
PersonnelFilter.MECHANIC.text=Mechanics
PersonnelFilter.MECHANIC.toolTipText=Display active mechanics
PersonnelFilter.AERO_TECH.text=Aerospace Techs
PersonnelFilter.AERO_TECH.toolTipText=Display active aerospace techs
PersonnelFilter.BA_TECH.text=Battle Armour Techs
PersonnelFilter.BA_TECH.toolTipText=Display active battle armor techs
PersonnelFilter.ASTECH.text=Astechs
PersonnelFilter.ASTECH.toolTipText=Display active astechs
PersonnelFilter.MEDICAL.text=Medical Staff
PersonnelFilter.MEDICAL.toolTipText=Display active medical staff, namely doctors and medics
PersonnelFilter.DOCTOR.text=Doctors
PersonnelFilter.DOCTOR.toolTipText=Display active doctors
PersonnelFilter.MEDIC.text=Medics
PersonnelFilter.MEDIC.toolTipText=Display active medics
PersonnelFilter.ADMINISTRATOR.text=Administrators
PersonnelFilter.ADMINISTRATOR.toolTipText=Display all active administrators
PersonnelFilter.ADMINISTRATOR_COMMAND.text=Administrators (Command)
PersonnelFilter.ADMINISTRATOR_COMMAND.toolTipText=Display command-focused administrators
PersonnelFilter.ADMINISTRATOR_LOGISTICS.text=Administrators (Logistics)
PersonnelFilter.ADMINISTRATOR_LOGISTICS.toolTipText=Display logistics-focused administrators
PersonnelFilter.ADMINISTRATOR_TRANSPORT.text=Administrators (Transport)
PersonnelFilter.ADMINISTRATOR_TRANSPORT.toolTipText=Display transport-focused administrators
PersonnelFilter.ADMINISTRATOR_HR.text=Administrators (HR)
PersonnelFilter.ADMINISTRATOR_HR.toolTipText=Display human resources-focused administrators
PersonnelFilter.DEPENDENT.text=Dependents
PersonnelFilter.DEPENDENT.toolTipText=Display active personnel with the Dependent primary role.
PersonnelFilter.FOUNDER.text=Founders
PersonnelFilter.FOUNDER.toolTipText=Display personnel with the Founder tag.
PersonnelFilter.PRISONER.text=Prisoners
PersonnelFilter.PRISONER.toolTipText=Display prisoners and bondsmen.
PersonnelFilter.INACTIVE.text=Inactive Personnel
PersonnelFilter.INACTIVE.toolTipText=Display personnel who are currently inactive.
PersonnelFilter.RETIRED.text=Retired Personnel
PersonnelFilter.RETIRED.toolTipText=Display retired personnel.
PersonnelFilter.MIA.text=Missing in Action Personnel
PersonnelFilter.MIA.toolTipText=Display personnel who are currently missing in action.
PersonnelFilter.KIA.text=Rolls of Honor
PersonnelFilter.KIA.toolTipText=Display personnel who have been killed in action.
PersonnelFilter.DEAD.text=Cemetery
PersonnelFilter.DEAD.toolTipText=Display personnel who have passed away.

### PersonnelFilterStyle Enum
PersonnelFilterStyle.STANDARD.text=Standard
PersonnelFilterStyle.STANDARD.toolTipText=This is the standard filter style for MekHQ, which groups less commonly used but related personnel roles into a single filter (e.g. Doctors and Medics are grouped as Medical Staff)
PersonnelFilterStyle.INDIVIDUAL_ROLE.text=Individual Role
PersonnelFilterStyle.INDIVIDUAL_ROLE.toolTipText=This filter style provides filters that allow one to filter personnel by each individual role, without the filter groupings as seen previously.
PersonnelFilterStyle.ALL.text=All
PersonnelFilterStyle.ALL.toolTipText=This filter style provides all of the standard AND individual role filters.

### PersonnelTabView Enum
PersonnelTabView.GRAPHIC.text=Graphic
PersonnelTabView.GRAPHIC.toolTipText=View the person's portrait, their current unit assignment, and their force, all shown with their graphics.
PersonnelTabView.GENERAL.text=General
PersonnelTabView.GENERAL.toolTipText=View the general information for a person.
PersonnelTabView.PILOT_GUNNERY_SKILLS.text=Piloting/Gunnery Skills
PersonnelTabView.PILOT_GUNNERY_SKILLS.toolTipText=View the person's various piloting and gunnery skill values.
PersonnelTabView.INFANTRY_SKILLS.text=Infantry Skills
PersonnelTabView.INFANTRY_SKILLS.toolTipText=View the person's infantry skill values.
PersonnelTabView.TACTICAL_SKILLS.text=Tactical Skills
PersonnelTabView.TACTICAL_SKILLS.toolTipText=View the person's tactical skill values.
PersonnelTabView.TECHNICAL_SKILLS.text=Tech Skills
PersonnelTabView.TECHNICAL_SKILLS.toolTipText=View the person's technical skill values.
PersonnelTabView.ADMINISTRATIVE_SKILLS.text=Admin Skills
PersonnelTabView.ADMINISTRATIVE_SKILLS.toolTipText=View the person's administrative skill values.
PersonnelTabView.BIOGRAPHICAL.text=Biographical Information
PersonnelTabView.BIOGRAPHICAL.toolTipText=View the biographical information about a person, including their age, status, role, origin faction/planet, recruitment date, and their death date.
PersonnelTabView.FLUFF.text=Fluff Information
PersonnelTabView.FLUFF.toolTipText=View various fluff information about a person, including their entire name, gender, and their kill count.



#### Model
### ProcurementTableModel Class
ProcurementTableModel.columnNames=Name,Type,Cost per Item,Total Cost,Target,Next Check,Quantity
Expand Down
77 changes: 0 additions & 77 deletions MekHQ/resources/mekhq/resources/GUIEnums.properties
View file

This file was deleted.

9 changes: 8 additions & 1 deletion MekHQ/src/mekhq/MekHqConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,14 @@ public final class MekHqConstants {
public static final String AWARDS_DIRECTORY_PATH = "data/universe/awards/";
public static final String RANKS_FILE_PATH = "data/universe/ranks.xml";
public static final String USER_RANKS_FILE_PATH = "userdata/data/universe/ranks.xml";
public static final String LAYERED_FORCE_ICON_TYPE_PATH = "Pieces/Type/";
public static final String LAYERED_FORCE_ICON_FORMATION_PATH = "Pieces/Formations/";
public static final String LAYERED_FORCE_ICON_ADJUSTMENT_PATH = "Pieces/Adjustments/";
public static final String LAYERED_FORCE_ICON_ALPHANUMERIC_PATH = "Pieces/Alphanumerics/";
public static final String LAYERED_FORCE_ICON_SPECIAL_MODIFIER_PATH = "Pieces/Special Modifiers/";
public static final String LAYERED_FORCE_ICON_BACKGROUND_PATH = "Pieces/Backgrounds/";
public static final String LAYERED_FORCE_ICON_FRAME_PATH = "Pieces/Frames/";
public static final String LAYERED_FORCE_ICON_LOGO_PATH = "Pieces/Logos/";
//endregion File Paths

// This is used in creating the name of save files, e.g. the MekHQ campaign file
Expand All @@ -126,7 +134,6 @@ public final class MekHqConstants {
/**
* Paths to StratCon definition files
*/

public static final String STRATCON_REQUIRED_HOSTILE_FACILITY_MODS = "./data/scenariomodifiers/requiredHostileFacilityModifiers.xml";
public static final String STRATCON_HOSTILE_FACILITY_MODS = "./data/scenariomodifiers/hostileFacilityModifiers.xml";
public static final String STRATCON_ALLIED_FACILITY_MODS = "./data/scenariomodifiers/alliedFacilityModifiers.xml";
Expand Down
Loading

0 comments on commit 31e8ff4

Please sign in to comment.