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.

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

add additional filters to advance search #4131

Merged
merged 62 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
077e41c
add filter on EType
kuronekochomusuke Jan 23, 2023
8dd733f
add filter on EType 2
kuronekochomusuke Jan 23, 2023
1d3e1e5
add quirk filter
kuronekochomusuke Jan 23, 2023
50eecb9
add quirk filter 2
kuronekochomusuke Jan 23, 2023
12fa9cb
add quirk filter 3
kuronekochomusuke Jan 23, 2023
fb6631d
add quirk filter 4
kuronekochomusuke Jan 23, 2023
2c7f767
add quirk filter 5
kuronekochomusuke Jan 23, 2023
afa4ab2
add omni filter 5
kuronekochomusuke Jan 23, 2023
99993fa
add offical filter
kuronekochomusuke Jan 24, 2023
e4fad97
add tons bv filter
kuronekochomusuke Jan 24, 2023
68676e8
add engine type and clan engine filter
kuronekochomusuke Jan 24, 2023
886774c
add weapon quirk filter
kuronekochomusuke Jan 24, 2023
2295153
add source filter
kuronekochomusuke Jan 24, 2023
2d5a74e
add transport and space filters
kuronekochomusuke Jan 25, 2023
1a8c419
swap to range filters
kuronekochomusuke Jan 25, 2023
c0d720d
add caono filter
kuronekochomusuke Jan 25, 2023
1f87025
add entity type filter
kuronekochomusuke Jan 25, 2023
08bd5c0
add entity type filter 2
kuronekochomusuke Jan 25, 2023
d9a5f2d
reformat code
kuronekochomusuke Jan 25, 2023
1de3363
add quirk filter
kuronekochomusuke Jan 26, 2023
df39904
add quirk filter
kuronekochomusuke Jan 26, 2023
f203474
switch to jlist
kuronekochomusuke Jan 26, 2023
79e865c
include OR
kuronekochomusuke Jan 26, 2023
4542428
include OR
kuronekochomusuke Jan 26, 2023
07dbc8d
include OR
kuronekochomusuke Jan 26, 2023
9aa4a36
fix error from changing to jlist
kuronekochomusuke Jan 27, 2023
3f00495
use AdvancedSearchDialog2 with RandomArmyDialog
kuronekochomusuke Jan 27, 2023
ae92007
bug
kuronekochomusuke Jan 28, 2023
6b85593
bug
kuronekochomusuke Jan 28, 2023
527cfa9
bug
kuronekochomusuke Jan 28, 2023
164d85c
layout
kuronekochomusuke Jan 28, 2023
bb24608
quirks and or
kuronekochomusuke Jan 28, 2023
f24c0f7
add unit role filter
kuronekochomusuke Jan 28, 2023
a885aab
bug
kuronekochomusuke Jan 28, 2023
f48389a
add filter on EType
kuronekochomusuke Jan 29, 2023
1d92c72
layout
kuronekochomusuke Jan 29, 2023
fc51e10
doors, units, transport tab
kuronekochomusuke Jan 29, 2023
7babac3
isBetween
kuronekochomusuke Jan 29, 2023
4d43544
add transport filters
kuronekochomusuke Jan 30, 2023
55aa35c
add transport filters
kuronekochomusuke Jan 30, 2023
d2fe6ff
add filter on military
kuronekochomusuke Jan 31, 2023
e81ff93
unit count, out of
kuronekochomusuke Jan 31, 2023
a3e4a69
code cleanup
kuronekochomusuke Jan 31, 2023
949c2df
code formating
kuronekochomusuke Jan 31, 2023
a720cb6
add bv total
kuronekochomusuke Jan 31, 2023
9bf6837
fix warnings
kuronekochomusuke Jan 31, 2023
38b7e16
add filter tank turrets
kuronekochomusuke Feb 1, 2023
f147c0d
tab order and table total by col
kuronekochomusuke Feb 7, 2023
2ad84f0
jlabel
kuronekochomusuke Feb 7, 2023
5f104db
code cleanup
kuronekochomusuke Feb 8, 2023
8671fcc
code cleanup
kuronekochomusuke Feb 8, 2023
1c840bd
set blank to ranges to max instead of -1
kuronekochomusuke Feb 8, 2023
a1f3a73
add filters lower arms and hands
kuronekochomusuke Feb 9, 2023
10f6cf9
code cleanup
kuronekochomusuke Feb 9, 2023
54b618d
clear tab
kuronekochomusuke Feb 9, 2023
ecabdd9
TriStateItem
kuronekochomusuke Feb 9, 2023
eb36bb9
code cleanup
kuronekochomusuke Feb 10, 2023
85a5199
remove unneeded DefaultListModel
kuronekochomusuke Feb 12, 2023
2148ab2
code cleanup
kuronekochomusuke Feb 13, 2023
df85e73
code cleanup
kuronekochomusuke Feb 14, 2023
525284c
code cleanup
kuronekochomusuke Feb 14, 2023
43807a1
code cleanup
kuronekochomusuke Feb 14, 2023
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
74 changes: 70 additions & 4 deletions megamek/i18n/megamek/client/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1903,6 +1903,7 @@ MechSelectorDialog.m_labelWeightClass=Weight Class:
MechSelectorDialog.MixedAll=Mixed All
MechSelectorDialog.Reset=Clear
MechSelectorDialog.TogglePV=BV / PV
MechSelectorDialog.ClearTab=Clear Tab
MechSelectorDialog.Search.add=Add
MechSelectorDialog.Search.Show=< Show Advanced Search >
MechSelectorDialog.Search.Hide=> Hide Advanced Search <
Expand All @@ -1919,9 +1920,9 @@ MechSelectorDialog.Search.EqualTo=equal to
MechSelectorDialog.Search.NoMoreThan=no more than
MechSelectorDialog.Search.Search=Search
MechSelectorDialog.Search.Reset=Reset
MechSelectorDialog.Search.Walk=Walk
MechSelectorDialog.Search.Jump=Jump
MechSelectorDialog.Search.Armor=Armor at least
MechSelectorDialog.Search.Walk=Walk:
MechSelectorDialog.Search.Jump=Jump:
MechSelectorDialog.Search.Armor=Armor at least:
MechSelectorDialog.Search.Armor25=25% of maximum
MechSelectorDialog.Search.Armor50=50% of maximum
MechSelectorDialog.Search.Armor75=75% of maximum
Expand All @@ -1935,9 +1936,72 @@ MechSelectorDialog.Search.TableFilters=Table filters:
MechSelectorDialog.Search.UnitType=Unit Type:
MechSelectorDialog.Search.TechClass=Tech Class:
MechSelectorDialog.Search.TechLevel=Tech Level:
MechSelectorDialog.Search.Quirk=Quirk:
MechSelectorDialog.Search.Quirks=Quirks
MechSelectorDialog.Search.WeaponQuirk=Weapon Quirk:
MechSelectorDialog.Search.Official=Official:
MechSelectorDialog.Search.Omni=Omni:
MechSelectorDialog.Search.Yes=Yes
MechSelectorDialog.Search.No=No
MechSelectorDialog.SupportVee=Support Vehicle
MechSelectorDialog.title=Select Unit
MechSelectorDialog.BV=Show BV calculation
MechSelectorDialog.UnitCount=Unit Count:
MechSelectorDialog.Search.Mech=Mech
MechSelectorDialog.Search.BipedMech=Biped Mech
MechSelectorDialog.Search.ProtoMech=Proto Mech
MechSelectorDialog.Search.LAM=Land Air Mech
MechSelectorDialog.Search.Tripod=Tripod
MechSelectorDialog.Search.Quad=Quad
MechSelectorDialog.Search.QuadVee=Quad VEE
MechSelectorDialog.Search.Aero=Aero
MechSelectorDialog.Search.FixedWingSupport=Fixed Wing Support
MechSelectorDialog.Search.ConvFighter=Conventional Fighter
MechSelectorDialog.Search.SmallCraft=Small Craft
MechSelectorDialog.Search.Dropship=Dropship
MechSelectorDialog.Search.Jumpship=Jumpship
MechSelectorDialog.Search.Warship=Warship
MechSelectorDialog.Search.SpaceStation=SpaceStation
MechSelectorDialog.Search.Infantry=Infantry
MechSelectorDialog.Search.BattleArmor=Battle Armor
MechSelectorDialog.Search.Tank=Tank
MechSelectorDialog.Search.VTOL=VTOL
MechSelectorDialog.Search.SupportVTOL=Support VTOL
MechSelectorDialog.Search.GunEmplacement=Gun Emplacement
MechSelectorDialog.Search.SupportTank=Support Tank
MechSelectorDialog.Search.LargeSupportTank=Large Support Tank
MechSelectorDialog.Search.SuperHeavyTank=Super Heavy Tank
MechSelectorDialog.Search.Tons=Tons:
MechSelectorDialog.Search.BV=BV:
MechSelectorDialog.Search.Engine=Engine Type:
MechSelectorDialog.Search.ClanEngine=Clan Engine:
MechSelectorDialog.Search.Source=Source:
MechSelectorDialog.Search.TroopSpace=Troop Space:
MechSelectorDialog.Search.ASFBays=ASF Bays:
MechSelectorDialog.Search.SmallCraftBays=Small Craft Bays:
MechSelectorDialog.Search.MechBays=Mech Bays:
MechSelectorDialog.Search.HeavyVehicleBays=Heavy Vehicle Bays:
MechSelectorDialog.Search.LightVehicleBays=Light Vehicle Bays:
MechSelectorDialog.Search.ProtomechBays=Protomech Bays:
MechSelectorDialog.Search.BattleArmorBays=Battle Armor Bays:
MechSelectorDialog.Search.InfantryBays=Infantry Bays:
MechSelectorDialog.Search.DockingCollars=Docking Collars:
MechSelectorDialog.Search.BattleArmorHandles=Battle Armor Handles:
MechSelectorDialog.Search.Base=Base
MechSelectorDialog.Search.WeaponEq=Weapons / Equipment
MechSelectorDialog.Search.unitType=Unit Type
MechSelectorDialog.Search.Canon=Canon:
MechSelectorDialog.Search.Doors=Doors:
MechSelectorDialog.Search.Units=Units:
MechSelectorDialog.Search.Transports=Transports
MechSelectorDialog.Search.CargoBayUnits=Cargo Space:
MechSelectorDialog.Search.NavalRepairFacilities=Naval Repair Facilities:
MechSelectorDialog.Search.SuperHeavyVehicleBays=Super Heavy Vehicle Bays:
MechSelectorDialog.Search.DropshuttleBays=Dropshuttle Bays:
MechSelectorDialog.Search.Military=Military:
MechSelectorDialog.Search.TankTurrets=Tank Turrets:
MechSelectorDialog.Search.LowerArms=Lower Arms:
MechSelectorDialog.Search.Hands=Hands:

#Mechview (Lobby, MHQ, Etc)
MechView.ActiveFighters=Active Fighters
Expand Down Expand Up @@ -2603,7 +2667,7 @@ RandomArmyDialog.SelectedUnits=Rolled Units
RandomArmyDialog.Army=Chosen Units
RandomArmyDialog.AddAll=Add All
RandomArmyDialog.AddSelected=Add Selected
RandomArmyDialog.AdvancedSearch=Advanced Search
RandomArmyDialog.AdvancedSearch=Mech Advanced Search
RandomArmyDialog.AdvancedSearchClear=Clear
RandomArmyDialog.title=Create a random army...
RandomArmyDialog.colUnit=Name
Expand All @@ -2622,6 +2686,7 @@ RandomArmyDialog.ShowMinorFactions=Show Minor Factions
RandomArmyDialog.UnitType=Unit Type:
RandomArmyDialog.WeightClass=Weight Class
RandomArmyDialog.Mixed=Mixed
RandomArmyDialog.OutOf= out of
RandomArmyDialog.weight_class_0=Ultralight/PA(L)
RandomArmyDialog.weight_class_1=Light
RandomArmyDialog.weight_class_2=Medium
Expand Down Expand Up @@ -2681,6 +2746,7 @@ RandomArmyDialog.Generate.tooltip=Create random assignment table from selected o
RandomArmyDialog.AddToForce=Add to Force
RandomArmyDialog.AddToForce.tooltip=Add selected line to chosen units.
RandomArmyDialog.Forcetab=Force Generator
RandomArmyDialog.BVTotal=BV Total:

#TAG within 8 hex range Target Selection Dialog
TAGTargetDialog.butOk=OK
Expand Down
Loading