diff --git a/.gitmodules b/.gitmodules index c0fe5fd..145bfcb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "lib/steamlocate-rs"] path = lib/steamlocate-rs url = https://github.com/sclu1034/steamlocate-rs.git -[submodule "crates/dtmm/assets/icons"] - path = crates/dtmm/assets/icons - url = https://github.com/tabler/tabler-icons [submodule "lib/luajit2-sys"] path = lib/luajit2-sys url = https://github.com/sclu1034/luajit2-sys.git diff --git a/crates/dtmm/assets/icons b/crates/dtmm/assets/icons deleted file mode 160000 index 74838de..0000000 --- a/crates/dtmm/assets/icons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 74838ded9980b6f134bb6f7edcf916cca4a2d97f diff --git a/crates/dtmm/assets/tabler-icons/LICENSE b/crates/dtmm/assets/tabler-icons/LICENSE new file mode 100644 index 0000000..fe62055 --- /dev/null +++ b/crates/dtmm/assets/tabler-icons/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020-2023 Paweł Kuna + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/crates/dtmm/assets/tabler-icons/alert-circle.svg b/crates/dtmm/assets/tabler-icons/alert-circle.svg new file mode 100644 index 0000000..35e7aad --- /dev/null +++ b/crates/dtmm/assets/tabler-icons/alert-circle.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/crates/dtmm/assets/tabler-icons/alert-triangle.svg b/crates/dtmm/assets/tabler-icons/alert-triangle.svg new file mode 100644 index 0000000..523111c --- /dev/null +++ b/crates/dtmm/assets/tabler-icons/alert-triangle.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/crates/dtmm/src/controller/game.rs b/crates/dtmm/src/controller/game.rs index b5b7f3c..7e2e6bb 100644 --- a/crates/dtmm/src/controller/game.rs +++ b/crates/dtmm/src/controller/game.rs @@ -597,7 +597,7 @@ pub(crate) async fn deploy_mods(state: ActionState) -> Result<()> { .wrap_err("Failed to re-create backup for bundle database.") }, async { - let path = bundle_dir.join(BOOT_BUNDLE_NAME); + let path = bundle_dir.join(boot_bundle_path); let backup_path = path.with_extension("bak"); fs::copy(&path, &backup_path) diff --git a/crates/dtmm/src/ui/theme/icons.rs b/crates/dtmm/src/ui/theme/icons.rs index 69156ad..8d82fc1 100644 --- a/crates/dtmm/src/ui/theme/icons.rs +++ b/crates/dtmm/src/ui/theme/icons.rs @@ -3,8 +3,8 @@ use usvg::{ Error, Fill, LineCap, LineJoin, NodeKind, NonZeroPositiveF64, Options, Paint, Stroke, Tree, }; -pub static ALERT_CIRCLE: &str = include_str!("../../../assets/icons/icons/alert-circle.svg"); -pub static ALERT_TRIANGLE: &str = include_str!("../../../assets/icons/icons/alert-triangle.svg"); +pub static ALERT_CIRCLE: &str = include_str!("../../../assets/tabler-icons/alert-circle.svg"); +pub static ALERT_TRIANGLE: &str = include_str!("../../../assets/tabler-icons/alert-triangle.svg"); pub fn parse_svg(svg: &str) -> Result { let opt = Options::default();