RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:07:47 +00:00
Code Issues Activity Actions

FileManager: Set file op progress window's text based on the operation

Browse source
This commit is contained in:
Sam Atkins 2021-06-22 12:56:40 +01:00 • committed by Andreas Kling
parent 0a62d517fd
commit 5090b1bdba
4 changed files with 47 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Userland/Applications/FileManager/FileOperationProgressWidget.cpp
View file

@ -5,6 +5,7 @@
*/
#include "FileOperationProgressWidget.h"
#include "FileUtils.h"
#include <Applications/FileManager/FileOperationProgressGML.h>
#include <LibCore/File.h>
#include <LibCore/Notifier.h>
@ -17,8 +18,9 @@
namespace FileManager {
FileOperationProgressWidget::FileOperationProgressWidget(NonnullRefPtr<Core::File> helper_pipe)
: m_helper_pipe(move(helper_pipe))
FileOperationProgressWidget::FileOperationProgressWidget(FileOperation operation, NonnullRefPtr<Core::File> helper_pipe)
: m_operation(operation)
, m_helper_pipe(move(helper_pipe))
{
load_from_gml(file_operation_progress_gml);
@ -39,6 +41,22 @@ FileOperationProgressWidget::FileOperationProgressWidget(NonnullRefPtr<Core::Fil
window()->close();
};
auto& files_copied_label = *find_descendant_of_type_named<GUI::Label>("files_copied_label");
auto& current_file_action_label = *find_descendant_of_type_named<GUI::Label>("current_file_action_label");
switch (m_operation) {
case FileOperation::Copy:
files_copied_label.set_text("Copying files...");
current_file_action_label.set_text("Copying: ");
break;
case FileOperation::Cut:
files_copied_label.set_text("Moving files...");
current_file_action_label.set_text("Moving: ");
break;
default:
VERIFY_NOT_REACHED();
}
m_notifier = Core::Notifier::construct(m_helper_pipe->fd(), Core::Notifier::Read);
m_notifier->on_ready_to_read = [this] {
auto line = m_helper_pipe->read_line();
@ -143,7 +161,17 @@ void FileOperationProgressWidget::did_progress(off_t bytes_done, off_t total_byt
current_file_label.set_text(current_filename);
files_copied_label.set_text(String::formatted("Copying file {} of {}", files_done, total_file_count));
switch (m_operation) {
case FileOperation::Copy:
files_copied_label.set_text(String::formatted("Copying file {} of {}", files_done, total_file_count));
break;
case FileOperation::Cut:
files_copied_label.set_text(String::formatted("Moving file {} of {}", files_done, total_file_count));
break;
default:
VERIFY_NOT_REACHED();
}
estimated_time_label.set_text(estimate_time(bytes_done, total_byte_count));
if (total_byte_count) {