From 7ec9b6685bad9923386637e66a41963e82165911 Mon Sep 17 00:00:00 2001 From: Toff Date: Sat, 6 May 2017 11:17:25 +0200 Subject: [PATCH] Merge pyroscope and chros73 suggestion: Command name uniformisation. ui.console.log.tempfilter => view.temp_filter.log --- src/command_ui.cc | 2 +- src/ui/download_list.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/command_ui.cc b/src/command_ui.cc index eba8f137..d65859e0 100644 --- a/src/command_ui.cc +++ b/src/command_ui.cc @@ -606,7 +606,7 @@ initialize_command_ui() { CMD2_ANY_STRING("ui.current_view.set", std::bind(&cmd_ui_set_view, std::placeholders::_2)); CMD2_VAR_STRING("view.temp_filter.excluded", "default,started,stopped"); - CMD2_VAR_BOOL ("ui.console.log.tempfilter", 0); + CMD2_VAR_BOOL ("view.temp_filter.log", 0); // TODO: Add 'option_string' for rtorrent-specific options. CMD2_VAR_STRING("ui.torrent_list.layout", "full"); diff --git a/src/ui/download_list.cc b/src/ui/download_list.cc index 9be1da1e..7f388e5e 100644 --- a/src/ui/download_list.cc +++ b/src/ui/download_list.cc @@ -348,7 +348,7 @@ DownloadList::receive_exit_input(Input type) { case INPUT_FILTER: if (input->str().empty()) { - if (rpc::call_command_value("ui.console.log.tempfilter")) + if (rpc::call_command_value("view.temp_filter.log")) control->core()->push_log_std("Clear temporary filter on '" + current_view()->name() + "' view."); current_view()->set_temp_filter(torrent::Object()); current_view()->filter(); @@ -361,7 +361,7 @@ DownloadList::receive_exit_input(Input type) { pattern = ".*" + pattern; std::transform(pattern.begin(), pattern.end(), pattern.begin(), ::tolower); std::string tempFilter = "match={d.name=," + pattern + "}"; - if (rpc::call_command_value("ui.console.log.tempfilter")) + if (rpc::call_command_value("view.temp_filter.log")) control->core()->push_log_std("Temporary filter on '" + current_view()->name() + "' view: " + pattern); current_view()->set_temp_filter(tempFilter); current_view()->filter();