plusui-native 0.2.106 → 0.2.108

package/templates/react/CMakeLists.txt.template

@@ -5,12 +5,15 @@ if(POLICY CMP0141)
     cmake_policy(SET CMP0141 NEW)
 endif()
 
-project({{PROJECT_NAME}} VERSION {{PROJECT_VERSION}} LANGUAGES CXX)
+project({{PROJECT_NAME_LOWER}} VERSION {{PROJECT_VERSION}} LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+# Convert PROJECT_NAME to lowercase for executables
+string(TOLOWER "{{PROJECT_NAME_LOWER}}" PROJECT_NAME_LOWER)
+
 # Platform detection
 if(WIN32)
     add_definitions(-DPLUSUI_EDGE)
@@ -120,15 +123,15 @@ if(NOT EXISTS "${PLUSUI_CORE_DIR}/Features/FileDrop/filedrop.cpp")
 endif()
 
 # Create the executable
-add_executable({{PROJECT_NAME}} main.cpp)
+add_executable({{PROJECT_NAME_LOWER}} main.cpp)
 
 # Optional: Add your own C++ files here
 # file(GLOB_RECURSE MY_SOURCES "features/*.cpp")
-# target_sources({{PROJECT_NAME}} PRIVATE ${MY_SOURCES})
+# target_sources({{PROJECT_NAME_LOWER}} PRIVATE ${MY_SOURCES})
 
 # Link PlusUI library
-target_link_libraries({{PROJECT_NAME}} PRIVATE plusui)
-target_include_directories({{PROJECT_NAME}} PRIVATE ${CMAKE_SOURCE_DIR})
+target_link_libraries({{PROJECT_NAME_LOWER}} PRIVATE plusui)
+target_include_directories({{PROJECT_NAME_LOWER}} PRIVATE ${CMAKE_SOURCE_DIR})
 
 # Platform-specific setup
 if(WIN32)
@@ -147,26 +150,26 @@ if(WIN32)
     
     if(WEBVIEW2_INCLUDE_DIR)
         message(STATUS "Found WebView2 headers at: ${WEBVIEW2_INCLUDE_DIR}")
-        target_include_directories({{PROJECT_NAME}} PRIVATE ${WEBVIEW2_INCLUDE_DIR})
+        target_include_directories({{PROJECT_NAME_LOWER}} PRIVATE ${WEBVIEW2_INCLUDE_DIR})
     else()
         message(WARNING "WebView2 headers not found. Building may fail.")
         message(STATUS "Please install WebView2 SDK via NuGet:")
         message(STATUS "  nuget install Microsoft.Web.WebView2 -OutputDirectory packages")
     endif()
     
-    target_link_libraries({{PROJECT_NAME}} PRIVATE ole32 shell32 shlwapi user32 version)
+    target_link_libraries({{PROJECT_NAME_LOWER}} PRIVATE ole32 shell32 shlwapi user32 version)
     # Keep default console subsystem so standard int main() works in all build modes.
 elseif(APPLE)
     # macOS: WebKit
     find_library(WEBKIT_LIBRARY WebKit REQUIRED)
     find_library(COCOA_LIBRARY Cocoa REQUIRED)
-    target_link_libraries({{PROJECT_NAME}} PRIVATE ${WEBKIT_LIBRARY} ${COCOA_LIBRARY})
+    target_link_libraries({{PROJECT_NAME_LOWER}} PRIVATE ${WEBKIT_LIBRARY} ${COCOA_LIBRARY})
 
     # Create app bundle for production
     if(NOT PLUSUI_DEV_MODE)
-        set_target_properties({{PROJECT_NAME}} PROPERTIES
+        set_target_properties({{PROJECT_NAME_LOWER}} PROPERTIES
             MACOSX_BUNDLE TRUE
-            MACOSX_BUNDLE_BUNDLE_NAME "{{PROJECT_NAME}}"
+            MACOSX_BUNDLE_BUNDLE_NAME "{{PROJECT_NAME_LOWER}}"
             MACOSX_BUNDLE_BUNDLE_VERSION "{{PROJECT_VERSION}}"
             MACOSX_BUNDLE_GUI_IDENTIFIER "com.plusui.{{PROJECT_NAME_LOWER}}"
         )
@@ -176,17 +179,17 @@ else()
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
     pkg_check_modules(WEBKIT2 REQUIRED webkit2gtk-4.0)
-    target_include_directories({{PROJECT_NAME}} PRIVATE ${GTK3_INCLUDE_DIRS} ${WEBKIT2_INCLUDE_DIRS})
-    target_link_libraries({{PROJECT_NAME}} PRIVATE ${GTK3_LIBRARIES} ${WEBKIT2_LIBRARIES})
+    target_include_directories({{PROJECT_NAME_LOWER}} PRIVATE ${GTK3_INCLUDE_DIRS} ${WEBKIT2_INCLUDE_DIRS})
+    target_link_libraries({{PROJECT_NAME_LOWER}} PRIVATE ${GTK3_LIBRARIES} ${WEBKIT2_LIBRARIES})
 endif()
 
 # Copy frontend dist files to build directory after build
 if(EXISTS "${CMAKE_SOURCE_DIR}/frontend/dist")
-    add_custom_command(TARGET {{PROJECT_NAME}} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:{{PROJECT_NAME}}>/frontend"
+    add_custom_command(TARGET {{PROJECT_NAME_LOWER}} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:{{PROJECT_NAME_LOWER}}>/frontend"
         COMMAND ${CMAKE_COMMAND} -E copy_directory
             "${CMAKE_SOURCE_DIR}/frontend/dist"
-            "$<TARGET_FILE_DIR:{{PROJECT_NAME}}>/frontend"
+            "$<TARGET_FILE_DIR:{{PROJECT_NAME_LOWER}}>/frontend"
         COMMENT "Copying frontend files to build directory"
     )
 endif()

package/templates/react/frontend/vite.config.ts

@@ -31,6 +31,6 @@ export default defineConfig({
   },
   server: {
     port: 5173,
-    strictPort: true,
+    strictPort: false,
   },
 });

package/templates/react/main.cpp.template

@@ -23,7 +23,6 @@ using json = nlohmann::json;
 struct AppConfig {
     std::string name    = "{{PROJECT_NAME}}";
     std::string version = "0.1.0";
-    bool showWhenFrontendReady = true; // Hides blank webview until React mounts
 } appConfig;
 
 struct WindowConfig {
@@ -38,6 +37,7 @@ struct WindowConfig {
     bool devTools       = true;
     bool scrollbars     = false;
     bool fileDrop      = true;    // Enable file drop from OS to webview
+    bool tray          = true;    // Enable system tray
     std::string route   = "/";     // Starting route
     int devServerPort   = 5173;
 } windowConfig;
@@ -80,30 +80,28 @@ int main() {
         .skipTaskbar(!windowConfig.showInTaskbar)
         .scrollbars(windowConfig.scrollbars)
         .fileDrop(windowConfig.fileDrop)
+        .tray(windowConfig.tray)
         .centered(true)
         .build();
 
     // Icon from embedded assets
     #ifdef ASSET_ICON_PNG
         mainWindow.setIconFromMemory(ASSET_ICON_PNG, ASSET_ICON_PNG_LEN);
+        mainWindow.setTrayIconFromMemory(ASSET_ICON_PNG, ASSET_ICON_PNG_LEN);
     #endif
 
-    // Hide until frontend signals it's ready (no blank flash)
-    if (appConfig.showWhenFrontendReady) {
-        mainWindow.hide();
-    }
-
     // Wire up connect system (for custom frontend ↔ backend communication)
     // Run `plusui connect` after adding custom connect methods
     static Connect conn;
     bindConnect(mainWindow, conn);
 
-    // Load frontend
+    // Load frontend then show.
     #ifdef PLUSUI_DEV_MODE
         mainWindow.navigate("http://localhost:" + std::to_string(windowConfig.devServerPort) + windowConfig.route);
     #else
         mainWindow.loadFile("frontend/dist/index.html" + (windowConfig.route == "/" ? "" : "#" + windowConfig.route));
     #endif
+    mainWindow.show();
 
     App runtime;
     runtime.run();

package/templates/solid/CMakeLists.txt.template

@@ -5,12 +5,15 @@ if(POLICY CMP0141)
     cmake_policy(SET CMP0141 NEW)
 endif()
 
-project({{PROJECT_NAME}} VERSION {{PROJECT_VERSION}} LANGUAGES CXX)
+project({{PROJECT_NAME_LOWER}} VERSION {{PROJECT_VERSION}} LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+# Convert PROJECT_NAME to lowercase for executables
+string(TOLOWER "{{PROJECT_NAME_LOWER}}" PROJECT_NAME_LOWER)
+
 # Platform detection
 if(WIN32)
     add_definitions(-DPLUSUI_EDGE)
@@ -120,15 +123,15 @@ if(NOT EXISTS "${PLUSUI_CORE_DIR}/Features/FileDrop/filedrop.cpp")
 endif()
 
 # Create the executable
-add_executable({{PROJECT_NAME}} main.cpp)
+add_executable({{PROJECT_NAME_LOWER}} main.cpp)
 
 # Optional: Add your own C++ files here
 # file(GLOB_RECURSE MY_SOURCES "features/*.cpp")
-# target_sources({{PROJECT_NAME}} PRIVATE ${MY_SOURCES})
+# target_sources({{PROJECT_NAME_LOWER}} PRIVATE ${MY_SOURCES})
 
 # Link PlusUI library
-target_link_libraries({{PROJECT_NAME}} PRIVATE plusui)
-target_include_directories({{PROJECT_NAME}} PRIVATE ${CMAKE_SOURCE_DIR})
+target_link_libraries({{PROJECT_NAME_LOWER}} PRIVATE plusui)
+target_include_directories({{PROJECT_NAME_LOWER}} PRIVATE ${CMAKE_SOURCE_DIR})
 
 # Platform-specific setup
 if(WIN32)
@@ -147,26 +150,26 @@ if(WIN32)
     
     if(WEBVIEW2_INCLUDE_DIR)
         message(STATUS "Found WebView2 headers at: ${WEBVIEW2_INCLUDE_DIR}")
-        target_include_directories({{PROJECT_NAME}} PRIVATE ${WEBVIEW2_INCLUDE_DIR})
+        target_include_directories({{PROJECT_NAME_LOWER}} PRIVATE ${WEBVIEW2_INCLUDE_DIR})
     else()
         message(WARNING "WebView2 headers not found. Building may fail.")
         message(STATUS "Please install WebView2 SDK via NuGet:")
         message(STATUS "  nuget install Microsoft.Web.WebView2 -OutputDirectory packages")
     endif()
     
-    target_link_libraries({{PROJECT_NAME}} PRIVATE ole32 shell32 shlwapi user32 version)
+    target_link_libraries({{PROJECT_NAME_LOWER}} PRIVATE ole32 shell32 shlwapi user32 version)
     # Keep default console subsystem so standard int main() works in all build modes.
 elseif(APPLE)
     # macOS: WebKit
     find_library(WEBKIT_LIBRARY WebKit REQUIRED)
     find_library(COCOA_LIBRARY Cocoa REQUIRED)
-    target_link_libraries({{PROJECT_NAME}} PRIVATE ${WEBKIT_LIBRARY} ${COCOA_LIBRARY})
+    target_link_libraries({{PROJECT_NAME_LOWER}} PRIVATE ${WEBKIT_LIBRARY} ${COCOA_LIBRARY})
 
     # Create app bundle for production
     if(NOT PLUSUI_DEV_MODE)
-        set_target_properties({{PROJECT_NAME}} PROPERTIES
+        set_target_properties({{PROJECT_NAME_LOWER}} PROPERTIES
             MACOSX_BUNDLE TRUE
-            MACOSX_BUNDLE_BUNDLE_NAME "{{PROJECT_NAME}}"
+            MACOSX_BUNDLE_BUNDLE_NAME "{{PROJECT_NAME_LOWER}}"
             MACOSX_BUNDLE_BUNDLE_VERSION "{{PROJECT_VERSION}}"
             MACOSX_BUNDLE_GUI_IDENTIFIER "com.plusui.{{PROJECT_NAME_LOWER}}"
         )
@@ -176,17 +179,17 @@ else()
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
     pkg_check_modules(WEBKIT2 REQUIRED webkit2gtk-4.0)
-    target_include_directories({{PROJECT_NAME}} PRIVATE ${GTK3_INCLUDE_DIRS} ${WEBKIT2_INCLUDE_DIRS})
-    target_link_libraries({{PROJECT_NAME}} PRIVATE ${GTK3_LIBRARIES} ${WEBKIT2_LIBRARIES})
+    target_include_directories({{PROJECT_NAME_LOWER}} PRIVATE ${GTK3_INCLUDE_DIRS} ${WEBKIT2_INCLUDE_DIRS})
+    target_link_libraries({{PROJECT_NAME_LOWER}} PRIVATE ${GTK3_LIBRARIES} ${WEBKIT2_LIBRARIES})
 endif()
 
 # Copy frontend dist files to build directory after build
 if(EXISTS "${CMAKE_SOURCE_DIR}/frontend/dist")
-    add_custom_command(TARGET {{PROJECT_NAME}} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:{{PROJECT_NAME}}>/frontend"
+    add_custom_command(TARGET {{PROJECT_NAME_LOWER}} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:{{PROJECT_NAME_LOWER}}>/frontend"
         COMMAND ${CMAKE_COMMAND} -E copy_directory
             "${CMAKE_SOURCE_DIR}/frontend/dist"
-            "$<TARGET_FILE_DIR:{{PROJECT_NAME}}>/frontend"
+            "$<TARGET_FILE_DIR:{{PROJECT_NAME_LOWER}}>/frontend"
         COMMENT "Copying frontend files to build directory"
     )
 endif()

package/templates/solid/frontend/vite.config.ts

@@ -31,6 +31,6 @@ export default defineConfig({
   },
   server: {
     port: 5173,
-    strictPort: true,
+    strictPort: false,
   },
 });

package/templates/solid/main.cpp.template

@@ -23,7 +23,6 @@ using json = nlohmann::json;
 struct AppConfig {
     std::string name    = "{{PROJECT_NAME}}";
     std::string version = "0.1.0";
-    bool showWhenFrontendReady = true; // Hides blank webview until Solid mounts
 } appConfig;
 
 struct WindowConfig {
@@ -38,6 +37,7 @@ struct WindowConfig {
     bool devTools       = true;
     bool scrollbars     = false;
     bool fileDrop      = true;    // Enable file drop from OS to webview
+    bool tray          = true;    // Enable system tray
     std::string route   = "/";     // Starting route
     int devServerPort   = 5173;
 } windowConfig;
@@ -80,30 +80,28 @@ int main() {
         .skipTaskbar(!windowConfig.showInTaskbar)
         .scrollbars(windowConfig.scrollbars)
         .fileDrop(windowConfig.fileDrop)
+        .tray(windowConfig.tray)
         .centered(true)
         .build();
 
     // Icon from embedded assets
     #ifdef ASSET_ICON_PNG
         mainWindow.setIconFromMemory(ASSET_ICON_PNG, ASSET_ICON_PNG_LEN);
+        mainWindow.setTrayIconFromMemory(ASSET_ICON_PNG, ASSET_ICON_PNG_LEN);
     #endif
 
-    // Hide until frontend signals it's ready (no blank flash)
-    if (appConfig.showWhenFrontendReady) {
-        mainWindow.hide();
-    }
-
     // Wire up connect system (for custom frontend ↔ backend communication)
     // Run `plusui connect` after adding custom connect methods
     static Connect conn;
     bindConnect(mainWindow, conn);
 
-    // Load frontend
+    // Load frontend then show.
     #ifdef PLUSUI_DEV_MODE
         mainWindow.navigate("http://localhost:" + std::to_string(windowConfig.devServerPort) + windowConfig.route);
     #else
         mainWindow.loadFile("frontend/dist/index.html" + (windowConfig.route == "/" ? "" : "#" + windowConfig.route));
     #endif
+    mainWindow.show();
 
     App runtime;
     runtime.run();