From d593500e180001818567a97dae5148e286325647 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 26 May 2019 15:29:10 -1000 Subject: [PATCH] Codegen fixes, DPI scaling, SVG icons --- cmake/VersionResource.rc | 2 +- dewfile.json | 4 +- src/Core/CMakeLists.txt | 2 +- src/Core/GameProject/CGameExporter.cpp | 4 +- src/Core/GameProject/CGameProject.cpp | 4 +- .../Resource/Script/Property/CEnumProperty.h | 2 +- src/Editor/CExportGameDialog.cpp | 6 +- src/Editor/CGeneratePropertyNamesDialog.ui | 4 +- src/Editor/CMakeLists.txt | 7 +- src/Editor/CProjectSettingsDialog.ui | 2 +- src/Editor/CTweakEditor.ui | 4 +- .../CharacterEditor/CCharacterEditor.cpp | 4 +- .../CharacterEditor/CCharacterEditor.ui | 30 ++-- .../CollisionEditor/CCollisionEditor.ui | 4 +- src/Editor/IEditor.cpp | 4 +- src/Editor/INodeEditor.cpp | 8 +- src/Editor/Icons.qrc | 154 +++++++++--------- src/Editor/MacOSExtras.mm | 9 + src/Editor/ModelEditor/CModelEditorWindow.cpp | 8 +- src/Editor/ModelEditor/CModelEditorWindow.ui | 12 +- src/Editor/NDolphinIntegration.cpp | 4 + .../ResourceBrowser/CResourceBrowser.cpp | 2 +- .../ResourceBrowser/CResourceBrowser.ui | 10 +- .../ResourceBrowser/CResourceTableModel.cpp | 4 +- .../CVirtualDirectoryModel.cpp | 2 +- src/Editor/ScanEditor/CScanEditor.ui | 4 +- src/Editor/StringEditor/CStringEditor.ui | 8 +- src/Editor/UICommon.cpp | 4 +- src/Editor/Widgets/CFilteredResourceModel.h | 2 +- src/Editor/Widgets/CResourceSelector.cpp | 4 +- src/Editor/WorldEditor/CInstancesModel.cpp | 4 +- src/Editor/WorldEditor/CLinkDialog.ui | 10 +- src/Editor/WorldEditor/CPoiListDialog.h | 4 +- src/Editor/WorldEditor/CPoiMapModel.cpp | 4 +- src/Editor/WorldEditor/CPoiMapSidebar.ui | 10 +- src/Editor/WorldEditor/CScriptEditSidebar.cpp | 6 +- src/Editor/WorldEditor/CWorldEditor.cpp | 8 +- src/Editor/WorldEditor/CWorldEditor.ui | 18 +- src/Editor/WorldEditor/CWorldTreeModel.cpp | 4 +- src/Editor/WorldEditor/WModifyTab.ui | 12 +- src/Editor/icons/AnchorRoot_32px.png | Bin 367 -> 0 bytes src/Editor/icons/AnchorRoot_32px.svg | 24 +++ src/Editor/icons/ArrowD_16px.png | Bin 160 -> 0 bytes src/Editor/icons/ArrowD_16px.svg | 11 ++ src/Editor/icons/ArrowL_16px.png | Bin 163 -> 0 bytes src/Editor/icons/ArrowL_16px.svg | 11 ++ src/Editor/icons/Beginning_24px.png | Bin 206 -> 0 bytes src/Editor/icons/Beginning_24px.svg | 11 ++ src/Editor/icons/Beginning_32px.png | Bin 266 -> 0 bytes src/Editor/icons/Beginning_32px.svg | 11 ++ src/Editor/icons/BindPose_24px.png | Bin 180 -> 0 bytes src/Editor/icons/BindPose_24px.svg | 25 +++ src/Editor/icons/BindPose_32px.png | Bin 224 -> 0 bytes src/Editor/icons/BindPose_32px.svg | 24 +++ src/Editor/icons/Create.png | Bin 243 -> 0 bytes src/Editor/icons/Create.svg | 13 ++ src/Editor/icons/Disc_16px.png | Bin 281 -> 0 bytes src/Editor/icons/Disc_16px.svg | 25 +++ src/Editor/icons/Display.png | Bin 174 -> 0 bytes src/Editor/icons/Display.svg | 13 ++ src/Editor/icons/DontLoop_24px.png | Bin 214 -> 0 bytes src/Editor/icons/DontLoop_24px.svg | 12 ++ src/Editor/icons/DontLoop_32px.png | Bin 303 -> 0 bytes src/Editor/icons/DontLoop_32px.svg | 12 ++ src/Editor/icons/Down.png | Bin 650 -> 0 bytes src/Editor/icons/Down.svg | 27 +++ src/Editor/icons/Edit_16px.png | Bin 484 -> 0 bytes src/Editor/icons/Edit_16px.svg | 34 ++++ src/Editor/icons/Edit_24px.png | Bin 905 -> 0 bytes src/Editor/icons/Edit_24px.svg | 35 ++++ src/Editor/icons/Edit_32px.png | Bin 1246 -> 0 bytes src/Editor/icons/Edit_32px.svg | 35 ++++ src/Editor/icons/End_24px.png | Bin 200 -> 0 bytes src/Editor/icons/End_24px.svg | 11 ++ src/Editor/icons/End_32px.png | Bin 237 -> 0 bytes src/Editor/icons/End_32px.svg | 11 ++ src/Editor/icons/Free Camera.png | Bin 349 -> 0 bytes src/Editor/icons/Free Camera.svg | 13 ++ src/Editor/icons/Gear_16px.png | Bin 230 -> 0 bytes src/Editor/icons/Gear_16px.svg | 13 ++ src/Editor/icons/Gear_24px.png | Bin 273 -> 0 bytes src/Editor/icons/Gear_24px.svg | 12 ++ src/Editor/icons/Grid_24px.png | Bin 101 -> 0 bytes src/Editor/icons/Grid_24px.svg | 13 ++ src/Editor/icons/Grid_32px.png | Bin 110 -> 0 bytes src/Editor/icons/Grid_32px.svg | 13 ++ src/Editor/icons/Hide.png | Bin 349 -> 0 bytes src/Editor/icons/Hide.svg | 14 ++ src/Editor/icons/Highlight.png | Bin 462 -> 0 bytes src/Editor/icons/Highlight.svg | 16 ++ src/Editor/icons/Instances.png | Bin 147 -> 0 bytes src/Editor/icons/Instances.svg | 16 ++ src/Editor/icons/Instances_16px.png | Bin 119 -> 0 bytes src/Editor/icons/Instances_16px.svg | 15 ++ src/Editor/icons/Link.png | Bin 314 -> 0 bytes src/Editor/icons/Link.svg | 16 ++ src/Editor/icons/Loop_24px.png | Bin 171 -> 0 bytes src/Editor/icons/Loop_24px.svg | 12 ++ src/Editor/icons/Loop_32px.png | Bin 241 -> 0 bytes src/Editor/icons/Loop_32px.svg | 12 ++ src/Editor/icons/Material Highlight.png | Bin 395 -> 0 bytes src/Editor/icons/Material Highlight.svg | 16 ++ src/Editor/icons/Minus v2.png | Bin 221 -> 0 bytes src/Editor/icons/Minus v2.svg | 30 ++++ src/Editor/icons/Minus.png | Bin 185 -> 0 bytes src/Editor/icons/Minus.svg | 30 ++++ src/Editor/icons/Model Preview.png | Bin 942 -> 0 bytes src/Editor/icons/Model Preview.svg | 77 +++++++++ src/Editor/icons/Modify.png | Bin 371 -> 0 bytes src/Editor/icons/Modify.svg | 22 +++ src/Editor/icons/New.png | Bin 136 -> 0 bytes src/Editor/icons/New.svg | 11 ++ src/Editor/icons/New_16px.png | Bin 108 -> 0 bytes src/Editor/icons/New_16px.svg | 11 ++ src/Editor/icons/Open.png | Bin 244 -> 0 bytes src/Editor/icons/Open.svg | 11 ++ src/Editor/icons/Open_16px.png | Bin 141 -> 0 bytes src/Editor/icons/Open_16px.svg | 11 ++ src/Editor/icons/Open_24px.png | Bin 179 -> 0 bytes src/Editor/icons/Open_24px.svg | 11 ++ src/Editor/icons/OrbitCamera_24px.png | Bin 338 -> 0 bytes src/Editor/icons/OrbitCamera_24px.svg | 22 +++ src/Editor/icons/OrbitCamera_32px.png | Bin 483 -> 0 bytes src/Editor/icons/OrbitCamera_32px.svg | 23 +++ src/Editor/icons/POI Important.png | Bin 307 -> 0 bytes src/Editor/icons/POI Important.svg | 49 ++++++ src/Editor/icons/POI Normal.png | Bin 378 -> 0 bytes src/Editor/icons/POI Normal.svg | 49 ++++++ src/Editor/icons/Pause_24px.png | Bin 94 -> 0 bytes src/Editor/icons/Pause_24px.svg | 11 ++ src/Editor/icons/Pause_32px.png | Bin 103 -> 0 bytes src/Editor/icons/Pause_32px.svg | 11 ++ src/Editor/icons/Play_24px.png | Bin 200 -> 0 bytes src/Editor/icons/Play_24px.svg | 11 ++ src/Editor/icons/Play_32px.png | Bin 236 -> 0 bytes src/Editor/icons/Play_32px.svg | 11 ++ src/Editor/icons/Plus.png | Bin 499 -> 0 bytes src/Editor/icons/Plus.svg | 30 ++++ src/Editor/icons/PoiSymbol_24px.png | Bin 396 -> 0 bytes src/Editor/icons/PoiSymbol_24px.svg | 20 +++ src/Editor/icons/Redo.png | Bin 362 -> 0 bytes src/Editor/icons/Redo.svg | 11 ++ src/Editor/icons/Rotate.png | Bin 450 -> 0 bytes src/Editor/icons/Rotate.svg | 14 ++ .../icons/Samus Silhouette Gradient.png | Bin 833 -> 0 bytes .../icons/Samus Silhouette Gradient.svg | 77 +++++++++ src/Editor/icons/Save.png | Bin 217 -> 0 bytes src/Editor/icons/Save.svg | 15 ++ src/Editor/icons/SaveAndRepack_32px.png | Bin 227 -> 0 bytes src/Editor/icons/SaveAndRepack_32px.svg | 12 ++ src/Editor/icons/Scale.png | Bin 232 -> 0 bytes src/Editor/icons/Scale.svg | 19 +++ src/Editor/icons/Search_16px.png | Bin 217 -> 0 bytes src/Editor/icons/Search_16px.svg | 13 ++ src/Editor/icons/SelectMode.png | Bin 493 -> 0 bytes src/Editor/icons/SelectMode.svg | 28 ++++ src/Editor/icons/SelectMode_16px.png | Bin 266 -> 0 bytes src/Editor/icons/SelectMode_16px.svg | 27 +++ src/Editor/icons/Show.png | Bin 443 -> 0 bytes src/Editor/icons/Show.svg | 15 ++ src/Editor/icons/ShowMesh_24px.png | Bin 421 -> 0 bytes src/Editor/icons/ShowMesh_24px.svg | 21 +++ src/Editor/icons/ShowSkeleton_24px.png | Bin 208 -> 0 bytes src/Editor/icons/ShowSkeleton_24px.svg | 14 ++ src/Editor/icons/ShowSkeleton_32px.png | Bin 262 -> 0 bytes src/Editor/icons/ShowSkeleton_32px.svg | 15 ++ src/Editor/icons/Sphere Preview.png | Bin 749 -> 0 bytes src/Editor/icons/Sphere Preview.svg | 17 ++ src/Editor/icons/Square Preview.png | Bin 331 -> 0 bytes src/Editor/icons/Square Preview.svg | 17 ++ src/Editor/icons/Swap_16px.png | Bin 145 -> 0 bytes src/Editor/icons/Swap_16px.svg | 11 ++ src/Editor/icons/Swap_24px.png | Bin 181 -> 0 bytes src/Editor/icons/Swap_24px.svg | 11 ++ src/Editor/icons/ToParentFolder_16px.png | Bin 248 -> 0 bytes src/Editor/icons/ToParentFolder_16px.svg | 12 ++ src/Editor/icons/Translate.png | Bin 359 -> 0 bytes src/Editor/icons/Translate.svg | 12 ++ src/Editor/icons/Tree_16px.png | Bin 129 -> 0 bytes src/Editor/icons/Tree_16px.svg | 15 ++ src/Editor/icons/Tree_24px.png | Bin 139 -> 0 bytes src/Editor/icons/Tree_24px.svg | 15 ++ src/Editor/icons/Undo.png | Bin 359 -> 0 bytes src/Editor/icons/Undo.svg | 11 ++ src/Editor/icons/Unlink.png | Bin 367 -> 0 bytes src/Editor/icons/Unlink.svg | 18 ++ src/Editor/icons/Up.png | Bin 630 -> 0 bytes src/Editor/icons/Up.svg | 25 +++ src/Editor/icons/World.png | Bin 511 -> 0 bytes src/Editor/icons/World.svg | 33 ++++ src/Editor/icons/World_16px.png | Bin 349 -> 0 bytes src/Editor/icons/World_16px.svg | 36 ++++ src/Editor/icons/X_16px.png | Bin 162 -> 0 bytes src/Editor/icons/X_16px.svg | 12 ++ src/Editor/main.cpp | 11 ++ 195 files changed, 1720 insertions(+), 192 deletions(-) create mode 100644 src/Editor/MacOSExtras.mm delete mode 100644 src/Editor/icons/AnchorRoot_32px.png create mode 100644 src/Editor/icons/AnchorRoot_32px.svg delete mode 100644 src/Editor/icons/ArrowD_16px.png create mode 100644 src/Editor/icons/ArrowD_16px.svg delete mode 100644 src/Editor/icons/ArrowL_16px.png create mode 100644 src/Editor/icons/ArrowL_16px.svg delete mode 100644 src/Editor/icons/Beginning_24px.png create mode 100644 src/Editor/icons/Beginning_24px.svg delete mode 100644 src/Editor/icons/Beginning_32px.png create mode 100644 src/Editor/icons/Beginning_32px.svg delete mode 100644 src/Editor/icons/BindPose_24px.png create mode 100644 src/Editor/icons/BindPose_24px.svg delete mode 100644 src/Editor/icons/BindPose_32px.png create mode 100644 src/Editor/icons/BindPose_32px.svg delete mode 100644 src/Editor/icons/Create.png create mode 100644 src/Editor/icons/Create.svg delete mode 100644 src/Editor/icons/Disc_16px.png create mode 100644 src/Editor/icons/Disc_16px.svg delete mode 100644 src/Editor/icons/Display.png create mode 100644 src/Editor/icons/Display.svg delete mode 100644 src/Editor/icons/DontLoop_24px.png create mode 100644 src/Editor/icons/DontLoop_24px.svg delete mode 100644 src/Editor/icons/DontLoop_32px.png create mode 100644 src/Editor/icons/DontLoop_32px.svg delete mode 100644 src/Editor/icons/Down.png create mode 100644 src/Editor/icons/Down.svg delete mode 100644 src/Editor/icons/Edit_16px.png create mode 100644 src/Editor/icons/Edit_16px.svg delete mode 100644 src/Editor/icons/Edit_24px.png create mode 100644 src/Editor/icons/Edit_24px.svg delete mode 100644 src/Editor/icons/Edit_32px.png create mode 100644 src/Editor/icons/Edit_32px.svg delete mode 100644 src/Editor/icons/End_24px.png create mode 100644 src/Editor/icons/End_24px.svg delete mode 100644 src/Editor/icons/End_32px.png create mode 100644 src/Editor/icons/End_32px.svg delete mode 100644 src/Editor/icons/Free Camera.png create mode 100644 src/Editor/icons/Free Camera.svg delete mode 100644 src/Editor/icons/Gear_16px.png create mode 100644 src/Editor/icons/Gear_16px.svg delete mode 100644 src/Editor/icons/Gear_24px.png create mode 100644 src/Editor/icons/Gear_24px.svg delete mode 100644 src/Editor/icons/Grid_24px.png create mode 100644 src/Editor/icons/Grid_24px.svg delete mode 100644 src/Editor/icons/Grid_32px.png create mode 100644 src/Editor/icons/Grid_32px.svg delete mode 100644 src/Editor/icons/Hide.png create mode 100644 src/Editor/icons/Hide.svg delete mode 100644 src/Editor/icons/Highlight.png create mode 100644 src/Editor/icons/Highlight.svg delete mode 100644 src/Editor/icons/Instances.png create mode 100644 src/Editor/icons/Instances.svg delete mode 100644 src/Editor/icons/Instances_16px.png create mode 100644 src/Editor/icons/Instances_16px.svg delete mode 100644 src/Editor/icons/Link.png create mode 100644 src/Editor/icons/Link.svg delete mode 100644 src/Editor/icons/Loop_24px.png create mode 100644 src/Editor/icons/Loop_24px.svg delete mode 100644 src/Editor/icons/Loop_32px.png create mode 100644 src/Editor/icons/Loop_32px.svg delete mode 100644 src/Editor/icons/Material Highlight.png create mode 100644 src/Editor/icons/Material Highlight.svg delete mode 100644 src/Editor/icons/Minus v2.png create mode 100644 src/Editor/icons/Minus v2.svg delete mode 100644 src/Editor/icons/Minus.png create mode 100644 src/Editor/icons/Minus.svg delete mode 100644 src/Editor/icons/Model Preview.png create mode 100644 src/Editor/icons/Model Preview.svg delete mode 100644 src/Editor/icons/Modify.png create mode 100644 src/Editor/icons/Modify.svg delete mode 100644 src/Editor/icons/New.png create mode 100644 src/Editor/icons/New.svg delete mode 100644 src/Editor/icons/New_16px.png create mode 100644 src/Editor/icons/New_16px.svg delete mode 100644 src/Editor/icons/Open.png create mode 100644 src/Editor/icons/Open.svg delete mode 100644 src/Editor/icons/Open_16px.png create mode 100644 src/Editor/icons/Open_16px.svg delete mode 100644 src/Editor/icons/Open_24px.png create mode 100644 src/Editor/icons/Open_24px.svg delete mode 100644 src/Editor/icons/OrbitCamera_24px.png create mode 100644 src/Editor/icons/OrbitCamera_24px.svg delete mode 100644 src/Editor/icons/OrbitCamera_32px.png create mode 100644 src/Editor/icons/OrbitCamera_32px.svg delete mode 100644 src/Editor/icons/POI Important.png create mode 100644 src/Editor/icons/POI Important.svg delete mode 100644 src/Editor/icons/POI Normal.png create mode 100644 src/Editor/icons/POI Normal.svg delete mode 100644 src/Editor/icons/Pause_24px.png create mode 100644 src/Editor/icons/Pause_24px.svg delete mode 100644 src/Editor/icons/Pause_32px.png create mode 100644 src/Editor/icons/Pause_32px.svg delete mode 100644 src/Editor/icons/Play_24px.png create mode 100644 src/Editor/icons/Play_24px.svg delete mode 100644 src/Editor/icons/Play_32px.png create mode 100644 src/Editor/icons/Play_32px.svg delete mode 100644 src/Editor/icons/Plus.png create mode 100644 src/Editor/icons/Plus.svg delete mode 100644 src/Editor/icons/PoiSymbol_24px.png create mode 100644 src/Editor/icons/PoiSymbol_24px.svg delete mode 100644 src/Editor/icons/Redo.png create mode 100644 src/Editor/icons/Redo.svg delete mode 100644 src/Editor/icons/Rotate.png create mode 100644 src/Editor/icons/Rotate.svg delete mode 100644 src/Editor/icons/Samus Silhouette Gradient.png create mode 100644 src/Editor/icons/Samus Silhouette Gradient.svg delete mode 100644 src/Editor/icons/Save.png create mode 100644 src/Editor/icons/Save.svg delete mode 100644 src/Editor/icons/SaveAndRepack_32px.png create mode 100644 src/Editor/icons/SaveAndRepack_32px.svg delete mode 100644 src/Editor/icons/Scale.png create mode 100644 src/Editor/icons/Scale.svg delete mode 100644 src/Editor/icons/Search_16px.png create mode 100644 src/Editor/icons/Search_16px.svg delete mode 100644 src/Editor/icons/SelectMode.png create mode 100644 src/Editor/icons/SelectMode.svg delete mode 100644 src/Editor/icons/SelectMode_16px.png create mode 100644 src/Editor/icons/SelectMode_16px.svg delete mode 100644 src/Editor/icons/Show.png create mode 100644 src/Editor/icons/Show.svg delete mode 100644 src/Editor/icons/ShowMesh_24px.png create mode 100644 src/Editor/icons/ShowMesh_24px.svg delete mode 100644 src/Editor/icons/ShowSkeleton_24px.png create mode 100644 src/Editor/icons/ShowSkeleton_24px.svg delete mode 100644 src/Editor/icons/ShowSkeleton_32px.png create mode 100644 src/Editor/icons/ShowSkeleton_32px.svg delete mode 100644 src/Editor/icons/Sphere Preview.png create mode 100644 src/Editor/icons/Sphere Preview.svg delete mode 100644 src/Editor/icons/Square Preview.png create mode 100644 src/Editor/icons/Square Preview.svg delete mode 100644 src/Editor/icons/Swap_16px.png create mode 100644 src/Editor/icons/Swap_16px.svg delete mode 100644 src/Editor/icons/Swap_24px.png create mode 100644 src/Editor/icons/Swap_24px.svg delete mode 100644 src/Editor/icons/ToParentFolder_16px.png create mode 100644 src/Editor/icons/ToParentFolder_16px.svg delete mode 100644 src/Editor/icons/Translate.png create mode 100644 src/Editor/icons/Translate.svg delete mode 100644 src/Editor/icons/Tree_16px.png create mode 100644 src/Editor/icons/Tree_16px.svg delete mode 100644 src/Editor/icons/Tree_24px.png create mode 100644 src/Editor/icons/Tree_24px.svg delete mode 100644 src/Editor/icons/Undo.png create mode 100644 src/Editor/icons/Undo.svg delete mode 100644 src/Editor/icons/Unlink.png create mode 100644 src/Editor/icons/Unlink.svg delete mode 100644 src/Editor/icons/Up.png create mode 100644 src/Editor/icons/Up.svg delete mode 100644 src/Editor/icons/World.png create mode 100644 src/Editor/icons/World.svg delete mode 100644 src/Editor/icons/World_16px.png create mode 100644 src/Editor/icons/World_16px.svg delete mode 100644 src/Editor/icons/X_16px.png create mode 100644 src/Editor/icons/X_16px.svg diff --git a/cmake/VersionResource.rc b/cmake/VersionResource.rc index 2501a7fe..a6109e31 100644 --- a/cmake/VersionResource.rc +++ b/cmake/VersionResource.rc @@ -3,7 +3,7 @@ IDI_ICON1 ICON PRODUCT_ICON -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT VS_VERSION_INFO VERSIONINFO FILEVERSION FILE_VERSION_RESOURCE diff --git a/dewfile.json b/dewfile.json index 774f25bc..0e127de1 100644 --- a/dewfile.json +++ b/dewfile.json @@ -34,14 +34,14 @@ "url": "https://github.com/jackoalan/CodeGen", "type": "git", "head": "cmake", - "ref": "7a71e4866a60c5bf49e6d8f26717726d939c2aaf" + "ref": "306a856ff541b9de6f3131eed8f958e91f4bf23d" }, { "name": "LibCommon", "url": "https://github.com/jackoalan/LibCommon", "type": "git", "head": "dew", - "ref": "f5c22715fbeb451a167ec3494f9d40ad53866029" + "ref": "86c7e5a455a77bdee72cb8706630a5782a102257" }, { "name": "lzo", diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt index 98a837c7..535bdab1 100644 --- a/src/Core/CMakeLists.txt +++ b/src/Core/CMakeLists.txt @@ -57,7 +57,7 @@ target_compile_definitions( GLEW_STATIC ) -get_target_property(pwecore_include_directories pwe_core INCLUDE_DIRECTORIES) +gather_include_directories(pwecore_include_directories pwe_core) add_codegen_targets( "${source_files}" diff --git a/src/Core/GameProject/CGameExporter.cpp b/src/Core/GameProject/CGameExporter.cpp index 18e4152c..ddb86a84 100644 --- a/src/Core/GameProject/CGameExporter.cpp +++ b/src/Core/GameProject/CGameExporter.cpp @@ -20,9 +20,9 @@ #define EXPORT_COOKED 1 #if NOD_UCS2 -static nod::SystemStringView TStringToNodString(const TString& string) { return ToWChar(string); } +#define TStringToNodString(string) ToWChar(string) #else -static nod::SystemStringView TStringToNodString(const TString& string) { return *string; } +#define TStringToNodString(string) *string #endif CGameExporter::CGameExporter(EDiscType DiscType, EGame Game, bool FrontEnd, ERegion Region, const TString& rkGameName, const TString& rkGameID, float BuildVersion) diff --git a/src/Core/GameProject/CGameProject.cpp b/src/Core/GameProject/CGameProject.cpp index f503fc14..5aa4f013 100644 --- a/src/Core/GameProject/CGameProject.cpp +++ b/src/Core/GameProject/CGameProject.cpp @@ -6,9 +6,9 @@ #include #if NOD_UCS2 -static nod::SystemStringView TStringToNodString(const TString& string) { return ToWChar(string); } +#define TStringToNodString(string) ToWChar(string) #else -static nod::SystemStringView TStringToNodString(const TString& string) { return *string; } +#define TStringToNodString(string) *string #endif CGameProject::~CGameProject() diff --git a/src/Core/Resource/Script/Property/CEnumProperty.h b/src/Core/Resource/Script/Property/CEnumProperty.h index a02d330f..55bfc9e7 100644 --- a/src/Core/Resource/Script/Property/CEnumProperty.h +++ b/src/Core/Resource/Script/Property/CEnumProperty.h @@ -94,7 +94,7 @@ public: virtual void InitFromArchetype(IProperty* pOther) { - base::InitFromArchetype(pOther); + TTypedProperty::InitFromArchetype(pOther); TEnumPropertyBase* pOtherEnum = static_cast(pOther); mValues = pOtherEnum->mValues; } diff --git a/src/Editor/CExportGameDialog.cpp b/src/Editor/CExportGameDialog.cpp index e9a99456..5f7cf68e 100644 --- a/src/Editor/CExportGameDialog.cpp +++ b/src/Editor/CExportGameDialog.cpp @@ -96,7 +96,7 @@ void CExportGameDialog::InitUI(QString ExportDir) const nod::Node *pkDiscRoot = &pPartition->getFSTRoot(); RecursiveAddToTree(pkDiscRoot, pTreeRoot); - pTreeRoot->setIcon(0, QIcon(":/icons/Disc_16px.png")); + pTreeRoot->setIcon(0, QIcon(":/icons/Disc_16px.svg")); pTreeRoot->setExpanded(true); // Signals and slots @@ -346,8 +346,8 @@ void CExportGameDialog::RecursiveAddToTree(const nod::Node *pkNode, QTreeWidgetI }); // Add nodes to tree - static const QIcon skFileIcon = QIcon(":/icons/New_16px.png"); - static const QIcon skDirIcon = QIcon(":/icons/Open_16px.png"); + static const QIcon skFileIcon = QIcon(":/icons/New_16px.svg"); + static const QIcon skDirIcon = QIcon(":/icons/Open_16px.svg"); for (auto Iter = NodeList.begin(); Iter != NodeList.end(); Iter++) { diff --git a/src/Editor/CGeneratePropertyNamesDialog.ui b/src/Editor/CGeneratePropertyNamesDialog.ui index d7ec0402..4df1d63b 100644 --- a/src/Editor/CGeneratePropertyNamesDialog.ui +++ b/src/Editor/CGeneratePropertyNamesDialog.ui @@ -232,7 +232,7 @@ - :/icons/Plus.png:/icons/Plus.png + :/icons/Plus.svg:/icons/Plus.svg @@ -243,7 +243,7 @@ - :/icons/Minus v2.png:/icons/Minus v2.png + :/icons/Minus v2.svg:/icons/Minus v2.svg diff --git a/src/Editor/CMakeLists.txt b/src/Editor/CMakeLists.txt index 9a45baca..96b25365 100644 --- a/src/Editor/CMakeLists.txt +++ b/src/Editor/CMakeLists.txt @@ -65,6 +65,7 @@ file(GLOB_RECURSE source_files "*.cpp" "*.h" "*.hpp" + "*.ui" ) string(TIMESTAMP CURRENT_YEAR "%Y") @@ -75,7 +76,7 @@ if (WIN32) VERSION_MAJOR ${pwe_editor_VERSION_MAJOR} VERSION_MINOR ${pwe_editor_VERSION_MINOR} VERSION_PATCH ${pwe_editor_VERSION_PATCH} VERSION_REVISION ${pwe_editor_VERSION_TWEAK} COMPANY_NAME "Aruki" COMMENTS "${PWE_APP_NAME} ${PWE_WC_DESCRIBE}" - ORIGINAL_FILENAME "PrimeWorldEditor") + ORIGINAL_FILENAME "PrimeWorldEditor.exe") set(PLAT_SRCS ${rc_file} icons/win/PrimeWorldEditor.manifest) elseif (APPLE) set_source_files_properties(icons/mac/mainicon.icns PROPERTIES @@ -87,7 +88,7 @@ elseif (APPLE) get_filename_component(reldir ${relsrc} DIRECTORY) set_source_files_properties(${src} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/${reldir}) endforeach() - set(PLAT_SRCS icons/mac/mainicon.icns ${RES_SOURCES}) + set(PLAT_SRCS icons/mac/mainicon.icns ${RES_SOURCES} MacOSExtras.mm) else() configure_file(icons/freedesktop/metainfo/PrimeWorldEditor.appdata.xml.in "${CMAKE_CURRENT_BINARY_DIR}/PrimeWorldEditor.appdata.xml" @ONLY) @@ -95,7 +96,7 @@ else() install(DIRECTORY icons/freedesktop/applications icons/freedesktop/icons DESTINATION share) endif() -add_executable(pwe_editor MACOSX_BUNDLE ${source_files} Icons.qrc ${PLAT_SRCS}) +add_executable(pwe_editor WIN32 MACOSX_BUNDLE ${source_files} Icons.qrc ${PLAT_SRCS}) set_target_properties(pwe_editor PROPERTIES OUTPUT_NAME PrimeWorldEditor DEBUG_POSTFIX -debug MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist" diff --git a/src/Editor/CProjectSettingsDialog.ui b/src/Editor/CProjectSettingsDialog.ui index 33167d8c..8900d513 100644 --- a/src/Editor/CProjectSettingsDialog.ui +++ b/src/Editor/CProjectSettingsDialog.ui @@ -213,7 +213,7 @@ - :/icons/Disc_16px.png:/icons/Disc_16px.png + :/icons/Disc_16px.svg:/icons/Disc_16px.svg diff --git a/src/Editor/CTweakEditor.ui b/src/Editor/CTweakEditor.ui index efd4eda0..91d502e8 100644 --- a/src/Editor/CTweakEditor.ui +++ b/src/Editor/CTweakEditor.ui @@ -75,7 +75,7 @@ - :/icons/Save.png:/icons/Save.png + :/icons/Save.svg:/icons/Save.svg Save @@ -90,7 +90,7 @@ - :/icons/SaveAndRepack_32px.png:/icons/SaveAndRepack_32px.png + :/icons/SaveAndRepack_32px.svg:/icons/SaveAndRepack_32px.svg Save and Cook diff --git a/src/Editor/CharacterEditor/CCharacterEditor.cpp b/src/Editor/CharacterEditor/CCharacterEditor.cpp index 616e66ba..768e95af 100644 --- a/src/Editor/CharacterEditor/CCharacterEditor.cpp +++ b/src/Editor/CharacterEditor/CCharacterEditor.cpp @@ -383,7 +383,7 @@ void CCharacterEditor::TogglePlay() ui->PlayPauseButton->setToolTip(NewText); ui->ActionPlay->setText(NewText); - QIcon PlayPauseIcon = QIcon(mPlayAnim ? ":/icons/Pause_24px.png" : ":/icons/Play_24px.png"); + QIcon PlayPauseIcon = QIcon(mPlayAnim ? ":/icons/Pause_24px.svg" : ":/icons/Play_24px.svg"); ui->PlayPauseButton->setIcon(PlayPauseIcon); if (ui->ActionPlay != sender()) @@ -412,7 +412,7 @@ void CCharacterEditor::ToggleLoop(bool Loop) ui->LoopButton->setToolTip(NewText); ui->ActionLoop->setText(NewText); - QIcon ActionIcon = QIcon(Loop ? ":/icons/DontLoop_24px" : ":/icons/Loop_24px.png"); + QIcon ActionIcon = QIcon(Loop ? ":/icons/DontLoop_24px" : ":/icons/Loop_24px.svg"); ui->ActionLoop->setIcon(ActionIcon); if (sender() != ui->LoopButton) diff --git a/src/Editor/CharacterEditor/CCharacterEditor.ui b/src/Editor/CharacterEditor/CCharacterEditor.ui index 461151b9..e86d3ed5 100644 --- a/src/Editor/CharacterEditor/CCharacterEditor.ui +++ b/src/Editor/CharacterEditor/CCharacterEditor.ui @@ -88,8 +88,8 @@ - :/icons/Loop_24px.png - :/icons/DontLoop_24px.png:/icons/Loop_24px.png + :/icons/Loop_24px.svg + :/icons/DontLoop_24px.svg:/icons/Loop_24px.svg @@ -141,7 +141,7 @@ - :/icons/Beginning_24px.png:/icons/Beginning_24px.png + :/icons/Beginning_24px.svg:/icons/Beginning_24px.svg @@ -167,7 +167,7 @@ - :/icons/Pause_24px.png:/icons/Pause_24px.png + :/icons/Pause_24px.svg:/icons/Pause_24px.svg @@ -199,7 +199,7 @@ - :/icons/End_24px.png:/icons/End_24px.png + :/icons/End_24px.svg:/icons/End_24px.svg @@ -355,7 +355,7 @@ - :/icons/ShowSkeleton_24px.png:/icons/ShowSkeleton_24px.png + :/icons/ShowSkeleton_24px.svg:/icons/ShowSkeleton_24px.svg Show Skeleton @@ -376,7 +376,7 @@ - :/icons/ShowMesh_24px.png:/icons/ShowMesh_24px.png + :/icons/ShowMesh_24px.svg:/icons/ShowMesh_24px.svg Show Mesh @@ -394,7 +394,7 @@ - :/icons/BindPose_24px.png:/icons/BindPose_24px.png + :/icons/BindPose_24px.svg:/icons/BindPose_24px.svg Bind Pose @@ -415,7 +415,7 @@ - :/icons/OrbitCamera_24px.png:/icons/OrbitCamera_24px.png + :/icons/OrbitCamera_24px.svg:/icons/OrbitCamera_24px.svg Orbit @@ -436,7 +436,7 @@ - :/icons/Grid_24px.png:/icons/Grid_24px.png + :/icons/Grid_24px.svg:/icons/Grid_24px.svg Show Grid @@ -470,8 +470,8 @@ - :/icons/Play_24px.png - :/icons/Pause_24px.png:/icons/Play_24px.png + :/icons/Play_24px.svg + :/icons/Pause_24px.svg:/icons/Play_24px.svg Pause @@ -483,7 +483,7 @@ - :/icons/Beginning_24px.png:/icons/Beginning_24px.png + :/icons/Beginning_24px.svg:/icons/Beginning_24px.svg Jump to Beginning @@ -495,7 +495,7 @@ - :/icons/End_24px.png:/icons/End_24px.png + :/icons/End_24px.svg:/icons/End_24px.svg Jump to End @@ -513,7 +513,7 @@ - :/icons/Loop_24px.png:/icons/Loop_24px.png + :/icons/Loop_24px.svg:/icons/Loop_24px.svg Loop diff --git a/src/Editor/CollisionEditor/CCollisionEditor.ui b/src/Editor/CollisionEditor/CCollisionEditor.ui index e3a3098b..2a438078 100644 --- a/src/Editor/CollisionEditor/CCollisionEditor.ui +++ b/src/Editor/CollisionEditor/CCollisionEditor.ui @@ -48,7 +48,7 @@ - :/icons/Grid_32px.png:/icons/Grid_32px.png + :/icons/Grid_32px.svg:/icons/Grid_32px.svg Toggle Grid @@ -66,7 +66,7 @@ - :/icons/OrbitCamera_32px.png:/icons/OrbitCamera_32px.png + :/icons/OrbitCamera_32px.svg:/icons/OrbitCamera_32px.svg Toggle Orbit diff --git a/src/Editor/IEditor.cpp b/src/Editor/IEditor.cpp index 57beff3a..5cb09b1e 100644 --- a/src/Editor/IEditor.cpp +++ b/src/Editor/IEditor.cpp @@ -17,8 +17,8 @@ IEditor::IEditor(QWidget* pParent) QAction *pRedoAction = mUndoStack.createRedoAction(this); pUndoAction->setShortcut(QKeySequence::Undo); pRedoAction->setShortcut(QKeySequence::Redo); - pUndoAction->setIcon(QIcon(":/icons/Undo.png")); - pRedoAction->setIcon(QIcon(":/icons/Redo.png")); + pUndoAction->setIcon(QIcon(":/icons/Undo.svg")); + pRedoAction->setIcon(QIcon(":/icons/Redo.svg")); mUndoActions.push_back(pUndoAction); mUndoActions.push_back(pRedoAction); diff --git a/src/Editor/INodeEditor.cpp b/src/Editor/INodeEditor.cpp index 68005b3d..c654a1f3 100644 --- a/src/Editor/INodeEditor.cpp +++ b/src/Editor/INodeEditor.cpp @@ -16,10 +16,10 @@ INodeEditor::INodeEditor(QWidget *pParent) , mCloneState(eNotCloning) { // Create gizmo actions - mGizmoActions.append(new QAction(QIcon(":/icons/SelectMode.png"), "Select Objects", this)); - mGizmoActions.append(new QAction(QIcon(":/icons/Translate.png"), "Translate", this)); - mGizmoActions.append(new QAction(QIcon(":/icons/Rotate.png"), "Rotate", this)); - mGizmoActions.append(new QAction(QIcon(":/icons/Scale.png"), "Scale", this)); + mGizmoActions.append(new QAction(QIcon(":/icons/SelectMode.svg"), "Select Objects", this)); + mGizmoActions.append(new QAction(QIcon(":/icons/Translate.svg"), "Translate", this)); + mGizmoActions.append(new QAction(QIcon(":/icons/Rotate.svg"), "Rotate", this)); + mGizmoActions.append(new QAction(QIcon(":/icons/Scale.svg"), "Scale", this)); mGizmoActions[0]->setShortcut(QKeySequence("Ctrl+Q")); mGizmoActions[1]->setShortcut(QKeySequence("Ctrl+W")); diff --git a/src/Editor/Icons.qrc b/src/Editor/Icons.qrc index 10c21ab3..79b91405 100644 --- a/src/Editor/Icons.qrc +++ b/src/Editor/Icons.qrc @@ -1,82 +1,82 @@ - icons/Down.png - icons/Free Camera.png - icons/Material Highlight.png - icons/Minus v2.png - icons/Minus.png - icons/Plus.png - icons/Rotate.png - icons/Samus Silhouette Gradient.png - icons/Scale.png - icons/Sphere Preview.png - icons/Square Preview.png - icons/Translate.png - icons/Up.png - icons/Hide.png - icons/Highlight.png - icons/Model Preview.png - icons/Show.png - icons/Create.png - icons/Display.png - icons/Instances.png - icons/Link.png - icons/Modify.png - icons/Unlink.png - icons/World.png - icons/SelectMode.png - icons/POI Important.png - icons/POI Normal.png + icons/Down.svg + icons/Free Camera.svg + icons/Material Highlight.svg + icons/Minus v2.svg + icons/Minus.svg + icons/Plus.svg + icons/Rotate.svg + icons/Samus Silhouette Gradient.svg + icons/Scale.svg + icons/Sphere Preview.svg + icons/Square Preview.svg + icons/Translate.svg + icons/Up.svg + icons/Hide.svg + icons/Highlight.svg + icons/Model Preview.svg + icons/Show.svg + icons/Create.svg + icons/Display.svg + icons/Instances.svg + icons/Link.svg + icons/Modify.svg + icons/Unlink.svg + icons/World.svg + icons/SelectMode.svg + icons/POI Important.svg + icons/POI Normal.svg icons/win/AppIcon.ico - icons/New.png - icons/Open.png - icons/Redo.png - icons/Save.png - icons/Undo.png - icons/Instances_16px.png - icons/SelectMode_16px.png - icons/Swap_16px.png - icons/Swap_24px.png - icons/Edit_16px.png - icons/Edit_24px.png - icons/Edit_32px.png - icons/SaveAndRepack_32px.png - icons/Play_32px.png - icons/Pause_32px.png - icons/End_32px.png - icons/Beginning_32px.png - icons/AnchorRoot_32px.png - icons/ShowSkeleton_32px.png - icons/BindPose_32px.png - icons/DontLoop_32px.png - icons/Loop_32px.png - icons/ShowSkeleton_24px.png - icons/BindPose_24px.png - icons/DontLoop_24px.png - icons/Loop_24px.png - icons/Beginning_24px.png - icons/End_24px.png - icons/Pause_24px.png - icons/Play_24px.png - icons/Open_24px.png - icons/ShowMesh_24px.png - icons/OrbitCamera_24px.png - icons/Grid_24px.png - icons/Grid_32px.png - icons/OrbitCamera_32px.png - icons/X_16px.png - icons/ArrowL_16px.png - icons/Search_16px.png - icons/Open_16px.png - icons/New_16px.png - icons/Disc_16px.png - icons/World_16px.png - icons/PoiSymbol_24px.png - icons/ArrowD_16px.png - icons/Tree_16px.png - icons/Tree_24px.png - icons/Gear_16px.png - icons/Gear_24px.png - icons/ToParentFolder_16px.png + icons/New.svg + icons/Open.svg + icons/Redo.svg + icons/Save.svg + icons/Undo.svg + icons/Instances_16px.svg + icons/SelectMode_16px.svg + icons/Swap_16px.svg + icons/Swap_24px.svg + icons/Edit_16px.svg + icons/Edit_24px.svg + icons/Edit_32px.svg + icons/SaveAndRepack_32px.svg + icons/Play_32px.svg + icons/Pause_32px.svg + icons/End_32px.svg + icons/Beginning_32px.svg + icons/AnchorRoot_32px.svg + icons/ShowSkeleton_32px.svg + icons/BindPose_32px.svg + icons/DontLoop_32px.svg + icons/Loop_32px.svg + icons/ShowSkeleton_24px.svg + icons/BindPose_24px.svg + icons/DontLoop_24px.svg + icons/Loop_24px.svg + icons/Beginning_24px.svg + icons/End_24px.svg + icons/Pause_24px.svg + icons/Play_24px.svg + icons/Open_24px.svg + icons/ShowMesh_24px.svg + icons/OrbitCamera_24px.svg + icons/Grid_24px.svg + icons/Grid_32px.svg + icons/OrbitCamera_32px.svg + icons/X_16px.svg + icons/ArrowL_16px.svg + icons/Search_16px.svg + icons/Open_16px.svg + icons/New_16px.svg + icons/Disc_16px.svg + icons/World_16px.svg + icons/PoiSymbol_24px.svg + icons/ArrowD_16px.svg + icons/Tree_16px.svg + icons/Tree_24px.svg + icons/Gear_16px.svg + icons/Gear_24px.svg + icons/ToParentFolder_16px.svg diff --git a/src/Editor/MacOSExtras.mm b/src/Editor/MacOSExtras.mm new file mode 100644 index 00000000..0df02987 --- /dev/null +++ b/src/Editor/MacOSExtras.mm @@ -0,0 +1,9 @@ +#import + +void MacOSSetDarkAppearance() +{ +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 + if ([NSApp respondsToSelector:@selector(setAppearance:)]) + [NSApp setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]]; +#endif +} diff --git a/src/Editor/ModelEditor/CModelEditorWindow.cpp b/src/Editor/ModelEditor/CModelEditorWindow.cpp index 7a3a67a8..775aab5c 100644 --- a/src/Editor/ModelEditor/CModelEditorWindow.cpp +++ b/src/Editor/ModelEditor/CModelEditorWindow.cpp @@ -274,9 +274,9 @@ void CModelEditorWindow::SetActiveMaterial(int MatIndex) QTableWidgetItem *pItemB = new QTableWidgetItem(); if (pPass->IsEnabled()) - pItemB->setIcon(QIcon(":/icons/Show.png")); + pItemB->setIcon(QIcon(":/icons/Show.svg")); else - pItemB->setIcon(QIcon(":/icons/Hide.png")); + pItemB->setIcon(QIcon(":/icons/Hide.svg")); ui->PassTable->setItem(iPass, 0, pItemA); ui->PassTable->setItem(iPass, 1, pItemB); @@ -478,9 +478,9 @@ void CModelEditorWindow::UpdateMaterial(int ValueA, int ValueB) mpCurrentMat->Pass(ValueA)->SetEnabled(Enabled); if (Enabled) - ui->PassTable->item(ValueA, ValueB)->setIcon(QIcon(":/icons/Show.png")); + ui->PassTable->item(ValueA, ValueB)->setIcon(QIcon(":/icons/Show.svg")); else - ui->PassTable->item(ValueA, ValueB)->setIcon(QIcon(":/icons/Hide.png")); + ui->PassTable->item(ValueA, ValueB)->setIcon(QIcon(":/icons/Hide.svg")); } } diff --git a/src/Editor/ModelEditor/CModelEditorWindow.ui b/src/Editor/ModelEditor/CModelEditorWindow.ui index acaa9dea..4b0aebd1 100644 --- a/src/Editor/ModelEditor/CModelEditorWindow.ui +++ b/src/Editor/ModelEditor/CModelEditorWindow.ui @@ -2176,7 +2176,7 @@ - :/icons/Grid_32px.png:/icons/Grid_32px.png + :/icons/Grid_32px.svg:/icons/Grid_32px.svg @@ -2205,7 +2205,7 @@ - :/icons/OrbitCamera_32px.png:/icons/OrbitCamera_32px.png + :/icons/OrbitCamera_32px.svg:/icons/OrbitCamera_32px.svg @@ -2253,7 +2253,7 @@ - :/icons/Model Preview.png:/icons/Model Preview.png + :/icons/Model Preview.svg:/icons/Model Preview.svg @@ -2288,7 +2288,7 @@ - :/icons/Sphere Preview.png:/icons/Sphere Preview.png + :/icons/Sphere Preview.svg:/icons/Sphere Preview.svg @@ -2323,7 +2323,7 @@ - :/icons/Square Preview.png:/icons/Square Preview.png + :/icons/Square Preview.svg:/icons/Square Preview.svg @@ -2430,7 +2430,7 @@ - :/icons/Save.png:/icons/Save.png + :/icons/Save.svg:/icons/Save.svg Save diff --git a/src/Editor/NDolphinIntegration.cpp b/src/Editor/NDolphinIntegration.cpp index 44a0231a..17b50718 100644 --- a/src/Editor/NDolphinIntegration.cpp +++ b/src/Editor/NDolphinIntegration.cpp @@ -6,6 +6,10 @@ #include #include +#undef CopyFile +#undef MoveFile +#undef DeleteFile + namespace NDolphinIntegration { diff --git a/src/Editor/ResourceBrowser/CResourceBrowser.cpp b/src/Editor/ResourceBrowser/CResourceBrowser.cpp index c8012eb3..d23133a0 100644 --- a/src/Editor/ResourceBrowser/CResourceBrowser.cpp +++ b/src/Editor/ResourceBrowser/CResourceBrowser.cpp @@ -569,7 +569,7 @@ void CResourceBrowser::UpdateDescriptionLabel() bool CanGoUp = (mpSelectedDir && !mpSelectedDir->IsRoot()); bool CanClear = (!mpUI->SearchBar->text().isEmpty() || mpModel->IsDisplayingUserEntryList()); mpUI->ClearButton->setEnabled(CanGoUp || CanClear); - mpUI->ClearButton->setIcon( CanClear ? QIcon(":/icons/X_16px.png") : QIcon(":/icons/ToParentFolder_16px.png") ); + mpUI->ClearButton->setIcon( CanClear ? QIcon(":/icons/X_16px.svg") : QIcon(":/icons/ToParentFolder_16px.svg") ); } void CResourceBrowser::SetResourceTreeView() diff --git a/src/Editor/ResourceBrowser/CResourceBrowser.ui b/src/Editor/ResourceBrowser/CResourceBrowser.ui index 0ca3b63d..6332cdb0 100644 --- a/src/Editor/ResourceBrowser/CResourceBrowser.ui +++ b/src/Editor/ResourceBrowser/CResourceBrowser.ui @@ -53,7 +53,7 @@ - :/icons/Gear_16px.png:/icons/Gear_16px.png + :/icons/Gear_16px.svg:/icons/Gear_16px.svg @@ -98,7 +98,7 @@ - :/icons/Tree_24px.png:/icons/Tree_24px.png + :/icons/Tree_24px.svg:/icons/Tree_24px.svg @@ -127,7 +127,7 @@ - :/icons/Instances.png:/icons/Instances.png + :/icons/Instances.svg:/icons/Instances.svg @@ -156,7 +156,7 @@ - :/icons/Plus.png:/icons/Plus.png + :/icons/Plus.svg:/icons/Plus.svg @@ -221,7 +221,7 @@ - :/icons/ToParentFolder_16px.png:/icons/ToParentFolder_16px.png + :/icons/ToParentFolder_16px.svg:/icons/ToParentFolder_16px.svg diff --git a/src/Editor/ResourceBrowser/CResourceTableModel.cpp b/src/Editor/ResourceBrowser/CResourceTableModel.cpp index a100fbec..879dea65 100644 --- a/src/Editor/ResourceBrowser/CResourceTableModel.cpp +++ b/src/Editor/ResourceBrowser/CResourceTableModel.cpp @@ -41,7 +41,7 @@ QVariant CResourceTableModel::data(const QModelIndex& rkIndex, int Role) const ? ".." : TO_QSTRING(pDir->Name())); else if (Role == Qt::DecorationRole) - return QIcon(":/icons/Open_24px.png"); + return QIcon(":/icons/Open_24px.svg"); else return QVariant::Invalid; @@ -57,7 +57,7 @@ QVariant CResourceTableModel::data(const QModelIndex& rkIndex, int Role) const return TO_QSTRING(pEntry->CookedAssetPath(true)); else if (Role == Qt::DecorationRole) - return QIcon(":/icons/Sphere Preview.png"); + return QIcon(":/icons/Sphere Preview.svg"); return QVariant::Invalid; } diff --git a/src/Editor/ResourceBrowser/CVirtualDirectoryModel.cpp b/src/Editor/ResourceBrowser/CVirtualDirectoryModel.cpp index d8e52972..b5251fb7 100644 --- a/src/Editor/ResourceBrowser/CVirtualDirectoryModel.cpp +++ b/src/Editor/ResourceBrowser/CVirtualDirectoryModel.cpp @@ -91,7 +91,7 @@ QVariant CVirtualDirectoryModel::data(const QModelIndex& rkIndex, int Role) cons if (Role == Qt::DecorationRole) { - return QIcon(":/icons/Open_24px.png"); + return QIcon(":/icons/Open_24px.svg"); } return QVariant::Invalid; diff --git a/src/Editor/ScanEditor/CScanEditor.ui b/src/Editor/ScanEditor/CScanEditor.ui index 92306c68..761fb4a1 100644 --- a/src/Editor/ScanEditor/CScanEditor.ui +++ b/src/Editor/ScanEditor/CScanEditor.ui @@ -72,7 +72,7 @@ - :/icons/Save.png:/icons/Save.png + :/icons/Save.svg:/icons/Save.svg Save @@ -87,7 +87,7 @@ - :/icons/SaveAndRepack_32px.png:/icons/SaveAndRepack_32px.png + :/icons/SaveAndRepack_32px.svg:/icons/SaveAndRepack_32px.svg Save and Cook diff --git a/src/Editor/StringEditor/CStringEditor.ui b/src/Editor/StringEditor/CStringEditor.ui index d4e89a32..8435a6b8 100644 --- a/src/Editor/StringEditor/CStringEditor.ui +++ b/src/Editor/StringEditor/CStringEditor.ui @@ -106,7 +106,7 @@ - :/icons/Plus.png:/icons/Plus.png + :/icons/Plus.svg:/icons/Plus.svg @@ -123,7 +123,7 @@ - :/icons/Minus v2.png:/icons/Minus v2.png + :/icons/Minus v2.svg:/icons/Minus v2.svg @@ -186,7 +186,7 @@ - :/icons/Save.png:/icons/Save.png + :/icons/Save.svg:/icons/Save.svg Save @@ -201,7 +201,7 @@ - :/icons/SaveAndRepack_32px.png:/icons/SaveAndRepack_32px.png + :/icons/SaveAndRepack_32px.svg:/icons/SaveAndRepack_32px.svg Save and Cook diff --git a/src/Editor/UICommon.cpp b/src/Editor/UICommon.cpp index d4bad994..95d39d78 100644 --- a/src/Editor/UICommon.cpp +++ b/src/Editor/UICommon.cpp @@ -31,8 +31,8 @@ void OpenContainingFolder(QWidget* parent, const QString& pathIn) } if (explorer.isEmpty()) { - QMessageBox::warning(parent, MainWindow::tr("Launching Windows Explorer Failed"), - MainWindow::tr("Could not find explorer.exe in path to launch Windows Explorer.")); + QMessageBox::warning(parent, "Launching Windows Explorer Failed", + "Could not find explorer.exe in path to launch Windows Explorer."); return; } QStringList param; diff --git a/src/Editor/Widgets/CFilteredResourceModel.h b/src/Editor/Widgets/CFilteredResourceModel.h index 30c9a31a..7df7f014 100644 --- a/src/Editor/Widgets/CFilteredResourceModel.h +++ b/src/Editor/Widgets/CFilteredResourceModel.h @@ -73,7 +73,7 @@ public: } else if (Role == Qt::DecorationRole) { - return QIcon(":/icons/Sphere Preview.png"); + return QIcon(":/icons/Sphere Preview.svg"); } } else diff --git a/src/Editor/Widgets/CResourceSelector.cpp b/src/Editor/Widgets/CResourceSelector.cpp index ad9864a9..e54a6b45 100644 --- a/src/Editor/Widgets/CResourceSelector.cpp +++ b/src/Editor/Widgets/CResourceSelector.cpp @@ -32,13 +32,13 @@ CResourceSelector::CResourceSelector(QWidget *pParent /*= 0*/) mpSelectButton = new QPushButton(this); mpSelectButton->setToolTip("Select Resource"); - mpSelectButton->setIcon(QIcon(":/icons/ArrowD_16px.png")); + mpSelectButton->setIcon(QIcon(":/icons/ArrowD_16px.svg")); mpSelectButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); mpSelectButton->setFixedSize(16, 16); mpClearButton = new QPushButton(this); mpClearButton->setToolTip("Clear"); - mpClearButton->setIcon(QIcon(":/icons/X_16px.png")); + mpClearButton->setIcon(QIcon(":/icons/X_16px.svg")); mpClearButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); mpClearButton->setFixedSize(16, 16); diff --git a/src/Editor/WorldEditor/CInstancesModel.cpp b/src/Editor/WorldEditor/CInstancesModel.cpp index 0a4bc9a2..b7a31e61 100644 --- a/src/Editor/WorldEditor/CInstancesModel.cpp +++ b/src/Editor/WorldEditor/CInstancesModel.cpp @@ -271,8 +271,8 @@ QVariant CInstancesModel::data(const QModelIndex& rkIndex, int Role) const { if (!mpScene) return QVariant::Invalid; - static QIcon Visible(":/icons/Show.png"); - static QIcon Invisible(":/icons/Hide.png"); + static QIcon Visible(":/icons/Show.svg"); + static QIcon Invisible(":/icons/Hide.svg"); // Show/Hide Node Types if (Type == EIndexType::NodeType) diff --git a/src/Editor/WorldEditor/CLinkDialog.ui b/src/Editor/WorldEditor/CLinkDialog.ui index 8d8cd58f..1c92e3e5 100644 --- a/src/Editor/WorldEditor/CLinkDialog.ui +++ b/src/Editor/WorldEditor/CLinkDialog.ui @@ -62,7 +62,7 @@ - :/icons/Instances_16px.png:/icons/Instances_16px.png + :/icons/Instances_16px.svg:/icons/Instances_16px.svg @@ -79,7 +79,7 @@ - :/icons/SelectMode_16px.png:/icons/SelectMode_16px.png + :/icons/SelectMode_16px.svg:/icons/SelectMode_16px.svg @@ -125,7 +125,7 @@ - :/icons/Swap_16px.png:/icons/Swap_16px.png + :/icons/Swap_16px.svg:/icons/Swap_16px.svg @@ -172,7 +172,7 @@ - :/icons/Instances_16px.png:/icons/Instances_16px.png + :/icons/Instances_16px.svg:/icons/Instances_16px.svg @@ -189,7 +189,7 @@ - :/icons/SelectMode_16px.png:/icons/SelectMode_16px.png + :/icons/SelectMode_16px.svg:/icons/SelectMode_16px.svg diff --git a/src/Editor/WorldEditor/CPoiListDialog.h b/src/Editor/WorldEditor/CPoiListDialog.h index 84e8586f..05b5e94f 100644 --- a/src/Editor/WorldEditor/CPoiListDialog.h +++ b/src/Editor/WorldEditor/CPoiListDialog.h @@ -60,9 +60,9 @@ public: bool IsImportant = (pScan ? pScan->IsCriticalPropertyRef() : false); if (IsImportant) - return QIcon(":/icons/POI Important.png"); + return QIcon(":/icons/POI Important.svg"); else - return QIcon(":/icons/POI Normal.png"); + return QIcon(":/icons/POI Normal.svg"); } return QVariant::Invalid; diff --git a/src/Editor/WorldEditor/CPoiMapModel.cpp b/src/Editor/WorldEditor/CPoiMapModel.cpp index cb254385..2c752a82 100644 --- a/src/Editor/WorldEditor/CPoiMapModel.cpp +++ b/src/Editor/WorldEditor/CPoiMapModel.cpp @@ -56,9 +56,9 @@ QVariant CPoiMapModel::data(const QModelIndex& rkIndex, int Role) const } if (IsImportant) - return QIcon(":/icons/POI Important.png"); + return QIcon(":/icons/POI Important.svg"); else - return QIcon(":/icons/POI Normal.png"); + return QIcon(":/icons/POI Normal.svg"); } } diff --git a/src/Editor/WorldEditor/CPoiMapSidebar.ui b/src/Editor/WorldEditor/CPoiMapSidebar.ui index 83f0a12c..12f16822 100644 --- a/src/Editor/WorldEditor/CPoiMapSidebar.ui +++ b/src/Editor/WorldEditor/CPoiMapSidebar.ui @@ -60,7 +60,7 @@ - :/icons/Plus.png:/icons/Plus.png + :/icons/Plus.svg:/icons/Plus.svg true @@ -74,7 +74,7 @@ - :/icons/Minus v2.png:/icons/Minus v2.png + :/icons/Minus v2.svg:/icons/Minus v2.svg true @@ -123,7 +123,7 @@ - :/icons/SelectMode_16px.png:/icons/SelectMode_16px.png + :/icons/SelectMode_16px.svg:/icons/SelectMode_16px.svg true @@ -140,7 +140,7 @@ - :/icons/Instances_16px.png:/icons/Instances_16px.png + :/icons/Instances_16px.svg:/icons/Instances_16px.svg @@ -154,7 +154,7 @@ - :/icons/Minus v2.png:/icons/Minus v2.png + :/icons/Minus v2.svg:/icons/Minus v2.svg diff --git a/src/Editor/WorldEditor/CScriptEditSidebar.cpp b/src/Editor/WorldEditor/CScriptEditSidebar.cpp index 8fd66e2b..7b40254a 100644 --- a/src/Editor/WorldEditor/CScriptEditSidebar.cpp +++ b/src/Editor/WorldEditor/CScriptEditSidebar.cpp @@ -22,8 +22,8 @@ CScriptEditSidebar::CScriptEditSidebar(CWorldEditor *pEditor) mpInstancesTab = new WInstancesTab(pEditor, this); mpTabWidget->setIconSize(QSize(24, 24)); - mpTabWidget->addTab(mpCreateTab, QIcon(":/icons/Create.png"), ""); - mpTabWidget->addTab(mpModifyTab, QIcon(":/icons/Modify.png"), ""); - mpTabWidget->addTab(mpInstancesTab, QIcon(":/icons/Instances.png"), ""); + mpTabWidget->addTab(mpCreateTab, QIcon(":/icons/Create.svg"), ""); + mpTabWidget->addTab(mpModifyTab, QIcon(":/icons/Modify.svg"), ""); + mpTabWidget->addTab(mpInstancesTab, QIcon(":/icons/Instances.svg"), ""); pLayout->addWidget(mpTabWidget); } diff --git a/src/Editor/WorldEditor/CWorldEditor.cpp b/src/Editor/WorldEditor/CWorldEditor.cpp index c456d1ac..e315d8b6 100644 --- a/src/Editor/WorldEditor/CWorldEditor.cpp +++ b/src/Editor/WorldEditor/CWorldEditor.cpp @@ -96,9 +96,9 @@ CWorldEditor::CWorldEditor(QWidget *parent) mpEditModeButtonGroup = new QButtonGroup(this); connect(mpEditModeButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(ChangeEditMode(int))); - AddEditModeButton( QIcon(":/icons/World.png"), "Edit World Info",eWEM_EditWorldInfo ); - AddEditModeButton( QIcon(":/icons/Modify.png"), "Edit Script", eWEM_EditScript ); - mpPoiMapAction = AddEditModeButton( QIcon(":/icons/PoiSymbol_24px.png"), "Edit POI Mappings", eWEM_EditPOIMappings ); + AddEditModeButton( QIcon(":/icons/World.svg"), "Edit World Info",eWEM_EditWorldInfo ); + AddEditModeButton( QIcon(":/icons/Modify.svg"), "Edit Script", eWEM_EditScript ); + mpPoiMapAction = AddEditModeButton( QIcon(":/icons/PoiSymbol_24px.svg"), "Edit POI Mappings", eWEM_EditPOIMappings ); mpPoiMapAction->setVisible(false); ChangeEditMode(eWEM_EditWorldInfo); @@ -123,7 +123,7 @@ CWorldEditor::CWorldEditor(QWidget *parent) // Quickplay buttons QToolButton* pQuickplayButton = new QToolButton(this); - pQuickplayButton->setIcon( QIcon(":/icons/Play_32px.png") ); + pQuickplayButton->setIcon( QIcon(":/icons/Play_32px.svg") ); pQuickplayButton->setPopupMode( QToolButton::MenuButtonPopup ); pQuickplayButton->setMenu( new CQuickplayPropertyEditor(mQuickplayParms, this) ); pQuickplayButton->setToolTip( "Quickplay" ); diff --git a/src/Editor/WorldEditor/CWorldEditor.ui b/src/Editor/WorldEditor/CWorldEditor.ui index b7db3167..18e7e6f8 100644 --- a/src/Editor/WorldEditor/CWorldEditor.ui +++ b/src/Editor/WorldEditor/CWorldEditor.ui @@ -377,7 +377,7 @@ - :/icons/Save.png:/icons/Save.png + :/icons/Save.svg:/icons/Save.svg Save World @@ -389,7 +389,7 @@ - :/icons/Link.png:/icons/Link.png + :/icons/Link.svg:/icons/Link.svg Link @@ -404,7 +404,7 @@ - :/icons/Unlink.png:/icons/Unlink.png + :/icons/Unlink.svg:/icons/Unlink.svg Unlink @@ -690,7 +690,7 @@ - :/icons/SaveAndRepack_32px.png:/icons/SaveAndRepack_32px.png + :/icons/SaveAndRepack_32px.svg:/icons/SaveAndRepack_32px.svg Save and Cook @@ -707,7 +707,7 @@ - :/icons/Open_16px.png:/icons/Open_16px.png + :/icons/Open_16px.svg:/icons/Open_16px.svg Open Recent @@ -716,7 +716,7 @@ - :/icons/Open_16px.png:/icons/Open_16px.png + :/icons/Open_16px.svg:/icons/Open_16px.svg Open Project @@ -725,7 +725,7 @@ - :/icons/New_16px.png:/icons/New_16px.png + :/icons/New_16px.svg:/icons/New_16px.svg Create Project @@ -753,7 +753,7 @@ - :/icons/World.png:/icons/World.png + :/icons/World.svg:/icons/World.svg Edit World Info @@ -765,7 +765,7 @@ - :/icons/Modify.png:/icons/Modify.png + :/icons/Modify.svg:/icons/Modify.svg Edit Script diff --git a/src/Editor/WorldEditor/CWorldTreeModel.cpp b/src/Editor/WorldEditor/CWorldTreeModel.cpp index c86c4f7e..b8b52048 100644 --- a/src/Editor/WorldEditor/CWorldTreeModel.cpp +++ b/src/Editor/WorldEditor/CWorldTreeModel.cpp @@ -95,8 +95,8 @@ QVariant CWorldTreeModel::data(const QModelIndex& rkIndex, int Role) const else if (Role == Qt::DecorationRole) { - static QIcon sWorldIcon = QIcon(":/icons/World_16px.png"); - static QIcon sAreaIcon = QIcon(":/icons/New_16px.png"); + static QIcon sWorldIcon = QIcon(":/icons/World_16px.svg"); + static QIcon sAreaIcon = QIcon(":/icons/New_16px.svg"); if (rkIndex.column() == 1) return QVariant::Invalid; diff --git a/src/Editor/WorldEditor/WModifyTab.ui b/src/Editor/WorldEditor/WModifyTab.ui index 77f9525d..c27b243b 100644 --- a/src/Editor/WorldEditor/WModifyTab.ui +++ b/src/Editor/WorldEditor/WModifyTab.ui @@ -173,7 +173,7 @@ - :/icons/Plus.png:/icons/Plus.png + :/icons/Plus.svg:/icons/Plus.svg QToolButton::InstantPopup @@ -199,7 +199,7 @@ - :/icons/Edit_16px.png:/icons/Edit_16px.png + :/icons/Edit_16px.svg:/icons/Edit_16px.svg @@ -232,7 +232,7 @@ - :/icons/Minus v2.png:/icons/Minus v2.png + :/icons/Minus v2.svg:/icons/Minus v2.svg @@ -296,7 +296,7 @@ - :/icons/Plus.png:/icons/Plus.png + :/icons/Plus.svg:/icons/Plus.svg QToolButton::InstantPopup @@ -319,7 +319,7 @@ - :/icons/Edit_16px.png:/icons/Edit_16px.png + :/icons/Edit_16px.svg:/icons/Edit_16px.svg @@ -352,7 +352,7 @@ - :/icons/Minus v2.png:/icons/Minus v2.png + :/icons/Minus v2.svg:/icons/Minus v2.svg diff --git a/src/Editor/icons/AnchorRoot_32px.png b/src/Editor/icons/AnchorRoot_32px.png deleted file mode 100644 index a2b8726acdfeae27b2d4b29a56dcd3d6ff716820..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmV-#0g(QQP)kdg0003tNklE5#v^;juU*fm09Fla`oc-;d9HFBw%A|KH0c0thjfN_A|e*~`4?f-TKJGxsn zl&OIBY!`&rRKNs)1R@4RiT*1j5NDvYLOkRV*Jmuy?AW0xc*`NW&7@E{gdfNtLO?PR z1`-J$Fr%Vk79^aJ;{z(DOsRsWIM^d61U&K6a}ldweZU++nD=JUP7HsDf<)u=0w0|P z?-4?$oj_60c(&J+Ht^yFo;}lg-}a63j1_|pFyOm?*xJAsp9~#f$c9Zius|@Zm>>uf zRv3gu{}0CvammqHcw~9`QaZo9GTaMe)@*5L*s^Bqyu)qe+&9x>bpp*Jf>0esqWAy+ N002ovPDHLkV1f$jn`i(4 diff --git a/src/Editor/icons/AnchorRoot_32px.svg b/src/Editor/icons/AnchorRoot_32px.svg new file mode 100644 index 00000000..088fb90c --- /dev/null +++ b/src/Editor/icons/AnchorRoot_32px.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/ArrowD_16px.png b/src/Editor/icons/ArrowD_16px.png deleted file mode 100644 index 9e9a93e4858c871f981f0d5f5a7fb542583f3c4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6(mh=qLp07O|2W?u-_&{6;DWU^o!HR%~s|ut7r4BXWLZp<52Z?d4(@W-}<)QwcK4SXfr{EVU>p1Z>R28K0qrOJYD@< J);T3K0RT*2JfQ#p diff --git a/src/Editor/icons/ArrowD_16px.svg b/src/Editor/icons/ArrowD_16px.svg new file mode 100644 index 00000000..300434d7 --- /dev/null +++ b/src/Editor/icons/ArrowD_16px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/ArrowL_16px.png b/src/Editor/icons/ArrowL_16px.png deleted file mode 100644 index 6ca8fd20591bef522c426fb9f255dd490a2d5be3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6vOHZJLp07O|2W?uZzK@1L7H)9 zx%t~Pht?BZ6=nIiY8kgPt-SlZ{Qv#EjMJH#@Afxd`d{vUVBLZ0@97&%#5jT`Z2rx! zm)X%2n)8U5JH$+_a}4<;_5E4mRP0Wz~0B<00^+rQnh2xu#V Mr>mdKI;Vst0P{yZg#Z8m diff --git a/src/Editor/icons/ArrowL_16px.svg b/src/Editor/icons/ArrowL_16px.svg new file mode 100644 index 00000000..cccc97cf --- /dev/null +++ b/src/Editor/icons/ArrowL_16px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Beginning_24px.png b/src/Editor/icons/Beginning_24px.png deleted file mode 100644 index 2a8583f384eabc2e805c2c32d846f99ab9724968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+ish%#5Ar`0SUOC9?;2^+y!PDXr zW2i=p-xMeHJN29)j_fj?*SMxx-1zyaf3yBg`^Y04;y+mv&Yf@%?RwQ0a`%%te?7ljd_cGHx650hfB#u# + + + + + + + + + diff --git a/src/Editor/icons/Beginning_32px.png b/src/Editor/icons/Beginning_32px.png deleted file mode 100644 index 4be70e7e8c96072501762129f672fda9e8af9aaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmV+l0rmcgP)kdg0002dNkl;+NFfjevlDK=?QYzk-+jyN zQ@@{A`27`MbdjO}_@PLK)L3hP0XO`-K!a^Cmj`ed@i24tKoc)KX9u`UctxhHfEN2` z*#;;v&d`X2MASGIzYXMW*Zlp zZ4A=oqyyAPIY^s>4iH?Xn(J&Hl${O`9L78~fcjB28FJSFLY+;){>J?I0?)(e2de^4 QZ~y=R07*qoM6N<$g1TpJRR910 diff --git a/src/Editor/icons/Beginning_32px.svg b/src/Editor/icons/Beginning_32px.svg new file mode 100644 index 00000000..d8f92ad1 --- /dev/null +++ b/src/Editor/icons/Beginning_32px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/BindPose_24px.png b/src/Editor/icons/BindPose_24px.png deleted file mode 100644 index 598824f9f50a9d3690a4fa409b9c31bb6bbab4e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iYEKu(5R21SLmasdDDb>~{(F_o z?IKzS e`Lq>v#_GT3Dzd&_aM&8?3 + + + + + + + + + diff --git a/src/Editor/icons/BindPose_32px.png b/src/Editor/icons/BindPose_32px.png deleted file mode 100644 index c1d3c534b117213be3e79993bf9e1aff1d5bef1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4U%ROBjLp+YZoqCYBL4n6LlK+{K z&QYsnJ&jAgGB{-}kn1tL&&>Ww=>GPrDT}=;mE@%t9{FUh!f+&pDazp%y9LXR+6Kpl zi40p;h0S(tkk#0Gj%9)QUCs=~PKI?Ac6y;-f9e$$yjSd$XAL+n$2d=3Q|>}Ica%dE z^96B%4Q~(hU-3y=+aLNf&B6A>+W`Ho442ZTFnHeT3F`H`)wBP|PM19YZwz1WM@|=J X$$s1?kYn=$=wt>@S3j3^P6 + + + + + + + + + diff --git a/src/Editor/icons/Create.png b/src/Editor/icons/Create.png deleted file mode 100644 index 0c65da24748c486977b6ec927d6662959938c5c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmV*L!LH1dJm5(9{OJ0lWnu zjw#JyF~E`=8)FiHJfx5tXMr_0J;wZ4l5A<`p}X69=*DGiEHAVFZ4GFc?`8fA0A+7b tW;gbBY9;l?pi6vGEh=(-Q?z74hT@(HsB(002ovPDHLkV1i)_ViN!W diff --git a/src/Editor/icons/Create.svg b/src/Editor/icons/Create.svg new file mode 100644 index 00000000..0a55272c --- /dev/null +++ b/src/Editor/icons/Create.svg @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Disc_16px.png b/src/Editor/icons/Disc_16px.png deleted file mode 100644 index 03c0b38708caadc793fa3721269ad0b53a49e014..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmV+!0p|XRP)u@2Wi9*!#u=ov25}F|R*cj{`d@azJ)}d3hE6vvhng0vZnR?p$ z4IOE~05j~+5_L8&eXf24gg8U@2;Hb^;RqC~Z@kt=Es0Js0*1JJW9Zz(lKxT#EKF?l zLW%@&QJ*M2Qlo6iLT!Z<5hD&cHKNLnh1LoQg<~S3FRncP2{)%ju8XQ~0a#&cge(?j zu#+xo#6(KhWnpH7GH4VJmUFr1f{|Smt;7swZr-C1I;*ahjS_Br?P5oeUg>8m?D51M f8%!~99_u%6diPyt$Oo~=00000NkvXXu0mjfnj> + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Display.png b/src/Editor/icons/Display.png deleted file mode 100644 index bd8fc1967fbf2c05bc5aeb07692bf3707ca45ccb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iQcoAh5R21quN>q&puod=;mkv~ zT_JN`_9rZyEF!DCS8|Ee+lBK^?f=IvXgBG??hA4Z{X8>O4r|Z2&f2ubL7_uIS&%7{ z(f3ocZNpis?FqS3u8s~fuj#X}&b|BPn<-NW<66db4Z05|w0&3Kp>A + + + + + + + + + diff --git a/src/Editor/icons/DontLoop_24px.png b/src/Editor/icons/DontLoop_24px.png deleted file mode 100644 index 3191f9f85b36631fbebeeebca87d35eb5405f7ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmV;{04e{8P)jozRsvel9t@2PF8MZ;zEye9qT`7{%jbz7;Md;^U4N zBz^jLm=}=XbG{W2&fUkfb-Trn#Cn%_tT)nn%c|ZeKA%u;l=v*o`=7v*?4Ph}hTUW) QE&u=k07*qoM6N<$f~#g-iU0rr diff --git a/src/Editor/icons/DontLoop_24px.svg b/src/Editor/icons/DontLoop_24px.svg new file mode 100644 index 00000000..3de86945 --- /dev/null +++ b/src/Editor/icons/DontLoop_24px.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/Editor/icons/DontLoop_32px.png b/src/Editor/icons/DontLoop_32px.png deleted file mode 100644 index 744fc6a9fe0c9a8e7837ee0a1ce1d63463fc771f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmV+~0nq-5P)kdg0002?NklDAXvw* zbcj6*k{{Yxl%7pG%5Om#pT4`Z^#n09HfaX-sh|Z{l#!FY(&}+##@&s-pRl%ZFv}phU002ovPDHLkV1i$; Be3JkG diff --git a/src/Editor/icons/DontLoop_32px.svg b/src/Editor/icons/DontLoop_32px.svg new file mode 100644 index 00000000..910d5c1b --- /dev/null +++ b/src/Editor/icons/DontLoop_32px.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Down.png b/src/Editor/icons/Down.png deleted file mode 100644 index 65a907f30a7f642d19100cb3eb452abf954632a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 650 zcmV;50(Jd~P){s3Hri$`s42c9&`#)l#Adxe`Gi z#1;`?01={vS_7pr)ikQzh1y*x`zjOYoz_GInFhI%sj7$|8dWT_ygV0ApHM5g(z=L7 zlAa7{F|&X1z^6JgT2 z=mWhIO|#jEy?t?TC|Uz}h?DjFY+9c_nN*$Nq1Hto=!0mD2t%~4Hd|3iCYR?b6Hajx kwEm;s>7Cw1YeXZ$|0WV$2&-EuLjV8(07*qoM6N<$g0Idz!vFvP diff --git a/src/Editor/icons/Down.svg b/src/Editor/icons/Down.svg new file mode 100644 index 00000000..285e0a4a --- /dev/null +++ b/src/Editor/icons/Down.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Editor/icons/Edit_16px.png b/src/Editor/icons/Edit_16px.png deleted file mode 100644 index 40a8d03b4f90ed9e82e9ecfb21ad55c313fedc20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 484 zcmV0KV*bNXT^%{KSV-`l8AM}+=gF4Qh+{#3&uk7v zn9)y6XtnBTy&kW2J3d@4?3qkBsI4W;FcRwyj%+#8$%tAlx-}X++H6?nd3X#4kr{`x zWRnxGgTuBn9sY9w0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Edit_24px.png b/src/Editor/icons/Edit_24px.png deleted file mode 100644 index fe154c9dc745e83281433bcdf4e609058dee84da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 905 zcmV;419tq0P)J`);(Z3We@; zQI(1)NMKT|sKnY<(WdG~Y-m%Pq%+g`_1?Y5#f)LnAIVs9;l0I$`#JZ=x#x6jt_FC2ZZ4^%shgdc;DyOaf~s3Oc5E|< z6yHAZ(81FAiGUHo8i*sIKQ{Em!pe_NB}T-}PfT!Vd>lqcAq37ZE#Xz&%<0obJM-M| zj<_Hg17d{8w!i+^Bz=Re>6MkJFg7rNRV5z+Sj&_7JXfw?pT2tbEKx7G2&jUp5(217 zBH+fx8yK@*`fTa9>6wEExzlX&c&!G&TD^`Hk^5HgARO8OI(>;XxVK&zWAd3H{<>W) z3=aF!_rKN(xj3fWXz=;+GCqXjJLk^1EdjQ}J1r5xz4_88<6|)lS)M(xhu?3M3ws89 z>8ES;!k=qv0L6C~797B4fbDQa0TK}R#`F8wKN1lcA@c2Ijpt*o-7FXSa=uhv%bhuK z;ez{bMo~|=k|4MvQzPVuEzML}t7HIp4;$5taxD-I))r5Gx9qyNJn9vno!ZCfUW*S( zD^*%)Aoa>x#j|j+j5QSBJG0{MO_=Ea;Hr>jO05y7Hv|8aGZrsb5TSVD;~VZl85una zUTp+!ZKRYgRRD?~d~(x0?6Pj&gD$vzpxfZ9>nWwn6;!qO;is!^yHXNqfWVfDnuy?L z5ATc%;&!T4kq;0$i7rB7MBI_XBR%2P?pzF`%qu|^5lM{TUYpuWez=WietSH!vU7mc zDm4P&V#*zWt>NP&9`7@Se_~nTDJXy!==` zV!i4y0wO}K5%}S16=S4m4bFDnf^J--w=8Mhj~MYourl&U8IA z-FOc^k@q@lt? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Edit_32px.png b/src/Editor/icons/Edit_32px.png deleted file mode 100644 index b244b962afa5b07b4837a8fc02ba16891c32bfd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1246 zcmV<41R?v0P){({hsH2-oG(C z&qE{Y{OQyBY8ZyL2u;yiA`!GGg&40iQ|_Zm+47Do!L7P3qG)ir{%P9ea4#UC3Gorh zm=UF{$d;paxRK|L6X3x$6$28knE#8(drLWvCROD=AZN?}#2O|b;0~n}3SQuqBPzJA z$!C^4e=?awqNN3wb2*3_hX1bZHG@Fti4!OhkkGQrZ^IoO7@#2*(?qA&)-;KLyxkN9 zynu)RxPCYcgL?vDvsA)np@4RV;jse;P^eZhLnS0MP00bB)d7jF{&I(FgmNjxJi>V7q%b@oRjVZC0o*@0eAvmvAv>8c=^enU8 zu!PF7bQ?hoTwL6gs8}Q8SzMYtWJy^vL?*)QCqXaBpN0s0@On2poS~&2eLR8Tp*Cs` zR2&a~W;Q|9t$`C+%>CMFg-NQzB=HZ!x7Swu{%hT4RKbeU_Vw0{-5sT_%&AG8!08B{0?>N2S8Ms;9fM!#0>NIw+Q< zEVa~zs%y{nYu5zcJxg$UF8ias2|UpkN14E40_KSPb9u~O&4+Ws-keWcR7(?3q3wl$ zfJ=tUey}Hj(KJ0Lu$Xu);1?J2xN@x!&IcRU2CZ16)**dxdJs;}9p}J1XFE+JD7B&9 zIL7)C2(lVg0t@(5radYx-6;F~YC%d(Pq!nbr>)wI zxMN_|cTe1pz}qh+YqAe9;ly)2eqCSk(DV7#qE>^)*dKnqZtb?J?iqr&UOdEvgCz_H zy5l&~)2cnz-*FDOcX4^KfQ35nkG|PG_&o`{`NF{(cz;(b`e@> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/End_24px.png b/src/Editor/icons/End_24px.png deleted file mode 100644 index d05ef81e15f84af5771fadc1934beaee68632ca8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+ieoq(25R21WryS&Ua1e1Zf9Sy; z;wWF@q-pigPIpBUpT(q_I+qmL8Tu0~_oqC6`^Ktp+YWz*D3t>KiOS*%GXfMhFwByh z$t$3fArQ%Mw&4(4#yg=n#)EG>6&T`~IAeq|9!yDKa+_ka;hlSz?$YA!Yf_5qw>qDS zpEGUA^1^9Lp3nXK`P$o-Kg_$P*D%-pH8pE|bZD~^?=m}}(-=Hm{an^LB{Ts5iiAkt diff --git a/src/Editor/icons/End_24px.svg b/src/Editor/icons/End_24px.svg new file mode 100644 index 00000000..b0fa679e --- /dev/null +++ b/src/Editor/icons/End_24px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/End_32px.png b/src/Editor/icons/End_32px.png deleted file mode 100644 index 0c72b3baf2a1911094f6475076884d011a84f5e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmVkdg0002ANklJ5CI|!yQM;n4be#`iviSn~y&u4IzQFCaCz@!gCQ>MZV0Xt(y3=g`aM{y; z;oW)92^O@%uK=Vp314J+pMY^=q58dfGcAK*w85G5i?fQltCIOqns$Ce56;{ciz)cR@z)y nY0^@?Gga1lN=rH{|9o8EQNiaE8|&WK00000NkvXXu0mjfVxnOf diff --git a/src/Editor/icons/End_32px.svg b/src/Editor/icons/End_32px.svg new file mode 100644 index 00000000..3ce6b278 --- /dev/null +++ b/src/Editor/icons/End_32px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Free Camera.png b/src/Editor/icons/Free Camera.png deleted file mode 100644 index 21de68cca1e2fbaad2fd1c7faa980b23f95583a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmV-j0iyniP)kdg0003bNklskq7&jAi$y_F<_z6Ap zHz_kY!UvnHuDzj5ZD$zFB za#Fo0ur> + + + + + + + + + diff --git a/src/Editor/icons/Gear_16px.png b/src/Editor/icons/Gear_16px.png deleted file mode 100644 index 627b5363277242113e19ff0d23d210a5dd66892d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6)_S@)hG?Acop_M9*+78hE`v$J zEDlZX|C9FL4V$4JBH*Fh!JZ?><~%`YQSF>9a(CzE^QJ9lQ@piTynFexrc|d6&eN^z zb*wf{XTD@y?3PrlVR`kXKtxbO{NIY1*(^G;PCXVyMKa1xUm|)IMurJ*-}1Y*P)%xc z_Dpq!`*-Xc%z6trS6u42mY`9gbfiI9d2y0MN8h72v!C8v_==-t{c^tS2u2P2Lt2d+ emi| + + + + + + + + + diff --git a/src/Editor/icons/Gear_24px.png b/src/Editor/icons/Gear_24px.png deleted file mode 100644 index c421d6121eb3ec767cd7fa548e9aa8193fd3c9f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmV+s0q*{ZP)|be5#Aag5F5}AK@UU$QxK&U`nNbQiNEcrK^>F&2|y}g za7tuk2^b1u6vhJ<#f<{928`Q!?$jQr$>N|Exm}BIb=TA zp$Q4mbbc+9IV2b=7ix*TkrAz1tuQ1LFuz<2@AW*k4uk@@oB(|Fq!jDx+lZtaUvo>k zWowHjAV7PMK5SK7cM8`p3wO9R>@HxJtuZ1`a?#$od#YU X+-=6O_$2v%00000NkvXXu0mjfyH02T diff --git a/src/Editor/icons/Gear_24px.svg b/src/Editor/icons/Gear_24px.svg new file mode 100644 index 00000000..a7db4574 --- /dev/null +++ b/src/Editor/icons/Gear_24px.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Grid_24px.png b/src/Editor/icons/Grid_24px.png deleted file mode 100644 index da9f85192ccb4447ce46cd95f1f8a571fd429228..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*19Zwg>5R22vKh8Tyu`Kfa-`Q@! y%M;LX=8%?EhiOmMED8Vqwo5CPZ>*eU!ohHBeSi9k(v(o3J_b)$KbLh*2~7YwULUmp diff --git a/src/Editor/icons/Grid_24px.svg b/src/Editor/icons/Grid_24px.svg new file mode 100644 index 00000000..cd372760 --- /dev/null +++ b/src/Editor/icons/Grid_24px.svg @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Grid_32px.png b/src/Editor/icons/Grid_32px.png deleted file mode 100644 index 3deabb6f59dd34e84cfb7cd2f12bfb1843e5469d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4Urk*a2As)w*f1G!aOp(xGd-KoV z%Ei2akuUJ3MXDR`0h0t1u{Kwo9=FFCX;P*QQX37XXooWd*+$PSY@AyKG=Ra=)z4*} HQ$iB}?x-J2 diff --git a/src/Editor/icons/Grid_32px.svg b/src/Editor/icons/Grid_32px.svg new file mode 100644 index 00000000..bf29b1c1 --- /dev/null +++ b/src/Editor/icons/Grid_32px.svg @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Hide.png b/src/Editor/icons/Hide.png deleted file mode 100644 index 4a89e0ee366db77392a57d90ecc2fb4196c1ce4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmV-j0iyniP)kdg0003bNkloDgIrEN*kyGUyrO%iY=O%c%9>*-dSs2V!7Uc}C=m}h^cka^I1m$a;Dj=! zk3)+n`^nFEQU&SCL)n>bhcZa71C)r?rC^pB&PSP + + + + + + + + + diff --git a/src/Editor/icons/Highlight.png b/src/Editor/icons/Highlight.png deleted file mode 100644 index d653b371c695bd1f0de52bb868be734d5929dbfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmV;<0WtoGP)G%_z6hKPa&Z{`!;PN*8xv}n1>t(G=Zg|_+Cs5C85wnssj{&_&c%#{<5+CKeA*A zxeoXa#0sQ1U=_0EF#N*Kj*?JVMXUqtu~`noXL@=lafAaQ2QUNid3+A|q^$gZ&(59X zI^aAIGvjkWDn83$_*y{$C83ap%K-vF{E8R{{N(5VzkmIDavksrhy}1YpqCiSVfbNi zFeRbThwcCkApS*)1OBnF{698t9=Q(q1;iR~2mI#d-cO3gALxDl$ z;%&$d(0~RDy(~wK0%*4AqoV`*Q4%540Rqr0LTk%0vmsLPm_`Q&q+=9BNDg3z7MHZL z9D7lWR!ce1&;i&hBP@-DRWz_1cXf=#0SeGY1hp&&nWadI0~nyqC~7$Xf0GP{1Gu3L zN=hv!+$hD>YzE?JDmZ{}vmB2D7@?gD8h1=a`-TIE0bnd1?xJ`vQ~&?~07*qoM6N<$ Eg1GCyrvLx| diff --git a/src/Editor/icons/Highlight.svg b/src/Editor/icons/Highlight.svg new file mode 100644 index 00000000..02a90188 --- /dev/null +++ b/src/Editor/icons/Highlight.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Instances.png b/src/Editor/icons/Instances.png deleted file mode 100644 index 9b2ad8895a9d70f76e098b6d8484c9ecd7cbf77c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iC{Gv15DWk0Kj$5!5@a??nQb?E zV(62!g3Tye(o5pT1<}TX`fYOevu3o-cW{lDsA%*N;1>V!=ydl6#rcU!jM8<+CCWJt u(~mILNS?T6@G4WrZ_)bYo{WbbnHj{l`ZKb&{`?EHg~8L+&t;ucLK6TQ(=UYp diff --git a/src/Editor/icons/Instances.svg b/src/Editor/icons/Instances.svg new file mode 100644 index 00000000..765ef7e4 --- /dev/null +++ b/src/Editor/icons/Instances.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Instances_16px.png b/src/Editor/icons/Instances_16px.png deleted file mode 100644 index 4386a6e032d7bc6077999c9965bab25be0625121..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6>^xl@Lp07O|2W?uZzQlVq5So` z^A0?V>finAXQ_Xe*Q&w5S%2?rgBows{6w{ygIS04XK+?L@F-$_I + + + + + + + + + diff --git a/src/Editor/icons/Link.png b/src/Editor/icons/Link.png deleted file mode 100644 index 3e0a1e90dee3f5e7e597c56cc219aa9893f83bad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmV-A0mc4_P)kdg00032Nkl>(8N7Xi=n^58#OT#14{bgFnwB##dlTw1fZ!D zZMYN_XoWyUJ&jyFpM3z-cJYZ?d(=`u*}K>F;|3=jQ1X)Fd;umxp!F_+MBIW-hzfs* zRdP>5oR^0hjxqe&nrqMROC0bCZO`N{lM6y;y_AtCaDs@CzQN}FsYsNA*M;~X@`$7pVV+8{q^7Z38qb|j}PN(LI3~& M07*qoM6N<$g1bV8WB>pF diff --git a/src/Editor/icons/Link.svg b/src/Editor/icons/Link.svg new file mode 100644 index 00000000..48af45f0 --- /dev/null +++ b/src/Editor/icons/Link.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Loop_24px.png b/src/Editor/icons/Loop_24px.png deleted file mode 100644 index 4efc1c2a5cc31fa488a913d0b4331cb228b3bdf5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iB2O2`5R21WuNd+*1aP=G=AFCO zeK_%>G-K?6BRQ`{ek^*lX?6`$*)p{n!4*H*fN0L~nIkAULS3mqQ;V|c3#;qpIE8=5>bsOUUONsNjr}3Qo S+P)fSJA + + + + + + + + + diff --git a/src/Editor/icons/Loop_32px.png b/src/Editor/icons/Loop_32px.png deleted file mode 100644 index c2784bd384c5a722fec1db330920fa38451dcb04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UJ3L(+Lp+W@y}D7b*?^}tQ8ey= z^8pnDpA!NV9TO6Ns5dG`G&rqv((5~UvTXXD)qn4v+>{cyvilFm0pmXDB!8ZYv@J3j z5f_RUBs-s#Onz`^Uf~~wxC0Y-Gh&?PhdMC{M1@^eoyXMFE|uU?;Pdpr#W_U>+*Ks3zm2!9GQD{wz1^1v)0r8+4^(Wf#2RdGBz7ZQVzmmNi0ELf%(@O$ons p#UzUHQtp;#eZM1C)&DcMV_;qwuyvtyQy|a}44$rjF6*2Ung9-_Uv&Tg diff --git a/src/Editor/icons/Loop_32px.svg b/src/Editor/icons/Loop_32px.svg new file mode 100644 index 00000000..f5ef278a --- /dev/null +++ b/src/Editor/icons/Loop_32px.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Material Highlight.png b/src/Editor/icons/Material Highlight.png deleted file mode 100644 index a369866c79af7848cef161374acdae414f5ad00d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmV;60d)R}P)ZrE5JexNv!y|0|fMF48Tr6_U-@z>|Fsi0tW&4g}<#kzya90 z0OSIqo%>ZGp9&BQG+lrOBz6aAfOrZ(*$vk&{i;xo1$Z`vYo~q?=@39DP}=}%kkB2V z20|Oai!EF`^Q%JE2M`Gy#{e8bB6olz5Sakp#)NAZepM*00TO|B3P1~zxC696at1iT z*OYMW%C8F5833s8dzp(rx&VnP%Ua==pFpWt5#aseCsc~m5m`F?_84}QtpM zRl8g&+}w({5HVMH13XOuK#fsz0oX^f9&OY>=^H*glv=c# p0bqD6wi5`{{f$tv60I4rX2tP002ovPDHLkV1h-Io?QR{ diff --git a/src/Editor/icons/Material Highlight.svg b/src/Editor/icons/Material Highlight.svg new file mode 100644 index 00000000..33f4b86b --- /dev/null +++ b/src/Editor/icons/Material Highlight.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Minus v2.png b/src/Editor/icons/Minus v2.png deleted file mode 100644 index cb992bcebe0b83cc15f7a27ef2d89325e97c47de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmV<303!d1P)X{q6SA + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Minus.png b/src/Editor/icons/Minus.png deleted file mode 100644 index 72a468a703236b8ecc984642ae68be6cb65ea182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`4W2HJAr`0KPBIi~au8tI-7mbS z!Tu-9{zsc@B>4rL%6U~b9cekzaBh3~vaB;c-vVx&RAk71JR?1of$iy%+1Hp#x*V9! z`@E7lxYRUC(`2dU-L?fxp(`6s)kdx;Rtsh^ZHjw&UH|@zhPeBljqYl3(WifOyzJ*H jwUrB-cwFee!v`h@S$WUwXSd$~-NNAM>gTe~DWM4fJ`qQ? diff --git a/src/Editor/icons/Minus.svg b/src/Editor/icons/Minus.svg new file mode 100644 index 00000000..418e4fc9 --- /dev/null +++ b/src/Editor/icons/Minus.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Model Preview.png b/src/Editor/icons/Model Preview.png deleted file mode 100644 index aecf9454614b14dbc87db7048f98012af727e9ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 942 zcmV;f15x~mP)kdg000AZNkl&UvBm{~qC9 z1EjM=B7z`<`U+`2J=)xA&i7ty-cD=rC0Xa`a@{ZJj-uplDJkPvcQ^nNw>4Wa^`ZUc+u?mJ zu}~;@B~}m;efF@2X{H#^qXlrRE?@BtZ_4-OY`XKNKWVdWHf>@L+nj&p-^$4})!&%9 zZ|3E?LQA1wT19sm3hD47&hlXG33B%}n z^IMPj$G~N}C<_6r98wP_)_(L_i$W%lR^pcIlZ*0%AS>ZzeDMjUZMO-Jv_;vf`&Q|WY;g0 z2g)JGAG5=T9Wn9h(Bv2nNT^uUnZ&pn$9=)jQ@WJVQ$A%ADY@%V4IRPIX7Q@sR`kbw zC8L*h$GS!uLzFSVh>3KwvHV;vx$5Wojgr4s9nC`D1tGg{m&vqeU$vXMo>w!&-*RoZ z@$nWS?PeggoochJd(Rr(o5?pakucugF-X)zjmeKd4EjD}59wh=2bt6XhY1_+!k|rr zQ(&QlGH3f0J!mLxn57E%j|A!B)b?j-*bLX$X4S8mD~1s}v%9Hy&;OnO0sG0^x`^uz Q + + +image/svg+xml + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Editor/icons/Modify.png b/src/Editor/icons/Modify.png deleted file mode 100644 index f6fcfdcbce5c54f6f2c3cb279daf3b2ae96587cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmV-(0gV2MP)HaZxKiuHwUniO{EvGwb*hm-~}QgSp1sp<_-xFlFHiFf3Vd{ zv9iv(t1E%9c1~pE1Heb{xPhi;B=^#OP9v3H`XuYq?Xphz$c%f%vSWwE&y4## zH%_c*UyMdOAC2npP4nSP Rq{sjO002ovPDHLkV1kx-oxlJ9 diff --git a/src/Editor/icons/Modify.svg b/src/Editor/icons/Modify.svg new file mode 100644 index 00000000..89b2b65b --- /dev/null +++ b/src/Editor/icons/Modify.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/New.png b/src/Editor/icons/New.png deleted file mode 100644 index 274aca645e3df6badf4f33a1ae3415239c186669..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4U{+=$5As)xyUNz)mP~dUCcxMm$ z>4%S$k_6eK9os*BH)my16xU + + + + + + + + + diff --git a/src/Editor/icons/New_16px.png b/src/Editor/icons/New_16px.png deleted file mode 100644 index b36577a90f519bfdaf45e9978613fe68b24d4621..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6j6Gc(Lp07O|2W?u@3ivn|A`8R z-&HBFIo;v<=RD;>Fhf{VJYxW79xKm}yA17%xeP=ev@u*#kDIG-IL`p6ox#)9&t;uc GLK6UMej*Y8 diff --git a/src/Editor/icons/New_16px.svg b/src/Editor/icons/New_16px.svg new file mode 100644 index 00000000..1f33224c --- /dev/null +++ b/src/Editor/icons/New_16px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Open.png b/src/Editor/icons/Open.png deleted file mode 100644 index ef70f04f46e5c16dbb3d9bdfa0218c954910d0ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmVkdg0002HNkl91A>Rfi@PHuRjHv^&KytL4gCkl1706DQ+}SC{SUCo{SGj z6|gwb{VP3#4hA(1SOrS#;mCLg^939-T + + + + + + + + + diff --git a/src/Editor/icons/Open_16px.png b/src/Editor/icons/Open_16px.png deleted file mode 100644 index 06f590fd87336ff281b3d843e20045dca96bf752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6LOfj@Lp07O|2W?uZxrBs@ZJA{ z7aL|XiZ0T=;qSqy)uO$laUK8NmUVZdEY9rU3QX9%Tduu{t%GUV-S7g93vC()G8xbC pTIe=t?&xxEyq1@Bl(mk7;c1_h; + + + + + + + + + diff --git a/src/Editor/icons/Open_24px.png b/src/Editor/icons/Open_24px.png deleted file mode 100644 index ad73d42cfb7f4318ccb64a0d7eb8ce9617392a25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iDo+>35R22vKh8TyrASPXD*Nx= z9JO1r!10Zgl*iSAsUf^K6rM_*dr-z!roQyOncAUw#s<9e%Rj%F=h)I#GNUchfp + + + + + + + + + diff --git a/src/Editor/icons/OrbitCamera_24px.png b/src/Editor/icons/OrbitCamera_24px.png deleted file mode 100644 index 12e3d20ec79df72cdb96a5d5a98eefc123e9113c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 338 zcmV-Y0j>UtP)y>PR{Nz2KJoo20B?^~)2BgL}>~Y<2q(fTUSCVM0Mg zMZtto9E_QvP#7{KNQMc4MfhfiAzz(xL0GK%J8*#@+@iRN0-?mT!5&M5B}WV>c#3RG z$kFXHJRk_K3^_!jqFqkgV3$t>;TcWR15*E5kEs!aJF*_|?t^Wvnx#0Xd~k{4dJ~{X zn%jwkd3X3+V&KsSXFX5mVtt^=|11w4ZZ&viZ+Xc9kq?xxSa0}TOk`tucf8xtSW@QH k{P0GKMRz{XX8C{c3*@T7i&rg;hyVZp07*qoM6N<$g0MS`MF0Q* diff --git a/src/Editor/icons/OrbitCamera_24px.svg b/src/Editor/icons/OrbitCamera_24px.svg new file mode 100644 index 00000000..a7ce45d4 --- /dev/null +++ b/src/Editor/icons/OrbitCamera_24px.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/OrbitCamera_32px.png b/src/Editor/icons/OrbitCamera_32px.png deleted file mode 100644 index ed00df23217208caf89659656a44e9357ec41994..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 zcmV<90UZ8`P)kdg00051Nkl478R>Va&mspFSi-=SZ#HHc|9Rv}z7QtB*L>yYDE`ooc{sS?(hzO$PS;SEn z2QPy{Gt5QF zJq+d8MU?|;IYw}6T9dp>$_;%mF9VF3_6Q2Al$)24YvJx8A924c<$XywN= z6ZBNLfzgQS9OAxdWr?tjK=4G`1EDzqU1Uw`kq({_EVJSP$kFE9gH6jkW0pKo7CqZY zH~|4JEpvxKQr2kYI(4sdAFr0Z#SNpL0No8ZXWW{EKrrA5$hrYv?3MK0?H8c)LO&bU zkv6|A4AV=BYwJjh-ywD|!vs+xbfVHsqrcCn5UOH{i;EPJMVeMMKtq~|Dj!vqOCD1} zG4fSB=a?)L3#uF_>+(=7$~)5H{_t#ozv&+U ZegWb+4aT6zlWqV2002ovPDHLkV1jxt%dY?c diff --git a/src/Editor/icons/OrbitCamera_32px.svg b/src/Editor/icons/OrbitCamera_32px.svg new file mode 100644 index 00000000..b7de9976 --- /dev/null +++ b/src/Editor/icons/OrbitCamera_32px.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/POI Important.png b/src/Editor/icons/POI Important.png deleted file mode 100644 index 48b5140088f9724c42721f9db452d2709154feb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmV-30nGl1P)6b0b>2ELP}omlvTV4;Ou*$b}7B32qpEi6_=D<42%!6+;%XkqJL9wnaZo=6y? zNdh04nJ_0eH;K5eE4@Ub(-d*zD2rI4hiGV*l>XZ zeEO~rVE8UTt^Uh<1QmH6fyME6P(UA+yz3OI@W;R%=QTLKdW0FYc;_6fjjA?KiPD1` zq~T-)T)7?^;IN7xW6h3Qftv7{cfKBcus5LrT521 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/POI Normal.png b/src/Editor/icons/POI Normal.png deleted file mode 100644 index 048a90bf1853695db36717927e7f383a6fd92948..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 378 zcmV-=0fqjFP)R6QgE_1Lq7uufHe2plcpJjKXBgW>6} zfY=-XwB6T-d?H0(?igsw6} zO%J#OF%dJ>f$&-%hX1wZ5El{*17a}T0APlg0LmCJ0b;R}9K(Mv1%^f790@XnR0Cj| Y0Tv$9YrB}&aR2}S07*qoM6N<$f)*N>?f?J) diff --git a/src/Editor/icons/POI Normal.svg b/src/Editor/icons/POI Normal.svg new file mode 100644 index 00000000..b3c8363e --- /dev/null +++ b/src/Editor/icons/POI Normal.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Pause_24px.png b/src/Editor/icons/Pause_24px.png deleted file mode 100644 index 81c962d4b1169e36d1dc7329eb458e9b2830bec9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1RZkbk5R22vKh8Tyr6@!ne)r#F s0wdSNBW|WWSrS(bwwPR4bA^Fns>b#A$@lpm05vdpy85}Sb4q9e0B__SO8@`> diff --git a/src/Editor/icons/Pause_24px.svg b/src/Editor/icons/Pause_24px.svg new file mode 100644 index 00000000..708a837c --- /dev/null +++ b/src/Editor/icons/Pause_24px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Pause_32px.png b/src/Editor/icons/Pause_32px.png deleted file mode 100644 index 6be724a403dbddbb3c9799be792dc7364ed2cbc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UdY&$hAs)w*|D1P_Opu9Td*f){ zE9kYjbGJdCltI>k6^x77dVmZDTONs7Q?(g1yz>~t?^nM8>SXYA^>bP0l+XkK6Z0I7 diff --git a/src/Editor/icons/Pause_32px.svg b/src/Editor/icons/Pause_32px.svg new file mode 100644 index 00000000..ba57c577 --- /dev/null +++ b/src/Editor/icons/Pause_32px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Play_24px.png b/src/Editor/icons/Play_24px.png deleted file mode 100644 index 07dfca9c3a70d2871866bd3493a3f95c316c2098..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+ieoq(25R21Wr<~<%FpzNO{aF=tG4+WVX{!e@nmC&P5P zoje;NE+|Z6&|~J3d{8u5fKBJwW)`*`9tn-kO#Bs`MhPw_nP1l}aS6KRvE|x@J=gdo y>kF$r>!kLn*ykTUe>>OxGyjV)BaT1cvU5J1>u@gATzL`bGzL#sKbLh*2~7ZUGD$uF diff --git a/src/Editor/icons/Play_24px.svg b/src/Editor/icons/Play_24px.svg new file mode 100644 index 00000000..f95254e1 --- /dev/null +++ b/src/Editor/icons/Play_24px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Play_32px.png b/src/Editor/icons/Play_32px.png deleted file mode 100644 index 5fee204fe652ebe7689e6ac887763d467c7195d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmVkdg00029Nkl + + + + + + + + + diff --git a/src/Editor/icons/Plus.png b/src/Editor/icons/Plus.png deleted file mode 100644 index ce14f4529b1488e4a0cba1c523284f724a9cf6b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmVj)QGqNg2^?6$kCeg5wU2P~mp&-F6vdD@YwGUR1!HR*7oicRS zZYfq|kdajxa*VZ4CV+#i7zof48_0w~0|x8*u-g}r140YHu0C(q(>6`r!i3s3AJRgfd*Wvp%i0O-9gdj7i!J*#K4 zpR4z3$w9BN=4I@s0s!b$Jxei>MK)lQ0PA=dS+yUxUI5tad-W{H5%ZF+u&ZTOtmE~_ zsvPXc+Rp{hd+mE^Ibx3JLPHVO@zI!DT}Na#w*6etvwAO^Ok^<=&|R>yLYPgj$UU58 p^XHH6%&T#{9$A$m44JS|{s%;s2!=uuf + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/PoiSymbol_24px.png b/src/Editor/icons/PoiSymbol_24px.png deleted file mode 100644 index f368e5444a54a8dc9b0c6469a6b3e35c7427f405..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmV;70dxL|P)V zziL!b5C`CcNX(i%f<+XIU_!EBB-^sKt?#y> z5I$PIXz7E;<}Eo)X) qQ26QQv>h{v4(0000 + + + + + + + + + diff --git a/src/Editor/icons/Redo.png b/src/Editor/icons/Redo.png deleted file mode 100644 index 196a9419710384aeb2020637f5d35e177203f615..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmV-w0hRuVP)kdg0003oNklY6h$Y97zCp$*hv}-^#_Cw0?rwW19)80GTOp=WG)I= zrDkdF=z|pzelv4F?8aglbzi?rVz)H!6@VwIPpt9*+f+(cs%8>SMO-(e~voLR;BBtFicl&lJ6 zBfe15w3r`SY47Gro8f9`oQtH*rRuSUa+hLq!0p=r{{Kex12oJ(v7X&v{Qv*}07*qo IM6N<$f`FN!8UO$Q diff --git a/src/Editor/icons/Redo.svg b/src/Editor/icons/Redo.svg new file mode 100644 index 00000000..bae58c11 --- /dev/null +++ b/src/Editor/icons/Redo.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Rotate.png b/src/Editor/icons/Rotate.png deleted file mode 100644 index 90689f312ce0c0fd9ea66443f50027b463611795..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmV;z0X_bSP)kdg0004rNklY5Qa~Xd>By@{6Gk5FrDdAiGM;Qm7SH6`~VZHK>P(3T3M?I5ls0gf}n+kLaanA z&KMyGDk4ZkS&QVB%kAD>&^El?&CGMVGdJ%U!uX$z9>5O3t|(b5m^Asuq|6G#bY^$} zLKJvKIP^h@u*}IY;0BoHMk%&*#S{hxBQ!|r0dZ=s+1>6#@3f<+x5FVprI>}c5-$1?VVK(ML;V!X-nK4;GfaN2R1q6)~hLv_d7Elu)i z18l2+qjqRbTW*k%Clm}w2LIpJ2p`hm74P~HrD&XA}5FyDt3uGy> z#Ubb1^Q;1HJ+9DFkO{9{@N1&M4uS@o4Cw*Z7$056n2=*!)&u-Lq%*mfF}HOt$R6)H zPBG4jjFsH|AWYS^OnGMMCqkMHUgYztR51CXiAjYlQD0N-{h9u%Ut&gR*V=n*xc~qF07*qoM6N<$f_S;Ys{jB1 diff --git a/src/Editor/icons/Rotate.svg b/src/Editor/icons/Rotate.svg new file mode 100644 index 00000000..2c6bfc9e --- /dev/null +++ b/src/Editor/icons/Rotate.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Samus Silhouette Gradient.png b/src/Editor/icons/Samus Silhouette Gradient.png deleted file mode 100644 index 81745b577a72ddd9a8269f4535b6053b198044df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 833 zcmV-H1HSx;P)kdg0009BNkl)*odX1wA4n3m4#qwBUsvMAqrw+ zmlOsC3j=}yLvYPzvm1BG#$A#n(KqL_n3*>-FWXt<9^UY{bLX7z`_7+h;{Pq@VLPxF zaSX??+8iS-q-WBdd?~$^KS~?^wr%pdZpG!eUs6&sVnp>X%~Po$qA`ne`c&_6hMV?2 zFWU*br&sj3&g!+e9xK%;)n+eXfK|`OnBy||?`bKKDK-kr3q_8VPpAWp`a@^EaFYZ{gR=G{^V)(N5U`-^!2XH-ZrZGI`Iw)V!u* zO+S@S3jL~W&9b8_Hbj*qDNM&>UYB&Q%0)U-e3zFCGDW0M`~%e(M0C@5tlo+-z>0*E zC>}2^6whbUXX)KW1=UpR&&kxhTYf@V)acYG1qP%?V7$>ltPa_ted{M3 z$Cj<&d|zl`RVlaC*BFhnH?>@si|HMPjH9+oxZ|Yy=e?5Vc+1pgZJ}H6t)uK1(TiM3 zW!Sc1*iD<^klpcJt81ajLM?WMplf3!*9^lh*j2-}?62lzg|3PF>BW-54_le@MH9Ap}}MJG?zk09>nz+Pr~Rak^2<7c@S(eP@zL2ZaYyoIXxlsK34_S9G%iZ9n;akrvoF#1X~Pw zzxd;}9%7o)VG)ZJf_UI6%lk#I9TaS{%AVG>s!(@QbuidNzn%XBPN{kdKAH2;00000 LNkvXXu0mjf;TMxC diff --git a/src/Editor/icons/Samus Silhouette Gradient.svg b/src/Editor/icons/Samus Silhouette Gradient.svg new file mode 100644 index 00000000..2f72ffb9 --- /dev/null +++ b/src/Editor/icons/Samus Silhouette Gradient.svg @@ -0,0 +1,77 @@ + + + +image/svg+xml + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Editor/icons/Save.png b/src/Editor/icons/Save.png deleted file mode 100644 index a609bb93cfa9c14d28faf83171667b9ce7adff7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4U3p`yMLp+Wr|2Xd;nId7s_U50z z$eR0S85*BRF_<$=XS`kJedvut<0J=35#<8OhLw9uzo#p(Nj5&>ieXE*^_N}am+%>< zj~pM_6pjQQYU*Q4_h-;kK1kf# Q3v?@kr>mdKI;Vst0BG<~;s5{u diff --git a/src/Editor/icons/Save.svg b/src/Editor/icons/Save.svg new file mode 100644 index 00000000..59019777 --- /dev/null +++ b/src/Editor/icons/Save.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/src/Editor/icons/SaveAndRepack_32px.png b/src/Editor/icons/SaveAndRepack_32px.png deleted file mode 100644 index 7661046d417ccd607ed65871f5c95599284f80d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4Ut2|vCLp+Wr|2Xd;nIaLx_QtL4 z|H283!hKQ>J&e2sZxwDh^l?iSWFJpw@Nl*b=#;p_(eW)apl}fngJ$ZzTy8U_C41%0 z-0#j|QDk=T`dRMYEL!|-AMexqZW4|+7$yWwy~~<#JG896;gkJ=9))8-k>z*mH(YX& zVhEbmIalpk!~YLYTHN}j40iBlEV#l@qI|-D;VQ=_9tX1~A7%l!3AqesID&X3W=+** YD3M#xB{#+W3eeRIp00i_>zopr050EBSpWb4 diff --git a/src/Editor/icons/SaveAndRepack_32px.svg b/src/Editor/icons/SaveAndRepack_32px.svg new file mode 100644 index 00000000..258bd495 --- /dev/null +++ b/src/Editor/icons/SaveAndRepack_32px.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Scale.png b/src/Editor/icons/Scale.png deleted file mode 100644 index 3489c50322c8fbe1a8ee9f84a516a1ba64374e6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4U>pfi@Lp+XOotntkpuo|(_vhm{ z*}j~}#73)>;@*E(9(aHJ=riY;lD+iP2SOo9A8Z9C$V`0Q#Be;Rk6%Y@mAH+hFN5hn zOO^&s2i6_4f81rVda8fms*4yq%jQ340vT1lc^>x|xZ%PcQ*MEor!1U%dY-bT`*kSKtTTA!(Isyo`;xc7`qHiH ggN194GCoUUuRq)Wuwb*UCD7>%p00i_>zopr03w-P6951J diff --git a/src/Editor/icons/Scale.svg b/src/Editor/icons/Scale.svg new file mode 100644 index 00000000..ecf2c1db --- /dev/null +++ b/src/Editor/icons/Scale.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Search_16px.png b/src/Editor/icons/Search_16px.png deleted file mode 100644 index 7b4ea7b73aae61094b4d9a819cd7f87227db6c44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67I?ZihG?9hI$<|&vx9((xnZtD z*E+#nk9ILwG3;&;58y6IVDc94Wv<_nF0GQi_@d3(tYaJAcv*=Fam%WmdKI;Vst05G^w{Qv*} diff --git a/src/Editor/icons/Search_16px.svg b/src/Editor/icons/Search_16px.svg new file mode 100644 index 00000000..97b4a76f --- /dev/null +++ b/src/Editor/icons/Search_16px.svg @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/src/Editor/icons/SelectMode.png b/src/Editor/icons/SelectMode.png deleted file mode 100644 index e7e0f3dba4dd5b0ab5beebe5353979cf2337946a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 493 zcmVkdg0005BNkl;C5T03&7>*^rZO(?xO7E4se@z={hdszB8T- z2wcG(yd4+=9^+w6`USWw9?<*c@jaemo+c&Td=3C`8+b-DH4Auw1v;ka)+3LXuuSB{JD0= jBY*}KID(lz;Q##ro=KNq@k~hB00000NkvXXu0mjfS8dlq diff --git a/src/Editor/icons/SelectMode.svg b/src/Editor/icons/SelectMode.svg new file mode 100644 index 00000000..93f15ea1 --- /dev/null +++ b/src/Editor/icons/SelectMode.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/SelectMode_16px.png b/src/Editor/icons/SelectMode_16px.png deleted file mode 100644 index 4904ff06ea50600cd90ac39ffd78bc6211f92245..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmV+l0rmcgP)qmaZ9eASJz^Bft7*5@uLr}Q`+qyX!L?)X1CPxdt(-Yj QVgLXD07*qoM6N<$g42p-B>(^b diff --git a/src/Editor/icons/SelectMode_16px.svg b/src/Editor/icons/SelectMode_16px.svg new file mode 100644 index 00000000..cf0417c9 --- /dev/null +++ b/src/Editor/icons/SelectMode_16px.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Show.png b/src/Editor/icons/Show.png deleted file mode 100644 index 7ebc6475e02d3c383dd26f11a961a24b6bfe75a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmV;s0Yv_ZP)kdg0004kNklOSBTgowZ=N8RbnbZh_SOcpsh%36oZ8zq}0x! z>^7McnsL`1e~5uV2)Fv~%$&XR&D|Lx#bF_SAAmlhGzlsdq)Ajia}!{MIB)T0Gwsb>W!A(;_cs-*3k)_P8vS#c|Xhdz=%9t3{UNKD2U7>qHIr17g+ zuXuDGgqR_zQo%rK!l1&FtxkuD*V={aaicfU#TE0t0CQ5f)&WOUZIgQB$TPs;gE#KT z(X)+LIkEx*bS#54A_y|J1sMbpYL?6kfiHlMu1XJyArPE93XdZYoH10HEKC1QU}9 lZHgrDYwyHA@UZ*?#3!Gns(AmKlQIAR002ovPDHLkV1j1 + + + + + + + + + diff --git a/src/Editor/icons/ShowMesh_24px.png b/src/Editor/icons/ShowMesh_24px.png deleted file mode 100644 index 2d9ee91615f439b10d6665cfee63240544644a75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 421 zcmV;W0b2fvP)X zy-FNW6ae6B<0Dwu*$FnA&St?pfSs|ivkC!WQ|~(@B#5vOF-^v3o?!D878W8132tMh zwY!2AisolIDb|_HxVr|!Def@md>7`Pb0=O2QaOCf}o z*8S6^XXC)*Cz5bu3yltM8+8k%REbne<4U$wV0(YWrI4YN`8eZHHCx z)0SH&riaR>ow&8-M-_y19pS=!rF`Cn(6K(KDueGDLb$V9l&`uI!fW5kVA;7476u=t z@2we-R*Nx2W1WLM7@Q`OE6mm~`|3$W>VH9HC + + + + + + + + + + + + + + diff --git a/src/Editor/icons/ShowSkeleton_24px.png b/src/Editor/icons/ShowSkeleton_24px.png deleted file mode 100644 index d299d4ec10b2c46f590d50af082e1a2643ac4176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i>7Fi*Ar`0CUUuYbQQ&EPxXxnn z=EQZ2tu4=62YVjd%9(eBEz^3^jQYQ-tX!f}-CPUBCLB27!J)8MY>h_xXX69n52icL zt=)a#5%bKwVzmckZy5G6PL5EX>B2X6;=~U}-%b7&#o5yDU-h9qqru>=#}wJi2j_Zh zX4N@lcA=A-VmdK II;Vst0OXodUH||9 diff --git a/src/Editor/icons/ShowSkeleton_24px.svg b/src/Editor/icons/ShowSkeleton_24px.svg new file mode 100644 index 00000000..c7c7540d --- /dev/null +++ b/src/Editor/icons/ShowSkeleton_24px.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/src/Editor/icons/ShowSkeleton_32px.png b/src/Editor/icons/ShowSkeleton_32px.png deleted file mode 100644 index 3109d6954a841f754d5989ef9346d0420b65baf7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmV+h0r~!kP)kdg0002ZNkle^1C;_sxQ61-Mc!5In3vQUC+d1G+@}2?pW~#H@*% zkJ!I4fH7eLBjD*Feus%b9-jMem+ftUdT^{jEKXkZ1Lev&57V{00Mp+|n<`4E2LJ#7 M07*qoM6N<$f>9G<2><{9 diff --git a/src/Editor/icons/ShowSkeleton_32px.svg b/src/Editor/icons/ShowSkeleton_32px.svg new file mode 100644 index 00000000..e82c4cc7 --- /dev/null +++ b/src/Editor/icons/ShowSkeleton_32px.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Sphere Preview.png b/src/Editor/icons/Sphere Preview.png deleted file mode 100644 index e369fdc14393e8e0b7525cf51c2830d86c4b12f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 749 zcmVkdg0008CNkl>DalEQhzM80(J%~|*bH2HBCq%av^3G91P&%888IOWg?buZ zRg5=*^TT4nH+)(((V|6*0Evf1K|+LLgAFz+HKLZrn!tr+al)?y0|NH2N52bfa$+66 z&N}M78tU`|?IZ3df!{Z77w8fakA$cWUq_*iUj5t;+;*o0e=!5pOy^cVFz<{Ae0I48 zDAeNENI&qy-Y1ak@?RiCt&Z>S2NKKm5Pe}g?1OGgC%gt=xGudp?6?zkC8%_=0sLT} zgQtn^*xS?ssjkI{aCNGY!aO4;E*`ROTdI+~CL*H6nZ_dCW*TffJqw}7cW|(3pm84D zxi{U|NPGeV2Tvm&9xg6+1IS59Nl1u~KK$I+%I#%NfQf^Pr+Y7f9?(l7C3&9?J!;lM zdzb|bu&{A)aB*}376t|t6@^YBtJ2YI@!95bZa=02U}EFw-c7&+pwvm^WV89TjOSYb zpLqrW3@jaN=@kI1K fbN~0 + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Square Preview.png b/src/Editor/icons/Square Preview.png deleted file mode 100644 index 3823fad13810f7f999c9a528e64722db8350a664..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmV-R0kr;!P)kdg0003JNklXkyJ=MsTk(-oiLF2kz!Xoltj+ia zaT>rc;`v1AJW?LE0tn + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Swap_16px.png b/src/Editor/icons/Swap_16px.png deleted file mode 100644 index f650390d34d255077adc74b9e26cc046f329fb3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6B0OCjLp08}UU1}MFyvr9@WiReJ8fntp;L?4>MOxF#mB`(_EXIRNco@O1TaS?83{1OPf$F + + + + + + + + + diff --git a/src/Editor/icons/Swap_24px.png b/src/Editor/icons/Swap_24px.png deleted file mode 100644 index 87f63efe2ef9ecf39d1cd7153f5d61ee94dc07ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i8c!F;5R21OF9-4+P~cz=$n$%D z^x>}lR6ljo>|dw71q>wOngWYAJ({9_ViEJE7Y)1rm{**-?r~wd_kvTZ4csO-%|6>n z2^FY)j!?Yyz~|ag$0o;p%Ns8qoA<^+L?t1W{SiaNOQs5jIPVwoYYl#F)MEJRTFvlx f`R)X3JALus6=_RfDId)Mx`V;f)z4*}Q$iB}aZ*M6 diff --git a/src/Editor/icons/Swap_24px.svg b/src/Editor/icons/Swap_24px.svg new file mode 100644 index 00000000..2fbf5ad6 --- /dev/null +++ b/src/Editor/icons/Swap_24px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/ToParentFolder_16px.png b/src/Editor/icons/ToParentFolder_16px.png deleted file mode 100644 index 60785be55e5fd70d29bcc096935ffd5262c24b34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmVI2LX7T-Y^K@fVcKwK@Ule>M6eg_#9Oo0VM^a^q`LlR>59Fs8e z;2fl|AP6}_7mZc08Vg#C-SwTaTdN2{VnK + + + + + + + + + diff --git a/src/Editor/icons/Translate.png b/src/Editor/icons/Translate.png deleted file mode 100644 index 4a3553459e80d2c8c35a27ec25dc0d822ed575c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmV-t0hs=YP)kdg0003lNkl7G?uqntYC?cppk%;UCg#x=gJ+KD61E`@gniT#d4#dwtq3K5N z9_h{8nNg_Rm^06RkuRST5;Cm{7;!}qu8gVxOwLFgXUwvIK0zuMgn)h-K$l}iE(k}u zMFDMg4{|}+(Jlt~z{kaAkV*&GxcGdQZDRr`+{P9wEnr3KKR|~sd@aCZOXnG&#~#7e z0vv=ry}tmH6M|rC0TzOAN~{$n$EoWKEx?F#7sd%-#_eg}b#Y^cQY;87$pzugLb2pt z1F)?3g}0=L6D}2sIQiYiVLZM?+ZZr>G}584kq$rGA#3Gr9V + + + + + + + + + diff --git a/src/Editor/icons/Tree_16px.png b/src/Editor/icons/Tree_16px.png deleted file mode 100644 index 444a78d6bcb5ae661b4082ecf863fb225b5086d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6JUm?-Lp07O|2V&4cj@=@cmE&! zpg!Sj1J8eB2EiC97W?Gj27`y{p58v1;f!g*I^7KQ@0TzKiqlL0;aLI|mvr c^Zrm|kiDd)|HFRDKcJZmp00i_>zopr05fSU%K!iX diff --git a/src/Editor/icons/Tree_16px.svg b/src/Editor/icons/Tree_16px.svg new file mode 100644 index 00000000..5ec55f4d --- /dev/null +++ b/src/Editor/icons/Tree_16px.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Tree_24px.png b/src/Editor/icons/Tree_24px.png deleted file mode 100644 index 8428b1967e0e3b89bb31feb843185cc9b7e00fd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iAWs*^5R22vKh8Tyr6_nGes}Gz zefj_P!}A^Nn9VvaG^~+fu@}D7kabx9klBF;^>4V^H?Z{_IJS&Y{*TWr-u)YH8@zgX n@WD&AAltJJOO|IwWic>p)QU)8>=9rDn$FgTe~DWM4fUt= + + + + + + + + + diff --git a/src/Editor/icons/Undo.png b/src/Editor/icons/Undo.png deleted file mode 100644 index d87db0117156da42a4b3b591bd79dffcb22c9690..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmV-t0hs=YP)kdg0003lNkl(cn@E znM3$BDEgkg>wEXTE#i##o*&$MzjLk<6;A380MKcP3d&o$g%#Sgg9CDO5w3y(A{_CJ zAe;mN#Hb@qx|GK%5e^O9q-t63)78{FvYk)5H8*0eC#XEWrPP^q2zrP z$~ABLN=tF?S!qdnEYB;|s%Mzbu@qsH4GTyRRsVmZ`T-X#Kc;V1-E05=002ovPDHLk FV1jvYoyY(H diff --git a/src/Editor/icons/Undo.svg b/src/Editor/icons/Undo.svg new file mode 100644 index 00000000..ef07704e --- /dev/null +++ b/src/Editor/icons/Undo.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Unlink.png b/src/Editor/icons/Unlink.png deleted file mode 100644 index 7f571d9945531f32a2e3b58683edd62efe4c7fae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmV-#0g(QQP)kdg0003tNklMFod-OIa!^o`)G5Gn z%`JD`)kW9Nk36YUKwIx7bmX-oT$+*j60T^2)(+LD=XD;q=a5t%#yKE#Q#g`T?HDJM zss+X#Fg1eJ139rrST6yFM6tYtIH~)kP0W+paI+*#V@Zt<(!ai)zX1t~s%4rrQ(pi8 N002ovPDHLkV1jVHom2n- diff --git a/src/Editor/icons/Unlink.svg b/src/Editor/icons/Unlink.svg new file mode 100644 index 00000000..9407c2c7 --- /dev/null +++ b/src/Editor/icons/Unlink.svg @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Up.png b/src/Editor/icons/Up.png deleted file mode 100644 index 497982a2e67f901704f816f0902ba611d04e1988..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 630 zcmV-+0*U>JP)a)-s_x=cG|?xq-iXZ=ef{BQY7BBv`B2pl+b_NntUDMgT2^YvEVb;li*xO*8`_nldHnO&89r6@a;p91T+9B<$m4$dedE>NVzbq1 z5KU8RIjHFkRaUp}SYA9ou5cC+_omwKPV2D03zxq?0kHl2ftqI3JDJXZ{h3UvXic + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Editor/icons/World.png b/src/Editor/icons/World.png deleted file mode 100644 index 0fe96c9463a6e6dd781898c59289616d69a99a17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 511 zcmVPD@xTq8_9Fo)W zFK`g@ND(FPQU?umFh#f)^?T|S6vVSU@H{Vgp3mp~JfR%^ZiIgVq7irBm{kY%6pU#X zk5(^&JC@BV$rzB6Q8HuM-RdAFYgbB-F+sm)f>AwEc4fsbf~+|^5=!b%LA{cMZF92c zL7ReFGZy58QxH72U{$pmeD{^wAfZKwg%R~g$vCVbar+pLzR}?RRld?`%mi44@!HVWHpxKIW+_+1X(P;P9h(VvcaaFB; zIhQqh?Xy86-f2G{z9Eac B>W%;a diff --git a/src/Editor/icons/World.svg b/src/Editor/icons/World.svg new file mode 100644 index 00000000..04047039 --- /dev/null +++ b/src/Editor/icons/World.svg @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/src/Editor/icons/World_16px.png b/src/Editor/icons/World_16px.png deleted file mode 100644 index 0e4176873612182cef356ddd6d1740c028af0197..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmV-j0iyniP)2rTJIm&cvvb=KJ^$hH*2{jYo&J00000NkvXXu0mjf@3^29 diff --git a/src/Editor/icons/World_16px.svg b/src/Editor/icons/World_16px.svg new file mode 100644 index 00000000..1e883e8f --- /dev/null +++ b/src/Editor/icons/World_16px.svg @@ -0,0 +1,36 @@ + + + + + + + + + + diff --git a/src/Editor/icons/X_16px.png b/src/Editor/icons/X_16px.png deleted file mode 100644 index e504e79c52f92d0f8508c1848037f618facfa31a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6GCf@!Lp09UUOdQqz<`6|+PX$kl+uq97?v-f~xw}N$Dm`_mhHD0fjH48d>)B_$Z zH)rH}z@M<@09);?ia_<1yIV6R6-5dAUUI*(Z}OM(>6NOL>)F5fDy_&#jB)~6%HZkh K=d#Wzp$Pz4CpV7( diff --git a/src/Editor/icons/X_16px.svg b/src/Editor/icons/X_16px.svg new file mode 100644 index 00000000..7e8556c4 --- /dev/null +++ b/src/Editor/icons/X_16px.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/Editor/main.cpp b/src/Editor/main.cpp index 488ffe09..88a162ed 100644 --- a/src/Editor/main.cpp +++ b/src/Editor/main.cpp @@ -11,6 +11,10 @@ #include #include +#ifdef __APPLE__ +void MacOSSetDarkAppearance(); +#endif + // Redirect qDebug output to the log file void QtLogRedirect(QtMsgType Type, const QMessageLogContext& /*rkContext*/, const QString& rkMessage) { @@ -71,6 +75,10 @@ public: int Main(int argc, char *argv[]) { // Create application +#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +#endif QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); CEditorApplication App(argc, argv); App.setApplicationName( APP_NAME ); @@ -85,6 +93,9 @@ public: // Set up dark theme qApp->setStyle(QStyleFactory::create("Fusion")); SetupPalette(); +#ifdef __APPLE__ + MacOSSetDarkAppearance(); +#endif // Init log bool Initialized = NLog::InitLog(LocateLogPath());