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 a2b8726a..00000000 Binary files a/src/Editor/icons/AnchorRoot_32px.png and /dev/null differ 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 9e9a93e4..00000000 Binary files a/src/Editor/icons/ArrowD_16px.png and /dev/null differ 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 6ca8fd20..00000000 Binary files a/src/Editor/icons/ArrowL_16px.png and /dev/null differ 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 2a8583f3..00000000 Binary files a/src/Editor/icons/Beginning_24px.png and /dev/null differ diff --git a/src/Editor/icons/Beginning_24px.svg b/src/Editor/icons/Beginning_24px.svg new file mode 100644 index 00000000..b67c25b0 --- /dev/null +++ b/src/Editor/icons/Beginning_24px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Beginning_32px.png b/src/Editor/icons/Beginning_32px.png deleted file mode 100644 index 4be70e7e..00000000 Binary files a/src/Editor/icons/Beginning_32px.png and /dev/null differ 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 598824f9..00000000 Binary files a/src/Editor/icons/BindPose_24px.png and /dev/null differ diff --git a/src/Editor/icons/BindPose_24px.svg b/src/Editor/icons/BindPose_24px.svg new file mode 100644 index 00000000..c279f302 --- /dev/null +++ b/src/Editor/icons/BindPose_24px.svg @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/src/Editor/icons/BindPose_32px.png b/src/Editor/icons/BindPose_32px.png deleted file mode 100644 index c1d3c534..00000000 Binary files a/src/Editor/icons/BindPose_32px.png and /dev/null differ diff --git a/src/Editor/icons/BindPose_32px.svg b/src/Editor/icons/BindPose_32px.svg new file mode 100644 index 00000000..378e5858 --- /dev/null +++ b/src/Editor/icons/BindPose_32px.svg @@ -0,0 +1,24 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Create.png b/src/Editor/icons/Create.png deleted file mode 100644 index 0c65da24..00000000 Binary files a/src/Editor/icons/Create.png and /dev/null differ 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 03c0b387..00000000 Binary files a/src/Editor/icons/Disc_16px.png and /dev/null differ diff --git a/src/Editor/icons/Disc_16px.svg b/src/Editor/icons/Disc_16px.svg new file mode 100644 index 00000000..8c5648cb --- /dev/null +++ b/src/Editor/icons/Disc_16px.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Display.png b/src/Editor/icons/Display.png deleted file mode 100644 index bd8fc196..00000000 Binary files a/src/Editor/icons/Display.png and /dev/null differ diff --git a/src/Editor/icons/Display.svg b/src/Editor/icons/Display.svg new file mode 100644 index 00000000..28ae9dc3 --- /dev/null +++ b/src/Editor/icons/Display.svg @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/src/Editor/icons/DontLoop_24px.png b/src/Editor/icons/DontLoop_24px.png deleted file mode 100644 index 3191f9f8..00000000 Binary files a/src/Editor/icons/DontLoop_24px.png and /dev/null differ 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 744fc6a9..00000000 Binary files a/src/Editor/icons/DontLoop_32px.png and /dev/null differ 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 65a907f3..00000000 Binary files a/src/Editor/icons/Down.png and /dev/null differ 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 40a8d03b..00000000 Binary files a/src/Editor/icons/Edit_16px.png and /dev/null differ diff --git a/src/Editor/icons/Edit_16px.svg b/src/Editor/icons/Edit_16px.svg new file mode 100644 index 00000000..44774d23 --- /dev/null +++ b/src/Editor/icons/Edit_16px.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Edit_24px.png b/src/Editor/icons/Edit_24px.png deleted file mode 100644 index fe154c9d..00000000 Binary files a/src/Editor/icons/Edit_24px.png and /dev/null differ diff --git a/src/Editor/icons/Edit_24px.svg b/src/Editor/icons/Edit_24px.svg new file mode 100644 index 00000000..d216c35d --- /dev/null +++ b/src/Editor/icons/Edit_24px.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Edit_32px.png b/src/Editor/icons/Edit_32px.png deleted file mode 100644 index b244b962..00000000 Binary files a/src/Editor/icons/Edit_32px.png and /dev/null differ diff --git a/src/Editor/icons/Edit_32px.svg b/src/Editor/icons/Edit_32px.svg new file mode 100644 index 00000000..4bf1e209 --- /dev/null +++ b/src/Editor/icons/Edit_32px.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/End_24px.png b/src/Editor/icons/End_24px.png deleted file mode 100644 index d05ef81e..00000000 Binary files a/src/Editor/icons/End_24px.png and /dev/null differ 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 0c72b3ba..00000000 Binary files a/src/Editor/icons/End_32px.png and /dev/null differ 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 21de68cc..00000000 Binary files a/src/Editor/icons/Free Camera.png and /dev/null differ diff --git a/src/Editor/icons/Free Camera.svg b/src/Editor/icons/Free Camera.svg new file mode 100644 index 00000000..009ff7bc --- /dev/null +++ b/src/Editor/icons/Free Camera.svg @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Gear_16px.png b/src/Editor/icons/Gear_16px.png deleted file mode 100644 index 627b5363..00000000 Binary files a/src/Editor/icons/Gear_16px.png and /dev/null differ diff --git a/src/Editor/icons/Gear_16px.svg b/src/Editor/icons/Gear_16px.svg new file mode 100644 index 00000000..aadc0074 --- /dev/null +++ b/src/Editor/icons/Gear_16px.svg @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Gear_24px.png b/src/Editor/icons/Gear_24px.png deleted file mode 100644 index c421d612..00000000 Binary files a/src/Editor/icons/Gear_24px.png and /dev/null differ 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 da9f8519..00000000 Binary files a/src/Editor/icons/Grid_24px.png and /dev/null differ 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 3deabb6f..00000000 Binary files a/src/Editor/icons/Grid_32px.png and /dev/null differ 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 4a89e0ee..00000000 Binary files a/src/Editor/icons/Hide.png and /dev/null differ diff --git a/src/Editor/icons/Hide.svg b/src/Editor/icons/Hide.svg new file mode 100644 index 00000000..8c339b0e --- /dev/null +++ b/src/Editor/icons/Hide.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Highlight.png b/src/Editor/icons/Highlight.png deleted file mode 100644 index d653b371..00000000 Binary files a/src/Editor/icons/Highlight.png and /dev/null differ 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 9b2ad889..00000000 Binary files a/src/Editor/icons/Instances.png and /dev/null differ 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 4386a6e0..00000000 Binary files a/src/Editor/icons/Instances_16px.png and /dev/null differ diff --git a/src/Editor/icons/Instances_16px.svg b/src/Editor/icons/Instances_16px.svg new file mode 100644 index 00000000..9a992b39 --- /dev/null +++ b/src/Editor/icons/Instances_16px.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Link.png b/src/Editor/icons/Link.png deleted file mode 100644 index 3e0a1e90..00000000 Binary files a/src/Editor/icons/Link.png and /dev/null differ 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 4efc1c2a..00000000 Binary files a/src/Editor/icons/Loop_24px.png and /dev/null differ diff --git a/src/Editor/icons/Loop_24px.svg b/src/Editor/icons/Loop_24px.svg new file mode 100644 index 00000000..0a9f24c1 --- /dev/null +++ b/src/Editor/icons/Loop_24px.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Loop_32px.png b/src/Editor/icons/Loop_32px.png deleted file mode 100644 index c2784bd3..00000000 Binary files a/src/Editor/icons/Loop_32px.png and /dev/null differ 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 a369866c..00000000 Binary files a/src/Editor/icons/Material Highlight.png and /dev/null differ 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 cb992bce..00000000 Binary files a/src/Editor/icons/Minus v2.png and /dev/null differ diff --git a/src/Editor/icons/Minus v2.svg b/src/Editor/icons/Minus v2.svg new file mode 100644 index 00000000..031cac16 --- /dev/null +++ b/src/Editor/icons/Minus v2.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Minus.png b/src/Editor/icons/Minus.png deleted file mode 100644 index 72a468a7..00000000 Binary files a/src/Editor/icons/Minus.png and /dev/null differ 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 aecf9454..00000000 Binary files a/src/Editor/icons/Model Preview.png and /dev/null differ diff --git a/src/Editor/icons/Model Preview.svg b/src/Editor/icons/Model Preview.svg new file mode 100644 index 00000000..2f082869 --- /dev/null +++ b/src/Editor/icons/Model Preview.svg @@ -0,0 +1,77 @@ + + + +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 f6fcfdcb..00000000 Binary files a/src/Editor/icons/Modify.png and /dev/null differ 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 274aca64..00000000 Binary files a/src/Editor/icons/New.png and /dev/null differ diff --git a/src/Editor/icons/New.svg b/src/Editor/icons/New.svg new file mode 100644 index 00000000..22084585 --- /dev/null +++ b/src/Editor/icons/New.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/New_16px.png b/src/Editor/icons/New_16px.png deleted file mode 100644 index b36577a9..00000000 Binary files a/src/Editor/icons/New_16px.png and /dev/null differ 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 ef70f04f..00000000 Binary files a/src/Editor/icons/Open.png and /dev/null differ diff --git a/src/Editor/icons/Open.svg b/src/Editor/icons/Open.svg new file mode 100644 index 00000000..b75d1551 --- /dev/null +++ b/src/Editor/icons/Open.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Open_16px.png b/src/Editor/icons/Open_16px.png deleted file mode 100644 index 06f590fd..00000000 Binary files a/src/Editor/icons/Open_16px.png and /dev/null differ diff --git a/src/Editor/icons/Open_16px.svg b/src/Editor/icons/Open_16px.svg new file mode 100644 index 00000000..dfaa7c61 --- /dev/null +++ b/src/Editor/icons/Open_16px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Open_24px.png b/src/Editor/icons/Open_24px.png deleted file mode 100644 index ad73d42c..00000000 Binary files a/src/Editor/icons/Open_24px.png and /dev/null differ diff --git a/src/Editor/icons/Open_24px.svg b/src/Editor/icons/Open_24px.svg new file mode 100644 index 00000000..47e91ead --- /dev/null +++ b/src/Editor/icons/Open_24px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/OrbitCamera_24px.png b/src/Editor/icons/OrbitCamera_24px.png deleted file mode 100644 index 12e3d20e..00000000 Binary files a/src/Editor/icons/OrbitCamera_24px.png and /dev/null differ 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 ed00df23..00000000 Binary files a/src/Editor/icons/OrbitCamera_32px.png and /dev/null differ 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 48b51400..00000000 Binary files a/src/Editor/icons/POI Important.png and /dev/null differ diff --git a/src/Editor/icons/POI Important.svg b/src/Editor/icons/POI Important.svg new file mode 100644 index 00000000..311cfda5 --- /dev/null +++ b/src/Editor/icons/POI Important.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/POI Normal.png b/src/Editor/icons/POI Normal.png deleted file mode 100644 index 048a90bf..00000000 Binary files a/src/Editor/icons/POI Normal.png and /dev/null differ 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 81c962d4..00000000 Binary files a/src/Editor/icons/Pause_24px.png and /dev/null differ 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 6be724a4..00000000 Binary files a/src/Editor/icons/Pause_32px.png and /dev/null differ 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 07dfca9c..00000000 Binary files a/src/Editor/icons/Play_24px.png and /dev/null differ 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 5fee204f..00000000 Binary files a/src/Editor/icons/Play_32px.png and /dev/null differ diff --git a/src/Editor/icons/Play_32px.svg b/src/Editor/icons/Play_32px.svg new file mode 100644 index 00000000..a7c00311 --- /dev/null +++ b/src/Editor/icons/Play_32px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Plus.png b/src/Editor/icons/Plus.png deleted file mode 100644 index ce14f452..00000000 Binary files a/src/Editor/icons/Plus.png and /dev/null differ diff --git a/src/Editor/icons/Plus.svg b/src/Editor/icons/Plus.svg new file mode 100644 index 00000000..4f17d98e --- /dev/null +++ b/src/Editor/icons/Plus.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/PoiSymbol_24px.png b/src/Editor/icons/PoiSymbol_24px.png deleted file mode 100644 index f368e544..00000000 Binary files a/src/Editor/icons/PoiSymbol_24px.png and /dev/null differ diff --git a/src/Editor/icons/PoiSymbol_24px.svg b/src/Editor/icons/PoiSymbol_24px.svg new file mode 100644 index 00000000..3effb373 --- /dev/null +++ b/src/Editor/icons/PoiSymbol_24px.svg @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Redo.png b/src/Editor/icons/Redo.png deleted file mode 100644 index 196a9419..00000000 Binary files a/src/Editor/icons/Redo.png and /dev/null differ 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 90689f31..00000000 Binary files a/src/Editor/icons/Rotate.png and /dev/null differ 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 81745b57..00000000 Binary files a/src/Editor/icons/Samus Silhouette Gradient.png and /dev/null differ 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 a609bb93..00000000 Binary files a/src/Editor/icons/Save.png and /dev/null differ 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 7661046d..00000000 Binary files a/src/Editor/icons/SaveAndRepack_32px.png and /dev/null differ 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 3489c503..00000000 Binary files a/src/Editor/icons/Scale.png and /dev/null differ 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 7b4ea7b7..00000000 Binary files a/src/Editor/icons/Search_16px.png and /dev/null differ 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 e7e0f3db..00000000 Binary files a/src/Editor/icons/SelectMode.png and /dev/null differ 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 4904ff06..00000000 Binary files a/src/Editor/icons/SelectMode_16px.png and /dev/null differ 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 7ebc6475..00000000 Binary files a/src/Editor/icons/Show.png and /dev/null differ diff --git a/src/Editor/icons/Show.svg b/src/Editor/icons/Show.svg new file mode 100644 index 00000000..f77ac227 --- /dev/null +++ b/src/Editor/icons/Show.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/src/Editor/icons/ShowMesh_24px.png b/src/Editor/icons/ShowMesh_24px.png deleted file mode 100644 index 2d9ee916..00000000 Binary files a/src/Editor/icons/ShowMesh_24px.png and /dev/null differ diff --git a/src/Editor/icons/ShowMesh_24px.svg b/src/Editor/icons/ShowMesh_24px.svg new file mode 100644 index 00000000..d4eeaa36 --- /dev/null +++ b/src/Editor/icons/ShowMesh_24px.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/ShowSkeleton_24px.png b/src/Editor/icons/ShowSkeleton_24px.png deleted file mode 100644 index d299d4ec..00000000 Binary files a/src/Editor/icons/ShowSkeleton_24px.png and /dev/null differ 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 3109d695..00000000 Binary files a/src/Editor/icons/ShowSkeleton_32px.png and /dev/null differ 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 e369fdc1..00000000 Binary files a/src/Editor/icons/Sphere Preview.png and /dev/null differ diff --git a/src/Editor/icons/Sphere Preview.svg b/src/Editor/icons/Sphere Preview.svg new file mode 100644 index 00000000..0af60b13 --- /dev/null +++ b/src/Editor/icons/Sphere Preview.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Square Preview.png b/src/Editor/icons/Square Preview.png deleted file mode 100644 index 3823fad1..00000000 Binary files a/src/Editor/icons/Square Preview.png and /dev/null differ diff --git a/src/Editor/icons/Square Preview.svg b/src/Editor/icons/Square Preview.svg new file mode 100644 index 00000000..bd1dd194 --- /dev/null +++ b/src/Editor/icons/Square Preview.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/Editor/icons/Swap_16px.png b/src/Editor/icons/Swap_16px.png deleted file mode 100644 index f650390d..00000000 Binary files a/src/Editor/icons/Swap_16px.png and /dev/null differ diff --git a/src/Editor/icons/Swap_16px.svg b/src/Editor/icons/Swap_16px.svg new file mode 100644 index 00000000..fdd773a5 --- /dev/null +++ b/src/Editor/icons/Swap_16px.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Swap_24px.png b/src/Editor/icons/Swap_24px.png deleted file mode 100644 index 87f63efe..00000000 Binary files a/src/Editor/icons/Swap_24px.png and /dev/null differ 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 60785be5..00000000 Binary files a/src/Editor/icons/ToParentFolder_16px.png and /dev/null differ diff --git a/src/Editor/icons/ToParentFolder_16px.svg b/src/Editor/icons/ToParentFolder_16px.svg new file mode 100644 index 00000000..456397f1 --- /dev/null +++ b/src/Editor/icons/ToParentFolder_16px.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Translate.png b/src/Editor/icons/Translate.png deleted file mode 100644 index 4a355345..00000000 Binary files a/src/Editor/icons/Translate.png and /dev/null differ diff --git a/src/Editor/icons/Translate.svg b/src/Editor/icons/Translate.svg new file mode 100644 index 00000000..35896b11 --- /dev/null +++ b/src/Editor/icons/Translate.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Tree_16px.png b/src/Editor/icons/Tree_16px.png deleted file mode 100644 index 444a78d6..00000000 Binary files a/src/Editor/icons/Tree_16px.png and /dev/null differ 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 8428b196..00000000 Binary files a/src/Editor/icons/Tree_24px.png and /dev/null differ diff --git a/src/Editor/icons/Tree_24px.svg b/src/Editor/icons/Tree_24px.svg new file mode 100644 index 00000000..5eda96d1 --- /dev/null +++ b/src/Editor/icons/Tree_24px.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/src/Editor/icons/Undo.png b/src/Editor/icons/Undo.png deleted file mode 100644 index d87db011..00000000 Binary files a/src/Editor/icons/Undo.png and /dev/null differ 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 7f571d99..00000000 Binary files a/src/Editor/icons/Unlink.png and /dev/null differ 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 497982a2..00000000 Binary files a/src/Editor/icons/Up.png and /dev/null differ diff --git a/src/Editor/icons/Up.svg b/src/Editor/icons/Up.svg new file mode 100644 index 00000000..dbd2edb0 --- /dev/null +++ b/src/Editor/icons/Up.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + \ 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 0fe96c94..00000000 Binary files a/src/Editor/icons/World.png and /dev/null differ 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 0e417687..00000000 Binary files a/src/Editor/icons/World_16px.png and /dev/null differ 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 e504e79c..00000000 Binary files a/src/Editor/icons/X_16px.png and /dev/null differ 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());