diff --git a/AppScope/app.json5 b/AppScope/app.json5 index a94925a7..19a815c5 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.example.opencax", + "bundleName": "com.example.nxea", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/AppScope/resources/base/element/string.json b/AppScope/resources/base/element/string.json index f79c7b24..91574bc2 100644 --- a/AppScope/resources/base/element/string.json +++ b/AppScope/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "OpenCAX" + "value": "NXEA" } ] } diff --git a/README.md b/README.md new file mode 100644 index 00000000..a12bfcb7 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +OpenCAX由于商标已经被注册,所以本软件即日起改名NXEA \ No newline at end of file diff --git a/build-profile.json5 b/build-profile.json5 index d946cc58..71d38fbc 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -5,13 +5,13 @@ "name": "default", "type": "HarmonyOS", "material": { - "certpath": "C:\\Users\\JackLee\\.ohos\\config\\default_OpenCAX_IBQbNZG6W5V0zTmQxRPojupy-F1gTlaQ6msiMPu4JRM=.cer", + "certpath": "C:\\Users\\JackLee\\.ohos\\config\\default_NXEA_0s33e8rF_-eDfV9W_2q2am8R5niF3V4xhQxkUtRtaC0=.cer", "keyAlias": "debugKey", - "keyPassword": "0000001B3A77593550E08B545C9DBACCC59B3C15B073167C67ECEF2B8B6B92A7FB893F9EF12C0B46F27F1D", - "profile": "C:\\Users\\JackLee\\.ohos\\config\\default_OpenCAX_IBQbNZG6W5V0zTmQxRPojupy-F1gTlaQ6msiMPu4JRM=.p7b", + "keyPassword": "0000001AA30759760D9D5D17A91BFB7147D9F271378B6316F13E50379FF23A4CF9A209064CA81F434E86", + "profile": "C:\\Users\\JackLee\\.ohos\\config\\default_NXEA_0s33e8rF_-eDfV9W_2q2am8R5niF3V4xhQxkUtRtaC0=.p7b", "signAlg": "SHA256withECDSA", - "storeFile": "C:\\Users\\JackLee\\.ohos\\config\\default_OpenCAX_IBQbNZG6W5V0zTmQxRPojupy-F1gTlaQ6msiMPu4JRM=.p12", - "storePassword": "0000001BA261C4B798064E9B27EDF1ABE90DCBB63F196BE8922529410D84879CD4436A14ADCC49F3E6248D" + "storeFile": "C:\\Users\\JackLee\\.ohos\\config\\default_NXEA_0s33e8rF_-eDfV9W_2q2am8R5niF3V4xhQxkUtRtaC0=.p12", + "storePassword": "0000001A54288F3ED33A493359C0F43F9FDBB746AC483C30B3CCC3CDCD726910AFD3190EDD7ABC9D16BE" } } ], diff --git a/entry/oh-package-lock.json5 b/entry/oh-package-lock.json5 index 02b3d542..3827455a 100644 --- a/entry/oh-package-lock.json5 +++ b/entry/oh-package-lock.json5 @@ -6,13 +6,13 @@ "lockfileVersion": 3, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { - "libopencax.so@src/main/cpp/types/libopencax": "libopencax.so@src/main/cpp/types/libopencax" + "libnxea.so@src/main/cpp/types/libnxea": "libnxea.so@src/main/cpp/types/libnxea" }, "packages": { - "libopencax.so@src/main/cpp/types/libopencax": { - "name": "libopencax.so", + "libnxea.so@src/main/cpp/types/libnxea": { + "name": "libnxea.so", "version": "1.0.0", - "resolved": "src/main/cpp/types/libopencax", + "resolved": "src/main/cpp/types/libnxea", "registryType": "local" } } diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index e452ac9d..40f9144b 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -6,6 +6,6 @@ "author": "", "license": "", "dependencies": { - "libopencax.so": "file:./src/main/cpp/types/libopencax" + "libnxea.so": "file:./src/main/cpp/types/libnxea" } } \ No newline at end of file diff --git a/entry/src/main/cpp/CMakeLists.txt b/entry/src/main/cpp/CMakeLists.txt index 50917c54..0af438c5 100644 --- a/entry/src/main/cpp/CMakeLists.txt +++ b/entry/src/main/cpp/CMakeLists.txt @@ -1,6 +1,6 @@ # the minimum version of CMake. cmake_minimum_required(VERSION 3.18.1) -project(opencax) +project(nxea) set(NATIVERENDER_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}) add_definitions(-DOHOS_PLATFORM) @@ -43,7 +43,7 @@ foreach(LIB_NAME ${OCCT_3RD_LIBS}) endforeach() # 添加源文件 -add_library(opencax SHARED +add_library(nxea SHARED napi_init.cpp # Header NativeEGLOCCT/EGLMgr/EGLCore.h @@ -80,7 +80,7 @@ add_library(opencax SHARED NativeEGLOCCT/Visualization/Tri/V3dTri.cpp NativeEGLOCCT/Visualization/Tri/V3dWCSTri.cpp NativeEGLOCCT/Visualization/Tri/V3dTriCube.cpp - NativeEGLOCCT/ViewController/V3dViewController.h NativeEGLOCCT/ViewController/V3dViewController.cpp) + NativeEGLOCCT/ViewController/V3dViewController.h NativeEGLOCCT/ViewController/V3dViewController.cpp) # 查找系统库 @@ -95,8 +95,8 @@ set(SYSTEM_LIBS ) # 链接系统库 -target_link_libraries(opencax PUBLIC ${SYSTEM_LIBS}) -target_link_libraries(opencax PUBLIC +target_link_libraries(nxea PUBLIC ${SYSTEM_LIBS}) +target_link_libraries(nxea PUBLIC # EGL Hilog 库 ${EGL-lib} ${GLES-lib} diff --git a/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLCore.cpp b/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLCore.cpp index 044e44d1..a7f6dc05 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLCore.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLCore.cpp @@ -10,7 +10,7 @@ #define NATIVE_TAG "EGLCore" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { // 配置EGL EGLint cfgAttribs[] = { diff --git a/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLCore.h b/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLCore.h index d5c91f3b..b03902c2 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLCore.h +++ b/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLCore.h @@ -10,7 +10,7 @@ #include "../common.h" #include -namespace NativeOpenCAX { +namespace NativeNXEA { class EGLCore { public: EGLCore(); diff --git a/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLSubCore.cpp b/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLSubCore.cpp index d07706e5..10935af4 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLSubCore.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLSubCore.cpp @@ -10,7 +10,7 @@ #define NATIVE_TAG "EGLSubCore" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { // 创建EGL context EGLint ctxAttribs[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE}; diff --git a/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLSubCore.h b/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLSubCore.h index dd7cc944..6737696a 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLSubCore.h +++ b/entry/src/main/cpp/NativeEGLOCCT/EGLMgr/EGLSubCore.h @@ -11,7 +11,7 @@ #include #include #include -namespace NativeOpenCAX { +namespace NativeNXEA { class EGLSubCore { public: diff --git a/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.cpp b/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.cpp index 4aa63558..a96388f0 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.cpp @@ -20,7 +20,7 @@ #endif #include "arkui/ui_input_event.h" -namespace NativeOpenCAX { +namespace NativeNXEA { // [Start plugin_manager_cpp] // plugin_manager.cpp std::unordered_map NativeMgr::nodeHandleMap_; diff --git a/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.h b/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.h index 6bc533f9..315ad651 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.h +++ b/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.h @@ -32,7 +32,7 @@ #include #include -namespace NativeOpenCAX { +namespace NativeNXEA { constexpr const int ZERO_ARG = 0; constexpr const int FIRST_ARG = 1; diff --git a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/OCCTMgr.cpp b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/OCCTMgr.cpp index 4dfdfd38..8c9e0a1a 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/OCCTMgr.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/OCCTMgr.cpp @@ -9,7 +9,7 @@ #define NATIVE_TAG "OCCTMgr" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { OCCTMgr::OCCTMgr():eglCore(nullptr) { diff --git a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/OCCTMgr.h b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/OCCTMgr.h index 3b4e3cda..691b6d40 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/OCCTMgr.h +++ b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/OCCTMgr.h @@ -11,7 +11,7 @@ #include "../EGLMgr/EGLCore.h" #include "../EGLMgr/EGLSubCore.h" #include "RenderThread.h" -namespace NativeOpenCAX { +namespace NativeNXEA { class OCCTMgr { diff --git a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/Render.cpp b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/Render.cpp index c18d9863..14f1775e 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/Render.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/Render.cpp @@ -8,7 +8,7 @@ #endif static std::mutex renderMutex; -namespace NativeOpenCAX { +namespace NativeNXEA { Render::Render(int w, int h): width(0), diff --git a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/Render.h b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/Render.h index f9c7dfd5..49544dc0 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/Render.h +++ b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/Render.h @@ -25,7 +25,7 @@ #include "../ViewController/V3dViewController.h" //TextLabel_Dev #include -namespace NativeOpenCAX { +namespace NativeNXEA { class Render { public: diff --git a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/RenderThread.cpp b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/RenderThread.cpp index 59525043..1bb4c71e 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/RenderThread.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/RenderThread.cpp @@ -4,7 +4,7 @@ #include #include #include -namespace NativeOpenCAX { +namespace NativeNXEA { RenderThread::RenderThread() : isRunning_(false) diff --git a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/RenderThread.h b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/RenderThread.h index b7924b68..d52b0983 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/RenderThread.h +++ b/entry/src/main/cpp/NativeEGLOCCT/OCCTMgr/RenderThread.h @@ -17,7 +17,7 @@ #include #include -namespace NativeOpenCAX { +namespace NativeNXEA { struct ThreadInfo{ int width; diff --git a/entry/src/main/cpp/NativeEGLOCCT/ViewController/V3dViewController.cpp b/entry/src/main/cpp/NativeEGLOCCT/ViewController/V3dViewController.cpp index 998387de..763333f6 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/ViewController/V3dViewController.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/ViewController/V3dViewController.cpp @@ -5,7 +5,7 @@ // please include "napi/native_api.h". #include "V3dViewController.h" -namespace NativeOpenCAX { +namespace NativeNXEA { V3dViewController::V3dViewController() { diff --git a/entry/src/main/cpp/NativeEGLOCCT/ViewController/V3dViewController.h b/entry/src/main/cpp/NativeEGLOCCT/ViewController/V3dViewController.h index 7e3ab3c9..be351556 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/ViewController/V3dViewController.h +++ b/entry/src/main/cpp/NativeEGLOCCT/ViewController/V3dViewController.h @@ -7,7 +7,7 @@ #ifndef OPENCAX_V3DVIEWCONTROLLER_H #define OPENCAX_V3DVIEWCONTROLLER_H #include "AIS_ViewController.hxx" -namespace NativeOpenCAX { +namespace NativeNXEA { class V3dViewController { public: V3dViewController(); diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Camera/V3dCamera.cpp b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Camera/V3dCamera.cpp index 8466bf15..43a4ffce 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Camera/V3dCamera.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Camera/V3dCamera.cpp @@ -10,7 +10,7 @@ #define NATIVE_TAG "CAMERA" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { V3dCamera::V3dCamera() : camera(nullptr) {} V3dCamera::~V3dCamera() {} diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Camera/V3dCamera.h b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Camera/V3dCamera.h index 5e661329..0d61444f 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Camera/V3dCamera.h +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Camera/V3dCamera.h @@ -10,7 +10,7 @@ #include #include #include -namespace NativeOpenCAX { +namespace NativeNXEA { class V3dCamera{ public: diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Context/V3dCtx.cpp b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Context/V3dCtx.cpp index 7cfc7c8d..b31f7844 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Context/V3dCtx.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Context/V3dCtx.cpp @@ -10,7 +10,7 @@ #define NATIVE_TAG "CTX" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { V3dCtx::V3dCtx(): ctx(nullptr) diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Context/V3dCtx.h b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Context/V3dCtx.h index 8667e018..0f31baba 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Context/V3dCtx.h +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Context/V3dCtx.h @@ -14,7 +14,7 @@ #include "../Drawer/V3dDrawer.h" -namespace NativeOpenCAX{ +namespace NativeNXEA{ class V3dCtx{ public: diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Drawer/V3dDrawer.cpp b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Drawer/V3dDrawer.cpp index e90ebf67..e10b70c4 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Drawer/V3dDrawer.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Drawer/V3dDrawer.cpp @@ -7,7 +7,7 @@ #define NATIVE_TAG "V3DDRAWER" #endif #include "V3dDrawer.h" -namespace NativeOpenCAX { +namespace NativeNXEA { V3dDrawer::V3dDrawer() : drawer(nullptr), diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Drawer/V3dDrawer.h b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Drawer/V3dDrawer.h index 2768a063..74c1c299 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Drawer/V3dDrawer.h +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Drawer/V3dDrawer.h @@ -20,7 +20,7 @@ #include #include -namespace NativeOpenCAX{ +namespace NativeNXEA{ class V3dDrawer { public: diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/OGD/V3dOGD.cpp b/entry/src/main/cpp/NativeEGLOCCT/Visualization/OGD/V3dOGD.cpp index e534ac64..ea090b4c 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/OGD/V3dOGD.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/OGD/V3dOGD.cpp @@ -10,7 +10,7 @@ #define NATIVE_TAG "GRAPHIC_DRIVER" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { V3dOGD::V3dOGD() : graphicDriver(nullptr), displayConnection(nullptr) {} V3dOGD::~V3dOGD() {} diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/OGD/V3dOGD.h b/entry/src/main/cpp/NativeEGLOCCT/Visualization/OGD/V3dOGD.h index 9a0adda5..951fd291 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/OGD/V3dOGD.h +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/OGD/V3dOGD.h @@ -12,7 +12,7 @@ #include #include -namespace NativeOpenCAX{ +namespace NativeNXEA{ class V3dOGD{ public: V3dOGD(); diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTri.cpp b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTri.cpp index f33ad6af..396c96e0 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTri.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTri.cpp @@ -9,7 +9,7 @@ #ifndef NATIVE_TAG #define NATIVE_TAG "V3DTRI" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { V3dTri::V3dTri(): axiPlam(nullptr), diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTri.h b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTri.h index 77288a80..efda4557 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTri.h +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTri.h @@ -10,7 +10,7 @@ #include #include #include -namespace NativeOpenCAX { +namespace NativeNXEA { class V3dTri { public: diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTriCube.cpp b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTriCube.cpp index f4ea26e7..e1ee9538 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTriCube.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTriCube.cpp @@ -10,7 +10,7 @@ #ifndef NATIVE_TAG #define NATIVE_TAG "V3DTRICUBE" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { V3dTriCube::V3dTriCube(): triCube(nullptr) diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTriCube.h b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTriCube.h index e797b956..ab4e59a4 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTriCube.h +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dTriCube.h @@ -12,7 +12,7 @@ #include #include -namespace NativeOpenCAX { +namespace NativeNXEA { class V3dTriCube { public: diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dWCSTri.cpp b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dWCSTri.cpp index cd0dcfbd..17d59d3e 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dWCSTri.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dWCSTri.cpp @@ -9,7 +9,7 @@ #ifndef NATIVE_TAG #define NATIVE_TAG "V3DWCSTRI" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { V3dWCSTri::V3dWCSTri() { diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dWCSTri.h b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dWCSTri.h index 15ce5673..fcc0cb2a 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dWCSTri.h +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Tri/V3dWCSTri.h @@ -10,7 +10,7 @@ #include #include #include -namespace NativeOpenCAX { +namespace NativeNXEA { class V3dWCSTri { public: diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/View/V3dView.cpp b/entry/src/main/cpp/NativeEGLOCCT/Visualization/View/V3dView.cpp index 065580e6..974f2f80 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/View/V3dView.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/View/V3dView.cpp @@ -13,7 +13,7 @@ #define NATIVE_TAG "VIEW" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { V3dView::V3dView() : view(nullptr) {} V3dView::~V3dView() {} diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/View/V3dView.h b/entry/src/main/cpp/NativeEGLOCCT/Visualization/View/V3dView.h index b6d15018..70930a9d 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/View/V3dView.h +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/View/V3dView.h @@ -14,7 +14,7 @@ #include #include -namespace NativeOpenCAX{ +namespace NativeNXEA{ class V3dView{ public: diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Viewer/V3dViewer.cpp b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Viewer/V3dViewer.cpp index 21f22e3e..0028ae4b 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Viewer/V3dViewer.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Viewer/V3dViewer.cpp @@ -11,7 +11,7 @@ #endif #include #include -namespace NativeOpenCAX { +namespace NativeNXEA { V3dViewer::V3dViewer() : viewer(nullptr) {} V3dViewer::~V3dViewer() {} diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Viewer/V3dViewer.h b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Viewer/V3dViewer.h index bc624d03..93c01875 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Viewer/V3dViewer.h +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Viewer/V3dViewer.h @@ -12,7 +12,7 @@ #include #include -namespace NativeOpenCAX{ +namespace NativeNXEA{ class V3dViewer{ public: diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Win/V3dWin.cpp b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Win/V3dWin.cpp index 47ed7bfd..e18e6fc6 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Win/V3dWin.cpp +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Win/V3dWin.cpp @@ -8,7 +8,7 @@ #ifndef NATIVE_TAG #define NATIVE_TAG "WINDOW" #endif -namespace NativeOpenCAX { +namespace NativeNXEA { V3dWin::V3dWin():win(nullptr){ diff --git a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Win/V3dWin.h b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Win/V3dWin.h index 2da37626..e4d40bf2 100644 --- a/entry/src/main/cpp/NativeEGLOCCT/Visualization/Win/V3dWin.h +++ b/entry/src/main/cpp/NativeEGLOCCT/Visualization/Win/V3dWin.h @@ -10,7 +10,7 @@ #include "NativeEGLOCCT/common.h" #include -namespace NativeOpenCAX { +namespace NativeNXEA { class V3dWin { public: diff --git a/entry/src/main/cpp/napi_init.cpp b/entry/src/main/cpp/napi_init.cpp index de44c355..8decbc8a 100644 --- a/entry/src/main/cpp/napi_init.cpp +++ b/entry/src/main/cpp/napi_init.cpp @@ -3,7 +3,7 @@ #include "NativeEGLOCCT/common.h" #include "NativeEGLOCCT/NativeMgr.h" -namespace NativeOpenCAX { +namespace NativeNXEA { EXTERN_C_START static napi_value Init(napi_env env, napi_value exports) { OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "Init", "Init begins"); @@ -31,18 +31,18 @@ static napi_value Init(napi_env env, napi_value exports) { EXTERN_C_END // 编写接口的描述信息,根据实际需要可以修改对应参数 -static napi_module OpenCAXModel = { +static napi_module NXEAModel = { .nm_version = 1, .nm_flags = 0, .nm_filename = nullptr, .nm_register_func = Init, - .nm_modname = "opencax", + .nm_modname = "nxea", .nm_priv = ((void*)0), .reserved = { 0 } }; } extern "C" __attribute__((constructor)) -void RegisterOpenCAXModule(void) +void RegisterNXEAModule(void) { - napi_module_register(&NativeOpenCAX::OpenCAXModel); + napi_module_register(&NativeNXEA::NXEAModel); } diff --git a/entry/src/main/cpp/types/libopencax/Index.d.ts b/entry/src/main/cpp/types/libnxea/Index.d.ts similarity index 77% rename from entry/src/main/cpp/types/libopencax/Index.d.ts rename to entry/src/main/cpp/types/libnxea/Index.d.ts index 0d2370e2..5e35e282 100644 --- a/entry/src/main/cpp/types/libopencax/Index.d.ts +++ b/entry/src/main/cpp/types/libnxea/Index.d.ts @@ -1,4 +1,4 @@ -export interface NativeXOpenCAX { +export interface NativeNXEA { setFrameRate(nodeId: string, min: number, max: number, expected: number): void; setNeedSoftKeyboard(nodeId: string, need: boolean): void; } diff --git a/entry/src/main/cpp/types/libopencax/oh-package.json5 b/entry/src/main/cpp/types/libnxea/oh-package.json5 similarity index 79% rename from entry/src/main/cpp/types/libopencax/oh-package.json5 rename to entry/src/main/cpp/types/libnxea/oh-package.json5 index 402cc366..871e00dd 100644 --- a/entry/src/main/cpp/types/libopencax/oh-package.json5 +++ b/entry/src/main/cpp/types/libnxea/oh-package.json5 @@ -1,5 +1,5 @@ { - "name": "libopencax.so", + "name": "libnxea.so", "types": "./Index.d.ts", "version": "1.0.0", "description": "Please describe the basic information." diff --git a/entry/src/main/ets/entryability/InitWindow.ets b/entry/src/main/ets/entryability/InitWindow.ets index 4359aaaf..82c285e1 100644 --- a/entry/src/main/ets/entryability/InitWindow.ets +++ b/entry/src/main/ets/entryability/InitWindow.ets @@ -34,6 +34,12 @@ function SetWinSize (width:number,height:number){ console.error(`MainWindow SetWinSize Error: win is nullptr!`); } } +function SetBackgroundColor(){ + if(mdwInfo.win){ + mdwInfo.win.setWindowBackgroundColor('#B3FFFFFF'); + mdwInfo.win.setWindowContainerColor('#B3FFFFFF', '#FFFFFFFF'); + } +} //窗口的事件监听 function InitWinEventHub(ctx:common.UIAbilityContext){ if(mdwInfo.win==undefined||mdwInfo.winStage==undefined){ @@ -63,13 +69,14 @@ export function InitLoadInfoPage(){ hilog.error(DOMAIN, 'Tag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err)); return; } + SetWinSize(mdwInfo.winWidth,mdwInfo.winHeight) + SetDisplayPosition((mdwInfo.displayWidth-InfoWinMargin[0])/4.16,(mdwInfo.displayHeight-InfoWinMargin[1])/4.16); + SetBackgroundColor(); hilog.info(DOMAIN, 'testTag', 'Succeeded in loading the content.'); }); }else{ console.error(`InitLoadInfoPage winStage Error: win is nullptr!`); } - SetWinSize(mdwInfo.winWidth,mdwInfo.winHeight) - SetDisplayPosition((mdwInfo.displayWidth-InfoWinMargin[0])/4.16,(mdwInfo.displayHeight-InfoWinMargin[1])/4.16); } //WinStage加载软件Info页面 export function InitLoadMainPage(rType:LoadPageType){ @@ -81,6 +88,11 @@ export function InitLoadMainPage(rType:LoadPageType){ hilog.error(DOMAIN, 'Tag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err)); return; } + mdwInfo.winWidth=mdwInfo.displayWidth-MainWinMargin[0]; + mdwInfo.winHeight=mdwInfo.displayHeight-MainWinMargin[1]*2; + SetWinSize(mdwInfo.winWidth,mdwInfo.winHeight) + SetDisplayPosition(MainWinMargin[0]/2,MainWinMargin[1]/2); + SetBackgroundColor(); hilog.info(DOMAIN, 'testTag', 'Succeeded in loading the content.'); }); }else{ @@ -93,6 +105,11 @@ export function InitLoadMainPage(rType:LoadPageType){ hilog.error(DOMAIN, 'Tag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err)); return; } + mdwInfo.winWidth=mdwInfo.displayWidth-MainWinMargin[0]; + mdwInfo.winHeight=mdwInfo.displayHeight-MainWinMargin[1]*2; + SetWinSize(mdwInfo.winWidth,mdwInfo.winHeight) + SetDisplayPosition(MainWinMargin[0]/2,MainWinMargin[1]/2); + SetBackgroundColor(); hilog.info(DOMAIN, 'testTag', 'Succeeded in loading the content.'); }); mdwInfo.win.showWindow(); @@ -100,10 +117,6 @@ export function InitLoadMainPage(rType:LoadPageType){ console.error(`InitLoadInfoPage winStage Error: win is nullptr!`); } } - mdwInfo.winWidth=mdwInfo.displayWidth-MainWinMargin[0]; - mdwInfo.winHeight=mdwInfo.displayHeight-MainWinMargin[1]*2; - SetWinSize(mdwInfo.winWidth,mdwInfo.winHeight) - SetDisplayPosition(MainWinMargin[0]/2,MainWinMargin[1]/2); } //初始化显示信息页面 @@ -116,7 +129,6 @@ export function InitInfoWindow(winStage: window.WindowStage,ctx:common.UIAbility } InitGlobalDWI(winStage); InitLoadInfoPage(); - //InitLoadMainPage(LoadPageType.STAGE) InitWinEventHub(ctx); }); } \ No newline at end of file diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index be68882a..25ca8965 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -70,8 +70,8 @@ struct Index { //OpenCAX主界面整体布局,采用多行布局 Column() { //头部导航功能区 - //Blank().height(uiMode.state?'15%':'0%') - TitleTab().height(uiMode.state?mdwInfo.displayHeight*0.07:0) + Blank().height(uiMode.state?mdwInfo.displayHeight*0.07:0) + //TitleTab().height(uiMode.state?mdwInfo.displayHeight*0.07:0) //分割线 Divider().vertical(false).strokeWidth(1).lineCap(LineCapStyle.Round).width('100%').backgroundColor(Color.Grey) //工具栏 @@ -116,11 +116,9 @@ struct Index { }.width('100%') .justifyContent(FlexAlign.Start) .height(mdwInfo.displayHeight*0.02) + .backgroundColor(Color.Transparent) } - // TitleTab() - // .height(uiMode.state?'15%':'0%') - // .backgroundColor(Color.Transparent) - // .backgroundBlurStyle(BlurStyle.Thin, { colorMode: ThemeColorMode.LIGHT, adaptiveColor: AdaptiveColor.DEFAULT, scale: 1.0 }) + TitleTab().height(uiMode.state?mdwInfo.displayHeight*0.07:0) }.width('100%') .height('100%') diff --git a/entry/src/main/ets/pages/Info.ets b/entry/src/main/ets/pages/Info.ets index 9ec0d7b2..40518e24 100644 --- a/entry/src/main/ets/pages/Info.ets +++ b/entry/src/main/ets/pages/Info.ets @@ -4,9 +4,9 @@ import { common } from '@kit.AbilityKit'; import { SWInfo } from './subpages/info/SWInfo'; import { SWSrc } from './subpages/info/SWSrc'; import { SWEnv } from './subpages/info/SWEnv'; +import { SegmentButtonV2Items,TabSegmentButtonV2 } from '@kit.ArkUI'; -const TabsBarStr:Array=['运行检测','软件介绍','更新日志','开源信息','关于'] @Entry @ComponentV2 struct Info { @@ -14,53 +14,23 @@ struct Info { private titleBarTabs: TabsController = new TabsController(); //当前的顶部导航选择页 @Local selectedIndex: number = 0; // 当前选中的索引 + @Local textItems: SegmentButtonV2Items = new SegmentButtonV2Items([ + { text: '运行检测' }, + { text: '软件介绍' }, + { text: '更新日志' }, + { text: '开源信息' }, + { text: '关于' }, + ]); build() { Flex({ direction: FlexDirection.Column }){ - Scroll() { - Row({space:0}) { - Blank().layoutWeight(1) - ForEach(TabsBarStr, (item: string, index: number) => { - Button(){ - Column(){ - Text(item) - .height('95%') - .fontSize(index === this.selectedIndex ? 20 : 16) - .fontWeight(index === this.selectedIndex ? FontWeight.Bold : FontWeight.Normal) - .backgroundColor(Color.Transparent) - Divider() - .height('5%') - .vertical(false) - .strokeWidth(2) - .lineCap(LineCapStyle.Round) - .color(Color.Grey) - .align(Alignment.Top) - .visibility(index === this.selectedIndex?Visibility.Visible:Visibility.Hidden) - }.width('100%') - .height('100%') - } - .width('7%') - .backgroundColor(index === this.selectedIndex ? $r('sys.color.container_modal_button_normal_baseboard') : Color.Transparent) - .type(ButtonType.Normal) - .onClick(() => { - this.titleBarTabs.changeIndex(index); - this.selectedIndex = index; - }) - }) - Blank().layoutWeight(1) - } - } - .height('5%') - .align(Alignment.Center) - .scrollable(ScrollDirection.Horizontal) - .scrollBar(BarState.Off) - .margin({ top: 0,left:0,bottom:0,right:0}) - //分割线 - Divider() - .vertical(false) - .strokeWidth(1) - .lineCap(LineCapStyle.Round) - .width('100%') - .backgroundColor(Color.Grey) + Row(){ + Blank().layoutWeight(1) + TabSegmentButtonV2({ + items: this.textItems, + selectedIndex: this.selectedIndex!!, + }).width('60%') + Blank().layoutWeight(1) + }.margin({ top: '1%'}) Tabs({barPosition: BarPosition.Start, index: this.selectedIndex,controller: this.titleBarTabs}){ TabContent() { @@ -90,7 +60,7 @@ struct Info { console.info('Checkbox1 change is'+ value); }) Text('下次启动不再显示').fontSize(18) - Button('确定') + Button('确定', { buttonStyle: ButtonStyleMode.NORMAL, role: ButtonRole.NORMAL }) .onClick(()=>{ let ctx=this.getUIContext().getHostContext() as common.UIAbilityContext; ctx.eventHub.emit('EMIT_LOADMAINPAGE',LoadPageType.STAGE) @@ -98,6 +68,8 @@ struct Info { Blank().layoutWeight(1) }.height('5%') .justifyContent(FlexAlign.Center) - }.margin({ top:'1%', left: 0, bottom: '1%', right:0 }) + .margin({ bottom: '1%'}) + }.width('100%') + .height('100%') } } \ No newline at end of file diff --git a/entry/src/main/ets/pages/eventhub/EventBase.ets b/entry/src/main/ets/pages/eventhub/EventBase.ets index 650648a3..8a457aed 100644 --- a/entry/src/main/ets/pages/eventhub/EventBase.ets +++ b/entry/src/main/ets/pages/eventhub/EventBase.ets @@ -4,7 +4,7 @@ import { mdwInfo } from '../dispwininfo/DispWinInfo'; import { window } from '@kit.ArkUI'; import { common, StartOptions,Want } from "@kit.AbilityKit"; import { picker } from '@kit.CoreFileKit'; -import NativeOpenCAX from 'libopencax.so'; +import NativeOpenCAX from 'libnxea.so'; import {EventSubAbility} from './EventSubAbility' import { diff --git a/entry/src/main/ets/pages/eventhub/EventSubAbility.ets b/entry/src/main/ets/pages/eventhub/EventSubAbility.ets index fc4e3aba..e9a29512 100644 --- a/entry/src/main/ets/pages/eventhub/EventSubAbility.ets +++ b/entry/src/main/ets/pages/eventhub/EventSubAbility.ets @@ -7,7 +7,7 @@ import { SubWinInfo } from "./EventBase"; export async function EventSubAbility(winInfo:SubWinInfo): Promise{ let ctx = mdwInfo.win?.getUIContext().getHostContext() as common.UIAbilityContext; let want: Want = { - bundleName: 'com.example.opencax', + bundleName: 'com.example.nxea', abilityName: 'SubAbility', parameters: { instanceKey: winInfo.subEventName as string diff --git a/entry/src/main/ets/pages/eventhub/XCompMgr.ets b/entry/src/main/ets/pages/eventhub/XCompMgr.ets index 6a076ae5..c8f5e79f 100644 --- a/entry/src/main/ets/pages/eventhub/XCompMgr.ets +++ b/entry/src/main/ets/pages/eventhub/XCompMgr.ets @@ -1,6 +1,6 @@ import { AppStorageV2, NodeContent } from "@kit.ArkUI"; import {RndId} from './EventBase' -import NativeOpenCAX from 'libopencax.so'; +import NativeOpenCAX from 'libnxea.so'; @ObservedV2 export class XCompInfo{ diff --git a/entry/src/main/ets/pages/initEvent/ExtractDir.ets b/entry/src/main/ets/pages/initevent/ExtractDir.ets similarity index 100% rename from entry/src/main/ets/pages/initEvent/ExtractDir.ets rename to entry/src/main/ets/pages/initevent/ExtractDir.ets diff --git a/entry/src/main/ets/pages/initEvent/InitEnv.ets b/entry/src/main/ets/pages/initevent/InitEnv.ets similarity index 100% rename from entry/src/main/ets/pages/initEvent/InitEnv.ets rename to entry/src/main/ets/pages/initevent/InitEnv.ets diff --git a/entry/src/main/ets/pages/initEvent/InitEventHub.ets b/entry/src/main/ets/pages/initevent/InitEventHub.ets similarity index 100% rename from entry/src/main/ets/pages/initEvent/InitEventHub.ets rename to entry/src/main/ets/pages/initevent/InitEventHub.ets diff --git a/entry/src/main/ets/pages/initEvent/InitOptions.ets b/entry/src/main/ets/pages/initevent/InitOptions.ets similarity index 100% rename from entry/src/main/ets/pages/initEvent/InitOptions.ets rename to entry/src/main/ets/pages/initevent/InitOptions.ets diff --git a/entry/src/main/ets/pages/initEvent/README.md b/entry/src/main/ets/pages/initevent/README.md similarity index 100% rename from entry/src/main/ets/pages/initEvent/README.md rename to entry/src/main/ets/pages/initevent/README.md diff --git a/entry/src/main/ets/pages/subpages/info/SWEnv.ets b/entry/src/main/ets/pages/subpages/info/SWEnv.ets index dbf4b4da..90bf0bd2 100644 --- a/entry/src/main/ets/pages/subpages/info/SWEnv.ets +++ b/entry/src/main/ets/pages/subpages/info/SWEnv.ets @@ -10,7 +10,7 @@ import { import { FreeWinMode, ExtractFonts -} from '../../initEvent/InitEnv'; +} from '../../initevent/InitEnv'; export let DisplayMode:Array=[ {btnModel:[ModelType.BASE],btnName:"横屏",btnNamed:"",btnIcon:"",btnTips:"横屏",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, @@ -85,6 +85,7 @@ export struct SWEnv { Text('状态:') Checkbox().select(this.drivceState); }.height('10%') + Row(){ TextComboBox({name:'屏幕支持方向:',menu:DisplayMode}) Blank().layoutWeight(1) @@ -93,6 +94,7 @@ export struct SWEnv { Text('状态:') Checkbox().select(this.winOriState); }.height('10%') + Row(){ Text('沙箱字体状态:') Blank().layoutWeight(1) diff --git a/entry/src/main/ets/pages/subpages/info/SWSrc.ets b/entry/src/main/ets/pages/subpages/info/SWSrc.ets index 9c29e6eb..d795d91b 100644 --- a/entry/src/main/ets/pages/subpages/info/SWSrc.ets +++ b/entry/src/main/ets/pages/subpages/info/SWSrc.ets @@ -20,7 +20,7 @@ export struct SWSrc { .height('30%') Column(){ TextArea({ - text: '源码开源地址:http://git.axibug.com/JackLee/OpenCAX.git \n ' + + text: '源码开源地址:http://git.axibug.com/JackLee/NXEA.git \n ' + '开源麻本质就是一种抄所以大家一起抄.正所谓你不抄我不抄项目怎么交 \n' + '一杯茶,一包烟,一行代码写一天,上午写,中午改,晚上调又调 \n'+ '东借借,西看看,月薪指定能过万 \n', diff --git a/entry/src/main/ets/pages/titletabs/TitleColumnSub.ets b/entry/src/main/ets/pages/titletabs/TitleColumnSub.ets index 81f07e15..aec82998 100644 --- a/entry/src/main/ets/pages/titletabs/TitleColumnSub.ets +++ b/entry/src/main/ets/pages/titletabs/TitleColumnSub.ets @@ -69,7 +69,6 @@ export struct TitleColumnSub { Blank().layoutWeight(1) }.width('100%') .height('100%') - .backgroundBlurStyle(BlurStyle.Thin, - { colorMode: ThemeColorMode.LIGHT, adaptiveColor: AdaptiveColor.DEFAULT, scale: 1.0 }) + .backgroundColor(Color.Transparent) } } \ No newline at end of file diff --git a/entry/src/main/ets/pages/titletabs/TitleTab.ets b/entry/src/main/ets/pages/titletabs/TitleTab.ets index 05d592f0..ac4a4833 100644 --- a/entry/src/main/ets/pages/titletabs/TitleTab.ets +++ b/entry/src/main/ets/pages/titletabs/TitleTab.ets @@ -46,7 +46,7 @@ export struct TitleTab { .align(Alignment.Top) .visibility(index === this.selectedIndex?Visibility.Visible:Visibility.Hidden) }.width('100%') - .height('100%') + .height('100%') } .width('7%') .backgroundColor(index === this.selectedIndex ? $r('sys.color.container_modal_button_normal_baseboard') : Color.Transparent) @@ -84,7 +84,6 @@ export struct TitleTab { .barHeight(0) .barMode(BarMode.Fixed) }.margin({ top:0, left: 0, bottom: 0, right: 0 }) - .backgroundBlurStyle(BlurStyle.Thin, - { colorMode: ThemeColorMode.LIGHT, adaptiveColor: AdaptiveColor.DEFAULT, scale: 1.0 }) + .backgroundColor(Color.Transparent) } } diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 index f7553a6d..ad68c445 100644 --- a/entry/src/main/module.json5 +++ b/entry/src/main/module.json5 @@ -17,7 +17,7 @@ "name": "ohos.permission.INPUT_MONITORING" }, { - "name": "ohos.permission.SET_WINDOW_TRANSPARENT" + 'name': "ohos.permission.SET_WINDOW_TRANSPARENT" } ], "abilities": [ diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index 664db65c..5cda90b4 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -10,7 +10,7 @@ }, { "name": "EntryAbility_label", - "value": "OpenCAX" + "value": "NXEA" } ] } \ No newline at end of file diff --git a/entry/src/main/resources/base/media/base_background.png b/entry/src/main/resources/base/media/base_background.png index c4554bb9..933b5e93 100644 Binary files a/entry/src/main/resources/base/media/base_background.png and b/entry/src/main/resources/base/media/base_background.png differ diff --git a/entry/src/main/resources/base/media/base_opencax_logo.png b/entry/src/main/resources/base/media/base_opencax_logo.png index 1eb45db2..3278faff 100644 Binary files a/entry/src/main/resources/base/media/base_opencax_logo.png and b/entry/src/main/resources/base/media/base_opencax_logo.png differ diff --git a/entry/src/main/resources/base/media/base_start_background.png b/entry/src/main/resources/base/media/base_start_background.png index 696cdefb..933b5e93 100644 Binary files a/entry/src/main/resources/base/media/base_start_background.png and b/entry/src/main/resources/base/media/base_start_background.png differ diff --git a/image/background.xcf b/image/background.xcf new file mode 100644 index 00000000..738941ef Binary files /dev/null and b/image/background.xcf differ diff --git a/image/icon.xcf b/image/icon.xcf new file mode 100644 index 00000000..e729a5d6 Binary files /dev/null and b/image/icon.xcf differ