1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:17:35 +00:00

GMessageBox: Add icons to message boxes with 3 standard ones to choose from.

This commit is contained in:
Andreas Kling 2019-05-08 20:13:39 +02:00
parent b5b44a29bb
commit de98b2770b
7 changed files with 57 additions and 10 deletions

View file

@ -90,8 +90,7 @@ int main(int argc, char** argv)
); );
int rc = mkdir(new_dir_path.characters(), 0777); int rc = mkdir(new_dir_path.characters(), 0777);
if (rc < 0) { if (rc < 0) {
GMessageBox message_box(String::format("mkdir() failed: %s", strerror(errno)), "Error", window); GMessageBox::show(String::format("mkdir() failed: %s", strerror(errno)), "Error", GMessageBox::Type::Error, window);
message_box.exec();
} else { } else {
directory_view->refresh(); directory_view->refresh();
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 583 B

View file

@ -307,8 +307,7 @@ void VBForm::write_to_file(const String& path)
{ {
CFile file(path); CFile file(path);
if (!file.open(CIODevice::WriteOnly)) { if (!file.open(CIODevice::WriteOnly)) {
GMessageBox box(String::format("Could not open '%s' for writing", path.characters()), "Error", window()); GMessageBox::show(String::format("Could not open '%s' for writing", path.characters()), "Error", GMessageBox::Type::Error, window());
box.exec();
return; return;
} }
file.printf("[Form]\n"); file.printf("[Form]\n");

View file

@ -2,10 +2,18 @@
#include <LibGUI/GBoxLayout.h> #include <LibGUI/GBoxLayout.h>
#include <LibGUI/GLabel.h> #include <LibGUI/GLabel.h>
#include <LibGUI/GButton.h> #include <LibGUI/GButton.h>
#include <stdio.h>
GMessageBox::GMessageBox(const String& text, const String& title, CObject* parent) void GMessageBox::show(const String& text, const String& title, Type type, CObject* parent)
{
GMessageBox box(text, title, type, parent);
box.exec();
}
GMessageBox::GMessageBox(const String& text, const String& title, Type type, CObject* parent)
: GDialog(parent) : GDialog(parent)
, m_text(text) , m_text(text)
, m_type(type)
{ {
set_title(title); set_title(title);
build(); build();
@ -15,14 +23,27 @@ GMessageBox::~GMessageBox()
{ {
} }
RetainPtr<GraphicsBitmap> GMessageBox::icon() const
{
switch (m_type) {
case Type::Information:
return GraphicsBitmap::load_from_file("/res/icons/32x32/msgbox-information.png");
case Type::Warning:
return GraphicsBitmap::load_from_file("/res/icons/32x32/msgbox-warning.png");
case Type::Error:
return GraphicsBitmap::load_from_file("/res/icons/32x32/msgbox-error.png");
default:
return nullptr;
}
}
void GMessageBox::build() void GMessageBox::build()
{ {
auto* widget = new GWidget; auto* widget = new GWidget;
set_main_widget(widget); set_main_widget(widget);
int text_width = widget->font().width(m_text); int text_width = widget->font().width(m_text);
int icon_width = 0;
set_rect(x(), y(), text_width + 80, 80);
widget->set_layout(make<GBoxLayout>(Orientation::Vertical)); widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
widget->set_fill_with_background_color(true); widget->set_fill_with_background_color(true);
@ -30,8 +51,22 @@ void GMessageBox::build()
widget->layout()->set_margins({ 0, 15, 0, 15 }); widget->layout()->set_margins({ 0, 15, 0, 15 });
widget->layout()->set_spacing(15); widget->layout()->set_spacing(15);
auto* label = new GLabel(m_text, widget); GWidget* message_container = widget;
label->set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed); if (m_type != Type::None) {
message_container = new GWidget(widget);
message_container->set_layout(make<GBoxLayout>(Orientation::Horizontal));
message_container->layout()->set_margins({ 8, 0, 8, 0 });
message_container->layout()->set_spacing(8);
auto* icon_label = new GLabel(message_container);
icon_label->set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed);
icon_label->set_preferred_size({ 32, 32 });
icon_label->set_icon(icon());
icon_width = icon_label->icon()->width();
}
auto* label = new GLabel(m_text, message_container);
label->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
label->set_preferred_size({ text_width, 16 }); label->set_preferred_size({ text_width, 16 });
auto* button = new GButton(widget); auto* button = new GButton(widget);
@ -42,4 +77,7 @@ void GMessageBox::build()
dbgprintf("GMessageBox: OK button clicked\n"); dbgprintf("GMessageBox: OK button clicked\n");
done(0); done(0);
}; };
set_rect(x(), y(), text_width + icon_width + 80, 100);
set_resizable(false);
} }

View file

@ -4,11 +4,22 @@
class GMessageBox : public GDialog { class GMessageBox : public GDialog {
public: public:
explicit GMessageBox(const String& text, const String& title, CObject* parent = nullptr); enum class Type {
None,
Information,
Warning,
Error,
};
explicit GMessageBox(const String& text, const String& title, Type type = Type::None, CObject* parent = nullptr);
virtual ~GMessageBox() override; virtual ~GMessageBox() override;
static void show(const String& text, const String& title, Type type = Type::None, CObject* parent = nullptr);
private: private:
void build(); void build();
RetainPtr<GraphicsBitmap> icon() const;
String m_text; String m_text;
Type m_type { Type::None };
}; };