diff --git a/README.md b/README.md index fb5f5ce3..bb20f287 100644 --- a/README.md +++ b/README.md @@ -287,10 +287,10 @@ actions-on-enter = ["save-to-clipboard"] # [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit] actions-on-escape = ["exit"] # Action to perform when the Enter key is pressed [possible values: see `satty --help`] -# Deprecated: use actions-on-enter instead +# Deprecated since 0.19.0: use actions-on-enter instead action-on-enter = "save-to-clipboard" # Right click to copy -# Deprecated: use actions-on-right-click instead +# Deprecated since 0.19.0: use actions-on-right-click instead right-click-copy = false # request no window decoration. Please note that the compositor has the final say in this. At this point. requires xdg-decoration-unstable-v1. no-window-decoration = true @@ -513,9 +513,9 @@ Options: --notification-thumbnail Experimental feature (0.22.0): use preview thumbnail in notifications where available [possible values: screenshot, app-icon] --right-click-copy - Right click to copy. Preferably use the `action_on_right_click` option instead + Right click to copy, deprecated since 0.19.0 Preferably use the `action_on_right_click` option instead --action-on-enter - Action to perform when pressing Enter. Preferably use the `actions_on_enter` option instead [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit] + Action to perform when pressing Enter, deprecated since 0.19.0 Preferably use the `actions_on_enter` option instead [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit] -h, --help Print help -V, --version diff --git a/cli/src/command_line.rs b/cli/src/command_line.rs index 5026c4f8..177fc070 100644 --- a/cli/src/command_line.rs +++ b/cli/src/command_line.rs @@ -175,11 +175,11 @@ pub struct CommandLine { pub notification_thumbnail: Option, // --- deprecated options --- - /// Right click to copy. + /// Right click to copy, deprecated since 0.19.0 /// Preferably use the `action_on_right_click` option instead. #[arg(long)] pub right_click_copy: bool, - /// Action to perform when pressing Enter. + /// Action to perform when pressing Enter, deprecated since 0.19.0 /// Preferably use the `actions_on_enter` option instead. #[arg(long, value_delimiter = ',')] pub action_on_enter: Option, diff --git a/config.toml b/config.toml index c877bc0c..28036f49 100644 --- a/config.toml +++ b/config.toml @@ -58,10 +58,10 @@ actions-on-enter = ["save-to-clipboard"] # [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit] actions-on-escape = ["exit"] # Action to perform when the Enter key is pressed [possible values: see `satty --help`] -# Deprecated: use actions-on-enter instead +# Deprecated since 0.19.0: use actions-on-enter instead action-on-enter = "save-to-clipboard" # Right click to copy -# Deprecated: use actions-on-right-click instead +# Deprecated since 0.19.0: use actions-on-right-click instead right-click-copy = false # request no window decoration. Please note that the compositor has the final say in this. At this point. requires xdg-decoration-unstable-v1. no-window-decoration = true diff --git a/src/configuration.rs b/src/configuration.rs index 4ad8e11e..55ed9da3 100644 --- a/src/configuration.rs +++ b/src/configuration.rs @@ -394,10 +394,16 @@ impl Configuration { .actions_on_right_click .contains(&Action::SaveToClipboard) { + log_config_error( + "Deprecated config option: right-click-copy, use actions-on-right-click instead", + ); self.actions_on_right_click .insert(0, Action::SaveToClipboard); } if let Some(v) = general.action_on_enter { + log_config_error( + "Deprecated config option: action-on-enter, use action-on-enter instead", + ); self.actions_on_enter.insert(0, v); } // --- @@ -537,10 +543,16 @@ impl Configuration { .actions_on_right_click .contains(&Action::SaveToClipboard) { + log_config_error( + "Deprecated command line option: right-click-copy, use actions-on-right-click instead", + ); self.actions_on_right_click .insert(0, Action::SaveToClipboard); } if let Some(v) = command_line.action_on_enter { + log_config_error( + "Deprecated command line option: action-on-enter, use actions-on-enter instead", + ); self.actions_on_enter.insert(0, v.into()); } // ---