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

LibGUI: The UI calls it 'Icon view', fix the name in the code

Browse source
This commit is contained in:
Ben Wiederhake 2020-05-01 02:09:04 +02:00 • committed by Andreas Kling
parent 8e01356b2f
commit ef433cb367
9 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Applications/FileManager/DirectoryView.cpp
View file

@ -78,8 +78,8 @@ DirectoryView::DirectoryView()
{
set_active_widget(nullptr);
set_content_margins({ 2, 2, 2, 2 });
m_item_view = add<GUI::ItemView>();
m_item_view->set_model(model());
m_icon_view = add<GUI::IconView>();
m_icon_view->set_model(model());
m_columns_view = add<GUI::ColumnsView>();
m_columns_view->set_model(model());
@ -89,7 +89,7 @@ DirectoryView::DirectoryView()
m_table_view->model()->set_key_column_and_sort_order(GUI::FileSystemModel::Column::Name, GUI::SortOrder::Ascending);
m_item_view->set_model_column(GUI::FileSystemModel::Column::Name);
m_icon_view->set_model_column(GUI::FileSystemModel::Column::Name);
m_columns_view->set_model_column(GUI::FileSystemModel::Column::Name);
m_model->on_error = [this](int error, const char* error_string) {
@ -105,7 +105,7 @@ DirectoryView::DirectoryView()
m_model->on_complete = [this] {
m_table_view->selection().clear();
m_item_view->selection().clear();
m_icon_view->selection().clear();
add_path_to_history(model().root_path());
@ -129,7 +129,7 @@ DirectoryView::DirectoryView()
on_thumbnail_progress(done, total);
};
m_item_view->on_activation = [&](const GUI::ModelIndex& index) {
m_icon_view->on_activation = [&](const GUI::ModelIndex& index) {
handle_activation(index);
};
m_columns_view->on_activation = [&](const GUI::ModelIndex& index) {
@ -145,10 +145,10 @@ DirectoryView::DirectoryView()
if (on_selection_change)
on_selection_change(*m_table_view);
};
m_item_view->on_selection_change = [this] {
m_icon_view->on_selection_change = [this] {
update_statusbar();
if (on_selection_change)
on_selection_change(*m_item_view);
on_selection_change(*m_icon_view);
};
m_columns_view->on_selection_change = [this] {
update_statusbar();
@ -160,9 +160,9 @@ DirectoryView::DirectoryView()
if (on_context_menu_request)
on_context_menu_request(*m_table_view, index, event);
};
m_item_view->on_context_menu_request = [this](auto& index, auto& event) {
m_icon_view->on_context_menu_request = [this](auto& index, auto& event) {
if (on_context_menu_request)
on_context_menu_request(*m_item_view, index, event);
on_context_menu_request(*m_icon_view, index, event);
};
m_columns_view->on_context_menu_request = [this](auto& index, auto& event) {
if (on_context_menu_request)
@ -173,9 +173,9 @@ DirectoryView::DirectoryView()
if (on_drop)
on_drop(*m_table_view, index, event);
};
m_item_view->on_drop = [this](auto& index, auto& event) {
m_icon_view->on_drop = [this](auto& index, auto& event) {
if (on_drop)
on_drop(*m_item_view, index, event);
on_drop(*m_icon_view, index, event);
};
m_columns_view->on_drop = [this](auto& index, auto& event) {
if (on_drop)
@ -195,7 +195,7 @@ void DirectoryView::set_view_mode(ViewMode mode)
return;
m_view_mode = mode;
update();
if (mode == ViewMode::List) {
if (mode == ViewMode::Table) {
set_active_widget(m_table_view);
return;
}
@ -204,7 +204,7 @@ void DirectoryView::set_view_mode(ViewMode mode)
return;
}
if (mode == ViewMode::Icon) {
set_active_widget(m_item_view);
set_active_widget(m_icon_view);
return;
}
ASSERT_NOT_REACHED();
@ -297,7 +297,7 @@ void DirectoryView::update_statusbar()
auto index = current_view().selection().first();
// FIXME: This is disgusting. This code should not even be aware that there is a GUI::SortingProxyModel in the table view.
if (m_view_mode == ViewMode::List) {
if (m_view_mode == ViewMode::Table) {
auto& filter_model = (GUI::SortingProxyModel&)*m_table_view->model();
index = filter_model.map_to_target(index);
}

12
Applications/FileManager/DirectoryView.h
View file

@ -29,7 +29,7 @@
#include <AK/Vector.h>
#include <LibGUI/ColumnsView.h>
#include <LibGUI/FileSystemModel.h>
#include <LibGUI/ItemView.h>
#include <LibGUI/IconView.h>
#include <LibGUI/StackWidget.h>
#include <LibGUI/TableView.h>
#include <sys/stat.h>
@ -59,7 +59,7 @@ public:
enum ViewMode {
Invalid,
List,
Table,
Columns,
Icon
};
@ -69,12 +69,12 @@ public:
GUI::AbstractView& current_view()
{
switch (m_view_mode) {
case ViewMode::List:
case ViewMode::Table:
return *m_table_view;
case ViewMode::Columns:
return *m_columns_view;
case ViewMode::Icon:
return *m_item_view;
return *m_icon_view;
default:
ASSERT_NOT_REACHED();
}
@ -84,7 +84,7 @@ public:
void for_each_view_implementation(Callback callback)
{
callback(*m_table_view);
callback(*m_item_view);
callback(*m_icon_view);
callback(*m_columns_view);
}
@ -107,6 +107,6 @@ private:
void add_path_to_history(const StringView& path);
RefPtr<GUI::TableView> m_table_view;
RefPtr<GUI::ItemView> m_item_view;
RefPtr<GUI::IconView> m_icon_view;
RefPtr<GUI::ColumnsView> m_columns_view;
};

24
Applications/FileManager/main.cpp
View file

@ -144,16 +144,16 @@ int run_in_desktop_mode(RefPtr<Core::ConfigFile> config, String initial_location
auto& desktop_widget = window->set_main_widget<DesktopWidget>();
desktop_widget.set_layout<GUI::VerticalBoxLayout>();
auto& item_view = desktop_widget.add<GUI::ItemView>();
item_view.set_frame_thickness(0);
item_view.set_scrollbars_enabled(false);
item_view.set_fill_with_background_color(false);
auto& icon_view = desktop_widget.add<GUI::IconView>();
icon_view.set_frame_thickness(0);
icon_view.set_scrollbars_enabled(false);
icon_view.set_fill_with_background_color(false);
auto model = GUI::FileSystemModel::create(initial_location);
item_view.set_model(model);
item_view.set_model_column(GUI::FileSystemModel::Column::Name);
icon_view.set_model(model);
icon_view.set_model_column(GUI::FileSystemModel::Column::Name);
item_view.on_activation = [&](auto& index) {
icon_view.on_activation = [&](auto& index) {
if (!index.is_valid())
return;
auto& node = model->node(index);
@ -219,7 +219,7 @@ int run_in_desktop_mode(RefPtr<Core::ConfigFile> config, String initial_location
desktop_view_context_menu->add_separator();
desktop_view_context_menu->add_action(display_properties_action);
item_view.on_context_menu_request = [&](const GUI::ModelIndex& index, const GUI::ContextMenuEvent& event) {
icon_view.on_context_menu_request = [&](const GUI::ModelIndex& index, const GUI::ContextMenuEvent& event) {
if (!index.is_valid())
desktop_view_context_menu->popup(event.screen_position());
};
@ -354,8 +354,8 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
view_as_table_action = GUI::Action::create_checkable(
"Table view", { Mod_Ctrl, KeyCode::Key_L }, Gfx::Bitmap::load_from_file("/res/icons/16x16/table-view.png"), [&](const GUI::Action&) {
directory_view.set_view_mode(DirectoryView::ViewMode::List);
config->write_entry("DirectoryView", "ViewMode", "List");
directory_view.set_view_mode(DirectoryView::ViewMode::Table);
config->write_entry("DirectoryView", "ViewMode", "Table");
config->sync();
},
window);
@ -832,8 +832,8 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
// Read direcory read mode from config.
auto dir_view_mode = config->read_entry("DirectoryView", "ViewMode", "Icon");
if (dir_view_mode.contains("List")) {
directory_view.set_view_mode(DirectoryView::ViewMode::List);
if (dir_view_mode.contains("Table")) {
directory_view.set_view_mode(DirectoryView::ViewMode::Table);
view_as_table_action->set_checked(true);
} else if (dir_view_mode.contains("Columns")) {
directory_view.set_view_mode(DirectoryView::ViewMode::Columns);