Skip to content

Commit

Permalink
Merge pull request #87 from Nadwey/main
Browse files Browse the repository at this point in the history
Replace FEditorStyle with FAppStyle as it was removed
  • Loading branch information
pavlicekdominik authored Aug 23, 2023
2 parents 981a376 + fef80b7 commit 308fb4e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void FMounteaInventoryItemAssetAction::GetActions(const TArray<UObject*>& InObje
"Item_RefreshItem",
LOCTEXT("Item_RefreshItem", "Refresh Item Data"),
LOCTEXT("Item_RefreshItemTooltip", "Updates data for selected Item(s)."),
FSlateIcon(FEditorStyle::GetStyleSetName(), "Icons.Refresh"),
FSlateIcon(FAppStyle::GetAppStyleSetName(), "Icons.Refresh"),
FUIAction(
FExecuteAction::CreateSP( this, &FMounteaInventoryItemAssetAction::ExecuteRefreshItem, Items )
)
Expand Down Expand Up @@ -116,7 +116,7 @@ void FAssetActionExtender_MounteaInventoryItem::RegisterMenus()
{
const TAttribute<FText> Label = LOCTEXT("Item_RefreshItem", "Refresh Item Data");
const TAttribute<FText> ToolTip = LOCTEXT("Item_RefreshItemTooltip", "Updates data for selected Item(s).");
const FSlateIcon Icon = FSlateIcon(FEditorStyle::GetStyleSetName(), "Icons.Refresh");
const FSlateIcon Icon = FSlateIcon(FAppStyle::GetAppStyleSetName(), "Icons.Refresh");
const FToolMenuExecuteAction UIExecuteAction = FToolMenuExecuteAction::CreateStatic(&FAssetActionExtender_MounteaInventoryItem::ExecuteRefreshItem);

InSection.AddMenuEntry("MounteaInventoryItemAsset_RefreshItem", Label, ToolTip, Icon, UIExecuteAction);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void FMounteaInventoryItemDescsAssetAction::GetActions(const TArray<UObject*>& I
{
const TAttribute<FText> Label = LOCTEXT("MounteaInventoryItemDescriptionsTable_ExportAsJSON", "Export as JSON");
const TAttribute<FText> ToolTip = LOCTEXT("MounteaInventoryItemDescriptionsTable_ExportAsJSONTooltip", "Export the Inventory Table as a file containing JSON data.");
const FSlateIcon Icon = FSlateIcon(FEditorStyle::GetStyleSetName(), "AssetEditor.ReimportAsset.Small");
const FSlateIcon Icon = FSlateIcon(FAppStyle::GetAppStyleSetName(), "AssetEditor.ReimportAsset.Small");
const FUIAction UIExecuteAction = FUIAction
(
FExecuteAction::CreateSP( this, &FMounteaInventoryItemDescsAssetAction::ExecuteExportAsJSON, Tables ),
Expand All @@ -144,7 +144,7 @@ void FMounteaInventoryItemDescsAssetAction::GetActions(const TArray<UObject*>& I
{
const TAttribute<FText> Label =LOCTEXT("MounteaInventoryItemDescriptionsTable_OpenSourceData", "Open Source Data");
const TAttribute<FText> ToolTip = LOCTEXT("MounteaInventoryItemDescriptionsTable_OpenSourceDataTooltip", "Opens the data table's source data file in an external editor. It will search using the following extensions: .xls/.xlsm/.csv/.json");
const FSlateIcon Icon = FSlateIcon(FEditorStyle::GetStyleSetName(), "Symbols.SearchGlass");
const FSlateIcon Icon = FSlateIcon(FAppStyle::GetAppStyleSetName(), "Symbols.SearchGlass");
const FUIAction UIExecuteAction = FUIAction
(
FExecuteAction::CreateSP( this, &FMounteaInventoryItemDescsAssetAction::ProcessFindSourceFileInExplorer, ImportPaths, PotentialFileExtensions ),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void FMounteaInventoryItemsTableAssetAction::GetActions(const TArray<UObject*>&
{
const TAttribute<FText> Label = LOCTEXT("MounteaInventoryTable_ExportAsJSON", "Export as JSON");
const TAttribute<FText> ToolTip = LOCTEXT("MounteaInventoryTable_ExportAsJSONTooltip", "Export the Inventory Table as a file containing JSON data.");
const FSlateIcon Icon = FSlateIcon(FEditorStyle::GetStyleSetName(), "AssetEditor.ReimportAsset.Small");
const FSlateIcon Icon = FSlateIcon(FAppStyle::GetAppStyleSetName(), "AssetEditor.ReimportAsset.Small");
const FUIAction UIExecuteAction = FUIAction
(
FExecuteAction::CreateSP( this, &FMounteaInventoryItemsTableAssetAction::ExecuteExportAsJSON, Tables ),
Expand All @@ -156,7 +156,7 @@ void FMounteaInventoryItemsTableAssetAction::GetActions(const TArray<UObject*>&
{
const TAttribute<FText> Label =LOCTEXT("MounteaInventoryTable_OpenSourceData", "Open Source Data");
const TAttribute<FText> ToolTip = LOCTEXT("MounteaInventoryTable_OpenSourceDataTooltip", "Opens the data table's source data file in an external editor. It will search using the following extensions: .xls/.xlsm/.csv/.json");
const FSlateIcon Icon = FSlateIcon(FEditorStyle::GetStyleSetName(), "Symbols.SearchGlass");
const FSlateIcon Icon = FSlateIcon(FAppStyle::GetAppStyleSetName(), "Symbols.SearchGlass");
const FUIAction UIExecuteAction = FUIAction
(
FExecuteAction::CreateSP( this, &FMounteaInventoryItemsTableAssetAction::ProcessFindSourceFileInExplorer, ImportPaths, PotentialFileExtensions ),
Expand All @@ -169,7 +169,7 @@ void FMounteaInventoryItemsTableAssetAction::GetActions(const TArray<UObject*>&
// Generate new Items
const TAttribute<FText> Label =LOCTEXT("MounteaInventoryTable_GenerateNewItems", "Generate New Items");
const TAttribute<FText> ToolTip = LOCTEXT("MounteaInventoryTable_GenerateNewItemsTooltip", "For each row in selected Inventory Tables will make a new Item Asset, if such Item doesn't exist yet.");
const FSlateIcon Icon = FSlateIcon(FEditorStyle::GetStyleSetName(), "Icons.Refresh");
const FSlateIcon Icon = FSlateIcon(FAppStyle::GetAppStyleSetName(), "Icons.Refresh");
const FUIAction UIExecuteAction = FUIAction
(
FExecuteAction::CreateSP( this, &FMounteaInventoryItemsTableAssetAction::GenerateNewItems, Tables ),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void FMounteaInventoryItemAction_CustomDetailsHelper::Update()
.Padding(4.f)
[
SNew(SButton)
.ButtonStyle(FEditorStyle::Get(), "HoverHintOnly")
.ButtonStyle(FAppStyle::Get(), "HoverHintOnly")
.ToolTipText(this, &Self::GetBrowseObjectText)
.ContentPadding(4.f)
.ForegroundColor(FSlateColor::UseForeground())
Expand All @@ -104,7 +104,7 @@ void FMounteaInventoryItemAction_CustomDetailsHelper::Update()
.Padding(4.f, 2.f)
[
SNew(SButton)
.ButtonStyle(FEditorStyle::Get(), "HoverHintOnly")
.ButtonStyle(FAppStyle::Get(), "HoverHintOnly")
.ToolTipText(this, &Self::GetJumpToObjectText)
.ContentPadding(4.f)
.ForegroundColor(FSlateColor::UseForeground())
Expand All @@ -124,7 +124,7 @@ void FMounteaInventoryItemAction_CustomDetailsHelper::Update()
.Padding(4.f, 2.f)
[
SNew(SButton)
.ButtonStyle(FEditorStyle::Get(), "HoverHintOnly")
.ButtonStyle(FAppStyle::Get(), "HoverHintOnly")
.ToolTipText(this, &Self::GetOpenDocumentationText)
.ContentPadding(4.f)
.ForegroundColor(FSlateColor::UseForeground())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void FMounteaInventoryItemConfig_CustomDetailsHelper::Update()
.Padding(4.f)
[
SNew(SButton)
.ButtonStyle(FEditorStyle::Get(), "HoverHintOnly")
.ButtonStyle(FAppStyle::Get(), "HoverHintOnly")
.ToolTipText(this, &Self::GetBrowseObjectText)
.ContentPadding(4.f)
.ForegroundColor(FSlateColor::UseForeground())
Expand All @@ -107,7 +107,7 @@ void FMounteaInventoryItemConfig_CustomDetailsHelper::Update()
.Padding(4.f, 2.f)
[
SNew(SButton)
.ButtonStyle(FEditorStyle::Get(), "HoverHintOnly")
.ButtonStyle(FAppStyle::Get(), "HoverHintOnly")
.ToolTipText(this, &Self::GetJumpToObjectText)
.ContentPadding(4.f)
.ForegroundColor(FSlateColor::UseForeground())
Expand All @@ -127,7 +127,7 @@ void FMounteaInventoryItemConfig_CustomDetailsHelper::Update()
.Padding(4.f, 2.f)
[
SNew(SButton)
.ButtonStyle(FEditorStyle::Get(), "HoverHintOnly")
.ButtonStyle(FAppStyle::Get(), "HoverHintOnly")
.ToolTipText(this, &Self::GetOpenDocumentationText)
.ContentPadding(4.f)
.ForegroundColor(FSlateColor::UseForeground())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ void MIEPopup::Open(const FString& Changelog)
[
SNew(SBorder)
.Padding(10)
.BorderImage(FEditorStyle::GetBrush("ToolPanel.DarkGroupBorder"))
.BorderImage(FAppStyle::GetBrush("ToolPanel.DarkGroupBorder"))
[
SNew(SScrollBox)
+ SScrollBox::Slot()
[
SNew(SRichTextBlock)
.Text(FText::FromString(DisplayText))
.TextStyle(FEditorStyle::Get(), "NormalText")
.DecoratorStyleSet(&FEditorStyle::Get())
.TextStyle(FAppStyle::Get(), "NormalText")
.DecoratorStyleSet(&FAppStyle::Get())
.AutoWrapText(true)
+ SRichTextBlock::HyperlinkDecorator(TEXT("browser"), FSlateHyperlinkRun::FOnClick::CreateStatic(&OnBrowserLinkClicked))
]
Expand Down

0 comments on commit 308fb4e

Please sign in to comment.