From 860c3f0c723dc847d82605e694a0d6cd789f1170 Mon Sep 17 00:00:00 2001 From: Charliechen114514 <725610365@qq.com> Date: Sat, 4 Jul 2026 23:35:17 +0800 Subject: [PATCH] refactor: folders change --- AGENT.md | 37 ++++-- CMakeLists.txt | 107 ++++++++++++++++- base/CMakeLists.txt | 101 +++------------- .../base => base}/ascii_art/CMakeLists.txt | 0 .../ascii_art/include/cfasciiart.h | 0 .../ascii_art/src/cfasciiart.cpp | 0 base/cfbase/CMakeLists.txt | 87 ++++++++++++++ base/{ => cfbase}/README.md | 0 base/{ => cfbase}/device/CMakeLists.txt | 0 .../device/console/CMakeLists.txt | 0 .../device/console/console_defines.h | 0 .../device/console/console_helper.cpp | 0 .../device/console/console_helper.h | 0 .../device/console/impl/console_platform.cpp | 0 .../device/console/impl/console_platform.h | 0 .../console/impl/unix/console_unix_impl.cpp | 0 .../console/impl/unix/console_unix_impl.h | 0 .../console/impl/win/console_win_impl.cpp | 0 .../console/impl/win/console_win_impl.h | 0 base/{ => cfbase}/include/base/export.h | 0 .../include/base/linux/proc_parser.h | 0 .../include/base/windows/co_helper.hpp | 0 .../include/base/windows/common.h | 0 base/{ => cfbase}/include/system/cpu/cfcpu.h | 0 .../include/system/cpu/cfcpu_bonus.h | 0 .../include/system/cpu/cfcpu_profile.h | 0 base/{ => cfbase}/include/system/gpu/gpu.h | 0 .../system/hardware_tier/hardware_tier.h | 0 .../system/hardware_tier/hardware_tier_data.h | 0 .../include/system/memory/memory_info.h | 0 .../include/system/network/network.h | 0 base/{ => cfbase}/system/CMakeLists.txt | 0 base/{ => cfbase}/system/cpu/CMakeLists.txt | 0 base/{ => cfbase}/system/cpu/cfcpu.cpp | 0 base/{ => cfbase}/system/cpu/cfcpu_bonus.cpp | 0 .../{ => cfbase}/system/cpu/cfcpu_profile.cpp | 0 .../system/cpu/private/cpu_host.h | 0 .../cpu/private/linux_impl/cpu_bonus.cpp | 0 .../system/cpu/private/linux_impl/cpu_bonus.h | 0 .../cpu/private/linux_impl/cpu_features.cpp | 0 .../cpu/private/linux_impl/cpu_features.h | 0 .../cpu/private/linux_impl/cpu_info.cpp | 0 .../system/cpu/private/linux_impl/cpu_info.h | 0 .../cpu/private/linux_impl/cpu_profile.cpp | 0 .../cpu/private/linux_impl/cpu_profile.h | 0 .../system/cpu/private/win_impl/cpu_bonus.cpp | 0 .../system/cpu/private/win_impl/cpu_bonus.h | 0 .../cpu/private/win_impl/cpu_features.cpp | 0 .../cpu/private/win_impl/cpu_features.h | 0 .../system/cpu/private/win_impl/cpu_info.cpp | 0 .../system/cpu/private/win_impl/cpu_info.h | 0 .../cpu/private/win_impl/cpu_profile.cpp | 0 .../system/cpu/private/win_impl/cpu_profile.h | 0 base/{ => cfbase}/system/gpu/CMakeLists.txt | 0 base/{ => cfbase}/system/gpu/gpu.cpp | 0 .../system/gpu/private/gpu_host.h | 0 .../gpu/private/linux_impl/gpu_info.cpp | 0 .../system/gpu/private/linux_impl/gpu_info.h | 0 .../system/gpu/private/win_impl/gpu_info.cpp | 0 .../system/gpu/private/win_impl/gpu_info.h | 0 .../system/hardware_tier/CMakeLists.txt | 0 .../default/default_assessor.cpp | 0 .../default/default_collector.cpp | 0 .../default/default_cpu_scorer.cpp | 0 .../default/default_display_scorer.cpp | 0 .../default/default_gpu_scorer.cpp | 0 .../default/default_memory_scorer.cpp | 0 .../hardware_tier/default/default_policy.cpp | 0 .../system/hardware_tier/default_factories.h | 0 .../system/hardware_tier/hardware_tier.cpp | 0 .../hardware_tier/hardware_tier_assessor.h | 0 .../hardware_tier/hardware_tier_collector.h | 0 .../hardware_tier/hardware_tier_policy.h | 0 .../hardware_tier/hardware_tier_scorer.h | 0 .../{ => cfbase}/system/memory/CMakeLists.txt | 0 .../system/memory/memory_info.cpp | 0 .../private/linux_impl/cached_memory.cpp | 0 .../memory/private/linux_impl/cached_memory.h | 0 .../memory/private/linux_impl/dimm_info.cpp | 0 .../memory/private/linux_impl/dimm_info.h | 0 .../memory/private/linux_impl/memory_info.cpp | 0 .../memory/private/linux_impl/memory_info.h | 0 .../private/linux_impl/physical_memory.cpp | 0 .../private/linux_impl/physical_memory.h | 0 .../private/linux_impl/process_memory.cpp | 0 .../private/linux_impl/process_memory.h | 0 .../memory/private/linux_impl/swap_memory.cpp | 0 .../memory/private/linux_impl/swap_memory.h | 0 .../memory/private/win_impl/dimm_info.cpp | 0 .../memory/private/win_impl/dimm_info.h | 0 .../memory/private/win_impl/memory_info.cpp | 0 .../memory/private/win_impl/memory_info.h | 0 .../private/win_impl/physical_memory.cpp | 0 .../memory/private/win_impl/physical_memory.h | 0 .../private/win_impl/process_memory.cpp | 0 .../memory/private/win_impl/process_memory.h | 0 .../memory/private/win_impl/swap_memory.cpp | 0 .../memory/private/win_impl/swap_memory.h | 0 .../system/network/CMakeLists.txt | 0 base/{ => cfbase}/system/network/network.cpp | 0 base/{ => cfbase}/utils/linux/proc_parser.cpp | 0 .../config_manager/CMakeLists.txt | 0 .../config_manager/include/cfconfig.hpp | 0 .../include/cfconfig/cfconfig_domain_handle.h | 0 .../include/cfconfig/cfconfig_path_provider.h | 0 .../include/cfconfig/cfconfig_result.h | 0 .../include/cfconfig/cfconfig_watcher.h | 0 .../config_manager/include/cfconfig_key.h | 0 .../config_manager/include/cfconfig_layer.h | 0 .../include/cfconfig_notify_policy.h | 0 .../include/impl/config_backend.h | 0 .../include/impl/config_domain.h | 0 .../include/impl/config_domain_handle_impl.h | 0 .../config_manager/include/impl/config_impl.h | 0 .../config_manager/src/cfconfig.cpp | 0 .../src/cfconfig_path_provider.cpp | 0 .../src/impl/config_backend_factory.cpp | 0 .../src/impl/config_backend_factory.h | 0 .../config_manager/src/impl/config_domain.cpp | 0 .../config_manager/src/impl/config_impl.cpp | 0 .../config_manager/src/impl/config_key.cpp | 0 .../config_manager/src/impl/json_backend.cpp | 0 .../config_manager/src/impl/json_backend.h | 0 .../src/impl/qsettings_backend.cpp | 0 .../src/impl/qsettings_backend.h | 0 .../file_operations/CMakeLists.txt | 0 .../base => base}/file_operations/file_op.cpp | 0 .../base => base}/file_operations/file_op.h | 0 .../file_operations/filter_target.cpp | 0 .../file_operations/filter_target.h | 0 .../base => base}/fundamental/CMakeLists.txt | 0 .../include/cffundamental/log_helper.h | 0 .../fundamental/src/log_helper.cpp | 0 {desktop/base => base}/logger/CMakeLists.txt | 0 {desktop/base => base}/logger/README.md | 0 {desktop/base => base}/logger/include/cflog.h | 0 .../logger/include/cflog/cflog.hpp | 0 .../logger/include/cflog/cflog_export.h | 0 .../logger/include/cflog/cflog_format.h | 0 .../include/cflog/cflog_format_config.h | 0 .../include/cflog/cflog_format_factory.h | 0 .../logger/include/cflog/cflog_format_flags.h | 0 .../logger/include/cflog/cflog_level.hpp | 0 .../logger/include/cflog/cflog_record.h | 0 .../logger/include/cflog/cflog_sink.h | 0 .../cflog/formatter/console_formatter.h | 0 .../cflog/formatter/default_formatter.h | 0 .../include/cflog/formatter/file_formatter.h | 0 .../logger/include/cflog/sinks/console_sink.h | 0 .../logger/include/cflog/sinks/file_sink.h | 0 .../logger/src/async_queue/async_queue.cpp | 0 .../logger/src/async_queue/async_queue.h | 0 .../src/formatter/console_formatter.cpp | 0 .../logger/src/formatter/file_formatter.cpp | 0 .../logger/src/impl/cflog_impl.cpp | 0 .../logger/src/impl/cflog_impl.h | 0 .../base => base}/logger/src/logger/cflog.cpp | 0 .../logger/src/sinks/console_sink.cpp | 0 .../logger/src/sinks/file_sink.cpp | 0 {desktop/base => base}/path/CMakeLists.txt | 0 .../cfpath/desktop_main_path_resolvers.h | 0 .../cfpath/desktop_self_path_resolvers.h | 0 .../include/cfpath/desktop_settings_path.h | 0 .../path/src/desktop_main_path_resolvers.cpp | 0 .../path/src/desktop_self_path_resolvers.cpp | 0 desktop/CMakeLists.txt | 112 ------------------ desktop/base/CMakeLists.txt | 6 - document/status/current.md | 2 + desktop/export.h => export.h | 0 desktop/main.cpp => main.cpp | 0 {desktop/main => main}/CMakeLists.txt | 0 {desktop/main => main}/desktop_entry.cpp | 0 {desktop/main => main}/desktop_entry.h | 0 {desktop => main}/desktop_run_session.cpp | 0 .../early_session/CMakeLists.txt | 0 .../early_handle/early_handle.cpp | 0 .../early_session/early_handle/early_handle.h | 0 .../early_session/impl/CMakeLists.txt | 0 .../impl/console_signal_stage.cpp | 0 .../early_session/impl/console_signal_stage.h | 0 .../impl/desktop_backbone_setup.cpp | 0 .../impl/desktop_backbone_setup.h | 0 .../early_session/impl/early_config_stage.cpp | 0 .../early_session/impl/early_config_stage.h | 0 .../early_session/impl/early_welcome_impl.cpp | 0 .../early_session/impl/early_welcome_impl.h | 0 .../early_session/impl/logger_stage.cpp | 0 .../early_session/impl/logger_stage.h | 0 .../early_session/init_chain/init_chain.cpp | 0 .../early_session/init_chain/init_chain.h | 0 .../early_session/init_chain/init_stage.h | 0 .../early_session/settings/early_settings.cpp | 0 .../early_session/settings/early_settings.h | 0 {desktop/main => main}/init/CMakeLists.txt | 0 {desktop/main => main}/init/boot_stage_info.h | 0 .../desktop_backbone_init.cpp | 0 .../desktop_backbone_init.h | 0 .../desktop_config_init.cpp | 0 .../desktop_config_init/desktop_config_init.h | 0 .../init/early_gain/early_pass_stage.cpp | 0 .../init/early_gain/early_pass_stage.h | 0 .../init/gui_progress/gui_init_stage.cpp | 0 .../init/gui_progress/gui_init_stage.h | 0 {desktop/main => main}/init/init.h | 0 .../main => main}/init/init_early_session.cpp | 0 {desktop/main => main}/init/init_session.cpp | 0 .../main => main}/init/init_session_chain.cpp | 0 .../main => main}/init/init_session_chain.h | 0 {desktop/main => main}/init/init_settings.cpp | 0 {desktop/main => main}/init/init_settings.h | 0 {desktop/main => main}/init/init_stage.h | 0 {desktop/main => main}/init/init_stage_name.h | 0 scripts/release/hooks/pre-commit | 14 +-- test/config_manager/CMakeLists.txt | 2 +- {desktop/ui => ui}/CFDesktop.cpp | 0 {desktop/ui => ui}/CFDesktop.h | 0 {desktop/ui => ui}/CFDesktopEntity.cpp | 0 {desktop/ui => ui}/CFDesktopEntity.h | 0 {desktop/ui => ui}/CFDesktopProxy.cpp | 0 {desktop/ui => ui}/CFDesktopProxy.h | 0 {desktop/ui => ui}/CFDesktopWindowProxy.cpp | 0 {desktop/ui => ui}/CFDesktopWindowProxy.h | 0 {desktop/ui => ui}/CMakeLists.txt | 0 {desktop/ui => ui}/base/CMakeLists.txt | 0 {desktop/ui => ui}/base/meta_adapts.cpp | 0 {desktop/ui => ui}/base/meta_adapts.h | 0 {desktop/ui => ui}/base/qt_backend.cpp | 0 {desktop/ui => ui}/base/qt_backend.h | 0 {desktop/ui => ui}/components/CMakeLists.txt | 0 .../DisplayServerBackendFactory.cpp | 0 .../components/DisplayServerBackendFactory.h | 0 .../components/IDisplayServerBackend.cpp | 0 .../components/IDisplayServerBackend.h | 0 {desktop/ui => ui}/components/IPanel.h | 0 {desktop/ui => ui}/components/IShellLayer.h | 0 .../components/IShellLayerStrategy.h | 0 {desktop/ui => ui}/components/IWindow.cpp | 0 {desktop/ui => ui}/components/IWindow.h | 0 .../ui => ui}/components/IWindowBackend.cpp | 0 .../ui => ui}/components/IWindowBackend.h | 0 .../ui => ui}/components/PanelManager.cpp | 0 {desktop/ui => ui}/components/PanelManager.h | 0 {desktop/ui => ui}/components/README.md | 0 {desktop/ui => ui}/components/WindowDefine.h | 0 .../ui => ui}/components/WindowManager.cpp | 0 {desktop/ui => ui}/components/WindowManager.h | 0 {desktop/ui => ui}/components/app_entry.h | 0 .../components/builtin_apps/CMakeLists.txt | 0 .../components/builtin_apps/about_panel.cpp | 0 .../components/builtin_apps/about_panel.h | 0 .../builtin_apps/builtin_panel_registry.cpp | 0 .../builtin_apps/builtin_panel_registry.h | 0 .../components/builtin_apps/ibuiltin_panel.h | 0 .../frosted_backdrop/CMakeLists.txt | 0 .../frosted_backdrop/frosted_backdrop.cpp | 0 .../frosted_backdrop/frosted_backdrop.h | 0 .../components/launcher/CMakeLists.txt | 0 .../components/launcher/app_discoverer.cpp | 0 .../components/launcher/app_discoverer.h | 0 .../launcher/app_launch_service.cpp | 0 .../components/launcher/app_launch_service.h | 0 .../components/launcher/app_launcher.cpp | 0 .../components/launcher/app_launcher.h | 0 .../launcher/desktop_entry_index.cpp | 0 .../components/launcher/desktop_entry_index.h | 0 .../components/launcher/launcher_tile.cpp | 0 .../components/launcher/launcher_tile.h | 0 .../shell_layer_impl/CMakeLists.txt | 0 .../DefaultShellLayerStrategy.cpp | 0 .../DefaultShellLayerStrategy.h | 0 .../WallpaperShellLayerStrategy.cpp | 0 .../WallpaperShellLayerStrategy.h | 0 .../shell_layer_impl/WidgetShellLayer.cpp | 0 .../shell_layer_impl/WidgetShellLayer.h | 0 .../shell_layer_impl/wallpaper_setup.cpp | 0 .../shell_layer_impl/wallpaper_setup.h | 0 .../shell_layer_impl/wallpaper_src_chain.cpp | 0 .../shell_layer_impl/wallpaper_src_chain.h | 0 .../components/statusbar/CMakeLists.txt | 0 .../components/statusbar/IStatusBar.h | 0 .../components/statusbar/icons/LICENSE.md | 0 .../components/statusbar/icons/battery.png | Bin .../components/statusbar/icons/signal.png | Bin .../components/statusbar/icons/volume.png | Bin .../components/statusbar/icons/wifi.png | Bin .../components/statusbar/status_bar.cpp | 0 .../components/statusbar/status_bar.h | 0 .../components/statusbar/statusbar_icons.qrc | 0 .../components/taskbar/CMakeLists.txt | 0 .../components/taskbar/centered_taskbar.cpp | 0 .../components/taskbar/centered_taskbar.h | 0 .../ui => ui}/components/taskbar/icon_mask.h | 0 .../components/taskbar/icons/README.md | 0 .../components/taskbar/icons/browser.png | Bin .../components/taskbar/icons/browser.svg | 0 .../components/taskbar/icons/files.png | Bin .../components/taskbar/icons/files.svg | 0 .../components/taskbar/icons/settings.png | Bin .../components/taskbar/icons/settings.svg | 0 .../components/taskbar/icons/start.png | Bin .../components/taskbar/icons/start.svg | 0 .../components/taskbar/icons/terminal.png | Bin .../components/taskbar/icons/terminal.svg | 0 .../components/taskbar/start_button.cpp | 0 .../components/taskbar/start_button.h | 0 .../components/taskbar/taskbar_icon.cpp | 0 .../components/taskbar/taskbar_icon.h | 0 .../components/taskbar/taskbar_icons.qrc | 0 .../components/wallpaper/CMakeLists.txt | 0 .../wallpaper/ImageWallPaperLayer.cpp | 0 .../wallpaper/ImageWallPaperLayer.h | 0 .../wallpaper/TransitionComposer.cpp | 0 .../components/wallpaper/TransitionComposer.h | 0 .../wallpaper/WallPaperAccessStorage.cpp | 0 .../wallpaper/WallPaperAccessStorage.h | 0 .../components/wallpaper/WallPaperEngine.cpp | 0 .../components/wallpaper/WallPaperEngine.h | 0 .../components/wallpaper/WallPaperLayer.h | 0 .../components/wallpaper/WallPaperToken.cpp | 0 .../components/wallpaper/WallPaperToken.h | 0 {desktop/ui => ui}/components/window_info.h | 0 .../window_placement/CMakeLists.txt | 0 .../window_placement_policy.cpp | 0 .../window_placement_policy.h | 0 {desktop/ui => ui}/models/CMakeLists.txt | 0 {desktop/ui => ui}/models/README.md | 0 {desktop/ui => ui}/platform/CMakeLists.txt | 0 .../DesktopPropertyStrategyFactory.cpp | 0 .../platform/DesktopPropertyStrategyFactory.h | 0 .../platform/IDesktopDisplaySizeStrategy.cpp | 0 .../platform/IDesktopDisplaySizeStrategy.h | 0 .../platform/IDesktopPropertyStrategy.cpp | 0 .../platform/IDesktopPropertyStrategy.h | 0 .../platform/display_backend_helper.cpp | 0 .../platform/display_backend_helper.h | 0 .../embedded_display_server_backend.cpp | 0 .../embedded_display_server_backend.h | 0 .../embedded/embedded_display_size_policy.cpp | 0 .../embedded/embedded_display_size_policy.h | 0 .../platform/embedded/embedded_platform.cpp | 0 .../platform/embedded/null_window_backend.cpp | 0 .../platform/embedded/null_window_backend.h | 0 .../linux_wsl_display_size_policy.cpp | 0 .../linux_wsl/linux_wsl_display_size_policy.h | 0 .../platform/linux_wsl/linux_wsl_factory.cpp | 0 .../platform/linux_wsl/linux_wsl_factory.h | 0 .../platform/linux_wsl/linux_wsl_platform.cpp | 0 .../platform/linux_wsl/linux_wsl_platform.h | 0 .../wsl_x11_display_server_backend.cpp | 0 .../wsl_x11_display_server_backend.h | 0 .../platform/linux_wsl/wsl_x11_window.cpp | 0 .../platform/linux_wsl/wsl_x11_window.h | 0 .../linux_wsl/wsl_x11_window_backend.cpp | 0 .../linux_wsl/wsl_x11_window_backend.h | 0 .../ui => ui}/platform/platform_helper.cpp | 0 {desktop/ui => ui}/platform/platform_helper.h | 0 .../ui => ui}/platform/shell_layer_helper.cpp | 0 .../ui => ui}/platform/shell_layer_helper.h | 0 .../windows_display_server_backend.cpp | 0 .../windows/windows_display_server_backend.h | 0 .../windows/windows_display_size_policy.cpp | 0 .../windows/windows_display_size_policy.h | 0 .../platform/windows/windows_factory.cpp | 0 .../platform/windows/windows_factory.h | 0 .../platform/windows/windows_platform.cpp | 0 .../platform/windows/windows_platform.h | 0 .../platform/windows/windows_window.cpp | 0 .../platform/windows/windows_window.h | 0 .../windows/windows_window_backend.cpp | 0 .../platform/windows/windows_window_backend.h | 0 {desktop/ui => ui}/render/CMakeLists.txt | 0 .../ui => ui}/render/backend_capabilities.h | 0 {desktop/ui => ui}/render/render_backend.h | 0 .../ui => ui}/render/render_backend_factory.h | 0 {desktop/ui => ui}/widget/CMakeLists.txt | 0 {desktop/ui => ui}/widget/README.md | 0 .../widget/init_session/CMakeLists.txt | 6 +- .../init_session/boot_progress_widget.cpp | 0 .../init_session/boot_progress_widget.h | 0 .../init_session/boot_widget_factory.cpp | 0 .../init_session/resources/CFDesktop.logo.png | Bin .../init_session/resources/resources.qrc | 0 .../init_session/simple_boot_widget.cpp | 0 .../widget/init_session/simple_boot_widget.h | 0 .../widget/init_session/simple_boot_widget.ui | 0 .../widget/init_session/step_dot_widget.cpp | 0 .../widget/init_session/step_dot_widget.h | 0 387 files changed, 239 insertions(+), 235 deletions(-) rename {desktop/base => base}/ascii_art/CMakeLists.txt (100%) rename {desktop/base => base}/ascii_art/include/cfasciiart.h (100%) rename {desktop/base => base}/ascii_art/src/cfasciiart.cpp (100%) create mode 100644 base/cfbase/CMakeLists.txt rename base/{ => cfbase}/README.md (100%) rename base/{ => cfbase}/device/CMakeLists.txt (100%) rename base/{ => cfbase}/device/console/CMakeLists.txt (100%) rename base/{ => cfbase}/device/console/console_defines.h (100%) rename base/{ => cfbase}/device/console/console_helper.cpp (100%) rename base/{ => cfbase}/device/console/console_helper.h (100%) rename base/{ => cfbase}/device/console/impl/console_platform.cpp (100%) rename base/{ => cfbase}/device/console/impl/console_platform.h (100%) rename base/{ => cfbase}/device/console/impl/unix/console_unix_impl.cpp (100%) rename base/{ => cfbase}/device/console/impl/unix/console_unix_impl.h (100%) rename base/{ => cfbase}/device/console/impl/win/console_win_impl.cpp (100%) rename base/{ => cfbase}/device/console/impl/win/console_win_impl.h (100%) rename base/{ => cfbase}/include/base/export.h (100%) rename base/{ => cfbase}/include/base/linux/proc_parser.h (100%) rename base/{ => cfbase}/include/base/windows/co_helper.hpp (100%) rename base/{ => cfbase}/include/base/windows/common.h (100%) rename base/{ => cfbase}/include/system/cpu/cfcpu.h (100%) rename base/{ => cfbase}/include/system/cpu/cfcpu_bonus.h (100%) rename base/{ => cfbase}/include/system/cpu/cfcpu_profile.h (100%) rename base/{ => cfbase}/include/system/gpu/gpu.h (100%) rename base/{ => cfbase}/include/system/hardware_tier/hardware_tier.h (100%) rename base/{ => cfbase}/include/system/hardware_tier/hardware_tier_data.h (100%) rename base/{ => cfbase}/include/system/memory/memory_info.h (100%) rename base/{ => cfbase}/include/system/network/network.h (100%) rename base/{ => cfbase}/system/CMakeLists.txt (100%) rename base/{ => cfbase}/system/cpu/CMakeLists.txt (100%) rename base/{ => cfbase}/system/cpu/cfcpu.cpp (100%) rename base/{ => cfbase}/system/cpu/cfcpu_bonus.cpp (100%) rename base/{ => cfbase}/system/cpu/cfcpu_profile.cpp (100%) rename base/{ => cfbase}/system/cpu/private/cpu_host.h (100%) rename base/{ => cfbase}/system/cpu/private/linux_impl/cpu_bonus.cpp (100%) rename base/{ => cfbase}/system/cpu/private/linux_impl/cpu_bonus.h (100%) rename base/{ => cfbase}/system/cpu/private/linux_impl/cpu_features.cpp (100%) rename base/{ => cfbase}/system/cpu/private/linux_impl/cpu_features.h (100%) rename base/{ => cfbase}/system/cpu/private/linux_impl/cpu_info.cpp (100%) rename base/{ => cfbase}/system/cpu/private/linux_impl/cpu_info.h (100%) rename base/{ => cfbase}/system/cpu/private/linux_impl/cpu_profile.cpp (100%) rename base/{ => cfbase}/system/cpu/private/linux_impl/cpu_profile.h (100%) rename base/{ => cfbase}/system/cpu/private/win_impl/cpu_bonus.cpp (100%) rename base/{ => cfbase}/system/cpu/private/win_impl/cpu_bonus.h (100%) rename base/{ => cfbase}/system/cpu/private/win_impl/cpu_features.cpp (100%) rename base/{ => cfbase}/system/cpu/private/win_impl/cpu_features.h (100%) rename base/{ => cfbase}/system/cpu/private/win_impl/cpu_info.cpp (100%) rename base/{ => cfbase}/system/cpu/private/win_impl/cpu_info.h (100%) rename base/{ => cfbase}/system/cpu/private/win_impl/cpu_profile.cpp (100%) rename base/{ => cfbase}/system/cpu/private/win_impl/cpu_profile.h (100%) rename base/{ => cfbase}/system/gpu/CMakeLists.txt (100%) rename base/{ => cfbase}/system/gpu/gpu.cpp (100%) rename base/{ => cfbase}/system/gpu/private/gpu_host.h (100%) rename base/{ => cfbase}/system/gpu/private/linux_impl/gpu_info.cpp (100%) rename base/{ => cfbase}/system/gpu/private/linux_impl/gpu_info.h (100%) rename base/{ => cfbase}/system/gpu/private/win_impl/gpu_info.cpp (100%) rename base/{ => cfbase}/system/gpu/private/win_impl/gpu_info.h (100%) rename base/{ => cfbase}/system/hardware_tier/CMakeLists.txt (100%) rename base/{ => cfbase}/system/hardware_tier/default/default_assessor.cpp (100%) rename base/{ => cfbase}/system/hardware_tier/default/default_collector.cpp (100%) rename base/{ => cfbase}/system/hardware_tier/default/default_cpu_scorer.cpp (100%) rename base/{ => cfbase}/system/hardware_tier/default/default_display_scorer.cpp (100%) rename base/{ => cfbase}/system/hardware_tier/default/default_gpu_scorer.cpp (100%) rename base/{ => cfbase}/system/hardware_tier/default/default_memory_scorer.cpp (100%) rename base/{ => cfbase}/system/hardware_tier/default/default_policy.cpp (100%) rename base/{ => cfbase}/system/hardware_tier/default_factories.h (100%) rename base/{ => cfbase}/system/hardware_tier/hardware_tier.cpp (100%) rename base/{ => cfbase}/system/hardware_tier/hardware_tier_assessor.h (100%) rename base/{ => cfbase}/system/hardware_tier/hardware_tier_collector.h (100%) rename base/{ => cfbase}/system/hardware_tier/hardware_tier_policy.h (100%) rename base/{ => cfbase}/system/hardware_tier/hardware_tier_scorer.h (100%) rename base/{ => cfbase}/system/memory/CMakeLists.txt (100%) rename base/{ => cfbase}/system/memory/memory_info.cpp (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/cached_memory.cpp (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/cached_memory.h (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/dimm_info.cpp (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/dimm_info.h (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/memory_info.cpp (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/memory_info.h (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/physical_memory.cpp (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/physical_memory.h (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/process_memory.cpp (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/process_memory.h (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/swap_memory.cpp (100%) rename base/{ => cfbase}/system/memory/private/linux_impl/swap_memory.h (100%) rename base/{ => cfbase}/system/memory/private/win_impl/dimm_info.cpp (100%) rename base/{ => cfbase}/system/memory/private/win_impl/dimm_info.h (100%) rename base/{ => cfbase}/system/memory/private/win_impl/memory_info.cpp (100%) rename base/{ => cfbase}/system/memory/private/win_impl/memory_info.h (100%) rename base/{ => cfbase}/system/memory/private/win_impl/physical_memory.cpp (100%) rename base/{ => cfbase}/system/memory/private/win_impl/physical_memory.h (100%) rename base/{ => cfbase}/system/memory/private/win_impl/process_memory.cpp (100%) rename base/{ => cfbase}/system/memory/private/win_impl/process_memory.h (100%) rename base/{ => cfbase}/system/memory/private/win_impl/swap_memory.cpp (100%) rename base/{ => cfbase}/system/memory/private/win_impl/swap_memory.h (100%) rename base/{ => cfbase}/system/network/CMakeLists.txt (100%) rename base/{ => cfbase}/system/network/network.cpp (100%) rename base/{ => cfbase}/utils/linux/proc_parser.cpp (100%) rename {desktop/base => base}/config_manager/CMakeLists.txt (100%) rename {desktop/base => base}/config_manager/include/cfconfig.hpp (100%) rename {desktop/base => base}/config_manager/include/cfconfig/cfconfig_domain_handle.h (100%) rename {desktop/base => base}/config_manager/include/cfconfig/cfconfig_path_provider.h (100%) rename {desktop/base => base}/config_manager/include/cfconfig/cfconfig_result.h (100%) rename {desktop/base => base}/config_manager/include/cfconfig/cfconfig_watcher.h (100%) rename {desktop/base => base}/config_manager/include/cfconfig_key.h (100%) rename {desktop/base => base}/config_manager/include/cfconfig_layer.h (100%) rename {desktop/base => base}/config_manager/include/cfconfig_notify_policy.h (100%) rename {desktop/base => base}/config_manager/include/impl/config_backend.h (100%) rename {desktop/base => base}/config_manager/include/impl/config_domain.h (100%) rename {desktop/base => base}/config_manager/include/impl/config_domain_handle_impl.h (100%) rename {desktop/base => base}/config_manager/include/impl/config_impl.h (100%) rename {desktop/base => base}/config_manager/src/cfconfig.cpp (100%) rename {desktop/base => base}/config_manager/src/cfconfig_path_provider.cpp (100%) rename {desktop/base => base}/config_manager/src/impl/config_backend_factory.cpp (100%) rename {desktop/base => base}/config_manager/src/impl/config_backend_factory.h (100%) rename {desktop/base => base}/config_manager/src/impl/config_domain.cpp (100%) rename {desktop/base => base}/config_manager/src/impl/config_impl.cpp (100%) rename {desktop/base => base}/config_manager/src/impl/config_key.cpp (100%) rename {desktop/base => base}/config_manager/src/impl/json_backend.cpp (100%) rename {desktop/base => base}/config_manager/src/impl/json_backend.h (100%) rename {desktop/base => base}/config_manager/src/impl/qsettings_backend.cpp (100%) rename {desktop/base => base}/config_manager/src/impl/qsettings_backend.h (100%) rename {desktop/base => base}/file_operations/CMakeLists.txt (100%) rename {desktop/base => base}/file_operations/file_op.cpp (100%) rename {desktop/base => base}/file_operations/file_op.h (100%) rename {desktop/base => base}/file_operations/filter_target.cpp (100%) rename {desktop/base => base}/file_operations/filter_target.h (100%) rename {desktop/base => base}/fundamental/CMakeLists.txt (100%) rename {desktop/base => base}/fundamental/include/cffundamental/log_helper.h (100%) rename {desktop/base => base}/fundamental/src/log_helper.cpp (100%) rename {desktop/base => base}/logger/CMakeLists.txt (100%) rename {desktop/base => base}/logger/README.md (100%) rename {desktop/base => base}/logger/include/cflog.h (100%) rename {desktop/base => base}/logger/include/cflog/cflog.hpp (100%) rename {desktop/base => base}/logger/include/cflog/cflog_export.h (100%) rename {desktop/base => base}/logger/include/cflog/cflog_format.h (100%) rename {desktop/base => base}/logger/include/cflog/cflog_format_config.h (100%) rename {desktop/base => base}/logger/include/cflog/cflog_format_factory.h (100%) rename {desktop/base => base}/logger/include/cflog/cflog_format_flags.h (100%) rename {desktop/base => base}/logger/include/cflog/cflog_level.hpp (100%) rename {desktop/base => base}/logger/include/cflog/cflog_record.h (100%) rename {desktop/base => base}/logger/include/cflog/cflog_sink.h (100%) rename {desktop/base => base}/logger/include/cflog/formatter/console_formatter.h (100%) rename {desktop/base => base}/logger/include/cflog/formatter/default_formatter.h (100%) rename {desktop/base => base}/logger/include/cflog/formatter/file_formatter.h (100%) rename {desktop/base => base}/logger/include/cflog/sinks/console_sink.h (100%) rename {desktop/base => base}/logger/include/cflog/sinks/file_sink.h (100%) rename {desktop/base => base}/logger/src/async_queue/async_queue.cpp (100%) rename {desktop/base => base}/logger/src/async_queue/async_queue.h (100%) rename {desktop/base => base}/logger/src/formatter/console_formatter.cpp (100%) rename {desktop/base => base}/logger/src/formatter/file_formatter.cpp (100%) rename {desktop/base => base}/logger/src/impl/cflog_impl.cpp (100%) rename {desktop/base => base}/logger/src/impl/cflog_impl.h (100%) rename {desktop/base => base}/logger/src/logger/cflog.cpp (100%) rename {desktop/base => base}/logger/src/sinks/console_sink.cpp (100%) rename {desktop/base => base}/logger/src/sinks/file_sink.cpp (100%) rename {desktop/base => base}/path/CMakeLists.txt (100%) rename {desktop/base => base}/path/include/cfpath/desktop_main_path_resolvers.h (100%) rename {desktop/base => base}/path/include/cfpath/desktop_self_path_resolvers.h (100%) rename {desktop/base => base}/path/include/cfpath/desktop_settings_path.h (100%) rename {desktop/base => base}/path/src/desktop_main_path_resolvers.cpp (100%) rename {desktop/base => base}/path/src/desktop_self_path_resolvers.cpp (100%) delete mode 100644 desktop/CMakeLists.txt delete mode 100644 desktop/base/CMakeLists.txt rename desktop/export.h => export.h (100%) rename desktop/main.cpp => main.cpp (100%) rename {desktop/main => main}/CMakeLists.txt (100%) rename {desktop/main => main}/desktop_entry.cpp (100%) rename {desktop/main => main}/desktop_entry.h (100%) rename {desktop => main}/desktop_run_session.cpp (100%) rename {desktop/main => main}/early_session/CMakeLists.txt (100%) rename {desktop/main => main}/early_session/early_handle/early_handle.cpp (100%) rename {desktop/main => main}/early_session/early_handle/early_handle.h (100%) rename {desktop/main => main}/early_session/impl/CMakeLists.txt (100%) rename {desktop/main => main}/early_session/impl/console_signal_stage.cpp (100%) rename {desktop/main => main}/early_session/impl/console_signal_stage.h (100%) rename {desktop/main => main}/early_session/impl/desktop_backbone_setup.cpp (100%) rename {desktop/main => main}/early_session/impl/desktop_backbone_setup.h (100%) rename {desktop/main => main}/early_session/impl/early_config_stage.cpp (100%) rename {desktop/main => main}/early_session/impl/early_config_stage.h (100%) rename {desktop/main => main}/early_session/impl/early_welcome_impl.cpp (100%) rename {desktop/main => main}/early_session/impl/early_welcome_impl.h (100%) rename {desktop/main => main}/early_session/impl/logger_stage.cpp (100%) rename {desktop/main => main}/early_session/impl/logger_stage.h (100%) rename {desktop/main => main}/early_session/init_chain/init_chain.cpp (100%) rename {desktop/main => main}/early_session/init_chain/init_chain.h (100%) rename {desktop/main => main}/early_session/init_chain/init_stage.h (100%) rename {desktop/main => main}/early_session/settings/early_settings.cpp (100%) rename {desktop/main => main}/early_session/settings/early_settings.h (100%) rename {desktop/main => main}/init/CMakeLists.txt (100%) rename {desktop/main => main}/init/boot_stage_info.h (100%) rename {desktop/main => main}/init/desktop_backbone_init/desktop_backbone_init.cpp (100%) rename {desktop/main => main}/init/desktop_backbone_init/desktop_backbone_init.h (100%) rename {desktop/main => main}/init/desktop_config_init/desktop_config_init.cpp (100%) rename {desktop/main => main}/init/desktop_config_init/desktop_config_init.h (100%) rename {desktop/main => main}/init/early_gain/early_pass_stage.cpp (100%) rename {desktop/main => main}/init/early_gain/early_pass_stage.h (100%) rename {desktop/main => main}/init/gui_progress/gui_init_stage.cpp (100%) rename {desktop/main => main}/init/gui_progress/gui_init_stage.h (100%) rename {desktop/main => main}/init/init.h (100%) rename {desktop/main => main}/init/init_early_session.cpp (100%) rename {desktop/main => main}/init/init_session.cpp (100%) rename {desktop/main => main}/init/init_session_chain.cpp (100%) rename {desktop/main => main}/init/init_session_chain.h (100%) rename {desktop/main => main}/init/init_settings.cpp (100%) rename {desktop/main => main}/init/init_settings.h (100%) rename {desktop/main => main}/init/init_stage.h (100%) rename {desktop/main => main}/init/init_stage_name.h (100%) rename {desktop/ui => ui}/CFDesktop.cpp (100%) rename {desktop/ui => ui}/CFDesktop.h (100%) rename {desktop/ui => ui}/CFDesktopEntity.cpp (100%) rename {desktop/ui => ui}/CFDesktopEntity.h (100%) rename {desktop/ui => ui}/CFDesktopProxy.cpp (100%) rename {desktop/ui => ui}/CFDesktopProxy.h (100%) rename {desktop/ui => ui}/CFDesktopWindowProxy.cpp (100%) rename {desktop/ui => ui}/CFDesktopWindowProxy.h (100%) rename {desktop/ui => ui}/CMakeLists.txt (100%) rename {desktop/ui => ui}/base/CMakeLists.txt (100%) rename {desktop/ui => ui}/base/meta_adapts.cpp (100%) rename {desktop/ui => ui}/base/meta_adapts.h (100%) rename {desktop/ui => ui}/base/qt_backend.cpp (100%) rename {desktop/ui => ui}/base/qt_backend.h (100%) rename {desktop/ui => ui}/components/CMakeLists.txt (100%) rename {desktop/ui => ui}/components/DisplayServerBackendFactory.cpp (100%) rename {desktop/ui => ui}/components/DisplayServerBackendFactory.h (100%) rename {desktop/ui => ui}/components/IDisplayServerBackend.cpp (100%) rename {desktop/ui => ui}/components/IDisplayServerBackend.h (100%) rename {desktop/ui => ui}/components/IPanel.h (100%) rename {desktop/ui => ui}/components/IShellLayer.h (100%) rename {desktop/ui => ui}/components/IShellLayerStrategy.h (100%) rename {desktop/ui => ui}/components/IWindow.cpp (100%) rename {desktop/ui => ui}/components/IWindow.h (100%) rename {desktop/ui => ui}/components/IWindowBackend.cpp (100%) rename {desktop/ui => ui}/components/IWindowBackend.h (100%) rename {desktop/ui => ui}/components/PanelManager.cpp (100%) rename {desktop/ui => ui}/components/PanelManager.h (100%) rename {desktop/ui => ui}/components/README.md (100%) rename {desktop/ui => ui}/components/WindowDefine.h (100%) rename {desktop/ui => ui}/components/WindowManager.cpp (100%) rename {desktop/ui => ui}/components/WindowManager.h (100%) rename {desktop/ui => ui}/components/app_entry.h (100%) rename {desktop/ui => ui}/components/builtin_apps/CMakeLists.txt (100%) rename {desktop/ui => ui}/components/builtin_apps/about_panel.cpp (100%) rename {desktop/ui => ui}/components/builtin_apps/about_panel.h (100%) rename {desktop/ui => ui}/components/builtin_apps/builtin_panel_registry.cpp (100%) rename {desktop/ui => ui}/components/builtin_apps/builtin_panel_registry.h (100%) rename {desktop/ui => ui}/components/builtin_apps/ibuiltin_panel.h (100%) rename {desktop/ui => ui}/components/frosted_backdrop/CMakeLists.txt (100%) rename {desktop/ui => ui}/components/frosted_backdrop/frosted_backdrop.cpp (100%) rename {desktop/ui => ui}/components/frosted_backdrop/frosted_backdrop.h (100%) rename {desktop/ui => ui}/components/launcher/CMakeLists.txt (100%) rename {desktop/ui => ui}/components/launcher/app_discoverer.cpp (100%) rename {desktop/ui => ui}/components/launcher/app_discoverer.h (100%) rename {desktop/ui => ui}/components/launcher/app_launch_service.cpp (100%) rename {desktop/ui => ui}/components/launcher/app_launch_service.h (100%) rename {desktop/ui => ui}/components/launcher/app_launcher.cpp (100%) rename {desktop/ui => ui}/components/launcher/app_launcher.h (100%) rename {desktop/ui => ui}/components/launcher/desktop_entry_index.cpp (100%) rename {desktop/ui => ui}/components/launcher/desktop_entry_index.h (100%) rename {desktop/ui => ui}/components/launcher/launcher_tile.cpp (100%) rename {desktop/ui => ui}/components/launcher/launcher_tile.h (100%) rename {desktop/ui => ui}/components/shell_layer_impl/CMakeLists.txt (100%) rename {desktop/ui => ui}/components/shell_layer_impl/DefaultShellLayerStrategy.cpp (100%) rename {desktop/ui => ui}/components/shell_layer_impl/DefaultShellLayerStrategy.h (100%) rename {desktop/ui => ui}/components/shell_layer_impl/WallpaperShellLayerStrategy.cpp (100%) rename {desktop/ui => ui}/components/shell_layer_impl/WallpaperShellLayerStrategy.h (100%) rename {desktop/ui => ui}/components/shell_layer_impl/WidgetShellLayer.cpp (100%) rename {desktop/ui => ui}/components/shell_layer_impl/WidgetShellLayer.h (100%) rename {desktop/ui => ui}/components/shell_layer_impl/wallpaper_setup.cpp (100%) rename {desktop/ui => ui}/components/shell_layer_impl/wallpaper_setup.h (100%) rename {desktop/ui => ui}/components/shell_layer_impl/wallpaper_src_chain.cpp (100%) rename {desktop/ui => ui}/components/shell_layer_impl/wallpaper_src_chain.h (100%) rename {desktop/ui => ui}/components/statusbar/CMakeLists.txt (100%) rename {desktop/ui => ui}/components/statusbar/IStatusBar.h (100%) rename {desktop/ui => ui}/components/statusbar/icons/LICENSE.md (100%) rename {desktop/ui => ui}/components/statusbar/icons/battery.png (100%) rename {desktop/ui => ui}/components/statusbar/icons/signal.png (100%) rename {desktop/ui => ui}/components/statusbar/icons/volume.png (100%) rename {desktop/ui => ui}/components/statusbar/icons/wifi.png (100%) rename {desktop/ui => ui}/components/statusbar/status_bar.cpp (100%) rename {desktop/ui => ui}/components/statusbar/status_bar.h (100%) rename {desktop/ui => ui}/components/statusbar/statusbar_icons.qrc (100%) rename {desktop/ui => ui}/components/taskbar/CMakeLists.txt (100%) rename {desktop/ui => ui}/components/taskbar/centered_taskbar.cpp (100%) rename {desktop/ui => ui}/components/taskbar/centered_taskbar.h (100%) rename {desktop/ui => ui}/components/taskbar/icon_mask.h (100%) rename {desktop/ui => ui}/components/taskbar/icons/README.md (100%) rename {desktop/ui => ui}/components/taskbar/icons/browser.png (100%) rename {desktop/ui => ui}/components/taskbar/icons/browser.svg (100%) rename {desktop/ui => ui}/components/taskbar/icons/files.png (100%) rename {desktop/ui => ui}/components/taskbar/icons/files.svg (100%) rename {desktop/ui => ui}/components/taskbar/icons/settings.png (100%) rename {desktop/ui => ui}/components/taskbar/icons/settings.svg (100%) rename {desktop/ui => ui}/components/taskbar/icons/start.png (100%) rename {desktop/ui => ui}/components/taskbar/icons/start.svg (100%) rename {desktop/ui => ui}/components/taskbar/icons/terminal.png (100%) rename {desktop/ui => ui}/components/taskbar/icons/terminal.svg (100%) rename {desktop/ui => ui}/components/taskbar/start_button.cpp (100%) rename {desktop/ui => ui}/components/taskbar/start_button.h (100%) rename {desktop/ui => ui}/components/taskbar/taskbar_icon.cpp (100%) rename {desktop/ui => ui}/components/taskbar/taskbar_icon.h (100%) rename {desktop/ui => ui}/components/taskbar/taskbar_icons.qrc (100%) rename {desktop/ui => ui}/components/wallpaper/CMakeLists.txt (100%) rename {desktop/ui => ui}/components/wallpaper/ImageWallPaperLayer.cpp (100%) rename {desktop/ui => ui}/components/wallpaper/ImageWallPaperLayer.h (100%) rename {desktop/ui => ui}/components/wallpaper/TransitionComposer.cpp (100%) rename {desktop/ui => ui}/components/wallpaper/TransitionComposer.h (100%) rename {desktop/ui => ui}/components/wallpaper/WallPaperAccessStorage.cpp (100%) rename {desktop/ui => ui}/components/wallpaper/WallPaperAccessStorage.h (100%) rename {desktop/ui => ui}/components/wallpaper/WallPaperEngine.cpp (100%) rename {desktop/ui => ui}/components/wallpaper/WallPaperEngine.h (100%) rename {desktop/ui => ui}/components/wallpaper/WallPaperLayer.h (100%) rename {desktop/ui => ui}/components/wallpaper/WallPaperToken.cpp (100%) rename {desktop/ui => ui}/components/wallpaper/WallPaperToken.h (100%) rename {desktop/ui => ui}/components/window_info.h (100%) rename {desktop/ui => ui}/components/window_placement/CMakeLists.txt (100%) rename {desktop/ui => ui}/components/window_placement/window_placement_policy.cpp (100%) rename {desktop/ui => ui}/components/window_placement/window_placement_policy.h (100%) rename {desktop/ui => ui}/models/CMakeLists.txt (100%) rename {desktop/ui => ui}/models/README.md (100%) rename {desktop/ui => ui}/platform/CMakeLists.txt (100%) rename {desktop/ui => ui}/platform/DesktopPropertyStrategyFactory.cpp (100%) rename {desktop/ui => ui}/platform/DesktopPropertyStrategyFactory.h (100%) rename {desktop/ui => ui}/platform/IDesktopDisplaySizeStrategy.cpp (100%) rename {desktop/ui => ui}/platform/IDesktopDisplaySizeStrategy.h (100%) rename {desktop/ui => ui}/platform/IDesktopPropertyStrategy.cpp (100%) rename {desktop/ui => ui}/platform/IDesktopPropertyStrategy.h (100%) rename {desktop/ui => ui}/platform/display_backend_helper.cpp (100%) rename {desktop/ui => ui}/platform/display_backend_helper.h (100%) rename {desktop/ui => ui}/platform/embedded/embedded_display_server_backend.cpp (100%) rename {desktop/ui => ui}/platform/embedded/embedded_display_server_backend.h (100%) rename {desktop/ui => ui}/platform/embedded/embedded_display_size_policy.cpp (100%) rename {desktop/ui => ui}/platform/embedded/embedded_display_size_policy.h (100%) rename {desktop/ui => ui}/platform/embedded/embedded_platform.cpp (100%) rename {desktop/ui => ui}/platform/embedded/null_window_backend.cpp (100%) rename {desktop/ui => ui}/platform/embedded/null_window_backend.h (100%) rename {desktop/ui => ui}/platform/linux_wsl/linux_wsl_display_size_policy.cpp (100%) rename {desktop/ui => ui}/platform/linux_wsl/linux_wsl_display_size_policy.h (100%) rename {desktop/ui => ui}/platform/linux_wsl/linux_wsl_factory.cpp (100%) rename {desktop/ui => ui}/platform/linux_wsl/linux_wsl_factory.h (100%) rename {desktop/ui => ui}/platform/linux_wsl/linux_wsl_platform.cpp (100%) rename {desktop/ui => ui}/platform/linux_wsl/linux_wsl_platform.h (100%) rename {desktop/ui => ui}/platform/linux_wsl/wsl_x11_display_server_backend.cpp (100%) rename {desktop/ui => ui}/platform/linux_wsl/wsl_x11_display_server_backend.h (100%) rename {desktop/ui => ui}/platform/linux_wsl/wsl_x11_window.cpp (100%) rename {desktop/ui => ui}/platform/linux_wsl/wsl_x11_window.h (100%) rename {desktop/ui => ui}/platform/linux_wsl/wsl_x11_window_backend.cpp (100%) rename {desktop/ui => ui}/platform/linux_wsl/wsl_x11_window_backend.h (100%) rename {desktop/ui => ui}/platform/platform_helper.cpp (100%) rename {desktop/ui => ui}/platform/platform_helper.h (100%) rename {desktop/ui => ui}/platform/shell_layer_helper.cpp (100%) rename {desktop/ui => ui}/platform/shell_layer_helper.h (100%) rename {desktop/ui => ui}/platform/windows/windows_display_server_backend.cpp (100%) rename {desktop/ui => ui}/platform/windows/windows_display_server_backend.h (100%) rename {desktop/ui => ui}/platform/windows/windows_display_size_policy.cpp (100%) rename {desktop/ui => ui}/platform/windows/windows_display_size_policy.h (100%) rename {desktop/ui => ui}/platform/windows/windows_factory.cpp (100%) rename {desktop/ui => ui}/platform/windows/windows_factory.h (100%) rename {desktop/ui => ui}/platform/windows/windows_platform.cpp (100%) rename {desktop/ui => ui}/platform/windows/windows_platform.h (100%) rename {desktop/ui => ui}/platform/windows/windows_window.cpp (100%) rename {desktop/ui => ui}/platform/windows/windows_window.h (100%) rename {desktop/ui => ui}/platform/windows/windows_window_backend.cpp (100%) rename {desktop/ui => ui}/platform/windows/windows_window_backend.h (100%) rename {desktop/ui => ui}/render/CMakeLists.txt (100%) rename {desktop/ui => ui}/render/backend_capabilities.h (100%) rename {desktop/ui => ui}/render/render_backend.h (100%) rename {desktop/ui => ui}/render/render_backend_factory.h (100%) rename {desktop/ui => ui}/widget/CMakeLists.txt (100%) rename {desktop/ui => ui}/widget/README.md (100%) rename {desktop/ui => ui}/widget/init_session/CMakeLists.txt (80%) rename {desktop/ui => ui}/widget/init_session/boot_progress_widget.cpp (100%) rename {desktop/ui => ui}/widget/init_session/boot_progress_widget.h (100%) rename {desktop/ui => ui}/widget/init_session/boot_widget_factory.cpp (100%) rename {desktop/ui => ui}/widget/init_session/resources/CFDesktop.logo.png (100%) rename {desktop/ui => ui}/widget/init_session/resources/resources.qrc (100%) rename {desktop/ui => ui}/widget/init_session/simple_boot_widget.cpp (100%) rename {desktop/ui => ui}/widget/init_session/simple_boot_widget.h (100%) rename {desktop/ui => ui}/widget/init_session/simple_boot_widget.ui (100%) rename {desktop/ui => ui}/widget/init_session/step_dot_widget.cpp (100%) rename {desktop/ui => ui}/widget/init_session/step_dot_widget.h (100%) diff --git a/AGENT.md b/AGENT.md index 19c10d73a..12a4a4e24 100644 --- a/AGENT.md +++ b/AGENT.md @@ -17,15 +17,15 @@ ## Architecture: Three-Layer Strict Dependency ``` -desktop/ (Layer 3) → ui/ (Layer 2) → base/ (Layer 1) → Qt/OS API +main/ (Layer 3) → ui/ (Layer 2) → base/ (Layer 1) → Qt/OS API ``` **Rules (STRICT single-direction):** -- `base/` MUST NOT `#include` from `ui/` or `desktop/` -- `ui/` MUST NOT `#include` from `desktop/` -- `desktop/` MAY `#include` from `ui/` and `base/` -- Verify: `grep -r '#include.*\(ui/\|desktop/\)' base/` must return nothing -- Verify: `grep -r '#include.*desktop/' ui/` must return nothing +- `base/` MUST NOT `#include` from `ui/` or `main/` +- `ui/` MUST NOT `#include` from `main/` +- `main/` MAY `#include` from `ui/` and `base/` +- Verify: `grep -r '#include.*\(ui/\|main/\)' base/` must return nothing +- Verify: `grep -r '#include.*main/' ui/` must return nothing ## Build System @@ -93,13 +93,24 @@ Material Design 3 UI framework (5-layer pipeline): - Layer 4: Material Behavior (`StateMachine`, `RippleHelper`, `MdElevationController`) - Layer 5: Widget Adapter (19 MD3 widgets: Button, TextField, Slider, etc.) -### desktop/ → CFDesktop_shared -Desktop environment implementation. -- `main/` — DAG-based initialization chain + entry point -- `base/config_manager/` — 4-layer ConfigStore (Temp/App/User/System) with JSON backend -- `base/logger/` — Async multi-sink logging (lock-free MPSC queue) -- `ui/components/` — Core interfaces (`IWindow`, `IDisplayServerBackend`) -- `ui/platform/` — Platform backends (Windows, WSL X11, Wayland planned) +### base/ → cfbase + desktop infrastructure (merged) +Foundation layer: hardware probes + desktop infrastructure (cfbase SHARED + 6 desktop-base STATIC modules). +- `cfbase/` — Hardware probes (CPU/memory/GPU/network) + HWTier + console (SHARED) +- `config_manager/` — 4-layer ConfigStore (Temp/App/User/System) with JSON backend +- `logger/` — Async multi-sink logging (lock-free MPSC queue, SHARED) +- `path/` / `file_operations/` / `fundamental/` / `ascii_art/` — path resolution, file ops, helpers + +### ui/ → CFDesktopUi +Shell-specific Material Design 3 UI (the reusable widget lib is the QuarkWidgets submodule). +- `components/` — Core interfaces (`IWindow`, `IDisplayServerBackend`) +- `platform/` — Platform backends (Windows, WSL X11, Wayland planned) +- `widget/` / `models/` / `render/` / `base/` + +### main/ → CFDesktopMain (+ CFDesktop_shared assembled at top level) +Desktop entry point + initialization. +- `init/` — DAG-based initialization chain +- `early_session/` — Pre-QApplication setup +- `desktop_entry.cpp` + top-level `main.cpp` + `desktop_run_session.cpp` — entry + session ## Phase System diff --git a/CMakeLists.txt b/CMakeLists.txt index e9d0fa089..36d1559a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,18 +68,113 @@ setup_third_party( # Standalone desktop apps now live in the separate `CFDeskit` repo # (https://github.com/Awesome-Embedded-Learning-Studio/CFDeskit). The main # repo no longer compiles apps — they are deployed as prebuilt artifacts into -# /../apps// at install/runtime, where AppDiscoverer scans them. -# See apps/README.md for the deployment contract. +# /apps// at install/runtime, where AppDiscoverer scans them. +# See third_party/apps/README.md for the deployment contract. -log_module_start("desktop") -add_subdirectory(desktop) -# Log base module end -log_module_end("desktop") +# ============================================================ +# UI layer (Material Design 3 components, platform backends; was desktop/ui/) +# ============================================================ +log_module_start("ui") +add_subdirectory(ui) +log_module_end("ui") + +# ============================================================ +# Main layer (init chain + entry; was desktop/main/) +# ============================================================ +log_module_start("main") +add_subdirectory(main) +log_module_end("main") + +# ============================================================ +# Unified CFDesktop Shared Library — assembles static libs from base/ui/main. +# Moved here from the deleted desktop/CMakeLists.txt. +# ============================================================ +log_info("Desktop" "Creating unified CFDesktop shared library") + +add_library(CFDesktop_shared SHARED) + +if(WIN32) + target_compile_definitions(CFDesktop_shared PRIVATE CFDESKTOP_EXPORTS) +endif() +if(UNIX AND NOT APPLE) + target_compile_options(CFDesktop_shared PRIVATE -fvisibility=hidden) +endif() + +target_include_directories(CFDesktop_shared PUBLIC + $ + $ + $ +) + +# Static libs folded into the .so via --whole-archive. +set(CFDESKTOP_STATIC_LIBS + cffilesystem + cfconfig + cfasciiart + CFDesktopMain + CFDesktopUi + cf_desktop_render +) + +# Sources compiled directly into the DLL (with CFDESKTOP_EXPORTS defined). +target_sources(CFDesktop_shared PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/main/desktop_run_session.cpp +) + +if(MSVC) + target_link_libraries(CFDesktop_shared PRIVATE ${CFDESKTOP_STATIC_LIBS}) + foreach(_cfdesktop_module IN LISTS CFDESKTOP_STATIC_LIBS) + target_link_options(CFDesktop_shared PRIVATE "/WHOLEARCHIVE:$") + endforeach() +elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND NOT APPLE) + target_link_libraries(CFDesktop_shared PRIVATE + "-Wl,--whole-archive" + ${CFDESKTOP_STATIC_LIBS} + "-Wl,--no-whole-archive" + ) +else() + target_link_libraries(CFDesktop_shared PRIVATE ${CFDESKTOP_STATIC_LIBS}) +endif() + +target_link_libraries(CFDesktop_shared PUBLIC + Qt6::Core + Qt6::Gui + Qt6::Widgets +) +# QuarkWidgets::quarkwidgets is PUBLIC so the thin EXE can include the +# QApplication subclass (MaterialApplication) it instantiates in main.cpp. +target_link_libraries(CFDesktop_shared +PRIVATE + cfbase + cflogger +PUBLIC + QuarkWidgets::quarkwidgets +) + +if(WIN32) + target_link_libraries(CFDesktop_shared PUBLIC + wbemuuid PowrProf pdh psapi + ) +endif() + +add_library(CFDesktop::lib ALIAS CFDesktop_shared) + +# ============================================================ +# Main executable — thin shell that calls into the DLL +# ============================================================ +add_executable(CFDesktop main.cpp) +target_link_libraries(CFDesktop PRIVATE CFDesktop_shared) + +log_info("Desktop Buildings" "Configuring Desktop Buildings Done") log_module_start("example") add_subdirectory("example") log_module_end("example") +# Enable CTest at the top level so CTestTestfile.cmake is generated for the +# build root (enable_testing() inside test/CMakeLists.txt only covers that scope). +enable_testing() + # Log test module start log_module_start("test") add_subdirectory(test) diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index b592043b1..a9bf0409b 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -1,87 +1,14 @@ -# Base library - fundamental utilities and platform abstractions -cmake_minimum_required(VERSION 3.16) - -# ============================================================ -# Header-only exposure for base/include (system probes + platform helpers). -# Foundation utilities (expected, scope_guard, weak_ptr, macro, ...) were -# extracted to the aex submodule; retained headers (e.g. windows/co_helper.hpp) -# include them, so aex::aex is propagated here. -# ============================================================ -add_library(cfbase_headers INTERFACE) -target_include_directories(cfbase_headers INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/include -) -target_link_libraries(cfbase_headers INTERFACE aex::aex) -add_library(CFDesktop::base_headers ALIAS cfbase_headers) - -# Include subdirectory CMakeLists (static libraries) -add_subdirectory(system) -add_subdirectory(device) - -# ============================================================ -# Unified Base Library - Single DLL: cfbase.dll -# ============================================================ - -# Create the unified shared library -add_library(cfbase SHARED) - -set(CFBASE_MODULE_TARGETS - cfbase_cpu - cfbase_memory - cfbase_network - cfbase_gpu - cfbase_console - cfbase_hardware_tier -) - -# Link static libraries from sub-modules with --whole-archive to ensure -# all symbols (including dllexport) are included in cfbase.dll. -# Without this, the linker skips static lib objects since cfbase has no own sources. -# Force all objects into cfbase.dll (PRIVATE: only affects cfbase's link step). -if(MSVC) - target_link_libraries(cfbase PRIVATE ${CFBASE_MODULE_TARGETS}) - foreach(_cfbase_module IN LISTS CFBASE_MODULE_TARGETS) - target_link_options(cfbase PRIVATE "/WHOLEARCHIVE:$") - endforeach() -elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND NOT APPLE) - target_link_libraries(cfbase PRIVATE - -Wl,--whole-archive - ${CFBASE_MODULE_TARGETS} - -Wl,--no-whole-archive - ) -else() - target_link_libraries(cfbase PRIVATE ${CFBASE_MODULE_TARGETS}) -endif() - -# Set include directories -# Expose both include/ (for public headers) and . (for sub-module headers like device/console) -target_include_directories(cfbase PUBLIC - $ - $ - $ -) - -# Link dependencies -target_link_libraries(cfbase PUBLIC - Qt6::Core - aex::aex -) - -# Platform-specific link libraries -if(WIN32) - target_link_libraries(cfbase PUBLIC - wbemuuid - PowrProf - pdh - psapi - ) -endif() - -# ============================================================ -# Aliases -# ============================================================ -add_library(CFDesktop::base ALIAS cfbase) -# For backward compatibility -add_library(CFDesktop::base_cpu ALIAS cfbase) -add_library(CFDesktop::base_memory ALIAS cfbase) -add_library(CFDesktop::base_console ALIAS cfbase) +# ============================================================ +# base/ — Foundation layer +# Merges cfbase (hardware probes + HWTier + console, SHARED) with the desktop +# infrastructure (logger/config/path/filesystem/fundamental/ascii_art, STATIC) +# into a single base layer. Downstream (main/CFDesktop_shared) consumes them +# via the existing target aliases (CFDesktop::base, cfconfig, cfpath, ...). +# ============================================================ +add_subdirectory(cfbase) +add_subdirectory(fundamental) +add_subdirectory(path) +add_subdirectory(logger) +add_subdirectory(file_operations) +add_subdirectory(config_manager) +add_subdirectory(ascii_art) diff --git a/desktop/base/ascii_art/CMakeLists.txt b/base/ascii_art/CMakeLists.txt similarity index 100% rename from desktop/base/ascii_art/CMakeLists.txt rename to base/ascii_art/CMakeLists.txt diff --git a/desktop/base/ascii_art/include/cfasciiart.h b/base/ascii_art/include/cfasciiart.h similarity index 100% rename from desktop/base/ascii_art/include/cfasciiart.h rename to base/ascii_art/include/cfasciiart.h diff --git a/desktop/base/ascii_art/src/cfasciiart.cpp b/base/ascii_art/src/cfasciiart.cpp similarity index 100% rename from desktop/base/ascii_art/src/cfasciiart.cpp rename to base/ascii_art/src/cfasciiart.cpp diff --git a/base/cfbase/CMakeLists.txt b/base/cfbase/CMakeLists.txt new file mode 100644 index 000000000..b592043b1 --- /dev/null +++ b/base/cfbase/CMakeLists.txt @@ -0,0 +1,87 @@ +# Base library - fundamental utilities and platform abstractions +cmake_minimum_required(VERSION 3.16) + +# ============================================================ +# Header-only exposure for base/include (system probes + platform helpers). +# Foundation utilities (expected, scope_guard, weak_ptr, macro, ...) were +# extracted to the aex submodule; retained headers (e.g. windows/co_helper.hpp) +# include them, so aex::aex is propagated here. +# ============================================================ +add_library(cfbase_headers INTERFACE) +target_include_directories(cfbase_headers INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR}/include +) +target_link_libraries(cfbase_headers INTERFACE aex::aex) +add_library(CFDesktop::base_headers ALIAS cfbase_headers) + +# Include subdirectory CMakeLists (static libraries) +add_subdirectory(system) +add_subdirectory(device) + +# ============================================================ +# Unified Base Library - Single DLL: cfbase.dll +# ============================================================ + +# Create the unified shared library +add_library(cfbase SHARED) + +set(CFBASE_MODULE_TARGETS + cfbase_cpu + cfbase_memory + cfbase_network + cfbase_gpu + cfbase_console + cfbase_hardware_tier +) + +# Link static libraries from sub-modules with --whole-archive to ensure +# all symbols (including dllexport) are included in cfbase.dll. +# Without this, the linker skips static lib objects since cfbase has no own sources. +# Force all objects into cfbase.dll (PRIVATE: only affects cfbase's link step). +if(MSVC) + target_link_libraries(cfbase PRIVATE ${CFBASE_MODULE_TARGETS}) + foreach(_cfbase_module IN LISTS CFBASE_MODULE_TARGETS) + target_link_options(cfbase PRIVATE "/WHOLEARCHIVE:$") + endforeach() +elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND NOT APPLE) + target_link_libraries(cfbase PRIVATE + -Wl,--whole-archive + ${CFBASE_MODULE_TARGETS} + -Wl,--no-whole-archive + ) +else() + target_link_libraries(cfbase PRIVATE ${CFBASE_MODULE_TARGETS}) +endif() + +# Set include directories +# Expose both include/ (for public headers) and . (for sub-module headers like device/console) +target_include_directories(cfbase PUBLIC + $ + $ + $ +) + +# Link dependencies +target_link_libraries(cfbase PUBLIC + Qt6::Core + aex::aex +) + +# Platform-specific link libraries +if(WIN32) + target_link_libraries(cfbase PUBLIC + wbemuuid + PowrProf + pdh + psapi + ) +endif() + +# ============================================================ +# Aliases +# ============================================================ +add_library(CFDesktop::base ALIAS cfbase) +# For backward compatibility +add_library(CFDesktop::base_cpu ALIAS cfbase) +add_library(CFDesktop::base_memory ALIAS cfbase) +add_library(CFDesktop::base_console ALIAS cfbase) diff --git a/base/README.md b/base/cfbase/README.md similarity index 100% rename from base/README.md rename to base/cfbase/README.md diff --git a/base/device/CMakeLists.txt b/base/cfbase/device/CMakeLists.txt similarity index 100% rename from base/device/CMakeLists.txt rename to base/cfbase/device/CMakeLists.txt diff --git a/base/device/console/CMakeLists.txt b/base/cfbase/device/console/CMakeLists.txt similarity index 100% rename from base/device/console/CMakeLists.txt rename to base/cfbase/device/console/CMakeLists.txt diff --git a/base/device/console/console_defines.h b/base/cfbase/device/console/console_defines.h similarity index 100% rename from base/device/console/console_defines.h rename to base/cfbase/device/console/console_defines.h diff --git a/base/device/console/console_helper.cpp b/base/cfbase/device/console/console_helper.cpp similarity index 100% rename from base/device/console/console_helper.cpp rename to base/cfbase/device/console/console_helper.cpp diff --git a/base/device/console/console_helper.h b/base/cfbase/device/console/console_helper.h similarity index 100% rename from base/device/console/console_helper.h rename to base/cfbase/device/console/console_helper.h diff --git a/base/device/console/impl/console_platform.cpp b/base/cfbase/device/console/impl/console_platform.cpp similarity index 100% rename from base/device/console/impl/console_platform.cpp rename to base/cfbase/device/console/impl/console_platform.cpp diff --git a/base/device/console/impl/console_platform.h b/base/cfbase/device/console/impl/console_platform.h similarity index 100% rename from base/device/console/impl/console_platform.h rename to base/cfbase/device/console/impl/console_platform.h diff --git a/base/device/console/impl/unix/console_unix_impl.cpp b/base/cfbase/device/console/impl/unix/console_unix_impl.cpp similarity index 100% rename from base/device/console/impl/unix/console_unix_impl.cpp rename to base/cfbase/device/console/impl/unix/console_unix_impl.cpp diff --git a/base/device/console/impl/unix/console_unix_impl.h b/base/cfbase/device/console/impl/unix/console_unix_impl.h similarity index 100% rename from base/device/console/impl/unix/console_unix_impl.h rename to base/cfbase/device/console/impl/unix/console_unix_impl.h diff --git a/base/device/console/impl/win/console_win_impl.cpp b/base/cfbase/device/console/impl/win/console_win_impl.cpp similarity index 100% rename from base/device/console/impl/win/console_win_impl.cpp rename to base/cfbase/device/console/impl/win/console_win_impl.cpp diff --git a/base/device/console/impl/win/console_win_impl.h b/base/cfbase/device/console/impl/win/console_win_impl.h similarity index 100% rename from base/device/console/impl/win/console_win_impl.h rename to base/cfbase/device/console/impl/win/console_win_impl.h diff --git a/base/include/base/export.h b/base/cfbase/include/base/export.h similarity index 100% rename from base/include/base/export.h rename to base/cfbase/include/base/export.h diff --git a/base/include/base/linux/proc_parser.h b/base/cfbase/include/base/linux/proc_parser.h similarity index 100% rename from base/include/base/linux/proc_parser.h rename to base/cfbase/include/base/linux/proc_parser.h diff --git a/base/include/base/windows/co_helper.hpp b/base/cfbase/include/base/windows/co_helper.hpp similarity index 100% rename from base/include/base/windows/co_helper.hpp rename to base/cfbase/include/base/windows/co_helper.hpp diff --git a/base/include/base/windows/common.h b/base/cfbase/include/base/windows/common.h similarity index 100% rename from base/include/base/windows/common.h rename to base/cfbase/include/base/windows/common.h diff --git a/base/include/system/cpu/cfcpu.h b/base/cfbase/include/system/cpu/cfcpu.h similarity index 100% rename from base/include/system/cpu/cfcpu.h rename to base/cfbase/include/system/cpu/cfcpu.h diff --git a/base/include/system/cpu/cfcpu_bonus.h b/base/cfbase/include/system/cpu/cfcpu_bonus.h similarity index 100% rename from base/include/system/cpu/cfcpu_bonus.h rename to base/cfbase/include/system/cpu/cfcpu_bonus.h diff --git a/base/include/system/cpu/cfcpu_profile.h b/base/cfbase/include/system/cpu/cfcpu_profile.h similarity index 100% rename from base/include/system/cpu/cfcpu_profile.h rename to base/cfbase/include/system/cpu/cfcpu_profile.h diff --git a/base/include/system/gpu/gpu.h b/base/cfbase/include/system/gpu/gpu.h similarity index 100% rename from base/include/system/gpu/gpu.h rename to base/cfbase/include/system/gpu/gpu.h diff --git a/base/include/system/hardware_tier/hardware_tier.h b/base/cfbase/include/system/hardware_tier/hardware_tier.h similarity index 100% rename from base/include/system/hardware_tier/hardware_tier.h rename to base/cfbase/include/system/hardware_tier/hardware_tier.h diff --git a/base/include/system/hardware_tier/hardware_tier_data.h b/base/cfbase/include/system/hardware_tier/hardware_tier_data.h similarity index 100% rename from base/include/system/hardware_tier/hardware_tier_data.h rename to base/cfbase/include/system/hardware_tier/hardware_tier_data.h diff --git a/base/include/system/memory/memory_info.h b/base/cfbase/include/system/memory/memory_info.h similarity index 100% rename from base/include/system/memory/memory_info.h rename to base/cfbase/include/system/memory/memory_info.h diff --git a/base/include/system/network/network.h b/base/cfbase/include/system/network/network.h similarity index 100% rename from base/include/system/network/network.h rename to base/cfbase/include/system/network/network.h diff --git a/base/system/CMakeLists.txt b/base/cfbase/system/CMakeLists.txt similarity index 100% rename from base/system/CMakeLists.txt rename to base/cfbase/system/CMakeLists.txt diff --git a/base/system/cpu/CMakeLists.txt b/base/cfbase/system/cpu/CMakeLists.txt similarity index 100% rename from base/system/cpu/CMakeLists.txt rename to base/cfbase/system/cpu/CMakeLists.txt diff --git a/base/system/cpu/cfcpu.cpp b/base/cfbase/system/cpu/cfcpu.cpp similarity index 100% rename from base/system/cpu/cfcpu.cpp rename to base/cfbase/system/cpu/cfcpu.cpp diff --git a/base/system/cpu/cfcpu_bonus.cpp b/base/cfbase/system/cpu/cfcpu_bonus.cpp similarity index 100% rename from base/system/cpu/cfcpu_bonus.cpp rename to base/cfbase/system/cpu/cfcpu_bonus.cpp diff --git a/base/system/cpu/cfcpu_profile.cpp b/base/cfbase/system/cpu/cfcpu_profile.cpp similarity index 100% rename from base/system/cpu/cfcpu_profile.cpp rename to base/cfbase/system/cpu/cfcpu_profile.cpp diff --git a/base/system/cpu/private/cpu_host.h b/base/cfbase/system/cpu/private/cpu_host.h similarity index 100% rename from base/system/cpu/private/cpu_host.h rename to base/cfbase/system/cpu/private/cpu_host.h diff --git a/base/system/cpu/private/linux_impl/cpu_bonus.cpp b/base/cfbase/system/cpu/private/linux_impl/cpu_bonus.cpp similarity index 100% rename from base/system/cpu/private/linux_impl/cpu_bonus.cpp rename to base/cfbase/system/cpu/private/linux_impl/cpu_bonus.cpp diff --git a/base/system/cpu/private/linux_impl/cpu_bonus.h b/base/cfbase/system/cpu/private/linux_impl/cpu_bonus.h similarity index 100% rename from base/system/cpu/private/linux_impl/cpu_bonus.h rename to base/cfbase/system/cpu/private/linux_impl/cpu_bonus.h diff --git a/base/system/cpu/private/linux_impl/cpu_features.cpp b/base/cfbase/system/cpu/private/linux_impl/cpu_features.cpp similarity index 100% rename from base/system/cpu/private/linux_impl/cpu_features.cpp rename to base/cfbase/system/cpu/private/linux_impl/cpu_features.cpp diff --git a/base/system/cpu/private/linux_impl/cpu_features.h b/base/cfbase/system/cpu/private/linux_impl/cpu_features.h similarity index 100% rename from base/system/cpu/private/linux_impl/cpu_features.h rename to base/cfbase/system/cpu/private/linux_impl/cpu_features.h diff --git a/base/system/cpu/private/linux_impl/cpu_info.cpp b/base/cfbase/system/cpu/private/linux_impl/cpu_info.cpp similarity index 100% rename from base/system/cpu/private/linux_impl/cpu_info.cpp rename to base/cfbase/system/cpu/private/linux_impl/cpu_info.cpp diff --git a/base/system/cpu/private/linux_impl/cpu_info.h b/base/cfbase/system/cpu/private/linux_impl/cpu_info.h similarity index 100% rename from base/system/cpu/private/linux_impl/cpu_info.h rename to base/cfbase/system/cpu/private/linux_impl/cpu_info.h diff --git a/base/system/cpu/private/linux_impl/cpu_profile.cpp b/base/cfbase/system/cpu/private/linux_impl/cpu_profile.cpp similarity index 100% rename from base/system/cpu/private/linux_impl/cpu_profile.cpp rename to base/cfbase/system/cpu/private/linux_impl/cpu_profile.cpp diff --git a/base/system/cpu/private/linux_impl/cpu_profile.h b/base/cfbase/system/cpu/private/linux_impl/cpu_profile.h similarity index 100% rename from base/system/cpu/private/linux_impl/cpu_profile.h rename to base/cfbase/system/cpu/private/linux_impl/cpu_profile.h diff --git a/base/system/cpu/private/win_impl/cpu_bonus.cpp b/base/cfbase/system/cpu/private/win_impl/cpu_bonus.cpp similarity index 100% rename from base/system/cpu/private/win_impl/cpu_bonus.cpp rename to base/cfbase/system/cpu/private/win_impl/cpu_bonus.cpp diff --git a/base/system/cpu/private/win_impl/cpu_bonus.h b/base/cfbase/system/cpu/private/win_impl/cpu_bonus.h similarity index 100% rename from base/system/cpu/private/win_impl/cpu_bonus.h rename to base/cfbase/system/cpu/private/win_impl/cpu_bonus.h diff --git a/base/system/cpu/private/win_impl/cpu_features.cpp b/base/cfbase/system/cpu/private/win_impl/cpu_features.cpp similarity index 100% rename from base/system/cpu/private/win_impl/cpu_features.cpp rename to base/cfbase/system/cpu/private/win_impl/cpu_features.cpp diff --git a/base/system/cpu/private/win_impl/cpu_features.h b/base/cfbase/system/cpu/private/win_impl/cpu_features.h similarity index 100% rename from base/system/cpu/private/win_impl/cpu_features.h rename to base/cfbase/system/cpu/private/win_impl/cpu_features.h diff --git a/base/system/cpu/private/win_impl/cpu_info.cpp b/base/cfbase/system/cpu/private/win_impl/cpu_info.cpp similarity index 100% rename from base/system/cpu/private/win_impl/cpu_info.cpp rename to base/cfbase/system/cpu/private/win_impl/cpu_info.cpp diff --git a/base/system/cpu/private/win_impl/cpu_info.h b/base/cfbase/system/cpu/private/win_impl/cpu_info.h similarity index 100% rename from base/system/cpu/private/win_impl/cpu_info.h rename to base/cfbase/system/cpu/private/win_impl/cpu_info.h diff --git a/base/system/cpu/private/win_impl/cpu_profile.cpp b/base/cfbase/system/cpu/private/win_impl/cpu_profile.cpp similarity index 100% rename from base/system/cpu/private/win_impl/cpu_profile.cpp rename to base/cfbase/system/cpu/private/win_impl/cpu_profile.cpp diff --git a/base/system/cpu/private/win_impl/cpu_profile.h b/base/cfbase/system/cpu/private/win_impl/cpu_profile.h similarity index 100% rename from base/system/cpu/private/win_impl/cpu_profile.h rename to base/cfbase/system/cpu/private/win_impl/cpu_profile.h diff --git a/base/system/gpu/CMakeLists.txt b/base/cfbase/system/gpu/CMakeLists.txt similarity index 100% rename from base/system/gpu/CMakeLists.txt rename to base/cfbase/system/gpu/CMakeLists.txt diff --git a/base/system/gpu/gpu.cpp b/base/cfbase/system/gpu/gpu.cpp similarity index 100% rename from base/system/gpu/gpu.cpp rename to base/cfbase/system/gpu/gpu.cpp diff --git a/base/system/gpu/private/gpu_host.h b/base/cfbase/system/gpu/private/gpu_host.h similarity index 100% rename from base/system/gpu/private/gpu_host.h rename to base/cfbase/system/gpu/private/gpu_host.h diff --git a/base/system/gpu/private/linux_impl/gpu_info.cpp b/base/cfbase/system/gpu/private/linux_impl/gpu_info.cpp similarity index 100% rename from base/system/gpu/private/linux_impl/gpu_info.cpp rename to base/cfbase/system/gpu/private/linux_impl/gpu_info.cpp diff --git a/base/system/gpu/private/linux_impl/gpu_info.h b/base/cfbase/system/gpu/private/linux_impl/gpu_info.h similarity index 100% rename from base/system/gpu/private/linux_impl/gpu_info.h rename to base/cfbase/system/gpu/private/linux_impl/gpu_info.h diff --git a/base/system/gpu/private/win_impl/gpu_info.cpp b/base/cfbase/system/gpu/private/win_impl/gpu_info.cpp similarity index 100% rename from base/system/gpu/private/win_impl/gpu_info.cpp rename to base/cfbase/system/gpu/private/win_impl/gpu_info.cpp diff --git a/base/system/gpu/private/win_impl/gpu_info.h b/base/cfbase/system/gpu/private/win_impl/gpu_info.h similarity index 100% rename from base/system/gpu/private/win_impl/gpu_info.h rename to base/cfbase/system/gpu/private/win_impl/gpu_info.h diff --git a/base/system/hardware_tier/CMakeLists.txt b/base/cfbase/system/hardware_tier/CMakeLists.txt similarity index 100% rename from base/system/hardware_tier/CMakeLists.txt rename to base/cfbase/system/hardware_tier/CMakeLists.txt diff --git a/base/system/hardware_tier/default/default_assessor.cpp b/base/cfbase/system/hardware_tier/default/default_assessor.cpp similarity index 100% rename from base/system/hardware_tier/default/default_assessor.cpp rename to base/cfbase/system/hardware_tier/default/default_assessor.cpp diff --git a/base/system/hardware_tier/default/default_collector.cpp b/base/cfbase/system/hardware_tier/default/default_collector.cpp similarity index 100% rename from base/system/hardware_tier/default/default_collector.cpp rename to base/cfbase/system/hardware_tier/default/default_collector.cpp diff --git a/base/system/hardware_tier/default/default_cpu_scorer.cpp b/base/cfbase/system/hardware_tier/default/default_cpu_scorer.cpp similarity index 100% rename from base/system/hardware_tier/default/default_cpu_scorer.cpp rename to base/cfbase/system/hardware_tier/default/default_cpu_scorer.cpp diff --git a/base/system/hardware_tier/default/default_display_scorer.cpp b/base/cfbase/system/hardware_tier/default/default_display_scorer.cpp similarity index 100% rename from base/system/hardware_tier/default/default_display_scorer.cpp rename to base/cfbase/system/hardware_tier/default/default_display_scorer.cpp diff --git a/base/system/hardware_tier/default/default_gpu_scorer.cpp b/base/cfbase/system/hardware_tier/default/default_gpu_scorer.cpp similarity index 100% rename from base/system/hardware_tier/default/default_gpu_scorer.cpp rename to base/cfbase/system/hardware_tier/default/default_gpu_scorer.cpp diff --git a/base/system/hardware_tier/default/default_memory_scorer.cpp b/base/cfbase/system/hardware_tier/default/default_memory_scorer.cpp similarity index 100% rename from base/system/hardware_tier/default/default_memory_scorer.cpp rename to base/cfbase/system/hardware_tier/default/default_memory_scorer.cpp diff --git a/base/system/hardware_tier/default/default_policy.cpp b/base/cfbase/system/hardware_tier/default/default_policy.cpp similarity index 100% rename from base/system/hardware_tier/default/default_policy.cpp rename to base/cfbase/system/hardware_tier/default/default_policy.cpp diff --git a/base/system/hardware_tier/default_factories.h b/base/cfbase/system/hardware_tier/default_factories.h similarity index 100% rename from base/system/hardware_tier/default_factories.h rename to base/cfbase/system/hardware_tier/default_factories.h diff --git a/base/system/hardware_tier/hardware_tier.cpp b/base/cfbase/system/hardware_tier/hardware_tier.cpp similarity index 100% rename from base/system/hardware_tier/hardware_tier.cpp rename to base/cfbase/system/hardware_tier/hardware_tier.cpp diff --git a/base/system/hardware_tier/hardware_tier_assessor.h b/base/cfbase/system/hardware_tier/hardware_tier_assessor.h similarity index 100% rename from base/system/hardware_tier/hardware_tier_assessor.h rename to base/cfbase/system/hardware_tier/hardware_tier_assessor.h diff --git a/base/system/hardware_tier/hardware_tier_collector.h b/base/cfbase/system/hardware_tier/hardware_tier_collector.h similarity index 100% rename from base/system/hardware_tier/hardware_tier_collector.h rename to base/cfbase/system/hardware_tier/hardware_tier_collector.h diff --git a/base/system/hardware_tier/hardware_tier_policy.h b/base/cfbase/system/hardware_tier/hardware_tier_policy.h similarity index 100% rename from base/system/hardware_tier/hardware_tier_policy.h rename to base/cfbase/system/hardware_tier/hardware_tier_policy.h diff --git a/base/system/hardware_tier/hardware_tier_scorer.h b/base/cfbase/system/hardware_tier/hardware_tier_scorer.h similarity index 100% rename from base/system/hardware_tier/hardware_tier_scorer.h rename to base/cfbase/system/hardware_tier/hardware_tier_scorer.h diff --git a/base/system/memory/CMakeLists.txt b/base/cfbase/system/memory/CMakeLists.txt similarity index 100% rename from base/system/memory/CMakeLists.txt rename to base/cfbase/system/memory/CMakeLists.txt diff --git a/base/system/memory/memory_info.cpp b/base/cfbase/system/memory/memory_info.cpp similarity index 100% rename from base/system/memory/memory_info.cpp rename to base/cfbase/system/memory/memory_info.cpp diff --git a/base/system/memory/private/linux_impl/cached_memory.cpp b/base/cfbase/system/memory/private/linux_impl/cached_memory.cpp similarity index 100% rename from base/system/memory/private/linux_impl/cached_memory.cpp rename to base/cfbase/system/memory/private/linux_impl/cached_memory.cpp diff --git a/base/system/memory/private/linux_impl/cached_memory.h b/base/cfbase/system/memory/private/linux_impl/cached_memory.h similarity index 100% rename from base/system/memory/private/linux_impl/cached_memory.h rename to base/cfbase/system/memory/private/linux_impl/cached_memory.h diff --git a/base/system/memory/private/linux_impl/dimm_info.cpp b/base/cfbase/system/memory/private/linux_impl/dimm_info.cpp similarity index 100% rename from base/system/memory/private/linux_impl/dimm_info.cpp rename to base/cfbase/system/memory/private/linux_impl/dimm_info.cpp diff --git a/base/system/memory/private/linux_impl/dimm_info.h b/base/cfbase/system/memory/private/linux_impl/dimm_info.h similarity index 100% rename from base/system/memory/private/linux_impl/dimm_info.h rename to base/cfbase/system/memory/private/linux_impl/dimm_info.h diff --git a/base/system/memory/private/linux_impl/memory_info.cpp b/base/cfbase/system/memory/private/linux_impl/memory_info.cpp similarity index 100% rename from base/system/memory/private/linux_impl/memory_info.cpp rename to base/cfbase/system/memory/private/linux_impl/memory_info.cpp diff --git a/base/system/memory/private/linux_impl/memory_info.h b/base/cfbase/system/memory/private/linux_impl/memory_info.h similarity index 100% rename from base/system/memory/private/linux_impl/memory_info.h rename to base/cfbase/system/memory/private/linux_impl/memory_info.h diff --git a/base/system/memory/private/linux_impl/physical_memory.cpp b/base/cfbase/system/memory/private/linux_impl/physical_memory.cpp similarity index 100% rename from base/system/memory/private/linux_impl/physical_memory.cpp rename to base/cfbase/system/memory/private/linux_impl/physical_memory.cpp diff --git a/base/system/memory/private/linux_impl/physical_memory.h b/base/cfbase/system/memory/private/linux_impl/physical_memory.h similarity index 100% rename from base/system/memory/private/linux_impl/physical_memory.h rename to base/cfbase/system/memory/private/linux_impl/physical_memory.h diff --git a/base/system/memory/private/linux_impl/process_memory.cpp b/base/cfbase/system/memory/private/linux_impl/process_memory.cpp similarity index 100% rename from base/system/memory/private/linux_impl/process_memory.cpp rename to base/cfbase/system/memory/private/linux_impl/process_memory.cpp diff --git a/base/system/memory/private/linux_impl/process_memory.h b/base/cfbase/system/memory/private/linux_impl/process_memory.h similarity index 100% rename from base/system/memory/private/linux_impl/process_memory.h rename to base/cfbase/system/memory/private/linux_impl/process_memory.h diff --git a/base/system/memory/private/linux_impl/swap_memory.cpp b/base/cfbase/system/memory/private/linux_impl/swap_memory.cpp similarity index 100% rename from base/system/memory/private/linux_impl/swap_memory.cpp rename to base/cfbase/system/memory/private/linux_impl/swap_memory.cpp diff --git a/base/system/memory/private/linux_impl/swap_memory.h b/base/cfbase/system/memory/private/linux_impl/swap_memory.h similarity index 100% rename from base/system/memory/private/linux_impl/swap_memory.h rename to base/cfbase/system/memory/private/linux_impl/swap_memory.h diff --git a/base/system/memory/private/win_impl/dimm_info.cpp b/base/cfbase/system/memory/private/win_impl/dimm_info.cpp similarity index 100% rename from base/system/memory/private/win_impl/dimm_info.cpp rename to base/cfbase/system/memory/private/win_impl/dimm_info.cpp diff --git a/base/system/memory/private/win_impl/dimm_info.h b/base/cfbase/system/memory/private/win_impl/dimm_info.h similarity index 100% rename from base/system/memory/private/win_impl/dimm_info.h rename to base/cfbase/system/memory/private/win_impl/dimm_info.h diff --git a/base/system/memory/private/win_impl/memory_info.cpp b/base/cfbase/system/memory/private/win_impl/memory_info.cpp similarity index 100% rename from base/system/memory/private/win_impl/memory_info.cpp rename to base/cfbase/system/memory/private/win_impl/memory_info.cpp diff --git a/base/system/memory/private/win_impl/memory_info.h b/base/cfbase/system/memory/private/win_impl/memory_info.h similarity index 100% rename from base/system/memory/private/win_impl/memory_info.h rename to base/cfbase/system/memory/private/win_impl/memory_info.h diff --git a/base/system/memory/private/win_impl/physical_memory.cpp b/base/cfbase/system/memory/private/win_impl/physical_memory.cpp similarity index 100% rename from base/system/memory/private/win_impl/physical_memory.cpp rename to base/cfbase/system/memory/private/win_impl/physical_memory.cpp diff --git a/base/system/memory/private/win_impl/physical_memory.h b/base/cfbase/system/memory/private/win_impl/physical_memory.h similarity index 100% rename from base/system/memory/private/win_impl/physical_memory.h rename to base/cfbase/system/memory/private/win_impl/physical_memory.h diff --git a/base/system/memory/private/win_impl/process_memory.cpp b/base/cfbase/system/memory/private/win_impl/process_memory.cpp similarity index 100% rename from base/system/memory/private/win_impl/process_memory.cpp rename to base/cfbase/system/memory/private/win_impl/process_memory.cpp diff --git a/base/system/memory/private/win_impl/process_memory.h b/base/cfbase/system/memory/private/win_impl/process_memory.h similarity index 100% rename from base/system/memory/private/win_impl/process_memory.h rename to base/cfbase/system/memory/private/win_impl/process_memory.h diff --git a/base/system/memory/private/win_impl/swap_memory.cpp b/base/cfbase/system/memory/private/win_impl/swap_memory.cpp similarity index 100% rename from base/system/memory/private/win_impl/swap_memory.cpp rename to base/cfbase/system/memory/private/win_impl/swap_memory.cpp diff --git a/base/system/memory/private/win_impl/swap_memory.h b/base/cfbase/system/memory/private/win_impl/swap_memory.h similarity index 100% rename from base/system/memory/private/win_impl/swap_memory.h rename to base/cfbase/system/memory/private/win_impl/swap_memory.h diff --git a/base/system/network/CMakeLists.txt b/base/cfbase/system/network/CMakeLists.txt similarity index 100% rename from base/system/network/CMakeLists.txt rename to base/cfbase/system/network/CMakeLists.txt diff --git a/base/system/network/network.cpp b/base/cfbase/system/network/network.cpp similarity index 100% rename from base/system/network/network.cpp rename to base/cfbase/system/network/network.cpp diff --git a/base/utils/linux/proc_parser.cpp b/base/cfbase/utils/linux/proc_parser.cpp similarity index 100% rename from base/utils/linux/proc_parser.cpp rename to base/cfbase/utils/linux/proc_parser.cpp diff --git a/desktop/base/config_manager/CMakeLists.txt b/base/config_manager/CMakeLists.txt similarity index 100% rename from desktop/base/config_manager/CMakeLists.txt rename to base/config_manager/CMakeLists.txt diff --git a/desktop/base/config_manager/include/cfconfig.hpp b/base/config_manager/include/cfconfig.hpp similarity index 100% rename from desktop/base/config_manager/include/cfconfig.hpp rename to base/config_manager/include/cfconfig.hpp diff --git a/desktop/base/config_manager/include/cfconfig/cfconfig_domain_handle.h b/base/config_manager/include/cfconfig/cfconfig_domain_handle.h similarity index 100% rename from desktop/base/config_manager/include/cfconfig/cfconfig_domain_handle.h rename to base/config_manager/include/cfconfig/cfconfig_domain_handle.h diff --git a/desktop/base/config_manager/include/cfconfig/cfconfig_path_provider.h b/base/config_manager/include/cfconfig/cfconfig_path_provider.h similarity index 100% rename from desktop/base/config_manager/include/cfconfig/cfconfig_path_provider.h rename to base/config_manager/include/cfconfig/cfconfig_path_provider.h diff --git a/desktop/base/config_manager/include/cfconfig/cfconfig_result.h b/base/config_manager/include/cfconfig/cfconfig_result.h similarity index 100% rename from desktop/base/config_manager/include/cfconfig/cfconfig_result.h rename to base/config_manager/include/cfconfig/cfconfig_result.h diff --git a/desktop/base/config_manager/include/cfconfig/cfconfig_watcher.h b/base/config_manager/include/cfconfig/cfconfig_watcher.h similarity index 100% rename from desktop/base/config_manager/include/cfconfig/cfconfig_watcher.h rename to base/config_manager/include/cfconfig/cfconfig_watcher.h diff --git a/desktop/base/config_manager/include/cfconfig_key.h b/base/config_manager/include/cfconfig_key.h similarity index 100% rename from desktop/base/config_manager/include/cfconfig_key.h rename to base/config_manager/include/cfconfig_key.h diff --git a/desktop/base/config_manager/include/cfconfig_layer.h b/base/config_manager/include/cfconfig_layer.h similarity index 100% rename from desktop/base/config_manager/include/cfconfig_layer.h rename to base/config_manager/include/cfconfig_layer.h diff --git a/desktop/base/config_manager/include/cfconfig_notify_policy.h b/base/config_manager/include/cfconfig_notify_policy.h similarity index 100% rename from desktop/base/config_manager/include/cfconfig_notify_policy.h rename to base/config_manager/include/cfconfig_notify_policy.h diff --git a/desktop/base/config_manager/include/impl/config_backend.h b/base/config_manager/include/impl/config_backend.h similarity index 100% rename from desktop/base/config_manager/include/impl/config_backend.h rename to base/config_manager/include/impl/config_backend.h diff --git a/desktop/base/config_manager/include/impl/config_domain.h b/base/config_manager/include/impl/config_domain.h similarity index 100% rename from desktop/base/config_manager/include/impl/config_domain.h rename to base/config_manager/include/impl/config_domain.h diff --git a/desktop/base/config_manager/include/impl/config_domain_handle_impl.h b/base/config_manager/include/impl/config_domain_handle_impl.h similarity index 100% rename from desktop/base/config_manager/include/impl/config_domain_handle_impl.h rename to base/config_manager/include/impl/config_domain_handle_impl.h diff --git a/desktop/base/config_manager/include/impl/config_impl.h b/base/config_manager/include/impl/config_impl.h similarity index 100% rename from desktop/base/config_manager/include/impl/config_impl.h rename to base/config_manager/include/impl/config_impl.h diff --git a/desktop/base/config_manager/src/cfconfig.cpp b/base/config_manager/src/cfconfig.cpp similarity index 100% rename from desktop/base/config_manager/src/cfconfig.cpp rename to base/config_manager/src/cfconfig.cpp diff --git a/desktop/base/config_manager/src/cfconfig_path_provider.cpp b/base/config_manager/src/cfconfig_path_provider.cpp similarity index 100% rename from desktop/base/config_manager/src/cfconfig_path_provider.cpp rename to base/config_manager/src/cfconfig_path_provider.cpp diff --git a/desktop/base/config_manager/src/impl/config_backend_factory.cpp b/base/config_manager/src/impl/config_backend_factory.cpp similarity index 100% rename from desktop/base/config_manager/src/impl/config_backend_factory.cpp rename to base/config_manager/src/impl/config_backend_factory.cpp diff --git a/desktop/base/config_manager/src/impl/config_backend_factory.h b/base/config_manager/src/impl/config_backend_factory.h similarity index 100% rename from desktop/base/config_manager/src/impl/config_backend_factory.h rename to base/config_manager/src/impl/config_backend_factory.h diff --git a/desktop/base/config_manager/src/impl/config_domain.cpp b/base/config_manager/src/impl/config_domain.cpp similarity index 100% rename from desktop/base/config_manager/src/impl/config_domain.cpp rename to base/config_manager/src/impl/config_domain.cpp diff --git a/desktop/base/config_manager/src/impl/config_impl.cpp b/base/config_manager/src/impl/config_impl.cpp similarity index 100% rename from desktop/base/config_manager/src/impl/config_impl.cpp rename to base/config_manager/src/impl/config_impl.cpp diff --git a/desktop/base/config_manager/src/impl/config_key.cpp b/base/config_manager/src/impl/config_key.cpp similarity index 100% rename from desktop/base/config_manager/src/impl/config_key.cpp rename to base/config_manager/src/impl/config_key.cpp diff --git a/desktop/base/config_manager/src/impl/json_backend.cpp b/base/config_manager/src/impl/json_backend.cpp similarity index 100% rename from desktop/base/config_manager/src/impl/json_backend.cpp rename to base/config_manager/src/impl/json_backend.cpp diff --git a/desktop/base/config_manager/src/impl/json_backend.h b/base/config_manager/src/impl/json_backend.h similarity index 100% rename from desktop/base/config_manager/src/impl/json_backend.h rename to base/config_manager/src/impl/json_backend.h diff --git a/desktop/base/config_manager/src/impl/qsettings_backend.cpp b/base/config_manager/src/impl/qsettings_backend.cpp similarity index 100% rename from desktop/base/config_manager/src/impl/qsettings_backend.cpp rename to base/config_manager/src/impl/qsettings_backend.cpp diff --git a/desktop/base/config_manager/src/impl/qsettings_backend.h b/base/config_manager/src/impl/qsettings_backend.h similarity index 100% rename from desktop/base/config_manager/src/impl/qsettings_backend.h rename to base/config_manager/src/impl/qsettings_backend.h diff --git a/desktop/base/file_operations/CMakeLists.txt b/base/file_operations/CMakeLists.txt similarity index 100% rename from desktop/base/file_operations/CMakeLists.txt rename to base/file_operations/CMakeLists.txt diff --git a/desktop/base/file_operations/file_op.cpp b/base/file_operations/file_op.cpp similarity index 100% rename from desktop/base/file_operations/file_op.cpp rename to base/file_operations/file_op.cpp diff --git a/desktop/base/file_operations/file_op.h b/base/file_operations/file_op.h similarity index 100% rename from desktop/base/file_operations/file_op.h rename to base/file_operations/file_op.h diff --git a/desktop/base/file_operations/filter_target.cpp b/base/file_operations/filter_target.cpp similarity index 100% rename from desktop/base/file_operations/filter_target.cpp rename to base/file_operations/filter_target.cpp diff --git a/desktop/base/file_operations/filter_target.h b/base/file_operations/filter_target.h similarity index 100% rename from desktop/base/file_operations/filter_target.h rename to base/file_operations/filter_target.h diff --git a/desktop/base/fundamental/CMakeLists.txt b/base/fundamental/CMakeLists.txt similarity index 100% rename from desktop/base/fundamental/CMakeLists.txt rename to base/fundamental/CMakeLists.txt diff --git a/desktop/base/fundamental/include/cffundamental/log_helper.h b/base/fundamental/include/cffundamental/log_helper.h similarity index 100% rename from desktop/base/fundamental/include/cffundamental/log_helper.h rename to base/fundamental/include/cffundamental/log_helper.h diff --git a/desktop/base/fundamental/src/log_helper.cpp b/base/fundamental/src/log_helper.cpp similarity index 100% rename from desktop/base/fundamental/src/log_helper.cpp rename to base/fundamental/src/log_helper.cpp diff --git a/desktop/base/logger/CMakeLists.txt b/base/logger/CMakeLists.txt similarity index 100% rename from desktop/base/logger/CMakeLists.txt rename to base/logger/CMakeLists.txt diff --git a/desktop/base/logger/README.md b/base/logger/README.md similarity index 100% rename from desktop/base/logger/README.md rename to base/logger/README.md diff --git a/desktop/base/logger/include/cflog.h b/base/logger/include/cflog.h similarity index 100% rename from desktop/base/logger/include/cflog.h rename to base/logger/include/cflog.h diff --git a/desktop/base/logger/include/cflog/cflog.hpp b/base/logger/include/cflog/cflog.hpp similarity index 100% rename from desktop/base/logger/include/cflog/cflog.hpp rename to base/logger/include/cflog/cflog.hpp diff --git a/desktop/base/logger/include/cflog/cflog_export.h b/base/logger/include/cflog/cflog_export.h similarity index 100% rename from desktop/base/logger/include/cflog/cflog_export.h rename to base/logger/include/cflog/cflog_export.h diff --git a/desktop/base/logger/include/cflog/cflog_format.h b/base/logger/include/cflog/cflog_format.h similarity index 100% rename from desktop/base/logger/include/cflog/cflog_format.h rename to base/logger/include/cflog/cflog_format.h diff --git a/desktop/base/logger/include/cflog/cflog_format_config.h b/base/logger/include/cflog/cflog_format_config.h similarity index 100% rename from desktop/base/logger/include/cflog/cflog_format_config.h rename to base/logger/include/cflog/cflog_format_config.h diff --git a/desktop/base/logger/include/cflog/cflog_format_factory.h b/base/logger/include/cflog/cflog_format_factory.h similarity index 100% rename from desktop/base/logger/include/cflog/cflog_format_factory.h rename to base/logger/include/cflog/cflog_format_factory.h diff --git a/desktop/base/logger/include/cflog/cflog_format_flags.h b/base/logger/include/cflog/cflog_format_flags.h similarity index 100% rename from desktop/base/logger/include/cflog/cflog_format_flags.h rename to base/logger/include/cflog/cflog_format_flags.h diff --git a/desktop/base/logger/include/cflog/cflog_level.hpp b/base/logger/include/cflog/cflog_level.hpp similarity index 100% rename from desktop/base/logger/include/cflog/cflog_level.hpp rename to base/logger/include/cflog/cflog_level.hpp diff --git a/desktop/base/logger/include/cflog/cflog_record.h b/base/logger/include/cflog/cflog_record.h similarity index 100% rename from desktop/base/logger/include/cflog/cflog_record.h rename to base/logger/include/cflog/cflog_record.h diff --git a/desktop/base/logger/include/cflog/cflog_sink.h b/base/logger/include/cflog/cflog_sink.h similarity index 100% rename from desktop/base/logger/include/cflog/cflog_sink.h rename to base/logger/include/cflog/cflog_sink.h diff --git a/desktop/base/logger/include/cflog/formatter/console_formatter.h b/base/logger/include/cflog/formatter/console_formatter.h similarity index 100% rename from desktop/base/logger/include/cflog/formatter/console_formatter.h rename to base/logger/include/cflog/formatter/console_formatter.h diff --git a/desktop/base/logger/include/cflog/formatter/default_formatter.h b/base/logger/include/cflog/formatter/default_formatter.h similarity index 100% rename from desktop/base/logger/include/cflog/formatter/default_formatter.h rename to base/logger/include/cflog/formatter/default_formatter.h diff --git a/desktop/base/logger/include/cflog/formatter/file_formatter.h b/base/logger/include/cflog/formatter/file_formatter.h similarity index 100% rename from desktop/base/logger/include/cflog/formatter/file_formatter.h rename to base/logger/include/cflog/formatter/file_formatter.h diff --git a/desktop/base/logger/include/cflog/sinks/console_sink.h b/base/logger/include/cflog/sinks/console_sink.h similarity index 100% rename from desktop/base/logger/include/cflog/sinks/console_sink.h rename to base/logger/include/cflog/sinks/console_sink.h diff --git a/desktop/base/logger/include/cflog/sinks/file_sink.h b/base/logger/include/cflog/sinks/file_sink.h similarity index 100% rename from desktop/base/logger/include/cflog/sinks/file_sink.h rename to base/logger/include/cflog/sinks/file_sink.h diff --git a/desktop/base/logger/src/async_queue/async_queue.cpp b/base/logger/src/async_queue/async_queue.cpp similarity index 100% rename from desktop/base/logger/src/async_queue/async_queue.cpp rename to base/logger/src/async_queue/async_queue.cpp diff --git a/desktop/base/logger/src/async_queue/async_queue.h b/base/logger/src/async_queue/async_queue.h similarity index 100% rename from desktop/base/logger/src/async_queue/async_queue.h rename to base/logger/src/async_queue/async_queue.h diff --git a/desktop/base/logger/src/formatter/console_formatter.cpp b/base/logger/src/formatter/console_formatter.cpp similarity index 100% rename from desktop/base/logger/src/formatter/console_formatter.cpp rename to base/logger/src/formatter/console_formatter.cpp diff --git a/desktop/base/logger/src/formatter/file_formatter.cpp b/base/logger/src/formatter/file_formatter.cpp similarity index 100% rename from desktop/base/logger/src/formatter/file_formatter.cpp rename to base/logger/src/formatter/file_formatter.cpp diff --git a/desktop/base/logger/src/impl/cflog_impl.cpp b/base/logger/src/impl/cflog_impl.cpp similarity index 100% rename from desktop/base/logger/src/impl/cflog_impl.cpp rename to base/logger/src/impl/cflog_impl.cpp diff --git a/desktop/base/logger/src/impl/cflog_impl.h b/base/logger/src/impl/cflog_impl.h similarity index 100% rename from desktop/base/logger/src/impl/cflog_impl.h rename to base/logger/src/impl/cflog_impl.h diff --git a/desktop/base/logger/src/logger/cflog.cpp b/base/logger/src/logger/cflog.cpp similarity index 100% rename from desktop/base/logger/src/logger/cflog.cpp rename to base/logger/src/logger/cflog.cpp diff --git a/desktop/base/logger/src/sinks/console_sink.cpp b/base/logger/src/sinks/console_sink.cpp similarity index 100% rename from desktop/base/logger/src/sinks/console_sink.cpp rename to base/logger/src/sinks/console_sink.cpp diff --git a/desktop/base/logger/src/sinks/file_sink.cpp b/base/logger/src/sinks/file_sink.cpp similarity index 100% rename from desktop/base/logger/src/sinks/file_sink.cpp rename to base/logger/src/sinks/file_sink.cpp diff --git a/desktop/base/path/CMakeLists.txt b/base/path/CMakeLists.txt similarity index 100% rename from desktop/base/path/CMakeLists.txt rename to base/path/CMakeLists.txt diff --git a/desktop/base/path/include/cfpath/desktop_main_path_resolvers.h b/base/path/include/cfpath/desktop_main_path_resolvers.h similarity index 100% rename from desktop/base/path/include/cfpath/desktop_main_path_resolvers.h rename to base/path/include/cfpath/desktop_main_path_resolvers.h diff --git a/desktop/base/path/include/cfpath/desktop_self_path_resolvers.h b/base/path/include/cfpath/desktop_self_path_resolvers.h similarity index 100% rename from desktop/base/path/include/cfpath/desktop_self_path_resolvers.h rename to base/path/include/cfpath/desktop_self_path_resolvers.h diff --git a/desktop/base/path/include/cfpath/desktop_settings_path.h b/base/path/include/cfpath/desktop_settings_path.h similarity index 100% rename from desktop/base/path/include/cfpath/desktop_settings_path.h rename to base/path/include/cfpath/desktop_settings_path.h diff --git a/desktop/base/path/src/desktop_main_path_resolvers.cpp b/base/path/src/desktop_main_path_resolvers.cpp similarity index 100% rename from desktop/base/path/src/desktop_main_path_resolvers.cpp rename to base/path/src/desktop_main_path_resolvers.cpp diff --git a/desktop/base/path/src/desktop_self_path_resolvers.cpp b/base/path/src/desktop_self_path_resolvers.cpp similarity index 100% rename from desktop/base/path/src/desktop_self_path_resolvers.cpp rename to base/path/src/desktop_self_path_resolvers.cpp diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt deleted file mode 100644 index 4da6b4764..000000000 --- a/desktop/CMakeLists.txt +++ /dev/null @@ -1,112 +0,0 @@ -log_info("Desktop Buildings" "Start Configuring Desktop Buildings") - -# ============================================================ -# Add static library modules first -# ============================================================ -add_subdirectory(base) -add_subdirectory(ui) -add_subdirectory(main) -# ============================================================ -# Unified CFDesktop Shared Library -# ============================================================ -# Combines all static libraries into a single shared library libCFDesktop.so - -log_info("Desktop" "Creating unified CFDesktop shared library") - -add_library(CFDesktop_shared SHARED) - -# Export symbols for Windows DLL -if(WIN32) - target_compile_definitions(CFDesktop_shared PRIVATE - CFDESKTOP_EXPORTS - ) -endif() - -# Set symbol visibility to hidden on Unix/Linux -if(UNIX AND NOT APPLE) - target_compile_options(CFDesktop_shared PRIVATE -fvisibility=hidden) -endif() - -# Include directories -target_include_directories(CFDesktop_shared PUBLIC - $ - $ - $ -) - -# Collect all static libraries to be linked into the shared library -set(CFDESKTOP_STATIC_LIBS - cffilesystem - cfconfig - cfasciiart - CFDesktopMain - CFDesktopUi - cf_desktop_render -) - -# Sources compiled directly into the DLL (with CFDESKTOP_EXPORTS defined) -target_sources(CFDesktop_shared PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/desktop_run_session.cpp -) - -# Link all static libraries using whole-archive semantics. -# This ensures all symbols are included even if not directly referenced. -if(MSVC) - target_link_libraries(CFDesktop_shared PRIVATE ${CFDESKTOP_STATIC_LIBS}) - foreach(_cfdesktop_module IN LISTS CFDESKTOP_STATIC_LIBS) - target_link_options(CFDesktop_shared PRIVATE "/WHOLEARCHIVE:$") - endforeach() -elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND NOT APPLE) - target_link_libraries(CFDesktop_shared PRIVATE - "-Wl,--whole-archive" - ${CFDESKTOP_STATIC_LIBS} - "-Wl,--no-whole-archive" - ) -else() - target_link_libraries(CFDesktop_shared PRIVATE - ${CFDESKTOP_STATIC_LIBS} - ) -endif() - -# Link Qt libraries and shared library dependencies -target_link_libraries(CFDesktop_shared PUBLIC - Qt6::Core - Qt6::Gui - Qt6::Widgets -) - -# Link shared library dependencies (NOT in whole-archive). -# QuarkWidgets::quarkwidgets is PUBLIC so the thin EXE can include the QApplication subclass -# (MaterialApplication) it instantiates in main.cpp. -target_link_libraries(CFDesktop_shared -PRIVATE - cfbase - cflogger -PUBLIC - QuarkWidgets::quarkwidgets -) - -# Platform-specific link libraries (from base) -if(WIN32) - target_link_libraries(CFDesktop_shared PUBLIC - wbemuuid - PowrProf - pdh - psapi - ) -endif() - -# Add alias for consistent naming -add_library(CFDesktop::lib ALIAS CFDesktop_shared) -# ============================================================ -# Main executable — thin shell that calls into the DLL -# ============================================================ -add_executable(CFDesktop main.cpp) - -# The EXE only links the DLL import library. -# All code (CFDesktopMain, desktop_entry, init stages, etc.) lives in the DLL. -target_link_libraries(CFDesktop PRIVATE - CFDesktop_shared -) - -log_info("Desktop Buildings" "Configuring Desktop Buildings Done") diff --git a/desktop/base/CMakeLists.txt b/desktop/base/CMakeLists.txt deleted file mode 100644 index 8245e3286..000000000 --- a/desktop/base/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_subdirectory(fundamental) -add_subdirectory(path) -add_subdirectory(logger) -add_subdirectory(file_operations) -add_subdirectory(config_manager) -add_subdirectory(ascii_art) \ No newline at end of file diff --git a/document/status/current.md b/document/status/current.md index bbeaeed4f..f4aaf82e3 100644 --- a/document/status/current.md +++ b/document/status/current.md @@ -65,6 +65,8 @@ description: CFDesktop 项目进度的唯一事实来源与全局导航。 - **2026-07（双态框架正式化）**：独立进程 + 进程内 builtin 两条腿**正式化**——`LaunchKind{Auto,DetachedProcess,BuiltinPanel}` 替代 `builtin:` 字符串 hack;`IBuiltinPanel` 接口 + `BuiltinPanelRegistry`(map-based 自写,aex 无 named 变体)消灭 `if(id==about)` 链;`loadAppsConfig` 合并 builtin+discovered 两源,`HardwareTierCapabilities::prefer_inprocess_apps`(Low=true)把 manifest `launch_kind:"auto"` 按 tier 裁决(Low→builtin,High→detached,无 builtin 实现则降级 detached+记日志);calculator 双态验证(`CalculatorBuiltinPanel` 组合适配器,同一份 panel 源码两种加载);补 AboutPanel 缺失入口(原 `builtin:about` 点不出)。架构债:desktop 引用 apps/calculator 源文件,待迁中立层([milestone_07](../todo/desktop/milestone_07_app_ecosystem.md))。 - **2026-07（MS4 搜索 + .desktop + Noter 移植）**:`DesktopEntryIndex` 扫 `~/.local/share/applications` + `/usr/share/applications` 的 `.desktop`(freedesktop:Type=Application && !NoDisplay,Exec 清理 `%` 占位符)→ 进网格作 DetachedProcess;`AppLauncher` 加搜索 QLineEdit,`textChanged` 实时按 display_name 模糊过滤;移植 CCIMXNoter → `apps/noter/`(QuarkWidgets MD3 Button 重写工具栏 + QTextEdit 编辑,manifest `launch_kind:auto`),第二个独立 App 验证移植范式可复制。MS4 launcher 闭环(网格+搜索+启动),仅余入场动画。 - **2026-07（并发迁移 3 App）**:SystemState/AlarmyClock/CCCalendar 三 App 用 Agent **并行迁移**(参照 noter 范式,验证批量可复制):**SystemState**(`apps/system_state/`)复用 `cfbase` 的 CPU/memory probe(`getCPUProfileInfo`/`getCPUBonusInfo`/`getSystemMemoryInfo`)+ QTimer 刷新,展示 base 层能力;**AlarmyClock**(`apps/alarm_clock/`)1s 轮询 + QSpinBox 编辑器 + QListWidget 已设列表 + QMessageBox 响铃(音频 TODO);**CCCalendar**(`apps/calendar/`)`QCalendarWidget` + 日期笔记(内存 QMap,持久化 TODO)。集成时修:alarm_clock 的 `Q_DECLARE_METATYPE` 移到全局命名空间(moc 要求)、calendar 的 Qt6 API(`setVerticalGridLineVisible` 不存在、`DefaultLocaleLongDate` Qt6 删除→`Qt::TextDate`)。三 App 全 build 绿 + Doxygen 过。 +- **2026-07（App 抽离到 CFDeskit + 发现机制重构）**：5 个独立 app(calculator/noter/alarm_clock/calendar/system_state)抽到独立仓 [CFDeskit](https://github.com/Awesome-Embedded-Learning-Studio/CFDeskit);主仓 `apps/` 源码全删(PR #22),改**运行时部署模式**——app 由 CFDeskit build + install 到 `/apps//`,`AppDiscoverer` 改扫 `active_root/apps`(`Apps` PathType 小写,原 `/../apps/` 已弃),空目录 → `log_info` 不报错。system_state **vendoring cfbase probe**(STATIC `mini_system_probe` lib,零 `libcfbase.so` 依赖,完全独立演化)。**ABI 部署隔离**:app rpath `$ORIGIN/..` 找 `apps/libquarkwidgets.so`(独立于 desktop `bin/` 那份),QuarkWidgets 加版本导出(PR #2 `quarkwidgets_runtime_abi_version`)+ CFDeskit `abi_check.hpp` 启动自检(mismatch `qFatal`)。源码开发停放 `third_party/apps/`(gitignore,clone 任意 app 仓一视同仁)。calculator parser 单测随源码迁 CFDeskit(15 TEST 全过)。主仓零 app 代码,desktop 本体纯净。注:`LoadKind`/`IBuiltinPanel`/`BuiltinPanelRegistry` 双态机制保留(builtin 仅 about)。 +- **2026-07（主仓重组：cfbase + desktop/base 合并 + desktop/ 平铺）**：删 `desktop/` 包装层——`base/`(cfbase) + 原 `desktop/base/`(logger/config/path/filesystem/fundamental/ascii_art) 合并成新顶层 `base/`(cfbase 子目录化,desktop/base 6 模块同居);`desktop/ui` → `ui/`、`desktop/main` → `main/`(升顶层);`desktop/export.h` + `desktop/main.cpp` → 顶层;`CFDesktop_shared` 组装搬到顶层 CMakeLists。源码**零改动**(内部全相对 include,平移后路径不变,实测 `#include "desktop/"` = 0);CMake 重组(base/ 合并 + 顶层 `add_subdirectory(ui/main)` + CFDesktop_shared + exe,补 `enable_testing()` 顶层)。三层架构图 `base → ui → desktop` 改 `base → ui → main`。cfbase 名副其实(真正的 base 层,含探针 + 桌面基础设施)。验证:build 全绿 + ctest 全过 + desktop 启动正常。 - **已达成**：Milestone 1「桌面骨架可见」；Phase 0 / 1 / 2 / A(CI) / 6 / G(Widget) / H(显示后端)（详见 [SUMMARY.md](../todo/done/SUMMARY.md)） ## 新人入门 diff --git a/desktop/export.h b/export.h similarity index 100% rename from desktop/export.h rename to export.h diff --git a/desktop/main.cpp b/main.cpp similarity index 100% rename from desktop/main.cpp rename to main.cpp diff --git a/desktop/main/CMakeLists.txt b/main/CMakeLists.txt similarity index 100% rename from desktop/main/CMakeLists.txt rename to main/CMakeLists.txt diff --git a/desktop/main/desktop_entry.cpp b/main/desktop_entry.cpp similarity index 100% rename from desktop/main/desktop_entry.cpp rename to main/desktop_entry.cpp diff --git a/desktop/main/desktop_entry.h b/main/desktop_entry.h similarity index 100% rename from desktop/main/desktop_entry.h rename to main/desktop_entry.h diff --git a/desktop/desktop_run_session.cpp b/main/desktop_run_session.cpp similarity index 100% rename from desktop/desktop_run_session.cpp rename to main/desktop_run_session.cpp diff --git a/desktop/main/early_session/CMakeLists.txt b/main/early_session/CMakeLists.txt similarity index 100% rename from desktop/main/early_session/CMakeLists.txt rename to main/early_session/CMakeLists.txt diff --git a/desktop/main/early_session/early_handle/early_handle.cpp b/main/early_session/early_handle/early_handle.cpp similarity index 100% rename from desktop/main/early_session/early_handle/early_handle.cpp rename to main/early_session/early_handle/early_handle.cpp diff --git a/desktop/main/early_session/early_handle/early_handle.h b/main/early_session/early_handle/early_handle.h similarity index 100% rename from desktop/main/early_session/early_handle/early_handle.h rename to main/early_session/early_handle/early_handle.h diff --git a/desktop/main/early_session/impl/CMakeLists.txt b/main/early_session/impl/CMakeLists.txt similarity index 100% rename from desktop/main/early_session/impl/CMakeLists.txt rename to main/early_session/impl/CMakeLists.txt diff --git a/desktop/main/early_session/impl/console_signal_stage.cpp b/main/early_session/impl/console_signal_stage.cpp similarity index 100% rename from desktop/main/early_session/impl/console_signal_stage.cpp rename to main/early_session/impl/console_signal_stage.cpp diff --git a/desktop/main/early_session/impl/console_signal_stage.h b/main/early_session/impl/console_signal_stage.h similarity index 100% rename from desktop/main/early_session/impl/console_signal_stage.h rename to main/early_session/impl/console_signal_stage.h diff --git a/desktop/main/early_session/impl/desktop_backbone_setup.cpp b/main/early_session/impl/desktop_backbone_setup.cpp similarity index 100% rename from desktop/main/early_session/impl/desktop_backbone_setup.cpp rename to main/early_session/impl/desktop_backbone_setup.cpp diff --git a/desktop/main/early_session/impl/desktop_backbone_setup.h b/main/early_session/impl/desktop_backbone_setup.h similarity index 100% rename from desktop/main/early_session/impl/desktop_backbone_setup.h rename to main/early_session/impl/desktop_backbone_setup.h diff --git a/desktop/main/early_session/impl/early_config_stage.cpp b/main/early_session/impl/early_config_stage.cpp similarity index 100% rename from desktop/main/early_session/impl/early_config_stage.cpp rename to main/early_session/impl/early_config_stage.cpp diff --git a/desktop/main/early_session/impl/early_config_stage.h b/main/early_session/impl/early_config_stage.h similarity index 100% rename from desktop/main/early_session/impl/early_config_stage.h rename to main/early_session/impl/early_config_stage.h diff --git a/desktop/main/early_session/impl/early_welcome_impl.cpp b/main/early_session/impl/early_welcome_impl.cpp similarity index 100% rename from desktop/main/early_session/impl/early_welcome_impl.cpp rename to main/early_session/impl/early_welcome_impl.cpp diff --git a/desktop/main/early_session/impl/early_welcome_impl.h b/main/early_session/impl/early_welcome_impl.h similarity index 100% rename from desktop/main/early_session/impl/early_welcome_impl.h rename to main/early_session/impl/early_welcome_impl.h diff --git a/desktop/main/early_session/impl/logger_stage.cpp b/main/early_session/impl/logger_stage.cpp similarity index 100% rename from desktop/main/early_session/impl/logger_stage.cpp rename to main/early_session/impl/logger_stage.cpp diff --git a/desktop/main/early_session/impl/logger_stage.h b/main/early_session/impl/logger_stage.h similarity index 100% rename from desktop/main/early_session/impl/logger_stage.h rename to main/early_session/impl/logger_stage.h diff --git a/desktop/main/early_session/init_chain/init_chain.cpp b/main/early_session/init_chain/init_chain.cpp similarity index 100% rename from desktop/main/early_session/init_chain/init_chain.cpp rename to main/early_session/init_chain/init_chain.cpp diff --git a/desktop/main/early_session/init_chain/init_chain.h b/main/early_session/init_chain/init_chain.h similarity index 100% rename from desktop/main/early_session/init_chain/init_chain.h rename to main/early_session/init_chain/init_chain.h diff --git a/desktop/main/early_session/init_chain/init_stage.h b/main/early_session/init_chain/init_stage.h similarity index 100% rename from desktop/main/early_session/init_chain/init_stage.h rename to main/early_session/init_chain/init_stage.h diff --git a/desktop/main/early_session/settings/early_settings.cpp b/main/early_session/settings/early_settings.cpp similarity index 100% rename from desktop/main/early_session/settings/early_settings.cpp rename to main/early_session/settings/early_settings.cpp diff --git a/desktop/main/early_session/settings/early_settings.h b/main/early_session/settings/early_settings.h similarity index 100% rename from desktop/main/early_session/settings/early_settings.h rename to main/early_session/settings/early_settings.h diff --git a/desktop/main/init/CMakeLists.txt b/main/init/CMakeLists.txt similarity index 100% rename from desktop/main/init/CMakeLists.txt rename to main/init/CMakeLists.txt diff --git a/desktop/main/init/boot_stage_info.h b/main/init/boot_stage_info.h similarity index 100% rename from desktop/main/init/boot_stage_info.h rename to main/init/boot_stage_info.h diff --git a/desktop/main/init/desktop_backbone_init/desktop_backbone_init.cpp b/main/init/desktop_backbone_init/desktop_backbone_init.cpp similarity index 100% rename from desktop/main/init/desktop_backbone_init/desktop_backbone_init.cpp rename to main/init/desktop_backbone_init/desktop_backbone_init.cpp diff --git a/desktop/main/init/desktop_backbone_init/desktop_backbone_init.h b/main/init/desktop_backbone_init/desktop_backbone_init.h similarity index 100% rename from desktop/main/init/desktop_backbone_init/desktop_backbone_init.h rename to main/init/desktop_backbone_init/desktop_backbone_init.h diff --git a/desktop/main/init/desktop_config_init/desktop_config_init.cpp b/main/init/desktop_config_init/desktop_config_init.cpp similarity index 100% rename from desktop/main/init/desktop_config_init/desktop_config_init.cpp rename to main/init/desktop_config_init/desktop_config_init.cpp diff --git a/desktop/main/init/desktop_config_init/desktop_config_init.h b/main/init/desktop_config_init/desktop_config_init.h similarity index 100% rename from desktop/main/init/desktop_config_init/desktop_config_init.h rename to main/init/desktop_config_init/desktop_config_init.h diff --git a/desktop/main/init/early_gain/early_pass_stage.cpp b/main/init/early_gain/early_pass_stage.cpp similarity index 100% rename from desktop/main/init/early_gain/early_pass_stage.cpp rename to main/init/early_gain/early_pass_stage.cpp diff --git a/desktop/main/init/early_gain/early_pass_stage.h b/main/init/early_gain/early_pass_stage.h similarity index 100% rename from desktop/main/init/early_gain/early_pass_stage.h rename to main/init/early_gain/early_pass_stage.h diff --git a/desktop/main/init/gui_progress/gui_init_stage.cpp b/main/init/gui_progress/gui_init_stage.cpp similarity index 100% rename from desktop/main/init/gui_progress/gui_init_stage.cpp rename to main/init/gui_progress/gui_init_stage.cpp diff --git a/desktop/main/init/gui_progress/gui_init_stage.h b/main/init/gui_progress/gui_init_stage.h similarity index 100% rename from desktop/main/init/gui_progress/gui_init_stage.h rename to main/init/gui_progress/gui_init_stage.h diff --git a/desktop/main/init/init.h b/main/init/init.h similarity index 100% rename from desktop/main/init/init.h rename to main/init/init.h diff --git a/desktop/main/init/init_early_session.cpp b/main/init/init_early_session.cpp similarity index 100% rename from desktop/main/init/init_early_session.cpp rename to main/init/init_early_session.cpp diff --git a/desktop/main/init/init_session.cpp b/main/init/init_session.cpp similarity index 100% rename from desktop/main/init/init_session.cpp rename to main/init/init_session.cpp diff --git a/desktop/main/init/init_session_chain.cpp b/main/init/init_session_chain.cpp similarity index 100% rename from desktop/main/init/init_session_chain.cpp rename to main/init/init_session_chain.cpp diff --git a/desktop/main/init/init_session_chain.h b/main/init/init_session_chain.h similarity index 100% rename from desktop/main/init/init_session_chain.h rename to main/init/init_session_chain.h diff --git a/desktop/main/init/init_settings.cpp b/main/init/init_settings.cpp similarity index 100% rename from desktop/main/init/init_settings.cpp rename to main/init/init_settings.cpp diff --git a/desktop/main/init/init_settings.h b/main/init/init_settings.h similarity index 100% rename from desktop/main/init/init_settings.h rename to main/init/init_settings.h diff --git a/desktop/main/init/init_stage.h b/main/init/init_stage.h similarity index 100% rename from desktop/main/init/init_stage.h rename to main/init/init_stage.h diff --git a/desktop/main/init/init_stage_name.h b/main/init/init_stage_name.h similarity index 100% rename from desktop/main/init/init_stage_name.h rename to main/init/init_stage_name.h diff --git a/scripts/release/hooks/pre-commit b/scripts/release/hooks/pre-commit index 0684bf52b..ccb96d548 100755 --- a/scripts/release/hooks/pre-commit +++ b/scripts/release/hooks/pre-commit @@ -140,16 +140,16 @@ while IFS= read -r file; do [ ! -f "$file" ] && continue case "$file" in base/*) - if grep -nE '#include[[:space:]]+[<"]?(ui/|desktop/)' "$file" >/dev/null 2>&1; then - log_error "base 层违规: $file 引用了 ui/ 或 desktop/" - grep -nE '#include[[:space:]]+[<"]?(ui/|desktop/)' "$file" + if grep -nE '#include[[:space:]]+[<"]?(ui/|main/)' "$file" >/dev/null 2>&1; then + log_error "base 层违规: $file 引用了 ui/ 或 main/" + grep -nE '#include[[:space:]]+[<"]?(ui/|main/)' "$file" LAYER_ERR=1 fi ;; ui/*) - if grep -nE '#include[[:space:]]+[<"]?desktop/' "$file" >/dev/null 2>&1; then - log_error "ui 层违规: $file 引用了 desktop/" - grep -nE '#include[[:space:]]+[<"]?desktop/' "$file" + if grep -nE '#include[[:space:]]+[<"]?main/' "$file" >/dev/null 2>&1; then + log_error "ui 层违规: $file 引用了 main/" + grep -nE '#include[[:space:]]+[<"]?main/' "$file" LAYER_ERR=1 fi ;; @@ -157,7 +157,7 @@ while IFS= read -r file; do done <<< "$(git diff --cached --name-only --diff-filter=ACM | grep -E '\.(cpp|cc|cxx|h|hpp|hxx)$' || true)" if [ "$LAYER_ERR" -ne 0 ]; then echo "" - echo "三层依赖规则: base ↛ ui/desktop, ui ↛ desktop（见 AGENT.md Architecture）" + echo "三层依赖规则: base ↛ ui/main, ui ↛ main（见 AGENT.md Architecture）" echo "提示: 使用 --no-verify 可跳过（不推荐）" exit 1 fi diff --git a/test/config_manager/CMakeLists.txt b/test/config_manager/CMakeLists.txt index af6ec1989..2ed34e8c4 100644 --- a/test/config_manager/CMakeLists.txt +++ b/test/config_manager/CMakeLists.txt @@ -20,5 +20,5 @@ add_gtest_executable( LINK_LIBRARIES CFDesktop::config;Qt6::Core;GTest::gtest;GTest::gtest_main LABELS "config_manager;unit;functional" LOG_MODULE config_manager_json_tests - INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/desktop/base/config_manager/src + INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/base/config_manager/src ) diff --git a/desktop/ui/CFDesktop.cpp b/ui/CFDesktop.cpp similarity index 100% rename from desktop/ui/CFDesktop.cpp rename to ui/CFDesktop.cpp diff --git a/desktop/ui/CFDesktop.h b/ui/CFDesktop.h similarity index 100% rename from desktop/ui/CFDesktop.h rename to ui/CFDesktop.h diff --git a/desktop/ui/CFDesktopEntity.cpp b/ui/CFDesktopEntity.cpp similarity index 100% rename from desktop/ui/CFDesktopEntity.cpp rename to ui/CFDesktopEntity.cpp diff --git a/desktop/ui/CFDesktopEntity.h b/ui/CFDesktopEntity.h similarity index 100% rename from desktop/ui/CFDesktopEntity.h rename to ui/CFDesktopEntity.h diff --git a/desktop/ui/CFDesktopProxy.cpp b/ui/CFDesktopProxy.cpp similarity index 100% rename from desktop/ui/CFDesktopProxy.cpp rename to ui/CFDesktopProxy.cpp diff --git a/desktop/ui/CFDesktopProxy.h b/ui/CFDesktopProxy.h similarity index 100% rename from desktop/ui/CFDesktopProxy.h rename to ui/CFDesktopProxy.h diff --git a/desktop/ui/CFDesktopWindowProxy.cpp b/ui/CFDesktopWindowProxy.cpp similarity index 100% rename from desktop/ui/CFDesktopWindowProxy.cpp rename to ui/CFDesktopWindowProxy.cpp diff --git a/desktop/ui/CFDesktopWindowProxy.h b/ui/CFDesktopWindowProxy.h similarity index 100% rename from desktop/ui/CFDesktopWindowProxy.h rename to ui/CFDesktopWindowProxy.h diff --git a/desktop/ui/CMakeLists.txt b/ui/CMakeLists.txt similarity index 100% rename from desktop/ui/CMakeLists.txt rename to ui/CMakeLists.txt diff --git a/desktop/ui/base/CMakeLists.txt b/ui/base/CMakeLists.txt similarity index 100% rename from desktop/ui/base/CMakeLists.txt rename to ui/base/CMakeLists.txt diff --git a/desktop/ui/base/meta_adapts.cpp b/ui/base/meta_adapts.cpp similarity index 100% rename from desktop/ui/base/meta_adapts.cpp rename to ui/base/meta_adapts.cpp diff --git a/desktop/ui/base/meta_adapts.h b/ui/base/meta_adapts.h similarity index 100% rename from desktop/ui/base/meta_adapts.h rename to ui/base/meta_adapts.h diff --git a/desktop/ui/base/qt_backend.cpp b/ui/base/qt_backend.cpp similarity index 100% rename from desktop/ui/base/qt_backend.cpp rename to ui/base/qt_backend.cpp diff --git a/desktop/ui/base/qt_backend.h b/ui/base/qt_backend.h similarity index 100% rename from desktop/ui/base/qt_backend.h rename to ui/base/qt_backend.h diff --git a/desktop/ui/components/CMakeLists.txt b/ui/components/CMakeLists.txt similarity index 100% rename from desktop/ui/components/CMakeLists.txt rename to ui/components/CMakeLists.txt diff --git a/desktop/ui/components/DisplayServerBackendFactory.cpp b/ui/components/DisplayServerBackendFactory.cpp similarity index 100% rename from desktop/ui/components/DisplayServerBackendFactory.cpp rename to ui/components/DisplayServerBackendFactory.cpp diff --git a/desktop/ui/components/DisplayServerBackendFactory.h b/ui/components/DisplayServerBackendFactory.h similarity index 100% rename from desktop/ui/components/DisplayServerBackendFactory.h rename to ui/components/DisplayServerBackendFactory.h diff --git a/desktop/ui/components/IDisplayServerBackend.cpp b/ui/components/IDisplayServerBackend.cpp similarity index 100% rename from desktop/ui/components/IDisplayServerBackend.cpp rename to ui/components/IDisplayServerBackend.cpp diff --git a/desktop/ui/components/IDisplayServerBackend.h b/ui/components/IDisplayServerBackend.h similarity index 100% rename from desktop/ui/components/IDisplayServerBackend.h rename to ui/components/IDisplayServerBackend.h diff --git a/desktop/ui/components/IPanel.h b/ui/components/IPanel.h similarity index 100% rename from desktop/ui/components/IPanel.h rename to ui/components/IPanel.h diff --git a/desktop/ui/components/IShellLayer.h b/ui/components/IShellLayer.h similarity index 100% rename from desktop/ui/components/IShellLayer.h rename to ui/components/IShellLayer.h diff --git a/desktop/ui/components/IShellLayerStrategy.h b/ui/components/IShellLayerStrategy.h similarity index 100% rename from desktop/ui/components/IShellLayerStrategy.h rename to ui/components/IShellLayerStrategy.h diff --git a/desktop/ui/components/IWindow.cpp b/ui/components/IWindow.cpp similarity index 100% rename from desktop/ui/components/IWindow.cpp rename to ui/components/IWindow.cpp diff --git a/desktop/ui/components/IWindow.h b/ui/components/IWindow.h similarity index 100% rename from desktop/ui/components/IWindow.h rename to ui/components/IWindow.h diff --git a/desktop/ui/components/IWindowBackend.cpp b/ui/components/IWindowBackend.cpp similarity index 100% rename from desktop/ui/components/IWindowBackend.cpp rename to ui/components/IWindowBackend.cpp diff --git a/desktop/ui/components/IWindowBackend.h b/ui/components/IWindowBackend.h similarity index 100% rename from desktop/ui/components/IWindowBackend.h rename to ui/components/IWindowBackend.h diff --git a/desktop/ui/components/PanelManager.cpp b/ui/components/PanelManager.cpp similarity index 100% rename from desktop/ui/components/PanelManager.cpp rename to ui/components/PanelManager.cpp diff --git a/desktop/ui/components/PanelManager.h b/ui/components/PanelManager.h similarity index 100% rename from desktop/ui/components/PanelManager.h rename to ui/components/PanelManager.h diff --git a/desktop/ui/components/README.md b/ui/components/README.md similarity index 100% rename from desktop/ui/components/README.md rename to ui/components/README.md diff --git a/desktop/ui/components/WindowDefine.h b/ui/components/WindowDefine.h similarity index 100% rename from desktop/ui/components/WindowDefine.h rename to ui/components/WindowDefine.h diff --git a/desktop/ui/components/WindowManager.cpp b/ui/components/WindowManager.cpp similarity index 100% rename from desktop/ui/components/WindowManager.cpp rename to ui/components/WindowManager.cpp diff --git a/desktop/ui/components/WindowManager.h b/ui/components/WindowManager.h similarity index 100% rename from desktop/ui/components/WindowManager.h rename to ui/components/WindowManager.h diff --git a/desktop/ui/components/app_entry.h b/ui/components/app_entry.h similarity index 100% rename from desktop/ui/components/app_entry.h rename to ui/components/app_entry.h diff --git a/desktop/ui/components/builtin_apps/CMakeLists.txt b/ui/components/builtin_apps/CMakeLists.txt similarity index 100% rename from desktop/ui/components/builtin_apps/CMakeLists.txt rename to ui/components/builtin_apps/CMakeLists.txt diff --git a/desktop/ui/components/builtin_apps/about_panel.cpp b/ui/components/builtin_apps/about_panel.cpp similarity index 100% rename from desktop/ui/components/builtin_apps/about_panel.cpp rename to ui/components/builtin_apps/about_panel.cpp diff --git a/desktop/ui/components/builtin_apps/about_panel.h b/ui/components/builtin_apps/about_panel.h similarity index 100% rename from desktop/ui/components/builtin_apps/about_panel.h rename to ui/components/builtin_apps/about_panel.h diff --git a/desktop/ui/components/builtin_apps/builtin_panel_registry.cpp b/ui/components/builtin_apps/builtin_panel_registry.cpp similarity index 100% rename from desktop/ui/components/builtin_apps/builtin_panel_registry.cpp rename to ui/components/builtin_apps/builtin_panel_registry.cpp diff --git a/desktop/ui/components/builtin_apps/builtin_panel_registry.h b/ui/components/builtin_apps/builtin_panel_registry.h similarity index 100% rename from desktop/ui/components/builtin_apps/builtin_panel_registry.h rename to ui/components/builtin_apps/builtin_panel_registry.h diff --git a/desktop/ui/components/builtin_apps/ibuiltin_panel.h b/ui/components/builtin_apps/ibuiltin_panel.h similarity index 100% rename from desktop/ui/components/builtin_apps/ibuiltin_panel.h rename to ui/components/builtin_apps/ibuiltin_panel.h diff --git a/desktop/ui/components/frosted_backdrop/CMakeLists.txt b/ui/components/frosted_backdrop/CMakeLists.txt similarity index 100% rename from desktop/ui/components/frosted_backdrop/CMakeLists.txt rename to ui/components/frosted_backdrop/CMakeLists.txt diff --git a/desktop/ui/components/frosted_backdrop/frosted_backdrop.cpp b/ui/components/frosted_backdrop/frosted_backdrop.cpp similarity index 100% rename from desktop/ui/components/frosted_backdrop/frosted_backdrop.cpp rename to ui/components/frosted_backdrop/frosted_backdrop.cpp diff --git a/desktop/ui/components/frosted_backdrop/frosted_backdrop.h b/ui/components/frosted_backdrop/frosted_backdrop.h similarity index 100% rename from desktop/ui/components/frosted_backdrop/frosted_backdrop.h rename to ui/components/frosted_backdrop/frosted_backdrop.h diff --git a/desktop/ui/components/launcher/CMakeLists.txt b/ui/components/launcher/CMakeLists.txt similarity index 100% rename from desktop/ui/components/launcher/CMakeLists.txt rename to ui/components/launcher/CMakeLists.txt diff --git a/desktop/ui/components/launcher/app_discoverer.cpp b/ui/components/launcher/app_discoverer.cpp similarity index 100% rename from desktop/ui/components/launcher/app_discoverer.cpp rename to ui/components/launcher/app_discoverer.cpp diff --git a/desktop/ui/components/launcher/app_discoverer.h b/ui/components/launcher/app_discoverer.h similarity index 100% rename from desktop/ui/components/launcher/app_discoverer.h rename to ui/components/launcher/app_discoverer.h diff --git a/desktop/ui/components/launcher/app_launch_service.cpp b/ui/components/launcher/app_launch_service.cpp similarity index 100% rename from desktop/ui/components/launcher/app_launch_service.cpp rename to ui/components/launcher/app_launch_service.cpp diff --git a/desktop/ui/components/launcher/app_launch_service.h b/ui/components/launcher/app_launch_service.h similarity index 100% rename from desktop/ui/components/launcher/app_launch_service.h rename to ui/components/launcher/app_launch_service.h diff --git a/desktop/ui/components/launcher/app_launcher.cpp b/ui/components/launcher/app_launcher.cpp similarity index 100% rename from desktop/ui/components/launcher/app_launcher.cpp rename to ui/components/launcher/app_launcher.cpp diff --git a/desktop/ui/components/launcher/app_launcher.h b/ui/components/launcher/app_launcher.h similarity index 100% rename from desktop/ui/components/launcher/app_launcher.h rename to ui/components/launcher/app_launcher.h diff --git a/desktop/ui/components/launcher/desktop_entry_index.cpp b/ui/components/launcher/desktop_entry_index.cpp similarity index 100% rename from desktop/ui/components/launcher/desktop_entry_index.cpp rename to ui/components/launcher/desktop_entry_index.cpp diff --git a/desktop/ui/components/launcher/desktop_entry_index.h b/ui/components/launcher/desktop_entry_index.h similarity index 100% rename from desktop/ui/components/launcher/desktop_entry_index.h rename to ui/components/launcher/desktop_entry_index.h diff --git a/desktop/ui/components/launcher/launcher_tile.cpp b/ui/components/launcher/launcher_tile.cpp similarity index 100% rename from desktop/ui/components/launcher/launcher_tile.cpp rename to ui/components/launcher/launcher_tile.cpp diff --git a/desktop/ui/components/launcher/launcher_tile.h b/ui/components/launcher/launcher_tile.h similarity index 100% rename from desktop/ui/components/launcher/launcher_tile.h rename to ui/components/launcher/launcher_tile.h diff --git a/desktop/ui/components/shell_layer_impl/CMakeLists.txt b/ui/components/shell_layer_impl/CMakeLists.txt similarity index 100% rename from desktop/ui/components/shell_layer_impl/CMakeLists.txt rename to ui/components/shell_layer_impl/CMakeLists.txt diff --git a/desktop/ui/components/shell_layer_impl/DefaultShellLayerStrategy.cpp b/ui/components/shell_layer_impl/DefaultShellLayerStrategy.cpp similarity index 100% rename from desktop/ui/components/shell_layer_impl/DefaultShellLayerStrategy.cpp rename to ui/components/shell_layer_impl/DefaultShellLayerStrategy.cpp diff --git a/desktop/ui/components/shell_layer_impl/DefaultShellLayerStrategy.h b/ui/components/shell_layer_impl/DefaultShellLayerStrategy.h similarity index 100% rename from desktop/ui/components/shell_layer_impl/DefaultShellLayerStrategy.h rename to ui/components/shell_layer_impl/DefaultShellLayerStrategy.h diff --git a/desktop/ui/components/shell_layer_impl/WallpaperShellLayerStrategy.cpp b/ui/components/shell_layer_impl/WallpaperShellLayerStrategy.cpp similarity index 100% rename from desktop/ui/components/shell_layer_impl/WallpaperShellLayerStrategy.cpp rename to ui/components/shell_layer_impl/WallpaperShellLayerStrategy.cpp diff --git a/desktop/ui/components/shell_layer_impl/WallpaperShellLayerStrategy.h b/ui/components/shell_layer_impl/WallpaperShellLayerStrategy.h similarity index 100% rename from desktop/ui/components/shell_layer_impl/WallpaperShellLayerStrategy.h rename to ui/components/shell_layer_impl/WallpaperShellLayerStrategy.h diff --git a/desktop/ui/components/shell_layer_impl/WidgetShellLayer.cpp b/ui/components/shell_layer_impl/WidgetShellLayer.cpp similarity index 100% rename from desktop/ui/components/shell_layer_impl/WidgetShellLayer.cpp rename to ui/components/shell_layer_impl/WidgetShellLayer.cpp diff --git a/desktop/ui/components/shell_layer_impl/WidgetShellLayer.h b/ui/components/shell_layer_impl/WidgetShellLayer.h similarity index 100% rename from desktop/ui/components/shell_layer_impl/WidgetShellLayer.h rename to ui/components/shell_layer_impl/WidgetShellLayer.h diff --git a/desktop/ui/components/shell_layer_impl/wallpaper_setup.cpp b/ui/components/shell_layer_impl/wallpaper_setup.cpp similarity index 100% rename from desktop/ui/components/shell_layer_impl/wallpaper_setup.cpp rename to ui/components/shell_layer_impl/wallpaper_setup.cpp diff --git a/desktop/ui/components/shell_layer_impl/wallpaper_setup.h b/ui/components/shell_layer_impl/wallpaper_setup.h similarity index 100% rename from desktop/ui/components/shell_layer_impl/wallpaper_setup.h rename to ui/components/shell_layer_impl/wallpaper_setup.h diff --git a/desktop/ui/components/shell_layer_impl/wallpaper_src_chain.cpp b/ui/components/shell_layer_impl/wallpaper_src_chain.cpp similarity index 100% rename from desktop/ui/components/shell_layer_impl/wallpaper_src_chain.cpp rename to ui/components/shell_layer_impl/wallpaper_src_chain.cpp diff --git a/desktop/ui/components/shell_layer_impl/wallpaper_src_chain.h b/ui/components/shell_layer_impl/wallpaper_src_chain.h similarity index 100% rename from desktop/ui/components/shell_layer_impl/wallpaper_src_chain.h rename to ui/components/shell_layer_impl/wallpaper_src_chain.h diff --git a/desktop/ui/components/statusbar/CMakeLists.txt b/ui/components/statusbar/CMakeLists.txt similarity index 100% rename from desktop/ui/components/statusbar/CMakeLists.txt rename to ui/components/statusbar/CMakeLists.txt diff --git a/desktop/ui/components/statusbar/IStatusBar.h b/ui/components/statusbar/IStatusBar.h similarity index 100% rename from desktop/ui/components/statusbar/IStatusBar.h rename to ui/components/statusbar/IStatusBar.h diff --git a/desktop/ui/components/statusbar/icons/LICENSE.md b/ui/components/statusbar/icons/LICENSE.md similarity index 100% rename from desktop/ui/components/statusbar/icons/LICENSE.md rename to ui/components/statusbar/icons/LICENSE.md diff --git a/desktop/ui/components/statusbar/icons/battery.png b/ui/components/statusbar/icons/battery.png similarity index 100% rename from desktop/ui/components/statusbar/icons/battery.png rename to ui/components/statusbar/icons/battery.png diff --git a/desktop/ui/components/statusbar/icons/signal.png b/ui/components/statusbar/icons/signal.png similarity index 100% rename from desktop/ui/components/statusbar/icons/signal.png rename to ui/components/statusbar/icons/signal.png diff --git a/desktop/ui/components/statusbar/icons/volume.png b/ui/components/statusbar/icons/volume.png similarity index 100% rename from desktop/ui/components/statusbar/icons/volume.png rename to ui/components/statusbar/icons/volume.png diff --git a/desktop/ui/components/statusbar/icons/wifi.png b/ui/components/statusbar/icons/wifi.png similarity index 100% rename from desktop/ui/components/statusbar/icons/wifi.png rename to ui/components/statusbar/icons/wifi.png diff --git a/desktop/ui/components/statusbar/status_bar.cpp b/ui/components/statusbar/status_bar.cpp similarity index 100% rename from desktop/ui/components/statusbar/status_bar.cpp rename to ui/components/statusbar/status_bar.cpp diff --git a/desktop/ui/components/statusbar/status_bar.h b/ui/components/statusbar/status_bar.h similarity index 100% rename from desktop/ui/components/statusbar/status_bar.h rename to ui/components/statusbar/status_bar.h diff --git a/desktop/ui/components/statusbar/statusbar_icons.qrc b/ui/components/statusbar/statusbar_icons.qrc similarity index 100% rename from desktop/ui/components/statusbar/statusbar_icons.qrc rename to ui/components/statusbar/statusbar_icons.qrc diff --git a/desktop/ui/components/taskbar/CMakeLists.txt b/ui/components/taskbar/CMakeLists.txt similarity index 100% rename from desktop/ui/components/taskbar/CMakeLists.txt rename to ui/components/taskbar/CMakeLists.txt diff --git a/desktop/ui/components/taskbar/centered_taskbar.cpp b/ui/components/taskbar/centered_taskbar.cpp similarity index 100% rename from desktop/ui/components/taskbar/centered_taskbar.cpp rename to ui/components/taskbar/centered_taskbar.cpp diff --git a/desktop/ui/components/taskbar/centered_taskbar.h b/ui/components/taskbar/centered_taskbar.h similarity index 100% rename from desktop/ui/components/taskbar/centered_taskbar.h rename to ui/components/taskbar/centered_taskbar.h diff --git a/desktop/ui/components/taskbar/icon_mask.h b/ui/components/taskbar/icon_mask.h similarity index 100% rename from desktop/ui/components/taskbar/icon_mask.h rename to ui/components/taskbar/icon_mask.h diff --git a/desktop/ui/components/taskbar/icons/README.md b/ui/components/taskbar/icons/README.md similarity index 100% rename from desktop/ui/components/taskbar/icons/README.md rename to ui/components/taskbar/icons/README.md diff --git a/desktop/ui/components/taskbar/icons/browser.png b/ui/components/taskbar/icons/browser.png similarity index 100% rename from desktop/ui/components/taskbar/icons/browser.png rename to ui/components/taskbar/icons/browser.png diff --git a/desktop/ui/components/taskbar/icons/browser.svg b/ui/components/taskbar/icons/browser.svg similarity index 100% rename from desktop/ui/components/taskbar/icons/browser.svg rename to ui/components/taskbar/icons/browser.svg diff --git a/desktop/ui/components/taskbar/icons/files.png b/ui/components/taskbar/icons/files.png similarity index 100% rename from desktop/ui/components/taskbar/icons/files.png rename to ui/components/taskbar/icons/files.png diff --git a/desktop/ui/components/taskbar/icons/files.svg b/ui/components/taskbar/icons/files.svg similarity index 100% rename from desktop/ui/components/taskbar/icons/files.svg rename to ui/components/taskbar/icons/files.svg diff --git a/desktop/ui/components/taskbar/icons/settings.png b/ui/components/taskbar/icons/settings.png similarity index 100% rename from desktop/ui/components/taskbar/icons/settings.png rename to ui/components/taskbar/icons/settings.png diff --git a/desktop/ui/components/taskbar/icons/settings.svg b/ui/components/taskbar/icons/settings.svg similarity index 100% rename from desktop/ui/components/taskbar/icons/settings.svg rename to ui/components/taskbar/icons/settings.svg diff --git a/desktop/ui/components/taskbar/icons/start.png b/ui/components/taskbar/icons/start.png similarity index 100% rename from desktop/ui/components/taskbar/icons/start.png rename to ui/components/taskbar/icons/start.png diff --git a/desktop/ui/components/taskbar/icons/start.svg b/ui/components/taskbar/icons/start.svg similarity index 100% rename from desktop/ui/components/taskbar/icons/start.svg rename to ui/components/taskbar/icons/start.svg diff --git a/desktop/ui/components/taskbar/icons/terminal.png b/ui/components/taskbar/icons/terminal.png similarity index 100% rename from desktop/ui/components/taskbar/icons/terminal.png rename to ui/components/taskbar/icons/terminal.png diff --git a/desktop/ui/components/taskbar/icons/terminal.svg b/ui/components/taskbar/icons/terminal.svg similarity index 100% rename from desktop/ui/components/taskbar/icons/terminal.svg rename to ui/components/taskbar/icons/terminal.svg diff --git a/desktop/ui/components/taskbar/start_button.cpp b/ui/components/taskbar/start_button.cpp similarity index 100% rename from desktop/ui/components/taskbar/start_button.cpp rename to ui/components/taskbar/start_button.cpp diff --git a/desktop/ui/components/taskbar/start_button.h b/ui/components/taskbar/start_button.h similarity index 100% rename from desktop/ui/components/taskbar/start_button.h rename to ui/components/taskbar/start_button.h diff --git a/desktop/ui/components/taskbar/taskbar_icon.cpp b/ui/components/taskbar/taskbar_icon.cpp similarity index 100% rename from desktop/ui/components/taskbar/taskbar_icon.cpp rename to ui/components/taskbar/taskbar_icon.cpp diff --git a/desktop/ui/components/taskbar/taskbar_icon.h b/ui/components/taskbar/taskbar_icon.h similarity index 100% rename from desktop/ui/components/taskbar/taskbar_icon.h rename to ui/components/taskbar/taskbar_icon.h diff --git a/desktop/ui/components/taskbar/taskbar_icons.qrc b/ui/components/taskbar/taskbar_icons.qrc similarity index 100% rename from desktop/ui/components/taskbar/taskbar_icons.qrc rename to ui/components/taskbar/taskbar_icons.qrc diff --git a/desktop/ui/components/wallpaper/CMakeLists.txt b/ui/components/wallpaper/CMakeLists.txt similarity index 100% rename from desktop/ui/components/wallpaper/CMakeLists.txt rename to ui/components/wallpaper/CMakeLists.txt diff --git a/desktop/ui/components/wallpaper/ImageWallPaperLayer.cpp b/ui/components/wallpaper/ImageWallPaperLayer.cpp similarity index 100% rename from desktop/ui/components/wallpaper/ImageWallPaperLayer.cpp rename to ui/components/wallpaper/ImageWallPaperLayer.cpp diff --git a/desktop/ui/components/wallpaper/ImageWallPaperLayer.h b/ui/components/wallpaper/ImageWallPaperLayer.h similarity index 100% rename from desktop/ui/components/wallpaper/ImageWallPaperLayer.h rename to ui/components/wallpaper/ImageWallPaperLayer.h diff --git a/desktop/ui/components/wallpaper/TransitionComposer.cpp b/ui/components/wallpaper/TransitionComposer.cpp similarity index 100% rename from desktop/ui/components/wallpaper/TransitionComposer.cpp rename to ui/components/wallpaper/TransitionComposer.cpp diff --git a/desktop/ui/components/wallpaper/TransitionComposer.h b/ui/components/wallpaper/TransitionComposer.h similarity index 100% rename from desktop/ui/components/wallpaper/TransitionComposer.h rename to ui/components/wallpaper/TransitionComposer.h diff --git a/desktop/ui/components/wallpaper/WallPaperAccessStorage.cpp b/ui/components/wallpaper/WallPaperAccessStorage.cpp similarity index 100% rename from desktop/ui/components/wallpaper/WallPaperAccessStorage.cpp rename to ui/components/wallpaper/WallPaperAccessStorage.cpp diff --git a/desktop/ui/components/wallpaper/WallPaperAccessStorage.h b/ui/components/wallpaper/WallPaperAccessStorage.h similarity index 100% rename from desktop/ui/components/wallpaper/WallPaperAccessStorage.h rename to ui/components/wallpaper/WallPaperAccessStorage.h diff --git a/desktop/ui/components/wallpaper/WallPaperEngine.cpp b/ui/components/wallpaper/WallPaperEngine.cpp similarity index 100% rename from desktop/ui/components/wallpaper/WallPaperEngine.cpp rename to ui/components/wallpaper/WallPaperEngine.cpp diff --git a/desktop/ui/components/wallpaper/WallPaperEngine.h b/ui/components/wallpaper/WallPaperEngine.h similarity index 100% rename from desktop/ui/components/wallpaper/WallPaperEngine.h rename to ui/components/wallpaper/WallPaperEngine.h diff --git a/desktop/ui/components/wallpaper/WallPaperLayer.h b/ui/components/wallpaper/WallPaperLayer.h similarity index 100% rename from desktop/ui/components/wallpaper/WallPaperLayer.h rename to ui/components/wallpaper/WallPaperLayer.h diff --git a/desktop/ui/components/wallpaper/WallPaperToken.cpp b/ui/components/wallpaper/WallPaperToken.cpp similarity index 100% rename from desktop/ui/components/wallpaper/WallPaperToken.cpp rename to ui/components/wallpaper/WallPaperToken.cpp diff --git a/desktop/ui/components/wallpaper/WallPaperToken.h b/ui/components/wallpaper/WallPaperToken.h similarity index 100% rename from desktop/ui/components/wallpaper/WallPaperToken.h rename to ui/components/wallpaper/WallPaperToken.h diff --git a/desktop/ui/components/window_info.h b/ui/components/window_info.h similarity index 100% rename from desktop/ui/components/window_info.h rename to ui/components/window_info.h diff --git a/desktop/ui/components/window_placement/CMakeLists.txt b/ui/components/window_placement/CMakeLists.txt similarity index 100% rename from desktop/ui/components/window_placement/CMakeLists.txt rename to ui/components/window_placement/CMakeLists.txt diff --git a/desktop/ui/components/window_placement/window_placement_policy.cpp b/ui/components/window_placement/window_placement_policy.cpp similarity index 100% rename from desktop/ui/components/window_placement/window_placement_policy.cpp rename to ui/components/window_placement/window_placement_policy.cpp diff --git a/desktop/ui/components/window_placement/window_placement_policy.h b/ui/components/window_placement/window_placement_policy.h similarity index 100% rename from desktop/ui/components/window_placement/window_placement_policy.h rename to ui/components/window_placement/window_placement_policy.h diff --git a/desktop/ui/models/CMakeLists.txt b/ui/models/CMakeLists.txt similarity index 100% rename from desktop/ui/models/CMakeLists.txt rename to ui/models/CMakeLists.txt diff --git a/desktop/ui/models/README.md b/ui/models/README.md similarity index 100% rename from desktop/ui/models/README.md rename to ui/models/README.md diff --git a/desktop/ui/platform/CMakeLists.txt b/ui/platform/CMakeLists.txt similarity index 100% rename from desktop/ui/platform/CMakeLists.txt rename to ui/platform/CMakeLists.txt diff --git a/desktop/ui/platform/DesktopPropertyStrategyFactory.cpp b/ui/platform/DesktopPropertyStrategyFactory.cpp similarity index 100% rename from desktop/ui/platform/DesktopPropertyStrategyFactory.cpp rename to ui/platform/DesktopPropertyStrategyFactory.cpp diff --git a/desktop/ui/platform/DesktopPropertyStrategyFactory.h b/ui/platform/DesktopPropertyStrategyFactory.h similarity index 100% rename from desktop/ui/platform/DesktopPropertyStrategyFactory.h rename to ui/platform/DesktopPropertyStrategyFactory.h diff --git a/desktop/ui/platform/IDesktopDisplaySizeStrategy.cpp b/ui/platform/IDesktopDisplaySizeStrategy.cpp similarity index 100% rename from desktop/ui/platform/IDesktopDisplaySizeStrategy.cpp rename to ui/platform/IDesktopDisplaySizeStrategy.cpp diff --git a/desktop/ui/platform/IDesktopDisplaySizeStrategy.h b/ui/platform/IDesktopDisplaySizeStrategy.h similarity index 100% rename from desktop/ui/platform/IDesktopDisplaySizeStrategy.h rename to ui/platform/IDesktopDisplaySizeStrategy.h diff --git a/desktop/ui/platform/IDesktopPropertyStrategy.cpp b/ui/platform/IDesktopPropertyStrategy.cpp similarity index 100% rename from desktop/ui/platform/IDesktopPropertyStrategy.cpp rename to ui/platform/IDesktopPropertyStrategy.cpp diff --git a/desktop/ui/platform/IDesktopPropertyStrategy.h b/ui/platform/IDesktopPropertyStrategy.h similarity index 100% rename from desktop/ui/platform/IDesktopPropertyStrategy.h rename to ui/platform/IDesktopPropertyStrategy.h diff --git a/desktop/ui/platform/display_backend_helper.cpp b/ui/platform/display_backend_helper.cpp similarity index 100% rename from desktop/ui/platform/display_backend_helper.cpp rename to ui/platform/display_backend_helper.cpp diff --git a/desktop/ui/platform/display_backend_helper.h b/ui/platform/display_backend_helper.h similarity index 100% rename from desktop/ui/platform/display_backend_helper.h rename to ui/platform/display_backend_helper.h diff --git a/desktop/ui/platform/embedded/embedded_display_server_backend.cpp b/ui/platform/embedded/embedded_display_server_backend.cpp similarity index 100% rename from desktop/ui/platform/embedded/embedded_display_server_backend.cpp rename to ui/platform/embedded/embedded_display_server_backend.cpp diff --git a/desktop/ui/platform/embedded/embedded_display_server_backend.h b/ui/platform/embedded/embedded_display_server_backend.h similarity index 100% rename from desktop/ui/platform/embedded/embedded_display_server_backend.h rename to ui/platform/embedded/embedded_display_server_backend.h diff --git a/desktop/ui/platform/embedded/embedded_display_size_policy.cpp b/ui/platform/embedded/embedded_display_size_policy.cpp similarity index 100% rename from desktop/ui/platform/embedded/embedded_display_size_policy.cpp rename to ui/platform/embedded/embedded_display_size_policy.cpp diff --git a/desktop/ui/platform/embedded/embedded_display_size_policy.h b/ui/platform/embedded/embedded_display_size_policy.h similarity index 100% rename from desktop/ui/platform/embedded/embedded_display_size_policy.h rename to ui/platform/embedded/embedded_display_size_policy.h diff --git a/desktop/ui/platform/embedded/embedded_platform.cpp b/ui/platform/embedded/embedded_platform.cpp similarity index 100% rename from desktop/ui/platform/embedded/embedded_platform.cpp rename to ui/platform/embedded/embedded_platform.cpp diff --git a/desktop/ui/platform/embedded/null_window_backend.cpp b/ui/platform/embedded/null_window_backend.cpp similarity index 100% rename from desktop/ui/platform/embedded/null_window_backend.cpp rename to ui/platform/embedded/null_window_backend.cpp diff --git a/desktop/ui/platform/embedded/null_window_backend.h b/ui/platform/embedded/null_window_backend.h similarity index 100% rename from desktop/ui/platform/embedded/null_window_backend.h rename to ui/platform/embedded/null_window_backend.h diff --git a/desktop/ui/platform/linux_wsl/linux_wsl_display_size_policy.cpp b/ui/platform/linux_wsl/linux_wsl_display_size_policy.cpp similarity index 100% rename from desktop/ui/platform/linux_wsl/linux_wsl_display_size_policy.cpp rename to ui/platform/linux_wsl/linux_wsl_display_size_policy.cpp diff --git a/desktop/ui/platform/linux_wsl/linux_wsl_display_size_policy.h b/ui/platform/linux_wsl/linux_wsl_display_size_policy.h similarity index 100% rename from desktop/ui/platform/linux_wsl/linux_wsl_display_size_policy.h rename to ui/platform/linux_wsl/linux_wsl_display_size_policy.h diff --git a/desktop/ui/platform/linux_wsl/linux_wsl_factory.cpp b/ui/platform/linux_wsl/linux_wsl_factory.cpp similarity index 100% rename from desktop/ui/platform/linux_wsl/linux_wsl_factory.cpp rename to ui/platform/linux_wsl/linux_wsl_factory.cpp diff --git a/desktop/ui/platform/linux_wsl/linux_wsl_factory.h b/ui/platform/linux_wsl/linux_wsl_factory.h similarity index 100% rename from desktop/ui/platform/linux_wsl/linux_wsl_factory.h rename to ui/platform/linux_wsl/linux_wsl_factory.h diff --git a/desktop/ui/platform/linux_wsl/linux_wsl_platform.cpp b/ui/platform/linux_wsl/linux_wsl_platform.cpp similarity index 100% rename from desktop/ui/platform/linux_wsl/linux_wsl_platform.cpp rename to ui/platform/linux_wsl/linux_wsl_platform.cpp diff --git a/desktop/ui/platform/linux_wsl/linux_wsl_platform.h b/ui/platform/linux_wsl/linux_wsl_platform.h similarity index 100% rename from desktop/ui/platform/linux_wsl/linux_wsl_platform.h rename to ui/platform/linux_wsl/linux_wsl_platform.h diff --git a/desktop/ui/platform/linux_wsl/wsl_x11_display_server_backend.cpp b/ui/platform/linux_wsl/wsl_x11_display_server_backend.cpp similarity index 100% rename from desktop/ui/platform/linux_wsl/wsl_x11_display_server_backend.cpp rename to ui/platform/linux_wsl/wsl_x11_display_server_backend.cpp diff --git a/desktop/ui/platform/linux_wsl/wsl_x11_display_server_backend.h b/ui/platform/linux_wsl/wsl_x11_display_server_backend.h similarity index 100% rename from desktop/ui/platform/linux_wsl/wsl_x11_display_server_backend.h rename to ui/platform/linux_wsl/wsl_x11_display_server_backend.h diff --git a/desktop/ui/platform/linux_wsl/wsl_x11_window.cpp b/ui/platform/linux_wsl/wsl_x11_window.cpp similarity index 100% rename from desktop/ui/platform/linux_wsl/wsl_x11_window.cpp rename to ui/platform/linux_wsl/wsl_x11_window.cpp diff --git a/desktop/ui/platform/linux_wsl/wsl_x11_window.h b/ui/platform/linux_wsl/wsl_x11_window.h similarity index 100% rename from desktop/ui/platform/linux_wsl/wsl_x11_window.h rename to ui/platform/linux_wsl/wsl_x11_window.h diff --git a/desktop/ui/platform/linux_wsl/wsl_x11_window_backend.cpp b/ui/platform/linux_wsl/wsl_x11_window_backend.cpp similarity index 100% rename from desktop/ui/platform/linux_wsl/wsl_x11_window_backend.cpp rename to ui/platform/linux_wsl/wsl_x11_window_backend.cpp diff --git a/desktop/ui/platform/linux_wsl/wsl_x11_window_backend.h b/ui/platform/linux_wsl/wsl_x11_window_backend.h similarity index 100% rename from desktop/ui/platform/linux_wsl/wsl_x11_window_backend.h rename to ui/platform/linux_wsl/wsl_x11_window_backend.h diff --git a/desktop/ui/platform/platform_helper.cpp b/ui/platform/platform_helper.cpp similarity index 100% rename from desktop/ui/platform/platform_helper.cpp rename to ui/platform/platform_helper.cpp diff --git a/desktop/ui/platform/platform_helper.h b/ui/platform/platform_helper.h similarity index 100% rename from desktop/ui/platform/platform_helper.h rename to ui/platform/platform_helper.h diff --git a/desktop/ui/platform/shell_layer_helper.cpp b/ui/platform/shell_layer_helper.cpp similarity index 100% rename from desktop/ui/platform/shell_layer_helper.cpp rename to ui/platform/shell_layer_helper.cpp diff --git a/desktop/ui/platform/shell_layer_helper.h b/ui/platform/shell_layer_helper.h similarity index 100% rename from desktop/ui/platform/shell_layer_helper.h rename to ui/platform/shell_layer_helper.h diff --git a/desktop/ui/platform/windows/windows_display_server_backend.cpp b/ui/platform/windows/windows_display_server_backend.cpp similarity index 100% rename from desktop/ui/platform/windows/windows_display_server_backend.cpp rename to ui/platform/windows/windows_display_server_backend.cpp diff --git a/desktop/ui/platform/windows/windows_display_server_backend.h b/ui/platform/windows/windows_display_server_backend.h similarity index 100% rename from desktop/ui/platform/windows/windows_display_server_backend.h rename to ui/platform/windows/windows_display_server_backend.h diff --git a/desktop/ui/platform/windows/windows_display_size_policy.cpp b/ui/platform/windows/windows_display_size_policy.cpp similarity index 100% rename from desktop/ui/platform/windows/windows_display_size_policy.cpp rename to ui/platform/windows/windows_display_size_policy.cpp diff --git a/desktop/ui/platform/windows/windows_display_size_policy.h b/ui/platform/windows/windows_display_size_policy.h similarity index 100% rename from desktop/ui/platform/windows/windows_display_size_policy.h rename to ui/platform/windows/windows_display_size_policy.h diff --git a/desktop/ui/platform/windows/windows_factory.cpp b/ui/platform/windows/windows_factory.cpp similarity index 100% rename from desktop/ui/platform/windows/windows_factory.cpp rename to ui/platform/windows/windows_factory.cpp diff --git a/desktop/ui/platform/windows/windows_factory.h b/ui/platform/windows/windows_factory.h similarity index 100% rename from desktop/ui/platform/windows/windows_factory.h rename to ui/platform/windows/windows_factory.h diff --git a/desktop/ui/platform/windows/windows_platform.cpp b/ui/platform/windows/windows_platform.cpp similarity index 100% rename from desktop/ui/platform/windows/windows_platform.cpp rename to ui/platform/windows/windows_platform.cpp diff --git a/desktop/ui/platform/windows/windows_platform.h b/ui/platform/windows/windows_platform.h similarity index 100% rename from desktop/ui/platform/windows/windows_platform.h rename to ui/platform/windows/windows_platform.h diff --git a/desktop/ui/platform/windows/windows_window.cpp b/ui/platform/windows/windows_window.cpp similarity index 100% rename from desktop/ui/platform/windows/windows_window.cpp rename to ui/platform/windows/windows_window.cpp diff --git a/desktop/ui/platform/windows/windows_window.h b/ui/platform/windows/windows_window.h similarity index 100% rename from desktop/ui/platform/windows/windows_window.h rename to ui/platform/windows/windows_window.h diff --git a/desktop/ui/platform/windows/windows_window_backend.cpp b/ui/platform/windows/windows_window_backend.cpp similarity index 100% rename from desktop/ui/platform/windows/windows_window_backend.cpp rename to ui/platform/windows/windows_window_backend.cpp diff --git a/desktop/ui/platform/windows/windows_window_backend.h b/ui/platform/windows/windows_window_backend.h similarity index 100% rename from desktop/ui/platform/windows/windows_window_backend.h rename to ui/platform/windows/windows_window_backend.h diff --git a/desktop/ui/render/CMakeLists.txt b/ui/render/CMakeLists.txt similarity index 100% rename from desktop/ui/render/CMakeLists.txt rename to ui/render/CMakeLists.txt diff --git a/desktop/ui/render/backend_capabilities.h b/ui/render/backend_capabilities.h similarity index 100% rename from desktop/ui/render/backend_capabilities.h rename to ui/render/backend_capabilities.h diff --git a/desktop/ui/render/render_backend.h b/ui/render/render_backend.h similarity index 100% rename from desktop/ui/render/render_backend.h rename to ui/render/render_backend.h diff --git a/desktop/ui/render/render_backend_factory.h b/ui/render/render_backend_factory.h similarity index 100% rename from desktop/ui/render/render_backend_factory.h rename to ui/render/render_backend_factory.h diff --git a/desktop/ui/widget/CMakeLists.txt b/ui/widget/CMakeLists.txt similarity index 100% rename from desktop/ui/widget/CMakeLists.txt rename to ui/widget/CMakeLists.txt diff --git a/desktop/ui/widget/README.md b/ui/widget/README.md similarity index 100% rename from desktop/ui/widget/README.md rename to ui/widget/README.md diff --git a/desktop/ui/widget/init_session/CMakeLists.txt b/ui/widget/init_session/CMakeLists.txt similarity index 80% rename from desktop/ui/widget/init_session/CMakeLists.txt rename to ui/widget/init_session/CMakeLists.txt index 043c9332e..523f4851a 100644 --- a/desktop/ui/widget/init_session/CMakeLists.txt +++ b/ui/widget/init_session/CMakeLists.txt @@ -24,9 +24,9 @@ add_library(cf_desktop_ui_widget_init_session STATIC target_include_directories(cf_desktop_ui_widget_init_session PUBLIC $ - # For boot_stage_info.h, init_stage.h from desktop/main/init/ - # Note: Cannot link CFDesktopInit (circular dep: CFDesktopInit links this target) - $ + # For boot_stage_info.h, init_stage.h from main/init/ + # Note: Cannot link CFDesktopMain (circular dep: CFDesktopMain links this target) + $ ) target_link_libraries(cf_desktop_ui_widget_init_session PUBLIC diff --git a/desktop/ui/widget/init_session/boot_progress_widget.cpp b/ui/widget/init_session/boot_progress_widget.cpp similarity index 100% rename from desktop/ui/widget/init_session/boot_progress_widget.cpp rename to ui/widget/init_session/boot_progress_widget.cpp diff --git a/desktop/ui/widget/init_session/boot_progress_widget.h b/ui/widget/init_session/boot_progress_widget.h similarity index 100% rename from desktop/ui/widget/init_session/boot_progress_widget.h rename to ui/widget/init_session/boot_progress_widget.h diff --git a/desktop/ui/widget/init_session/boot_widget_factory.cpp b/ui/widget/init_session/boot_widget_factory.cpp similarity index 100% rename from desktop/ui/widget/init_session/boot_widget_factory.cpp rename to ui/widget/init_session/boot_widget_factory.cpp diff --git a/desktop/ui/widget/init_session/resources/CFDesktop.logo.png b/ui/widget/init_session/resources/CFDesktop.logo.png similarity index 100% rename from desktop/ui/widget/init_session/resources/CFDesktop.logo.png rename to ui/widget/init_session/resources/CFDesktop.logo.png diff --git a/desktop/ui/widget/init_session/resources/resources.qrc b/ui/widget/init_session/resources/resources.qrc similarity index 100% rename from desktop/ui/widget/init_session/resources/resources.qrc rename to ui/widget/init_session/resources/resources.qrc diff --git a/desktop/ui/widget/init_session/simple_boot_widget.cpp b/ui/widget/init_session/simple_boot_widget.cpp similarity index 100% rename from desktop/ui/widget/init_session/simple_boot_widget.cpp rename to ui/widget/init_session/simple_boot_widget.cpp diff --git a/desktop/ui/widget/init_session/simple_boot_widget.h b/ui/widget/init_session/simple_boot_widget.h similarity index 100% rename from desktop/ui/widget/init_session/simple_boot_widget.h rename to ui/widget/init_session/simple_boot_widget.h diff --git a/desktop/ui/widget/init_session/simple_boot_widget.ui b/ui/widget/init_session/simple_boot_widget.ui similarity index 100% rename from desktop/ui/widget/init_session/simple_boot_widget.ui rename to ui/widget/init_session/simple_boot_widget.ui diff --git a/desktop/ui/widget/init_session/step_dot_widget.cpp b/ui/widget/init_session/step_dot_widget.cpp similarity index 100% rename from desktop/ui/widget/init_session/step_dot_widget.cpp rename to ui/widget/init_session/step_dot_widget.cpp diff --git a/desktop/ui/widget/init_session/step_dot_widget.h b/ui/widget/init_session/step_dot_widget.h similarity index 100% rename from desktop/ui/widget/init_session/step_dot_widget.h rename to ui/widget/init_session/step_dot_widget.h