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

LibGUI: Rename FileSystemModel's "Owner" column to "User"

Browse source 
A file is owned by a User+Group, not an Owner+Group.
This commit is contained in:
Andreas Kling 2021-08-31 01:11:05 +02:00
parent 34f186e1e6
commit 887ab3cc9a
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/FileManager/main.cpp
View file

@ -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_model(directories_model);
tree_view.set_column_visible(GUI::FileSystemModel::Column::Icon, false); 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::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::Group, false);
tree_view.set_column_visible(GUI::FileSystemModel::Column::Permissions, false); tree_view.set_column_visible(GUI::FileSystemModel::Column::Permissions, false);
tree_view.set_column_visible(GUI::FileSystemModel::Column::ModificationTime, false); tree_view.set_column_visible(GUI::FileSystemModel::Column::ModificationTime, false);

2
Userland/Libraries/LibGUI/FilePicker.cpp
View file

@ -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(SortingProxyModel::create(*m_model));
m_view->set_model_column(FileSystemModel::Column::Name); 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_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::Group, true);
m_view->set_column_visible(FileSystemModel::Column::Permissions, true); m_view->set_column_visible(FileSystemModel::Column::Permissions, true);
m_view->set_column_visible(FileSystemModel::Column::Inode, true); m_view->set_column_visible(FileSystemModel::Column::Inode, true);

10
Userland/Libraries/LibGUI/FileSystemModel.cpp
View file

@ -487,7 +487,7 @@ Variant FileSystemModel::data(const ModelIndex& index, ModelRole role) const
case Column::Inode: case Column::Inode:
return Gfx::TextAlignment::CenterRight; return Gfx::TextAlignment::CenterRight;
case Column::Name: case Column::Name:
case Column::Owner: case Column::User:
case Column::Group: case Column::Group:
case Column::ModificationTime: case Column::ModificationTime:
case Column::Permissions: case Column::Permissions:
@ -522,7 +522,7 @@ Variant FileSystemModel::data(const ModelIndex& index, ModelRole role) const
return index.row(); return index.row();
case Column::Size: case Column::Size:
return (int)node.size; return (int)node.size;
case Column::Owner: case Column::User:
return name_for_uid(node.uid); return name_for_uid(node.uid);
case Column::Group: case Column::Group:
return name_for_gid(node.gid); return name_for_gid(node.gid);
@ -546,7 +546,7 @@ Variant FileSystemModel::data(const ModelIndex& index, ModelRole role) const
return node.name; return node.name;
case Column::Size: case Column::Size:
return human_readable_size(node.size); return human_readable_size(node.size);
case Column::Owner: case Column::User:
return name_for_uid(node.uid); return name_for_uid(node.uid);
case Column::Group: case Column::Group:
return name_for_gid(node.gid); return name_for_gid(node.gid);
@ -682,8 +682,8 @@ String FileSystemModel::column_name(int column) const
return "Name"; return "Name";
case Column::Size: case Column::Size:
return "Size"; return "Size";
case Column::Owner: case Column::User:
return "Owner"; return "User";
case Column::Group: case Column::Group:
return "Group"; return "Group";
case Column::Permissions: case Column::Permissions:

2
Userland/Libraries/LibGUI/FileSystemModel.h
View file

@ -33,7 +33,7 @@ public:
Icon = 0, Icon = 0,
Name, Name,
Size, Size,
Owner, User,
Group, Group,
Permissions, Permissions,
ModificationTime, ModificationTime,