RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 23:28:12 +00:00
Code Issues Activity Actions

FileManager: Paste inside folder if done through its context menu

Browse source 
Now FileManager will paste the clipboard contents inside a folder if the
paste action was clicked through a folder context menu, being the target
directory the selected folder.

This mimicks most of the behaviours that the different file managers
have.
This commit is contained in:
Andres Vieira 2020-04-27 00:09:53 +02:00 • committed by Andreas Kling
parent 91b70d34e7
commit ef963dae7e
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Applications/FileManager/main.cpp
View file

@ -425,7 +425,7 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
copy_action->set_enabled(false); copy_action->set_enabled(false);
auto paste_action = GUI::CommonActions::make_paste_action( auto paste_action = GUI::CommonActions::make_paste_action(
[&](const GUI::Action&) { [&](const GUI::Action& action) {
auto data_and_type = GUI::Clipboard::the().data_and_type(); auto data_and_type = GUI::Clipboard::the().data_and_type();
if (data_and_type.type != "file-list") { if (data_and_type.type != "file-list") {
dbg() << "Cannot paste clipboard type " << data_and_type.type; dbg() << "Cannot paste clipboard type " << data_and_type.type;
@ -436,12 +436,19 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
dbg() << "No files to paste"; dbg() << "No files to paste";
return; return;
} }
AK::String target_directory;
if (action.activator() == directory_context_menu)
target_directory = selected_file_paths()[0];
else
target_directory = directory_view.path();
for (auto& current_path : copied_lines) { for (auto& current_path : copied_lines) {
if (current_path.is_empty()) if (current_path.is_empty())
continue; continue;
auto current_directory = directory_view.path();
auto new_path = String::format("%s/%s", auto new_path = String::format("%s/%s",
current_directory.characters(), target_directory.characters(),
FileSystemPath(current_path).basename().characters()); FileSystemPath(current_path).basename().characters());
if (!FileUtils::copy_file_or_directory(current_path, new_path)) { if (!FileUtils::copy_file_or_directory(current_path, new_path)) {
auto error_message = String::format("Could not paste %s.", auto error_message = String::format("Could not paste %s.",