From f7ad051c46b9934ba927d5901faacbd7230a3ca7 Mon Sep 17 00:00:00 2001 From: Ricky Dane Perlick Date: Tue, 19 Nov 2024 21:47:57 +0100 Subject: [PATCH 1/8] settings ui + feedback on input hover + better copy path button for item preview --- src-tauri/Cargo.lock | 132 +++++------------------------------------- src-tauri/Cargo.toml | 6 +- src-tauri/src/main.rs | 4 +- ui/index.html | 10 ++-- ui/main_logic.js | 101 +++++++++++++++++--------------- ui/style.css | 40 ++++++++++--- 6 files changed, 109 insertions(+), 184 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e50624c..f201bc4 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -4,14 +4,13 @@ version = 3 [[package]] name = "CoDriver" -version = "0.4.86" +version = "0.4.87" dependencies = [ "archiver-rs", "chrono", "cocoa 0.25.0", "color-print", "copy_dir", - "dateparser", "delete", "flate2", "icns", @@ -20,7 +19,6 @@ dependencies = [ "num_cpus", "objc", "open", - "rar", "rayon", "regex", "remove_dir_all", @@ -86,7 +84,7 @@ dependencies = [ "cfg-if", "getrandom 0.2.15", "once_cell", - "version_check 0.9.5", + "version_check", "zerocopy", ] @@ -295,7 +293,7 @@ dependencies = [ "anyhow", "arrayvec", "log", - "nom 7.1.3", + "nom", "num-rational 0.4.2", "v_frame", ] @@ -517,7 +515,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.74", - "synstructure 0.13.1", + "synstructure", ] [[package]] @@ -890,7 +888,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ff1a80c5f3cb1ca7c06ffdd71b6a6dd6d8f896c42141fbd43f50ed28dcdb93" dependencies = [ - "nom 7.1.3", + "nom", "proc-macro2", "quote", "syn 2.0.74", @@ -932,7 +930,7 @@ checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ "percent-encoding", "time 0.3.36", - "version_check 0.9.5", + "version_check", ] [[package]] @@ -1226,18 +1224,6 @@ dependencies = [ "parking_lot_core 0.9.10", ] -[[package]] -name = "dateparser" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ef451feee09ae5ecd8a02e738bd9adee9266b8fa9b44e22d3ce968d8694238" -dependencies = [ - "anyhow", - "chrono", - "lazy_static", - "regex", -] - [[package]] name = "deflate" version = "0.8.6" @@ -1508,28 +1494,6 @@ dependencies = [ "zune-inflate", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure 0.12.6", -] - [[package]] name = "fast-float" version = "0.2.0" @@ -1794,12 +1758,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - [[package]] name = "gdk" version = "0.15.4" @@ -1920,7 +1878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", - "version_check 0.9.5", + "version_check", ] [[package]] @@ -3063,7 +3021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03cd3335fb5f2447755d45cda9c70f76013626a9db44374973791b0926a86c3" dependencies = [ "chrono", - "nom 7.1.3", + "nom", ] [[package]] @@ -3272,16 +3230,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -[[package]] -name = "nom" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -dependencies = [ - "memchr", - "version_check 0.1.5", -] - [[package]] name = "nom" version = "7.1.3" @@ -4160,7 +4108,7 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "version_check 0.9.5", + "version_check", ] [[package]] @@ -4171,7 +4119,7 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "version_check 0.9.5", + "version_check", ] [[package]] @@ -4266,16 +4214,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -dependencies = [ - "libc", - "rand 0.4.6", -] - [[package]] name = "rand" version = "0.4.6" @@ -4385,19 +4323,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rar" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd51aebfbf238d0e6362359e115f4a5fd62f8b75bef4675f262a0b23b277529" -dependencies = [ - "chrono", - "failure", - "lazy_static", - "nom 4.2.3", - "rust-crypto", -] - [[package]] name = "rav1e" version = "0.7.1" @@ -4742,19 +4667,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "rust-crypto" -version = "0.2.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" -dependencies = [ - "gcc", - "libc", - "rand 0.3.23", - "rustc-serialize", - "time 0.1.45", -] - [[package]] name = "rustc-demangle" version = "0.1.24" @@ -5403,18 +5315,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - [[package]] name = "synstructure" version = "0.13.1" @@ -6167,7 +6067,7 @@ dependencies = [ "fnv", "home", "memchr", - "nom 7.1.3", + "nom", "once_cell", "petgraph", ] @@ -6326,12 +6226,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" -[[package]] -name = "version_check" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" - [[package]] name = "version_check" version = "0.9.5" @@ -7335,7 +7229,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.74", - "synstructure 0.13.1", + "synstructure", ] [[package]] @@ -7377,7 +7271,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.74", - "synstructure 0.13.1", + "synstructure", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 65e0124..d1bb5a7 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -4,7 +4,7 @@ name = "CoDriver" version = "0.4.87" description = "A simple file explorer" authors = ["Ricky Dane Perlick"] -license = "none" +license = "BSD-2-Clause license" repository = "https://github.com/RickyDane/CoDriver" default-run = "CoDriver" edition = "2021" @@ -32,10 +32,10 @@ tauri = { version = "1.6", features = [ open = "5.0.0" stopwatch = "0.0.7" zip-extensions = "0.6.1" -rar = "0.2.0" +# rar = "0.2.0" sevenz-rust = "0.5.2" unrar = "0.5.1" -dateparser = "0.2.0" +# dateparser = "0.2.0" sysinfo = "0.30.5" color-print = "0.3.5" # fs_extra = "1.3.0" diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 43a6e08..2efea18 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -75,7 +75,7 @@ fn main() { #[cfg(target_os = "macos")] win.set_transparent_titlebar(true); #[cfg(target_os = "macos")] - win.position_traffic_lights(20.0, 25.0); + win.position_traffic_lights(25.0, 27.0); let _ = win.center(); #[cfg(not(target_os = "macos"))] let _ = win.set_decorations(false); @@ -85,7 +85,7 @@ fn main() { #[cfg(target_os = "macos")] if let WindowEvent::Resized(..) = e.event() { let win = e.window(); - win.position_traffic_lights(20.0, 25.0); + win.position_traffic_lights(25.0, 27.0); } // Fixes sluggish window resizing on Windows // See https://github.com/tauri-apps/tauri/issues/6322#issuecomment-1448141495 diff --git a/ui/index.html b/ui/index.html index e7a8c93..f713c5d 100644 --- a/ui/index.html +++ b/ui/index.html @@ -2,11 +2,11 @@ - + - - - + + + @@ -177,7 +177,7 @@

Extra options