Merge pull request #1 from JanSeliv/develop

JanSeliv · web-flow · commit a9ad75d5151a · 2023-05-26T00:55:34.000-04:00
Develop
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,74 @@
+# Visual Studio 2015 user specific files
+.vs/
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+*.ipa
+
+# These project files can be generated by the engine
+*.xcodeproj
+*.xcworkspace
+*.sln
+*.suo
+*.opensdf
+*.sdf
+*.VC.db
+*.VC.opendb
+
+# Precompiled Assets
+SourceArt/**/*.png
+SourceArt/**/*.tga
+
+# Binary Files
+Binaries/*
+Plugins/*/Binaries/*
+
+# Builds
+Build/*
+
+# Whitelist PakBlacklist-<BuildConfiguration>.txt files
+!Build/*/
+Build/*/**
+!Build/*/PakBlacklist*.txt
+
+# Don't ignore icon files in Build
+!Build/**/*.ico
+
+# Built data for maps
+*_BuiltData.uasset
+
+# Configuration files generated by the Editor
+Saved/*
+
+# Compiled source files for the engine to use
+Intermediate/*
+Plugins/*/Intermediate/*
+
+# Cache files for the editor to use
+DerivedDataCache/*
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Yevhenii Selivanov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -0,0 +1,25 @@
+# ⚙️ Settings Widget Constructor
+
+Settings Widget Constructor is a handy plugin for Unreal Engine 5 that lets you automatically generate user interface (UI) for your game settings. All it takes is a few clicks and adding a new row to the table for each desired option.
+
+![Settings UI](https://user-images.githubusercontent.com/20540872/147825296-ce7d33da-dfda-4757-b070-bfd08f700134.jpg)
+
+<img width="948" alt="image" src="https://github.com/JanSeliv/Bomber/assets/20540872/5b4592a4-173d-4e6c-8a31-a502c14bd2c6">
+
+## 📚 Documentation
+
+Detailed documentation about the Settings Widget Constructor can be found [here](https://docs.google.com/document/d/1IXnOqrgaXTClP-0cIo28a9f6GHc9N1BCgTNnMk-X9VQ).
+
+## 📅 Changelog
+#### 2023-05-26
+- 🎉 Initial public release.
+
+## 📫 Feedback & Contribution
+
+This is an open-source project and we encourage you to contribute. If you encounter any bugs 🐛, or if you have any feature requests 📝, please file an issue in the GitHub repository.
+
+## 📜 License
+
+This project is licensed under the terms of the MIT license. See [LICENSE](LICENSE) for more details.
+
+We hope you find this plugin useful and we look forward to your feedback and contributions. 🚀
diff --git a/SettingsWidgetConstructor.uplugin b/SettingsWidgetConstructor.uplugin
@@ -6,7 +6,7 @@
   "Description": "Plugin allows automatically generate settings on the UI from data table",
   "Category": "UI",
   "CreatedBy": "Yevhenii Selivanov",
-  "CreatedByURL": "https://github.com/JanSeliv/Bomber",
+  "CreatedByURL": "https://github.com/JanSeliv/SettingsWidgetConstructor",
   "DocsURL": "",
   "MarketplaceURL": "",
   "SupportURL": "mailto:janseliw@gmail.com",
@@ -28,17 +28,9 @@
     }
   ],
   "Plugins": [
-    {
-      "Name": "MyEditorUtils",
-      "Enabled": true
-    },
     {
       "Name": "GameplayTagsEditor",
       "Enabled": true
-    },
-    {
-      "Name": "FunctionPicker",
-      "Enabled": true
     }
   ]
 }
diff --git a/Source/SettingsWidgetConstructor/Private/FunctionPickerData/SWCFunctionPicker.h b/Source/SettingsWidgetConstructor/Private/FunctionPickerData/SWCFunctionPicker.h
@@ -24,7 +24,7 @@
   * FFunctionPicker SetMembers = FFunctionPicker::Empty;
   */
 USTRUCT(BlueprintType)
-struct FSWCFunctionPicker
+struct SETTINGSWIDGETCONSTRUCTOR_API FSWCFunctionPicker
 {
 	GENERATED_BODY()
 
diff --git a/Source/SettingsWidgetConstructor/Private/MyDataTable/MyDataTable.cpp b/Source/SettingsWidgetConstructor/Private/MyDataTable/MyDataTable.cpp
@@ -11,7 +11,7 @@
 // Called on every change in this this row
 void FSWCMyTableRow::OnDataTableChanged(const UDataTable* InDataTable, const FName InRowName)
 {
-	if (!GEditor && !GEditor->IsPlaySessionInProgress()) // Is Editor not PIE world
+	if (!GEditor || !GEditor->IsPlaySessionInProgress()) // Is Editor not PIE world
 	{
 		return;
 	}
diff --git a/Source/SettingsWidgetConstructor/Public/UI/SettingsWidget.h b/Source/SettingsWidgetConstructor/Public/UI/SettingsWidget.h
@@ -12,7 +12,7 @@
  * The UI widget of settings.
  * It generates and manages settings specified in rows of the Settings Data Table.
  */
-UCLASS()
+UCLASS(Abstract, Blueprintable, BlueprintType)
 class SETTINGSWIDGETCONSTRUCTOR_API USettingsWidget : public UUserWidget
 {
 	GENERATED_BODY()
diff --git a/Source/SettingsWidgetConstructorEditor/Private/MyAssets/AssetTypeActions_MyUserWidget.cpp b/Source/SettingsWidgetConstructorEditor/Private/MyAssets/AssetTypeActions_MyUserWidget.cpp
@@ -35,8 +35,6 @@ UObject* USWCMyUserWidgetFactory::FactoryCreateNew(UClass* Class, UObject* InPar
 	// Make sure we are trying to factory a blueprint, then create and init one
 	check(Class->IsChildOf(USWCMyUserWidgetBlueprint::StaticClass()));
 
-	FString ParentPath = InParent->GetPathName();
-
 	const TSubclassOf<UUserWidget> ParentClass = GetWidgetClass();
 	if (ParentClass == nullptr || !FKismetEditorUtilities::CanCreateBlueprintOfClass(ParentClass))
 	{
diff --git a/Source/SettingsWidgetConstructorEditor/Private/SettingsWidgetConstructorEditorModule.cpp b/Source/SettingsWidgetConstructorEditor/Private/SettingsWidgetConstructorEditorModule.cpp
@@ -8,6 +8,7 @@
 #include "SettingTagCustomization.h"
 #include "FunctionPickerType/FunctionPickerCustomization.h"
 //---
+#include "KismetCompiler.h"
 #include "Modules/ModuleManager.h"
 
 #define LOCTEXT_NAMESPACE "FSettingsWidgetConstructorEditorModule"
@@ -17,6 +18,8 @@ void FSettingsWidgetConstructorEditorModule::StartupModule()
 {
 	RegisterPropertyCustomizations();
 	RegisterSettingAssets();
+
+	FKismetCompilerContext::RegisterCompilerForBP(USWCMyUserWidgetBlueprint::StaticClass(), &UWidgetBlueprint::GetCompilerForWidgetBP);
 }
 
 // Called before the module is unloaded, right before the module object is destroyed

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"Description": "Plugin allows automatically generate settings on the UI from data table",`
`7`	`7`	`"Category": "UI",`
`8`	`8`	`"CreatedBy": "Yevhenii Selivanov",`
`9`		`- "CreatedByURL": "https://github.com/JanSeliv/Bomber",`
	`9`	`+ "CreatedByURL": "https://github.com/JanSeliv/SettingsWidgetConstructor",`
`10`	`10`	`"DocsURL": "",`
`11`	`11`	`"MarketplaceURL": "",`
`12`	`12`	`"SupportURL": "mailto:janseliw@gmail.com",`
`@@ -28,17 +28,9 @@`
`28`	`28`	`}`
`29`	`29`	`],`
`30`	`30`	`"Plugins": [`
`31`		`- {`
`32`		`- "Name": "MyEditorUtils",`
`33`		`- "Enabled": true`
`34`		`- },`
`35`	`31`	`{`
`36`	`32`	`"Name": "GameplayTagsEditor",`
`37`	`33`	`"Enabled": true`
`38`		`- },`
`39`		`- {`
`40`		`- "Name": "FunctionPicker",`
`41`		`- "Enabled": true`
`42`	`34`	`}`
`43`	`35`	`]`
`44`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`* FFunctionPicker SetMembers = FFunctionPicker::Empty;`
`25`	`25`	`*/`
`26`	`26`	`USTRUCT(BlueprintType)`
`27`		`-struct FSWCFunctionPicker`
	`27`	`+struct SETTINGSWIDGETCONSTRUCTOR_API FSWCFunctionPicker`
`28`	`28`	`{`
`29`	`29`	`GENERATED_BODY()`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`// Called on every change in this this row`
`12`	`12`	`void FSWCMyTableRow::OnDataTableChanged(const UDataTable* InDataTable, const FName InRowName)`
`13`	`13`	`{`
`14`		`- if (!GEditor && !GEditor->IsPlaySessionInProgress()) // Is Editor not PIE world`
	`14`	`+ if (!GEditor \|\| !GEditor->IsPlaySessionInProgress()) // Is Editor not PIE world`
`15`	`15`	`{`
`16`	`16`	`return;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* The UI widget of settings.`
`13`	`13`	`* It generates and manages settings specified in rows of the Settings Data Table.`
`14`	`14`	`*/`
`15`		`-UCLASS()`
	`15`	`+UCLASS(Abstract, Blueprintable, BlueprintType)`
`16`	`16`	`class SETTINGSWIDGETCONSTRUCTOR_API USettingsWidget : public UUserWidget`
`17`	`17`	`{`
`18`	`18`	`GENERATED_BODY()`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ UObject* USWCMyUserWidgetFactory::FactoryCreateNew(UClass* Class, UObject* InPar`
`35`	`35`	`// Make sure we are trying to factory a blueprint, then create and init one`
`36`	`36`	`check(Class->IsChildOf(USWCMyUserWidgetBlueprint::StaticClass()));`
`37`	`37`
`38`		`- FString ParentPath = InParent->GetPathName();`
`39`		`-`
`40`	`38`	`const TSubclassOf<UUserWidget> ParentClass = GetWidgetClass();`
`41`	`39`	`if (ParentClass == nullptr \|\| !FKismetEditorUtilities::CanCreateBlueprintOfClass(ParentClass))`
`42`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#include "SettingTagCustomization.h"`
`9`	`9`	`#include "FunctionPickerType/FunctionPickerCustomization.h"`
`10`	`10`	`//---`
	`11`	`+#include "KismetCompiler.h"`
`11`	`12`	`#include "Modules/ModuleManager.h"`
`12`	`13`
`13`	`14`	`#define LOCTEXT_NAMESPACE "FSettingsWidgetConstructorEditorModule"`
`@@ -17,6 +18,8 @@ void FSettingsWidgetConstructorEditorModule::StartupModule()`
`17`	`18`	`{`
`18`	`19`	`RegisterPropertyCustomizations();`
`19`	`20`	`RegisterSettingAssets();`
	`21`	`+`
	`22`	`+ FKismetCompilerContext::RegisterCompilerForBP(USWCMyUserWidgetBlueprint::StaticClass(), &UWidgetBlueprint::GetCompilerForWidgetBP);`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`// Called before the module is unloaded, right before the module object is destroyed`