From 2e692c1ef70218707e19062aa99c47e9ec3aa321 Mon Sep 17 00:00:00 2001 From: Artur Kovacs Date: Tue, 29 Dec 2020 21:51:29 +0100 Subject: [PATCH] Update `trash`, `arboard`, and `directories-next` --- CHANGELOG.md | 6 +++++ Cargo.lock | 49 +++++++++++++++++++---------------- Cargo.toml | 6 ++--- src/widgets/picture_widget.rs | 2 +- 4 files changed, 37 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd95d2c6..49c4cd9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ### Changed - The original scale button now shows "1:1" instead of "1" +- Changed the configuration folder on macOS (run `emulsion -h` to find where it's located) +- The image copied to the clipboard can now be pasted into a wider range of programs on Windows + +### Added +- The Windows installer now adds a Start menu entry. +- Added multiple configuration fields: https://github.com/ArturKovacs/emulsion/pull/160 ## 7.2 on 2020-11-30 diff --git a/Cargo.lock b/Cargo.lock index 250664fa..71ed8289 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -58,11 +58,10 @@ dependencies = [ [[package]] name = "arboard" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d4f3c15ad0f56a08ade9634e1901cfa7f1fe00b7eba87a50fecedb5518f3f3" +checksum = "85149eb4159516fbc261f362153822672e4bdb5b3accc863a5777627c6d9fe72" dependencies = [ - "byteorder", "clipboard-win", "core-graphics 0.21.0", "image", @@ -108,7 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" dependencies = [ "addr2line", - "cfg-if", + "cfg-if 0.1.10", "libc", "miniz_oxide 0.4.1", "object", @@ -197,6 +196,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "cgl" version = "0.3.2" @@ -406,7 +411,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "core-foundation-sys 0.7.0", "core-graphics 0.19.2", "libc", @@ -419,7 +424,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -440,7 +445,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg 1.0.1", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "lazy_static", "maybe-uninit", @@ -454,7 +459,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "maybe-uninit", ] @@ -466,7 +471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg 1.0.1", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -542,11 +547,11 @@ dependencies = [ [[package]] name = "directories-next" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eaa04e945bec7e2dc7383817c566881d9a83d20a07cc949b54585873585a48" +checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "dirs-sys-next", ] @@ -698,7 +703,7 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "wasi", ] @@ -1034,7 +1039,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -1101,7 +1106,7 @@ version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "fuchsia-zircon", "fuchsia-zircon-sys", "iovec", @@ -1150,7 +1155,7 @@ version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "winapi 0.3.9", ] @@ -1163,7 +1168,7 @@ checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "void", ] @@ -1303,7 +1308,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "cloudabi", "libc", "redox_syscall", @@ -1959,7 +1964,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "standback", "stdweb", @@ -2008,9 +2013,9 @@ dependencies = [ [[package]] name = "trash" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd4ea126e9b491aa0ee8043f5519cd56498413997a6c3859c8a9812aa300803" +checksum = "bbf511f5673142be74cd6a46cfb7e3da8d2b95bc08d2d46c072798e6ce8b5b9f" dependencies = [ "winapi 0.3.9", ] @@ -2122,7 +2127,7 @@ version = "0.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "wasm-bindgen-macro", ] diff --git a/Cargo.toml b/Cargo.toml index 7fa5ac2b..760ab306 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ winres = "0.1" gelatin = { path = "./subcrates/gelatin", version = "0.5" } ureq = { version = "1", features = ["json"], optional = true } lazy_static = "1.4.0" -directories-next = "1.0" +directories-next = "2.0" open = "1.4.0" sys-info = "0.7" error-chain = "0.12" @@ -73,10 +73,10 @@ serde = { version = "1.0", features = ["derive"] } toml = "0.5" rand = "0.7" lexical-sort = "0.3" -trash = "1.1" +trash = "1.2" clap = { version = "2.33", default-features = false } kamadak-exif = "0.5.1" -arboard = "1.0.1" +arboard = "1.1" [dependencies.libavif-image] version = "0.5" diff --git a/src/widgets/picture_widget.rs b/src/widgets/picture_widget.rs index cc73e1f6..4b80f8b4 100644 --- a/src/widgets/picture_widget.rs +++ b/src/widgets/picture_widget.rs @@ -498,7 +498,7 @@ impl PictureWidget { } if triggered!(IMG_DEL_NAME) { let path = borrowed.playback_manager.current_file_path(); - if let Err(e) = trash::remove(&path) { + if let Err(e) = trash::delete(&path) { eprintln!("Error while moving file '{:?}' to trash: {:?}", path, e); } if let Err(e) = borrowed.playback_manager.update_directory() {