diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index 73e6c34f20..fcf22ab89f 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -486,7 +486,7 @@ int run_in_windowed_mode(String initial_location, String entry_focused_on_init) tree_view.set_model(directories_model); tree_view.set_column_visible(GUI::FileSystemModel::Column::Icon, false); tree_view.set_column_visible(GUI::FileSystemModel::Column::Size, false); - tree_view.set_column_visible(GUI::FileSystemModel::Column::Owner, false); + tree_view.set_column_visible(GUI::FileSystemModel::Column::User, false); tree_view.set_column_visible(GUI::FileSystemModel::Column::Group, false); tree_view.set_column_visible(GUI::FileSystemModel::Column::Permissions, false); tree_view.set_column_visible(GUI::FileSystemModel::Column::ModificationTime, false); diff --git a/Userland/Libraries/LibGUI/FilePicker.cpp b/Userland/Libraries/LibGUI/FilePicker.cpp index 14a629a32f..8fa5f74d81 100644 --- a/Userland/Libraries/LibGUI/FilePicker.cpp +++ b/Userland/Libraries/LibGUI/FilePicker.cpp @@ -97,7 +97,7 @@ FilePicker::FilePicker(Window* parent_window, Mode mode, const StringView& filen m_view->set_model(SortingProxyModel::create(*m_model)); m_view->set_model_column(FileSystemModel::Column::Name); m_view->set_key_column_and_sort_order(GUI::FileSystemModel::Column::Name, GUI::SortOrder::Ascending); - m_view->set_column_visible(FileSystemModel::Column::Owner, true); + m_view->set_column_visible(FileSystemModel::Column::User, true); m_view->set_column_visible(FileSystemModel::Column::Group, true); m_view->set_column_visible(FileSystemModel::Column::Permissions, true); m_view->set_column_visible(FileSystemModel::Column::Inode, true); diff --git a/Userland/Libraries/LibGUI/FileSystemModel.cpp b/Userland/Libraries/LibGUI/FileSystemModel.cpp index 861280583c..279ec09e37 100644 --- a/Userland/Libraries/LibGUI/FileSystemModel.cpp +++ b/Userland/Libraries/LibGUI/FileSystemModel.cpp @@ -487,7 +487,7 @@ Variant FileSystemModel::data(const ModelIndex& index, ModelRole role) const case Column::Inode: return Gfx::TextAlignment::CenterRight; case Column::Name: - case Column::Owner: + case Column::User: case Column::Group: case Column::ModificationTime: case Column::Permissions: @@ -522,7 +522,7 @@ Variant FileSystemModel::data(const ModelIndex& index, ModelRole role) const return index.row(); case Column::Size: return (int)node.size; - case Column::Owner: + case Column::User: return name_for_uid(node.uid); case Column::Group: return name_for_gid(node.gid); @@ -546,7 +546,7 @@ Variant FileSystemModel::data(const ModelIndex& index, ModelRole role) const return node.name; case Column::Size: return human_readable_size(node.size); - case Column::Owner: + case Column::User: return name_for_uid(node.uid); case Column::Group: return name_for_gid(node.gid); @@ -682,8 +682,8 @@ String FileSystemModel::column_name(int column) const return "Name"; case Column::Size: return "Size"; - case Column::Owner: - return "Owner"; + case Column::User: + return "User"; case Column::Group: return "Group"; case Column::Permissions: diff --git a/Userland/Libraries/LibGUI/FileSystemModel.h b/Userland/Libraries/LibGUI/FileSystemModel.h index 3bbfeecfaf..e6e62f5d81 100644 --- a/Userland/Libraries/LibGUI/FileSystemModel.h +++ b/Userland/Libraries/LibGUI/FileSystemModel.h @@ -33,7 +33,7 @@ public: Icon = 0, Name, Size, - Owner, + User, Group, Permissions, ModificationTime,