move uidev to workspace root

2025-06-21 17:39:28 +09:00
parent 814700cbff
commit 9759dff8b9
119 changed files with 14 additions and 6 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5117,7 +5117,7 @@ dependencies = [
 ]

 [[package]]
-name = "uidev-vk"
+name = "uidev"
 version = "0.1.0"
 dependencies = [
 "anyhow",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ inherits = "release"
 debug = true

 [workspace]
-members = ["wgui", "wgui/uidev-vk", "wlx-overlay-s", "wlx-capture"]
+members = ["uidev", "wgui", "wlx-overlay-s", "wlx-capture"]
 resolver = "3"

 [workspace.dependencies]
--- a/wgui/uidev-vk/.gitignore
+++ b/wgui/uidev-vk/.gitignore
--- a/wgui/uidev-vk/Cargo.lock
+++ b/wgui/uidev-vk/Cargo.lock
--- a/wgui/uidev-vk/Cargo.toml
+++ b/wgui/uidev-vk/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "uidev-vk"
+name = "uidev"
 version = "0.1.0"
 edition = "2024"

@@ -9,7 +9,7 @@ glam = { workspace = true }
 log = { workspace = true }
 rust-embed = "8.7.2"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-wgui = { path = "../" }
+wgui = { path = "../wgui/" }
 winit = "0.30.10"
 vulkano = { workspace = true }
 vulkano-shaders = { workspace = true }
--- a/wgui/uidev-vk/assets/bar/add.svg
+++ b/wgui/uidev-vk/assets/bar/add.svg
--- a/wgui/uidev-vk/assets/bar/background-off.svg
+++ b/wgui/uidev-vk/assets/bar/background-off.svg
--- a/wgui/uidev-vk/assets/bar/background.svg
+++ b/wgui/uidev-vk/assets/bar/background.svg
--- a/wgui/uidev-vk/assets/bar/cancel.svg
+++ b/wgui/uidev-vk/assets/bar/cancel.svg
--- a/wgui/uidev-vk/assets/bar/checkbox-checked.svg
+++ b/wgui/uidev-vk/assets/bar/checkbox-checked.svg
--- a/wgui/uidev-vk/assets/bar/checkbox.svg
+++ b/wgui/uidev-vk/assets/bar/checkbox.svg
--- a/wgui/uidev-vk/assets/bar/delete.svg
+++ b/wgui/uidev-vk/assets/bar/delete.svg
--- a/wgui/uidev-vk/assets/bar/fade.svg
+++ b/wgui/uidev-vk/assets/bar/fade.svg
--- a/wgui/uidev-vk/assets/bar/inout.svg
+++ b/wgui/uidev-vk/assets/bar/inout.svg
--- a/wgui/uidev-vk/assets/bar/lock.svg
+++ b/wgui/uidev-vk/assets/bar/lock.svg
--- a/wgui/uidev-vk/assets/bar/lock_open.svg
+++ b/wgui/uidev-vk/assets/bar/lock_open.svg
--- a/wgui/uidev-vk/assets/bar/mouse.svg
+++ b/wgui/uidev-vk/assets/bar/mouse.svg
--- a/wgui/uidev-vk/assets/bar/mouse_lock.svg
+++ b/wgui/uidev-vk/assets/bar/mouse_lock.svg
--- a/wgui/uidev-vk/assets/bar/move-all.svg
+++ b/wgui/uidev-vk/assets/bar/move-all.svg
--- a/wgui/uidev-vk/assets/bar/move-horizontal.svg
+++ b/wgui/uidev-vk/assets/bar/move-horizontal.svg
--- a/wgui/uidev-vk/assets/bar/resize.svg
+++ b/wgui/uidev-vk/assets/bar/resize.svg
--- a/wgui/uidev-vk/assets/bar/screen-add.svg
+++ b/wgui/uidev-vk/assets/bar/screen-add.svg
--- a/wgui/uidev-vk/assets/bar/screen-options.svg
+++ b/wgui/uidev-vk/assets/bar/screen-options.svg
--- a/wgui/uidev-vk/assets/bar/screen-remove.svg
+++ b/wgui/uidev-vk/assets/bar/screen-remove.svg
--- a/wgui/uidev-vk/assets/dashboard/add.svg
+++ b/wgui/uidev-vk/assets/dashboard/add.svg
--- a/wgui/uidev-vk/assets/dashboard/alphabetical.svg
+++ b/wgui/uidev-vk/assets/dashboard/alphabetical.svg
--- a/wgui/uidev-vk/assets/dashboard/apps.svg
+++ b/wgui/uidev-vk/assets/dashboard/apps.svg
--- a/wgui/uidev-vk/assets/dashboard/back.svg
+++ b/wgui/uidev-vk/assets/dashboard/back.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_10.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_10.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_100.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_100.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_20.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_20.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_30.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_30.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_40.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_40.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_50.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_50.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_60.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_60.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_70.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_70.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_80.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_80.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_90.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_90.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_chr_10.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_chr_10.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_chr_100.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_chr_100.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_chr_20.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_chr_20.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_chr_30.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_chr_30.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_chr_40.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_chr_40.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_chr_50.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_chr_50.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_chr_60.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_chr_60.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_chr_70.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_chr_70.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_chr_80.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_chr_80.svg
--- a/wgui/uidev-vk/assets/dashboard/bat_chr_90.svg
+++ b/wgui/uidev-vk/assets/dashboard/bat_chr_90.svg
--- a/wgui/uidev-vk/assets/dashboard/binary.svg
+++ b/wgui/uidev-vk/assets/dashboard/binary.svg
--- a/wgui/uidev-vk/assets/dashboard/burger.svg
+++ b/wgui/uidev-vk/assets/dashboard/burger.svg
--- a/wgui/uidev-vk/assets/dashboard/category_search.svg
+++ b/wgui/uidev-vk/assets/dashboard/category_search.svg
--- a/wgui/uidev-vk/assets/dashboard/circle.svg
+++ b/wgui/uidev-vk/assets/dashboard/circle.svg
--- a/wgui/uidev-vk/assets/dashboard/close.svg
+++ b/wgui/uidev-vk/assets/dashboard/close.svg
--- a/wgui/uidev-vk/assets/dashboard/cpu.svg
+++ b/wgui/uidev-vk/assets/dashboard/cpu.svg
--- a/wgui/uidev-vk/assets/dashboard/display.svg
+++ b/wgui/uidev-vk/assets/dashboard/display.svg
--- a/wgui/uidev-vk/assets/dashboard/displayport.svg
+++ b/wgui/uidev-vk/assets/dashboard/displayport.svg
--- a/wgui/uidev-vk/assets/dashboard/eye.svg
+++ b/wgui/uidev-vk/assets/dashboard/eye.svg
--- a/wgui/uidev-vk/assets/dashboard/fix_floor.svg
+++ b/wgui/uidev-vk/assets/dashboard/fix_floor.svg
--- a/wgui/uidev-vk/assets/dashboard/games.svg
+++ b/wgui/uidev-vk/assets/dashboard/games.svg
--- a/wgui/uidev-vk/assets/dashboard/github.svg
+++ b/wgui/uidev-vk/assets/dashboard/github.svg
--- a/wgui/uidev-vk/assets/dashboard/globe.svg
+++ b/wgui/uidev-vk/assets/dashboard/globe.svg
--- a/wgui/uidev-vk/assets/dashboard/home.svg
+++ b/wgui/uidev-vk/assets/dashboard/home.svg
--- a/wgui/uidev-vk/assets/dashboard/knife.svg
+++ b/wgui/uidev-vk/assets/dashboard/knife.svg
--- a/wgui/uidev-vk/assets/dashboard/magic_wand.svg
+++ b/wgui/uidev-vk/assets/dashboard/magic_wand.svg
--- a/wgui/uidev-vk/assets/dashboard/microphone.svg
+++ b/wgui/uidev-vk/assets/dashboard/microphone.svg
--- a/wgui/uidev-vk/assets/dashboard/minijack.svg
+++ b/wgui/uidev-vk/assets/dashboard/minijack.svg
--- a/wgui/uidev-vk/assets/dashboard/monado.svg
+++ b/wgui/uidev-vk/assets/dashboard/monado.svg
--- a/wgui/uidev-vk/assets/dashboard/panorama.svg
+++ b/wgui/uidev-vk/assets/dashboard/panorama.svg
--- a/wgui/uidev-vk/assets/dashboard/play.svg
+++ b/wgui/uidev-vk/assets/dashboard/play.svg
--- a/wgui/uidev-vk/assets/dashboard/power.svg
+++ b/wgui/uidev-vk/assets/dashboard/power.svg
--- a/wgui/uidev-vk/assets/dashboard/recenter.svg
+++ b/wgui/uidev-vk/assets/dashboard/recenter.svg
--- a/wgui/uidev-vk/assets/dashboard/refresh.svg
+++ b/wgui/uidev-vk/assets/dashboard/refresh.svg
--- a/wgui/uidev-vk/assets/dashboard/remove_circle.svg
+++ b/wgui/uidev-vk/assets/dashboard/remove_circle.svg
--- a/wgui/uidev-vk/assets/dashboard/search.svg
+++ b/wgui/uidev-vk/assets/dashboard/search.svg
--- a/wgui/uidev-vk/assets/dashboard/settings.svg
+++ b/wgui/uidev-vk/assets/dashboard/settings.svg
--- a/wgui/uidev-vk/assets/dashboard/sleep.svg
+++ b/wgui/uidev-vk/assets/dashboard/sleep.svg
--- a/wgui/uidev-vk/assets/dashboard/terminal.svg
+++ b/wgui/uidev-vk/assets/dashboard/terminal.svg
--- a/wgui/uidev-vk/assets/dashboard/usage.svg
+++ b/wgui/uidev-vk/assets/dashboard/usage.svg
--- a/wgui/uidev-vk/assets/dashboard/volume.svg
+++ b/wgui/uidev-vk/assets/dashboard/volume.svg
--- a/wgui/uidev-vk/assets/dashboard/volume_off.svg
+++ b/wgui/uidev-vk/assets/dashboard/volume_off.svg
--- a/wgui/uidev-vk/assets/dashboard/vr.svg
+++ b/wgui/uidev-vk/assets/dashboard/vr.svg
--- a/wgui/uidev-vk/assets/dashboard/wayvr_dashboard.svg
+++ b/wgui/uidev-vk/assets/dashboard/wayvr_dashboard.svg
--- a/wgui/uidev-vk/assets/dashboard/wayvr_dashboard_mono.svg
+++ b/wgui/uidev-vk/assets/dashboard/wayvr_dashboard_mono.svg
--- a/wgui/uidev-vk/assets/dashboard/window.svg
+++ b/wgui/uidev-vk/assets/dashboard/window.svg
--- a/wgui/uidev-vk/assets/gui/anchor.xml
+++ b/wgui/uidev-vk/assets/gui/anchor.xml
--- a/wgui/uidev-vk/assets/gui/bar.xml
+++ b/wgui/uidev-vk/assets/gui/bar.xml
--- a/wgui/uidev-vk/assets/gui/dashboard.xml
+++ b/wgui/uidev-vk/assets/gui/dashboard.xml
--- a/wgui/uidev-vk/assets/gui/templates.xml
+++ b/wgui/uidev-vk/assets/gui/templates.xml
--- a/wgui/uidev-vk/assets/gui/testbed.xml
+++ b/wgui/uidev-vk/assets/gui/testbed.xml
--- a/wgui/uidev-vk/assets/gui/testbed/icons.xml
+++ b/wgui/uidev-vk/assets/gui/testbed/icons.xml
--- a/wgui/uidev-vk/assets/gui/theme.xml
+++ b/wgui/uidev-vk/assets/gui/theme.xml
--- a/uidev/assets/gui/watch.xml
+++ b/uidev/assets/gui/watch.xml
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/gui/watch.xml
--- a/wgui/uidev-vk/assets/gui/wlx_theme.xml
+++ b/wgui/uidev-vk/assets/gui/wlx_theme.xml
--- a/wgui/uidev-vk/assets/raster.png
+++ b/wgui/uidev-vk/assets/raster.png
--- a/uidev/assets/watch/controller.svg
+++ b/uidev/assets/watch/controller.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/controller.svg
--- a/uidev/assets/watch/hmd.svg
+++ b/uidev/assets/watch/hmd.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/hmd.svg
--- a/uidev/assets/watch/keyboard.svg
+++ b/uidev/assets/watch/keyboard.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/keyboard.svg
--- a/uidev/assets/watch/settings.svg
+++ b/uidev/assets/watch/settings.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/settings.svg
--- a/uidev/assets/watch/track.svg
+++ b/uidev/assets/watch/track.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/track.svg
--- a/uidev/assets/watch/track2.svg
+++ b/uidev/assets/watch/track2.svg
@@ -0,0 +1 @@
+../../../wlx-overlay-s/src/assets/watch/track2.svg
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`../../../wlx-overlay-s/src/assets/gui/watch.xml`
				`@@ -0,0 +1 @@`
				`../../../wlx-overlay-s/src/assets/watch/controller.svg`