ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-18 10:46:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sculpt_manager: remove unused Storage::dialog

Browse Source 
This member variable remained unused since we moved the storage dialog
into the component graph.
This commit is contained in:
Norman Feske 2023-01-20 15:00:11 +01:00 committed by Christian Helmuth
parent ffb8321e57
commit 3561ff90e9
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
repos/gems/src/app/sculpt_manager/main.cc
View File

@ -453,7 +453,7 @@ struct Sculpt::Main : Input_event_handler,
/** /**
* Dialog interface * Dialog interface
*/ */
Hover_result hover(Xml_node) override; Hover_result hover(Xml_node) override { return Hover_result::UNMODIFIED; }
void reset() override { } void reset() override { }
@ -690,7 +690,6 @@ struct Sculpt::Main : Input_event_handler,
Input::Seq_number const seq = *_clacked_seq_number; Input::Seq_number const seq = *_clacked_seq_number;
if (_main_menu_view.hovered(seq)) { if (_main_menu_view.hovered(seq)) {
_storage.dialog.clack(_storage);
_main_menu_view.generate(); _main_menu_view.generate();
_clacked_seq_number.destruct(); _clacked_seq_number.destruct();
} }
@ -758,6 +757,11 @@ struct Sculpt::Main : Input_event_handler,
void use(Storage_target const &target) override { _storage.use(target); } void use(Storage_target const &target) override { _storage.use(target); }
void _reset_storage_dialog_operation()
{
_graph.reset_storage_operation();
}
/* /*
* Storage_dialog::Action interface * Storage_dialog::Action interface
*/ */
@ -769,7 +773,7 @@ struct Sculpt::Main : Input_event_handler,
void cancel_format(Storage_target const &target) override void cancel_format(Storage_target const &target) override
{ {
_storage.cancel_format(target); _storage.cancel_format(target);
_graph.reset_storage_operation(); _reset_storage_dialog_operation();
} }
void expand(Storage_target const &target) override void expand(Storage_target const &target) override
@ -780,7 +784,7 @@ struct Sculpt::Main : Input_event_handler,
void cancel_expand(Storage_target const &target) override void cancel_expand(Storage_target const &target) override
{ {
_storage.cancel_expand(target); _storage.cancel_expand(target);
_graph.reset_storage_operation(); _reset_storage_dialog_operation();
} }
void check(Storage_target const &target) override void check(Storage_target const &target) override
@ -1585,12 +1589,6 @@ void Sculpt::Main::_handle_gui_mode()
} }
Sculpt::Dialog::Hover_result Sculpt::Main::hover(Xml_node hover)
{
return _storage.dialog.match_sub_dialog(hover, "vbox", "frame", "vbox");
}
void Sculpt::Main::_handle_update_state() void Sculpt::Main::_handle_update_state()
{ {
_update_state_rom.update(); _update_state_rom.update();
@ -1657,8 +1655,7 @@ void Sculpt::Main::_handle_runtime_state()
partition.check_in_progress = 0; partition.check_in_progress = 0;
reconfigure_runtime = true; reconfigure_runtime = true;
_storage.dialog.reset_operation(); _reset_storage_dialog_operation();
_graph.reset_storage_operation();
} }
} }
@ -1677,8 +1674,7 @@ void Sculpt::Main::_handle_runtime_state()
device.rediscover(); device.rediscover();
reconfigure_runtime = true; reconfigure_runtime = true;
_storage.dialog.reset_operation(); _reset_storage_dialog_operation();
_graph.reset_storage_operation();
} }
} }
@ -1689,8 +1685,7 @@ void Sculpt::Main::_handle_runtime_state()
partition.fs_resize_in_progress = false; partition.fs_resize_in_progress = false;
reconfigure_runtime = true; reconfigure_runtime = true;
device.rediscover(); device.rediscover();
_storage.dialog.reset_operation(); _reset_storage_dialog_operation();
_graph.reset_storage_operation();
} }
} }
@ -1712,8 +1707,7 @@ void Sculpt::Main::_handle_runtime_state()
if (exit_state.exited) { if (exit_state.exited) {
device.rediscover(); device.rediscover();
reconfigure_runtime = true; reconfigure_runtime = true;
_storage.dialog.reset_operation(); _reset_storage_dialog_operation();
_graph.reset_storage_operation();
} }
} }
@ -1731,8 +1725,7 @@ void Sculpt::Main::_handle_runtime_state()
}); });
reconfigure_runtime = true; reconfigure_runtime = true;
_storage.dialog.reset_operation(); _reset_storage_dialog_operation();
_graph.reset_storage_operation();
} }
} }

5
repos/gems/src/app/sculpt_manager/storage.h
View File

@ -58,8 +58,6 @@ struct Sculpt::Storage : Storage_dialog::Action, Ram_fs_dialog::Action
Inspect_view_version _inspect_view_version { 0 }; Inspect_view_version _inspect_view_version { 0 };
Storage_dialog dialog { _storage_devices, _sculpt_partition };
void handle_storage_devices_update(); void handle_storage_devices_update();
Signal_handler<Storage> _storage_device_update_handler { Signal_handler<Storage> _storage_device_update_handler {
@ -120,7 +118,6 @@ struct Sculpt::Storage : Storage_dialog::Action, Ram_fs_dialog::Action
partition.file_system.type = File_system::UNKNOWN; partition.file_system.type = File_system::UNKNOWN;
partition.format_in_progress = false; partition.format_in_progress = false;
} }
dialog.reset_operation();
}); });
} }
@ -139,7 +136,6 @@ struct Sculpt::Storage : Storage_dialog::Action, Ram_fs_dialog::Action
partition.gpt_expand_in_progress = false; partition.gpt_expand_in_progress = false;
partition.fs_resize_in_progress = false; partition.fs_resize_in_progress = false;
} }
dialog.reset_operation();
}); });
} }
@ -184,7 +180,6 @@ struct Sculpt::Storage : Storage_dialog::Action, Ram_fs_dialog::Action
{ {
_ram_fs_state.trigger_restart(); _ram_fs_state.trigger_restart();
dialog.reset_operation();
_runtime_config_generator.generate_runtime_config(); _runtime_config_generator.generate_runtime_config();
} }