1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:47:35 +00:00

Hearts: Allow player to set their name

Added a new settings dialog to Hearts with a textbox to allow the
player to set a name, which is persisted in the Hearts config file.
This commit is contained in:
Josh Perry 2021-05-23 02:07:20 +01:00 committed by Linus Groh
parent e706de8f91
commit d27616cf36
6 changed files with 104 additions and 4 deletions

View file

@ -4,6 +4,7 @@ set(SOURCES
Game.cpp Game.cpp
main.cpp main.cpp
Player.cpp Player.cpp
SettingsDialog.cpp
HeartsGML.h HeartsGML.h
) )

View file

@ -79,8 +79,10 @@ Game::~Game()
{ {
} }
void Game::setup() void Game::setup(String player_name)
{ {
m_players[0].name = move(player_name);
NonnullRefPtrVector<Card> deck; NonnullRefPtrVector<Card> deck;
dbgln_if(HEARTS_DEBUG, "====="); dbgln_if(HEARTS_DEBUG, "=====");

View file

@ -24,7 +24,7 @@ public:
virtual ~Game() override; virtual ~Game() override;
void setup(); void setup(String player_name);
Function<void(String const&)> on_status_change; Function<void(String const&)> on_status_change;

View file

@ -0,0 +1,52 @@
/*
* Copyright (c) 2021, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "SettingsDialog.h"
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h>
#include <LibGUI/Label.h>
#include <LibGUI/TextBox.h>
SettingsDialog::SettingsDialog(GUI::Window* parent, String player_name)
: GUI::Dialog(parent)
, m_player_name(move(player_name))
{
set_rect({ 0, 0, 250, 75 });
set_title("Settings");
set_icon(parent->icon());
set_resizable(false);
auto& main_widget = set_main_widget<GUI::Widget>();
main_widget.set_fill_with_background_color(true);
auto& layout = main_widget.set_layout<GUI::VerticalBoxLayout>();
layout.set_margins({ 4, 4, 4, 4 });
auto& name_box = main_widget.add<GUI::Widget>();
auto& input_layout = name_box.set_layout<GUI::HorizontalBoxLayout>();
input_layout.set_spacing(4);
auto& name_label = name_box.add<GUI::Label>("Name:");
name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
auto& textbox = name_box.add<GUI::TextBox>();
textbox.set_text(m_player_name);
textbox.on_change = [&] {
m_player_name = textbox.text();
};
auto& button_box = main_widget.add<GUI::Widget>();
auto& button_layout = button_box.set_layout<GUI::HorizontalBoxLayout>();
button_layout.set_spacing(10);
button_box.add<GUI::Button>("Cancel").on_click = [this](auto) {
done(Dialog::ExecCancel);
};
button_box.add<GUI::Button>("OK").on_click = [this](auto) {
done(Dialog::ExecOK);
};
}

View file

@ -0,0 +1,21 @@
/*
* Copyright (c) 2021, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/Types.h>
#include <LibGUI/Dialog.h>
class SettingsDialog : public GUI::Dialog {
C_OBJECT(SettingsDialog)
public:
String const& player_name() const { return m_player_name; }
private:
SettingsDialog(GUI::Window* parent, String player_name);
String m_player_name { "Gunnar" };
};

View file

@ -6,6 +6,7 @@
*/ */
#include "Game.h" #include "Game.h"
#include "SettingsDialog.h"
#include <Games/Hearts/HeartsGML.h> #include <Games/Hearts/HeartsGML.h>
#include <LibCore/ConfigFile.h> #include <LibCore/ConfigFile.h>
#include <LibCore/Timer.h> #include <LibCore/Timer.h>
@ -59,6 +60,8 @@ int main(int argc, char** argv)
auto& statusbar = *widget.find_descendant_of_type_named<GUI::Statusbar>("statusbar"); auto& statusbar = *widget.find_descendant_of_type_named<GUI::Statusbar>("statusbar");
statusbar.set_text(0, "Score: 0"); statusbar.set_text(0, "Score: 0");
String player_name = config->read_entry("", "player_name", "Gunnar");
game.on_status_change = [&](const AK::StringView& status) { game.on_status_change = [&](const AK::StringView& status) {
statusbar.set_override_text(status); statusbar.set_override_text(status);
}; };
@ -74,11 +77,32 @@ int main(int argc, char** argv)
statusbar.set_override_text({}); statusbar.set_override_text({});
}; };
auto change_settings = [&] {
auto settings_dialog = SettingsDialog::construct(window, player_name);
if (settings_dialog->exec() || settings_dialog->result() != GUI::Dialog::ExecOK)
return;
player_name = settings_dialog->player_name();
config->write_entry("", "player_name", player_name);
if (!config->sync()) {
GUI::MessageBox::show(window, "Settings could not be saved!", "Error", GUI::MessageBox::Type::Error);
return;
}
GUI::MessageBox::show(window, "Settings have been successfully saved and will take effect in the next game.", "Settings Changed Successfully", GUI::MessageBox::Type::Information);
};
auto menubar = GUI::Menubar::construct(); auto menubar = GUI::Menubar::construct();
auto& game_menu = menubar->add_menu("&Game"); auto& game_menu = menubar->add_menu("&Game");
game_menu.add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, [&](auto&) { game_menu.add_action(GUI::Action::create("&New Game", { Mod_None, Key_F2 }, [&](auto&) {
game.setup(); game.setup(player_name);
}));
game_menu.add_separator();
game_menu.add_action(GUI::Action::create("&Settings...", [&](auto&) {
change_settings();
})); }));
game_menu.add_separator(); game_menu.add_separator();
game_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); game_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
@ -91,7 +115,7 @@ int main(int argc, char** argv)
window->set_menubar(move(menubar)); window->set_menubar(move(menubar));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->show(); window->show();
game.setup(); game.setup(player_name);
return app->exec(); return app->exec();
} }