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.

Sign up for GitHub

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

Jump to bottom

Filter, sort and color items in Triggers, Scripts and Team Types windows #190

Merged
merged 4 commits into from
Sep 9, 2024
Merged

Filter, sort and color items in Triggers, Scripts and Team Types windows #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a21859f
Filter, color and sort for Triggers, Scripts, and TeamTypes
Shushishtok Sep 7, 2024
3906454
Change TeamType default value
Shushishtok Sep 7, 2024
ca1ca10
PR review fixes
Shushishtok Sep 9, 2024
99b0a16
Cleanup imports to NamedColors, moved NamedColor struct out of NamedC…
Shushishtok Sep 9, 2024
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
63 changes: 41 additions & 22 deletions src/TSMapEditor/Config/UI/Windows/ScriptsWindow.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,28 @@ $CC01=lblScriptTypes:XNALabel
$CC02=btnAddScript:EditorButton
$CC03=btnDeleteScript:EditorButton
$CC04=btnCloneScript:EditorButton
$CC05=lbScriptTypes:EditorListBox
$CC06=lblSelectedScript:XNALabel
$CC07=lblName:XNALabel
$CC08=tbName:EditorTextBox
$CC09=lblActions:XNALabel
$CC10=lbActions:EditorListBox
$CC11=btnAddAction:EditorButton
$CC12=btnMoveUp:EditorButton
$CC13=btnMoveDown:EditorButton
$CC14=btnCloneAction:EditorButton
$CC15=btnInsertAction:EditorButton
$CC16=btnDeleteAction:EditorButton
$CC17=lblTypeOfAction:XNALabel
$CC18=selTypeOfAction:EditorPopUpSelector
$CC19=lblParameterDescription:XNALabel
$CC20=tbParameterValue:EditorNumberTextBox
$CC21=btnEditorPresetValues:MenuButton
$CC22=lblActionDescription:XNALabel
$CC23=panelActionDescription:EditorPanel
$CC05=tbFilter:EditorSuggestionTextBox
$CC06=lbScriptTypes:EditorListBox
$CC07=lblSelectedScript:XNALabel
$CC08=lblName:XNALabel
$CC09=tbName:EditorTextBox
$CC10=lblScriptColor:XNALabel
$CC11=ddScriptColor:XNADropDown
$CC12=lblActions:XNALabel
$CC13=lbActions:EditorListBox
$CC14=btnAddAction:EditorButton
$CC15=btnMoveUp:EditorButton
$CC16=btnMoveDown:EditorButton
$CC17=btnCloneAction:EditorButton
$CC18=btnInsertAction:EditorButton
$CC19=btnDeleteAction:EditorButton
$CC20=lblTypeOfAction:XNALabel
$CC21=selTypeOfAction:EditorPopUpSelector
$CC22=lblParameterDescription:XNALabel
$CC23=tbParameterValue:EditorNumberTextBox
$CC24=btnEditorPresetValues:MenuButton
$CC25=lblActionDescription:XNALabel
$CC26=panelActionDescription:EditorPanel
HasCloseButton=true

[lblWindowDescription]
Expand Down Expand Up @@ -56,9 +59,15 @@ $Y=getBottom(btnDeleteScript) + VERTICAL_SPACING
$Width=getWidth(btnAddScript)
Text=Clone

[lbScriptTypes]
[tbFilter]
$X=getX(lblScriptTypes)
$Y=getBottom(btnCloneScript) + VERTICAL_SPACING
$Width=getWidth(btnCloneScript)
Suggestion=Search script...

[lbScriptTypes]
$X=getX(lblScriptTypes)
$Y=getBottom(tbFilter)
$Width=getWidth(btnAddScript)
$Height=getHeight(ScriptsWindow) - getY(lbScriptTypes) - EMPTY_SPACE_BOTTOM

Expand All @@ -78,14 +87,24 @@ $X=getX(lblSelectedScript) + 130
$Y=getY(lblName) - 1
$Width=getWidth(ScriptsWindow) - getX(tbName) - EMPTY_SPACE_SIDES

[lblScriptColor]
$X=getX(lblName)
$Y=getBottom(lblName) + VERTICAL_SPACING + 1
Text=Color:

[ddScriptColor]
$X=getX(tbName)
$Y=getY(lblScriptColor) + 1
$Width=getWidth(tbName)

[lblActions]
$X=getX(lblName)
$Y=getBottom(tbName) + VERTICAL_SPACING
$Y=getBottom(lblScriptColor) + VERTICAL_SPACING + 1
Text=Actions:

[lbActions]
$X=getX(tbName)
$Y=getY(lblActions)
$Y=getY(lblActions) + VERTICAL_SPACING
$Width=getWidth(tbName)
$Height=200

Expand Down
137 changes: 78 additions & 59 deletions src/TSMapEditor/Config/UI/Windows/TeamTypesWindow.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,43 @@ $CC01=lblTeamTypes:XNALabel
$CC02=btnNewTeamType:EditorButton
$CC03=btnDeleteTeamType:EditorButton
$CC04=btnCloneTeamType:EditorButton
$CC05=lbTeamTypes:EditorListBox
$CC06=lblSelectedTeamType:XNALabel
$CC07=tbName:EditorTextBox
$CC08=lblName:XNALabel
$CC09=ddVeteranLevel:XNADropDown
$CC10=lblVeteranLevel:XNALabel
$CC11=ddHouse:XNADropDown
$CC12=lblHouse:XNALabel
$CC13=tbPriority:EditorNumberTextBox
$CC14=lblPriority:XNALabel
$CC15=tbMax:EditorNumberTextBox
$CC16=lblMax:XNALabel
$CC17=tbTechLevel:EditorNumberTextBox
$CC18=lblTechLevel:XNALabel
$CC19=ddMindControlDecision:XNADropDown
$CC20=lblMindControlDecision:XNALabel
$CC21=tbGroup:EditorNumberTextBox
$CC22=lblGroup:XNALabel
$CC23=tbWaypoint:EditorNumberTextBox
$CC24=lblWaypoint:XNALabel
$CC25=selTaskForce:EditorPopUpSelector
$CC26=btnOpenTaskForce:EditorButton
$CC27=lblTaskForce:XNALabel
$CC28=selScript:EditorPopUpSelector
$CC29=btnOpenScript:EditorButton
$CC30=lblScript:XNALabel
$CC31=selTag:EditorPopUpSelector
$CC32=btnOpenTag:EditorButton
$CC33=lblTag:XNALabel
$CC34=tbTransportWaypoint:EditorNumberTextBox
$CC35=lblTransportWaypoint:XNALabel
$CC05=tbFilter:EditorSuggestionTextBox
$CC06=lbTeamTypes:EditorListBox
$CC07=lblSelectedTeamType:XNALabel
$CC08=tbName:EditorTextBox
$CC09=lblName:XNALabel
$CC10=ddVeteranLevel:XNADropDown
$CC11=lblVeteranLevel:XNALabel
$CC12=ddHouse:XNADropDown
$CC13=lblHouse:XNALabel
$CC14=tbPriority:EditorNumberTextBox
$CC15=lblPriority:XNALabel
$CC16=tbMax:EditorNumberTextBox
$CC17=lblMax:XNALabel
$CC18=tbTechLevel:EditorNumberTextBox
$CC19=lblTechLevel:XNALabel
$CC20=ddMindControlDecision:XNADropDown
$CC21=lblMindControlDecision:XNALabel
$CC22=ddTeamTypeColor:XNADropDown
$CC23=lblTeamTypeColor:XNALabel
$CC24=tbGroup:EditorNumberTextBox
$CC25=lblGroup:XNALabel
$CC26=tbWaypoint:EditorNumberTextBox
$CC27=lblWaypoint:XNALabel
$CC28=selTaskForce:EditorPopUpSelector
$CC29=btnOpenTaskForce:EditorButton
$CC30=lblTaskForce:XNALabel
$CC31=selScript:EditorPopUpSelector
$CC32=btnOpenScript:EditorButton
$CC33=lblScript:XNALabel
$CC34=selTag:EditorPopUpSelector
$CC35=btnOpenTag:EditorButton
$CC36=lblTag:XNALabel
$CC37=tbTransportWaypoint:EditorNumberTextBox
$CC38=lblTransportWaypoint:XNALabel
; Assign width before initializing panelBooleans so the panel can check the width of the window
$Width=getRight(tbGroup) + EMPTY_SPACE_SIDES
$CC36=panelBooleans:EditorPanel
$CC39=panelBooleans:EditorPanel
HasCloseButton=true


Expand Down Expand Up @@ -71,9 +74,15 @@ $Y=getBottom(btnDeleteTeamType) + VERTICAL_SPACING
$Width=getWidth(btnNewTeamType)
Text=Clone

[lbTeamTypes]
[tbFilter]
$X=getX(lblTeamTypes)
$Y=getBottom(btnCloneTeamType) + VERTICAL_SPACING
$Width=getWidth(btnCloneTeamType)
Suggestion=Search team types...

[lbTeamTypes]
$X=getX(lblTeamTypes)
$Y=getBottom(tbFilter)
$Width=getWidth(btnNewTeamType)
$Height=getHeight(TeamTypesWindow) - getY(lbTeamTypes) - EMPTY_SPACE_BOTTOM

Expand Down Expand Up @@ -168,30 +177,40 @@ $Enabled=IS_RA2YR
; Second column
; *************

[tbGroup]
[ddTeamTypeColor]
$X=getRight(tbName) + (HORIZONTAL_SPACING * 2) + 100
$Width=getWidth(tbName) + 30
$Y=getY(tbName)

[lblGroup]
$X=getX(tbGroup) - 100
[lblTeamTypeColor]
$X=getX(ddTeamTypeColor) - 100
$Y=getY(lblName)
Text=Color:

[tbGroup]
$X=getX(ddTeamTypeColor)
$Width=getWidth(ddTeamTypeColor)
$Y=getY(ddVeteranLevel)

[lblGroup]
$X=getX(lblTeamTypeColor)
$Y=getY(lblVeteranLevel)
Text=Group:

[tbWaypoint]
$X=getX(tbGroup)
$Width=getWidth(tbGroup)
$Y=getY(ddVeteranLevel)
$X=getX(ddTeamTypeColor)
$Width=getWidth(ddTeamTypeColor)
$Y=getY(ddHouse)

[lblWaypoint]
$X=getX(lblGroup)
$Y=getY(lblVeteranLevel)
$X=getX(lblTeamTypeColor)
$Y=getY(lblHouse)
Text=Waypoint:

[selTaskForce]
$X=getX(tbGroup)
$Width=getWidth(tbGroup) - 30
$Y=getY(ddHouse)
$X=getX(ddTeamTypeColor)
$Width=getWidth(ddTeamTypeColor) - 30
$Y=getY(tbPriority)

[btnOpenTaskForce]
$X=getRight(selTaskForce)
Expand All @@ -201,14 +220,14 @@ $Height=getHeight(selTaskForce)
Text=->

[lblTaskForce]
$X=getX(lblGroup)
$Y=getY(lblHouse)
$X=getX(lblTeamTypeColor)
$Y=getY(lblPriority)
Text=TaskForce:

[selScript]
$X=getX(tbGroup)
$X=getX(ddTeamTypeColor)
$Width=getWidth(selTaskForce)
$Y=getY(tbPriority)
$Y=getY(tbMax)

[btnOpenScript]
$X=getRight(selScript)
Expand All @@ -218,14 +237,14 @@ $Height=getHeight(selScript)
Text=->

[lblScript]
$X=getX(lblGroup)
$Y=getY(lblPriority)
$X=getX(lblTeamTypeColor)
$Y=getY(lblMax)
Text=Script:

[selTag]
$X=getX(tbGroup)
$X=getX(ddTeamTypeColor)
$Width=getWidth(selTaskForce)
$Y=getY(tbMax)
$Y=getY(tbTechLevel)

[btnOpenTag]
$X=getRight(selTag)
Expand All @@ -235,19 +254,19 @@ $Height=getHeight(selTag)
Text=->

[lblTag]
$X=getX(lblGroup)
$Y=getY(lblMax)
$X=getX(lblTeamTypeColor)
$Y=getY(lblTechLevel)
Text=Tag:

[tbTransportWaypoint]
$X=getX(tbGroup)
$Width=getWidth(tbGroup)
$Y=getY(tbTechLevel)
$X=getX(ddTeamTypeColor)
$Width=getWidth(ddTeamTypeColor)
$Y=getY(ddMindControlDecision)
$Enabled=IS_RA2YR

[lblTransportWaypoint]
$X=getX(lblGroup)
$Y=getY(lblTechLevel)
$X=getX(lblTeamTypeColor)
$Y=getY(lblMindControlDecision)
Text=Transport Wpt:
$Enabled=IS_RA2YR

Expand Down
Loading
Loading