Skip to content

Commit

Permalink
Update trash, arboard, and directories-next
Browse files Browse the repository at this point in the history
  • Loading branch information
ArturKovacs committed Dec 29, 2020
1 parent a56087d commit 2e692c1
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 26 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
49 changes: 27 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/picture_widget.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit 2e692c1

Please sign in to comment.