Merge frontend compilation on windows and UI update changes into develop

Author: mominul

CMakeLists.txt

@@ -11,8 +11,10 @@ add_definitions(-DPROJECT_VERSION="${PROJECT_VERSION}")
 ## Set Compiler Standard
 set(CMAKE_CXX_STANDARD 17)
 
-enable_language(Rust)
-include(CMakeCargo)
+if(NOT WIN32)
+    enable_language(Rust)
+    include(CMakeCargo)
+endif()
 
 find_package(Qt5 COMPONENTS Widgets Network REQUIRED)
 
@@ -85,6 +87,15 @@ if(OS_LINUX)
     pkg_check_modules(ZSTD REQUIRED libzstd)
 endif()
 
+# For Windows
+if(WIN32)
+    find_package(zstd CONFIG REQUIRED)
+    set(PROJECT_DATADIR "$ENV{LOCALAPPDATA}\\OpenBangla" CACHE PATH "Path to Data Directory")
+    set(BIN_DIR "${PROJECT_DATADIR}/bin")
+    add_definitions(-DPROJECT_DATADIR="${PROJECT_DATADIR}")
+    add_definitions(-DBIN_DIR="${BIN_DIR}")
+endif()
+
 add_subdirectory(src/engine)
 add_subdirectory(src/frontend)
 add_subdirectory(src/shared)

src/engine/CMakeLists.txt

@@ -1,7 +1,8 @@
+add_subdirectory(common)
+
 ## Platform depended things
 if (OS_LINUX)
     ## Platform is Linux
-    add_subdirectory(common)
 
     if (ENABLE_IBUS)
         add_subdirectory(ibus)
@@ -10,7 +11,7 @@ if (OS_LINUX)
     if (ENABLE_FCITX)
         add_subdirectory(fcitx)
     endif()
-endif (OS_LINUX)
 
-## Include subdirectories
-add_subdirectory(riti)
+    ## Include subdirectories
+    add_subdirectory(riti)
+endif (OS_LINUX)

src/engine/common/CMakeLists.txt

@@ -1,37 +1,46 @@
-configure_file(${CMAKE_SOURCE_DIR}/data/openbangla-keyboard.desktop.in ${CMAKE_BINARY_DIR}/data/openbangla-keyboard.desktop)
-
-## Install things
-install(FILES ${CMAKE_SOURCE_DIR}/data/32.png
-        DESTINATION ${PROJECT_DATADIR}/icons
-        RENAME OpenBangla-Keyboard.png)
-
-install(FILES ${CMAKE_SOURCE_DIR}/data/1024.png
-        DESTINATION ${DATADIR}/pixmaps/
-        RENAME openbangla-keyboard.png)
-
-install(FILES ${CMAKE_SOURCE_DIR}/data/16.png
-        DESTINATION ${DATADIR}/icons/hicolor/16x16/apps/
-        RENAME openbangla-keyboard.png)
-
-install(FILES ${CMAKE_SOURCE_DIR}/data/32.png
-        DESTINATION ${DATADIR}/icons/hicolor/32x32/apps/
-        RENAME openbangla-keyboard.png)
-
-install(FILES ${CMAKE_SOURCE_DIR}/data/48.png
-        DESTINATION ${DATADIR}/icons/hicolor/48x48/apps/
-        RENAME openbangla-keyboard.png)
-
-install(FILES ${CMAKE_SOURCE_DIR}/data/128.png
-        DESTINATION ${DATADIR}/icons/hicolor/128x128/apps/
-        RENAME openbangla-keyboard.png)
-
-install(FILES ${CMAKE_SOURCE_DIR}/data/512.png
-        DESTINATION ${DATADIR}/icons/hicolor/512x512/apps/
-        RENAME openbangla-keyboard.png)
-
-install(FILES ${CMAKE_SOURCE_DIR}/data/1024.png
-        DESTINATION ${DATADIR}/icons/hicolor/1024x1024/apps/
-        RENAME openbangla-keyboard.png)
+# This CMake module handles the installation of files
+
+if(OS_LINUX)
+        configure_file(${CMAKE_SOURCE_DIR}/data/openbangla-keyboard.desktop.in ${CMAKE_BINARY_DIR}/data/openbangla-keyboard.desktop)
+
+        install(FILES ${CMAKE_SOURCE_DIR}/data/32.png
+                DESTINATION ${PROJECT_DATADIR}/icons
+                RENAME OpenBangla-Keyboard.png)
+
+        install(FILES ${CMAKE_SOURCE_DIR}/data/1024.png
+                DESTINATION ${DATADIR}/pixmaps/
+                RENAME openbangla-keyboard.png)
+
+        install(FILES ${CMAKE_SOURCE_DIR}/data/16.png
+                DESTINATION ${DATADIR}/icons/hicolor/16x16/apps/
+                RENAME openbangla-keyboard.png)
+
+        install(FILES ${CMAKE_SOURCE_DIR}/data/32.png
+                DESTINATION ${DATADIR}/icons/hicolor/32x32/apps/
+                RENAME openbangla-keyboard.png)
+
+        install(FILES ${CMAKE_SOURCE_DIR}/data/48.png
+                DESTINATION ${DATADIR}/icons/hicolor/48x48/apps/
+                RENAME openbangla-keyboard.png)
+
+        install(FILES ${CMAKE_SOURCE_DIR}/data/128.png
+                DESTINATION ${DATADIR}/icons/hicolor/128x128/apps/
+                RENAME openbangla-keyboard.png)
+
+        install(FILES ${CMAKE_SOURCE_DIR}/data/512.png
+                DESTINATION ${DATADIR}/icons/hicolor/512x512/apps/
+                RENAME openbangla-keyboard.png)
+
+        install(FILES ${CMAKE_SOURCE_DIR}/data/1024.png
+                DESTINATION ${DATADIR}/icons/hicolor/1024x1024/apps/
+                RENAME openbangla-keyboard.png)
+        
+        install(FILES ${CMAKE_BINARY_DIR}/data/openbangla-keyboard.desktop
+                DESTINATION "${DATADIR}/applications")
+        
+        install(FILES ${CMAKE_SOURCE_DIR}/data/io.github.openbangla.keyboard.metainfo.xml
+                DESTINATION ${DATADIR}/metainfo)
+endif()
 
 install(FILES ${CMAKE_SOURCE_DIR}/data/avrophonetic.json
         DESTINATION ${PROJECT_DATADIR}/layouts)
@@ -62,10 +71,3 @@ install(FILES ${CMAKE_SOURCE_DIR}/data/suffix.json
 
 install(FILES ${CMAKE_SOURCE_DIR}/data/regex.json
         DESTINATION ${PROJECT_DATADIR}/data)
-
-install(FILES ${CMAKE_BINARY_DIR}/data/openbangla-keyboard.desktop
-        DESTINATION "${DATADIR}/applications")
-
-install(FILES ${CMAKE_SOURCE_DIR}/data/io.github.openbangla.keyboard.metainfo.xml
-        DESTINATION ${DATADIR}/metainfo)
-