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

Taskbar: Give the shutdown dialog a UI facelift :^)

Browse source
This commit is contained in:
Andreas Kling 2021-05-16 20:57:45 +02:00
parent ce47bbc965
commit f34a3b9521
2 changed files with 51 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Base/res/icons/32x32/shutdown.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 432 B

80
Userland/Services/Taskbar/ShutdownDialog.cpp
View file

@ -9,6 +9,7 @@
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h> #include <LibGUI/Button.h>
#include <LibGUI/ImageWidget.h>
#include <LibGUI/Label.h> #include <LibGUI/Label.h>
#include <LibGUI/RadioButton.h> #include <LibGUI/RadioButton.h>
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
@ -23,10 +24,9 @@ struct Option {
}; };
static const Vector<Option> options = { static const Vector<Option> options = {
{ "Shut down", { "/bin/shutdown", "--now", nullptr }, true, true }, { "Power off computer", { "/bin/shutdown", "--now", nullptr }, true, true },
{ "Restart", { "/bin/reboot", nullptr }, true, false }, { "Reboot", { "/bin/reboot", nullptr }, true, false },
{ "Log out", {}, false, false }, { "Log out", {}, false, false },
{ "Sleep", {}, false, false },
}; };
Vector<char const*> ShutdownDialog::show() Vector<char const*> ShutdownDialog::show()
@ -42,29 +42,41 @@ Vector<char const*> ShutdownDialog::show()
ShutdownDialog::ShutdownDialog() ShutdownDialog::ShutdownDialog()
: Dialog(nullptr) : Dialog(nullptr)
{ {
resize(180, 180 + ((static_cast<int>(options.size()) - 3) * 16)); auto& widget = set_main_widget<GUI::Widget>();
center_on_screen(); widget.set_fill_with_background_color(true);
set_resizable(false); widget.set_layout<GUI::VerticalBoxLayout>();
set_title("SerenityOS"); widget.layout()->set_spacing(0);
set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/power.png"));
// Request WindowServer to re-update us on the current theme as we might've not been alive for the last notification. auto& banner_image = widget.add<GUI::ImageWidget>();
refresh_system_theme(); banner_image.load_from_file("/res/graphics/brand-banner.png");
auto& main = set_main_widget<GUI::Widget>(); auto& content_container = widget.add<GUI::Widget>();
main.set_layout<GUI::VerticalBoxLayout>(); content_container.set_layout<GUI::HorizontalBoxLayout>();
main.layout()->set_margins({ 8, 8, 8, 8 });
main.layout()->set_spacing(8);
main.set_fill_with_background_color(true);
auto& header = main.add<GUI::Label>(); auto& left_container = content_container.add<GUI::Widget>();
header.set_text("What would you like to do?"); left_container.set_fixed_width(60);
header.set_fixed_height(16); left_container.set_layout<GUI::VerticalBoxLayout>();
header.set_font(Gfx::FontDatabase::default_bold_font()); left_container.layout()->set_margins({ 0, 12, 0, 0 });
auto& icon_wrapper = left_container.add<GUI::Widget>();
icon_wrapper.set_fixed_size(32, 48);
icon_wrapper.set_layout<GUI::VerticalBoxLayout>();
auto& icon_image = icon_wrapper.add<GUI::ImageWidget>();
icon_image.set_bitmap(Gfx::Bitmap::load_from_file("/res/icons/32x32/shutdown.png"));
auto& right_container = content_container.add<GUI::Widget>();
right_container.set_layout<GUI::VerticalBoxLayout>();
right_container.layout()->set_margins({ 0, 12, 12, 8 });
auto& label = right_container.add<GUI::Label>("What would you like to do?");
label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
label.set_fixed_height(22);
label.set_font(Gfx::FontDatabase::default_bold_font());
for (size_t i = 0; i < options.size(); i++) { for (size_t i = 0; i < options.size(); i++) {
auto action = options[i]; auto action = options[i];
auto& radio = main.add<GUI::RadioButton>(); auto& radio = right_container.add<GUI::RadioButton>();
radio.set_enabled(action.enabled); radio.set_enabled(action.enabled);
radio.set_text(action.title); radio.set_text(action.title);
@ -78,21 +90,31 @@ ShutdownDialog::ShutdownDialog()
} }
} }
auto& button_box = main.add<GUI::Widget>(); right_container.layout()->add_spacer();
button_box.set_layout<GUI::HorizontalBoxLayout>();
button_box.layout()->set_spacing(8);
auto& ok_button = button_box.add<GUI::Button>(); auto& button_container = right_container.add<GUI::Widget>();
button_container.set_fixed_height(23);
button_container.set_layout<GUI::HorizontalBoxLayout>();
button_container.layout()->add_spacer();
auto& ok_button = button_container.add<GUI::Button>("OK");
ok_button.set_fixed_size(80, 23);
ok_button.on_click = [this](auto) { ok_button.on_click = [this](auto) {
done(ExecResult::ExecOK); done(Dialog::ExecOK);
}; };
ok_button.set_text("OK"); auto& cancel_button = button_container.add<GUI::Button>("Cancel");
cancel_button.set_fixed_size(80, 23);
auto& cancel_button = button_box.add<GUI::Button>();
cancel_button.on_click = [this](auto) { cancel_button.on_click = [this](auto) {
done(ExecResult::ExecCancel); done(ExecResult::ExecCancel);
}; };
cancel_button.set_text("Cancel");
resize(413, 235);
center_on_screen();
set_resizable(true);
set_title("Exit SerenityOS");
set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/power.png"));
// Request WindowServer to re-update us on the current theme as we might've not been alive for the last notification.
refresh_system_theme();
} }
ShutdownDialog::~ShutdownDialog() ShutdownDialog::~ShutdownDialog()