Fixed code relying on SLATE_TEXT_ARGUMENT for STextComboPopup

Made sure everything was using FText rather than FString.

[CL 2373627 by Jamie Dale in Main branch]
This commit is contained in:
Jamie Dale
2014-12-02 07:27:27 -05:00
committed by UnrealBot
parent 2caaacaf8c
commit 31315887b8
2 changed files with 4 additions and 4 deletions

View File

@@ -2481,7 +2481,7 @@ void FMatinee::OnSetMoveKeyLookupGroup()
TSharedRef<STextComboPopup> TextEntryPopup =
SNew(STextComboPopup)
.Label(NSLOCTEXT("Matinee.Popups", "SelectGroup", "Select Group").ToString())
.Label(NSLOCTEXT("Matinee.Popups", "SelectGroup", "Select Group"))
.TextOptions(GroupNames)
.OnTextChosen(this, &FMatinee::OnSetMoveKeyLookupGroupTextChosen, SelKey.KeyIndex, MoveTrack, MoveTrackAxis)
;

View File

@@ -345,7 +345,7 @@ bool UMatineeTrackDirectorHelper::PreCreateKeyframe( UInterpTrack *Track, float
TSharedRef<STextComboPopup> TextEntryPopup =
SNew(STextComboPopup)
.Label(NSLOCTEXT("Matinee.Popups", "NewCut", "Cut to Group...").ToString())
.Label(NSLOCTEXT("Matinee.Popups", "NewCut", "Cut to Group..."))
.TextOptions(GroupNames)
.OnTextChosen_UObject(this, &UMatineeTrackDirectorHelper::OnAddKeyTextEntry, Mode->InterpEd, Track);
@@ -785,7 +785,7 @@ bool UMatineeTrackToggleHelper::PreCreateKeyframe( UInterpTrack *Track, float Ke
TSharedRef<STextComboPopup> TextEntryPopup =
SNew(STextComboPopup)
.Label(NSLOCTEXT("Matinee.Popups", "ToggleAction", "Toggle Action").ToString())
.Label(NSLOCTEXT("Matinee.Popups", "ToggleAction", "Toggle Action"))
.TextOptions(PropStrings)
.OnTextChosen_UObject(this, &UMatineeTrackToggleHelper::OnAddKeyTextEntry, InterpEd, Track)
;
@@ -1138,7 +1138,7 @@ bool UMatineeTrackVisibilityHelper::PreCreateKeyframe( UInterpTrack *Track, floa
TSharedRef<STextComboPopup> TextEntryPopup =
SNew(STextComboPopup)
.Label(NSLOCTEXT("Matinee.Popups", "VisibilityAction", "Visibility Action").ToString())
.Label(NSLOCTEXT("Matinee.Popups", "VisibilityAction", "Visibility Action"))
.TextOptions(PropStrings)
.OnTextChosen_UObject(this, &UMatineeTrackVisibilityHelper::OnAddKeyTextEntry, Mode->InterpEd, Track)
;