create rename file

This commit is contained in:
chatlanin 2023-04-02 12:01:04 +03:00
parent 84fc7a1976
commit c451d859a7
6 changed files with 110 additions and 1 deletions

View File

@ -204,6 +204,31 @@ namespace rrr
check_cursor_position(); check_cursor_position();
} }
void content::rename_file(std::filesystem::path old_name, std::filesystem::path new_name)
{
if (std::filesystem::exists(new_name))
{
new_name = new_name.filename().string() + "_" +
std::to_string(
std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count()
);
new_name = old_name.parent_path() / std::filesystem::path(new_name);
}
hack::utils::unix_cmd("mv " + old_name.string() + " " + new_name.string());
hack::log()(old_name, new_name);
nav.fill(PWD);
tbb::parallel_for(tbb::blocked_range<int>(0, nav.data.size()), [&](tbb::blocked_range<int> r)
{
for (int i = r.begin(); i < r.end(); ++i)
if (nav.data.at(i).path == new_name)
navigation_cursor_position = i;
});
check_cursor_position();
}
void content::delete_file(file f) void content::delete_file(file f)
{ {
std::string cmd = "delete " + f.path.string(); std::string cmd = "delete " + f.path.string();

View File

@ -32,6 +32,7 @@ namespace rrr
void navigation_right(); void navigation_right();
void navigation_left(); void navigation_left();
void create_file(std::string); void create_file(std::string);
void rename_file(std::filesystem::path, std::filesystem::path);
void delete_file(file); void delete_file(file);
file get_selected_file(TYPE_WIN); file get_selected_file(TYPE_WIN);

View File

@ -152,6 +152,14 @@ namespace rrr::layers::gui
selected_file = cnt->get_selected_file(TYPE_WIN::NAVIGATION); selected_file = cnt->get_selected_file(TYPE_WIN::NAVIGATION);
} }
break; break;
case types::event_type::RENAME_FILE:
{
freeze = false;
auto filename = std::any_cast<std::filesystem::path>(value);
cnt->rename_file(selected_file.path, filename);
selected_file = cnt->get_selected_file(TYPE_WIN::NAVIGATION);
}
break;
default: default:
break; break;
} }
@ -194,6 +202,13 @@ namespace rrr::layers::gui
freeze = true; freeze = true;
} }
// создание файла/директории
if (shift && key.get_keycode() == try_engine::key::R)
{
em->execute(types::event_type::SHOW_RENAME_FILE_DIALOG, selected_file);
freeze = true;
}
// перемещение в конец списка // перемещение в конец списка
if (shift && key.get_keycode() == try_engine::key::G) if (shift && key.get_keycode() == try_engine::key::G)
{ {

View File

@ -34,6 +34,9 @@ namespace rrr::layers::gui
if (create_dialog) if (create_dialog)
draw_create_dialog(); draw_create_dialog();
if (rename_dialog)
draw_rename_dialog();
END_IMGUI_WIN(); END_IMGUI_WIN();
ImGui::PopStyleVar(); ImGui::PopStyleVar();
@ -76,6 +79,13 @@ namespace rrr::layers::gui
create_dialog = true; create_dialog = true;
} }
break; break;
case types::event_type::SHOW_RENAME_FILE_DIALOG:
{
current_file = std::any_cast<file>(value);
show = true;
rename_dialog = true;
}
break;
default: default:
break; break;
} }
@ -120,6 +130,8 @@ namespace rrr::layers::gui
{ {
if (create_dialog) if (create_dialog)
create_file(); create_file();
if (rename_dialog)
rename();
} }
} }
@ -217,6 +229,47 @@ namespace rrr::layers::gui
TR_POP_FONT(); TR_POP_FONT();
} }
void dialogs::draw_rename_dialog()
{
TR_PUSH_FONT(MEDIUM, 18);
std::string label = "Переименование файла/директории!";
title = current_file.path.filename();
// манипуляции с тем чтобы название стояло посередлине
// см. и ниже тоже
auto pos = ImGui::GetCursorPos();
pos.x = width / (current_file.type == file_type::DIR ? 5.4f : 4.8f);
pos.y += 12.f;
ImGui::SetCursorPos(pos);
ImGui::TextUnformatted(label.data());
ImGui::Separator();
ImGui::PushItemWidth(-FLT_MIN - 10.f);
pos = ImGui::GetCursorPos();
pos.x = 10.f;
ImGui::SetCursorPos(pos);
// для фокусировки
if (!ImGui::IsAnyItemActive() && !ImGui::IsMouseClicked(0)) ImGui::SetKeyboardFocusHere(0);
if (ImGui::InputText("##new_file_title", &title)) {}
ImGui::PopItemWidth();
pos = ImGui::GetCursorPos();
pos.y = height - height / 4.f;
pos.x = width / 9.f;
ImGui::SetCursorPos(pos);
auto button_size = ImVec2(width / 3.f, height / 5.f);
if (ImGui::Button("Переименовать (Enter)", button_size))
rename();
ImGui::SameLine(width / 1.8f);
if (ImGui::Button("Отмена (Esc)", button_size))
cancel();
TR_POP_FONT();
}
void dialogs::create_file() void dialogs::create_file()
{ {
if (title.empty()) return; if (title.empty()) return;
@ -226,10 +279,20 @@ namespace rrr::layers::gui
title.clear(); title.clear();
} }
void dialogs::rename()
{
if (title.empty()) return;
show = false;
rename_dialog = false;
em->execute(types::event_type::RENAME_FILE, current_file.path.parent_path() / title);
title.clear();
}
void dialogs::cancel() void dialogs::cancel()
{ {
delete_dialog = false; delete_dialog = false;
create_dialog = false; create_dialog = false;
rename_dialog = false;
title.clear(); title.clear();
show = false; show = false;
em->execute(types::event_type::UNFREEZE_BROWSER_ACTION, nullptr); em->execute(types::event_type::UNFREEZE_BROWSER_ACTION, nullptr);

View File

@ -30,6 +30,7 @@ namespace rrr::layers::gui
float height = 0.f; float height = 0.f;
bool delete_dialog = false; bool delete_dialog = false;
bool create_dialog = false; bool create_dialog = false;
bool rename_dialog = false;
file current_file; file current_file;
bool shift = false; bool shift = false;
std::string title; std::string title;
@ -39,7 +40,9 @@ namespace rrr::layers::gui
void cancel(); void cancel();
void draw_delete_dialog(); void draw_delete_dialog();
void draw_create_dialog(); void draw_create_dialog();
void draw_rename_dialog();
void create_file(); void create_file();
void rename();
void pressed(system_event& e); void pressed(system_event& e);
void released(system_event& e); void released(system_event& e);
}; };

View File

@ -14,7 +14,9 @@ namespace rrr::types
UNFREEZE_BROWSER_ACTION, // размораживает все действия UNFREEZE_BROWSER_ACTION, // размораживает все действия
DELETE_CURRENT_FILE, DELETE_CURRENT_FILE,
SHOW_CREATE_FILE_DIALOG, SHOW_CREATE_FILE_DIALOG,
CREATE_FILE CREATE_FILE,
SHOW_RENAME_FILE_DIALOG,
RENAME_FILE
}; };
} }