mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 01:07:36 +00:00
LibGUI: Put all classes in the GUI namespace and remove the leading G
This took me a moment. Welcome to the new world of GUI::Widget! :^)
This commit is contained in:
Andreas Kling
parent
2d39da5405
commit
c5bd9d4ed1
337 changed files with 5400 additions and 4816 deletions
|
|
@ -29,8 +29,8 @@
|
|||
#include "AudioEngine.h"
|
||||
#include <LibGUI/GPainter.h>
|
||||
|
||||
KeysWidget::KeysWidget(GWidget* parent, AudioEngine& audio_engine)
|
||||
: GFrame(parent)
|
||||
KeysWidget::KeysWidget(GUI::Widget* parent, AudioEngine& audio_engine)
|
||||
: GUI::Frame(parent)
|
||||
, m_audio_engine(audio_engine)
|
||||
{
|
||||
set_frame_thickness(2);
|
||||
|
|
@ -174,9 +174,9 @@ constexpr int black_key_note_accumulator[] = {
|
|||
3,
|
||||
};
|
||||
|
||||
void KeysWidget::paint_event(GPaintEvent& event)
|
||||
void KeysWidget::paint_event(GUI::PaintEvent& event)
|
||||
{
|
||||
GPainter painter(*this);
|
||||
GUI::Painter painter(*this);
|
||||
painter.translate(frame_thickness(), frame_thickness());
|
||||
|
||||
int note = 0;
|
||||
|
|
@ -223,7 +223,7 @@ void KeysWidget::paint_event(GPaintEvent& event)
|
|||
break;
|
||||
}
|
||||
|
||||
GFrame::paint_event(event);
|
||||
GUI::Frame::paint_event(event);
|
||||
}
|
||||
|
||||
constexpr int notes_per_white_key[] = {
|
||||
|
|
@ -278,9 +278,9 @@ int KeysWidget::note_for_event_position(Point point) const
|
|||
return note;
|
||||
}
|
||||
|
||||
void KeysWidget::mousedown_event(GMouseEvent& event)
|
||||
void KeysWidget::mousedown_event(GUI::MouseEvent& event)
|
||||
{
|
||||
if (event.button() != Left)
|
||||
if (event.button() != GUI::MouseButton::Left)
|
||||
return;
|
||||
|
||||
m_mouse_down = true;
|
||||
|
|
@ -291,9 +291,9 @@ void KeysWidget::mousedown_event(GMouseEvent& event)
|
|||
update();
|
||||
}
|
||||
|
||||
void KeysWidget::mouseup_event(GMouseEvent& event)
|
||||
void KeysWidget::mouseup_event(GUI::MouseEvent& event)
|
||||
{
|
||||
if (event.button() != Left)
|
||||
if (event.button() != GUI::MouseButton::Left)
|
||||
return;
|
||||
|
||||
m_mouse_down = false;
|
||||
|
|
@ -302,7 +302,7 @@ void KeysWidget::mouseup_event(GMouseEvent& event)
|
|||
update();
|
||||
}
|
||||
|
||||
void KeysWidget::mousemove_event(GMouseEvent& event)
|
||||
void KeysWidget::mousemove_event(GUI::MouseEvent& event)
|
||||
{
|
||||
if (!m_mouse_down)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
class AudioEngine;
|
||||
|
||||
class KeysWidget final : public GFrame {
|
||||
class KeysWidget final : public GUI::Frame {
|
||||
C_OBJECT(KeysWidget)
|
||||
public:
|
||||
virtual ~KeysWidget() override;
|
||||
|
|
@ -43,12 +43,12 @@ public:
|
|||
void set_key(int key, Switch);
|
||||
|
||||
private:
|
||||
KeysWidget(GWidget* parent, AudioEngine&);
|
||||
KeysWidget(GUI::Widget* parent, AudioEngine&);
|
||||
|
||||
virtual void paint_event(GPaintEvent&) override;
|
||||
virtual void mousedown_event(GMouseEvent&) override;
|
||||
virtual void mouseup_event(GMouseEvent&) override;
|
||||
virtual void mousemove_event(GMouseEvent&) override;
|
||||
virtual void paint_event(GUI::PaintEvent&) override;
|
||||
virtual void mousedown_event(GUI::MouseEvent&) override;
|
||||
virtual void mouseup_event(GUI::MouseEvent&) override;
|
||||
virtual void mousemove_event(GUI::MouseEvent&) override;
|
||||
|
||||
int note_for_event_position(Point) const;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,43 +32,43 @@
|
|||
#include <LibGUI/GLabel.h>
|
||||
#include <LibGUI/GSlider.h>
|
||||
|
||||
KnobsWidget::KnobsWidget(GWidget* parent, AudioEngine& audio_engine, MainWidget& main_widget)
|
||||
: GFrame(parent)
|
||||
KnobsWidget::KnobsWidget(GUI::Widget* parent, AudioEngine& audio_engine, MainWidget& main_widget)
|
||||
: GUI::Frame(parent)
|
||||
, m_audio_engine(audio_engine)
|
||||
, m_main_widget(main_widget)
|
||||
{
|
||||
set_frame_thickness(2);
|
||||
set_frame_shadow(FrameShadow::Sunken);
|
||||
set_frame_shape(FrameShape::Container);
|
||||
set_layout(make<GVBoxLayout>());
|
||||
set_layout(make<GUI::VBoxLayout>());
|
||||
set_fill_with_background_color(true);
|
||||
|
||||
m_labels_container = GWidget::construct(this);
|
||||
m_labels_container->set_layout(make<GHBoxLayout>());
|
||||
m_labels_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
m_labels_container = GUI::Widget::construct(this);
|
||||
m_labels_container->set_layout(make<GUI::HBoxLayout>());
|
||||
m_labels_container->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_labels_container->set_preferred_size(0, 20);
|
||||
|
||||
m_octave_label = GLabel::construct("Octave", m_labels_container);
|
||||
m_wave_label = GLabel::construct("Wave", m_labels_container);
|
||||
m_decay_label = GLabel::construct("Decay", m_labels_container);
|
||||
m_delay_label = GLabel::construct("Delay", m_labels_container);
|
||||
m_octave_label = GUI::Label::construct("Octave", m_labels_container);
|
||||
m_wave_label = GUI::Label::construct("Wave", m_labels_container);
|
||||
m_decay_label = GUI::Label::construct("Decay", m_labels_container);
|
||||
m_delay_label = GUI::Label::construct("Delay", m_labels_container);
|
||||
|
||||
m_values_container = GWidget::construct(this);
|
||||
m_values_container->set_layout(make<GHBoxLayout>());
|
||||
m_values_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
m_values_container = GUI::Widget::construct(this);
|
||||
m_values_container->set_layout(make<GUI::HBoxLayout>());
|
||||
m_values_container->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_values_container->set_preferred_size(0, 10);
|
||||
|
||||
m_octave_value = GLabel::construct(String::number(m_audio_engine.octave()), m_values_container);
|
||||
m_wave_value = GLabel::construct(wave_strings[m_audio_engine.wave()], m_values_container);
|
||||
m_decay_value = GLabel::construct(String::number(m_audio_engine.decay()), m_values_container);
|
||||
m_delay_value = GLabel::construct(String::number(m_audio_engine.delay() / m_audio_engine.tick()), m_values_container);
|
||||
m_octave_value = GUI::Label::construct(String::number(m_audio_engine.octave()), m_values_container);
|
||||
m_wave_value = GUI::Label::construct(wave_strings[m_audio_engine.wave()], m_values_container);
|
||||
m_decay_value = GUI::Label::construct(String::number(m_audio_engine.decay()), m_values_container);
|
||||
m_delay_value = GUI::Label::construct(String::number(m_audio_engine.delay() / m_audio_engine.tick()), m_values_container);
|
||||
|
||||
m_knobs_container = GWidget::construct(this);
|
||||
m_knobs_container->set_layout(make<GHBoxLayout>());
|
||||
m_knobs_container = GUI::Widget::construct(this);
|
||||
m_knobs_container->set_layout(make<GUI::HBoxLayout>());
|
||||
|
||||
// FIXME: Implement vertical flipping in GSlider, not here.
|
||||
|
||||
m_octave_knob = GSlider::construct(Orientation::Vertical, m_knobs_container);
|
||||
m_octave_knob = GUI::Slider::construct(Orientation::Vertical, m_knobs_container);
|
||||
m_octave_knob->set_tooltip("Z: octave down, X: octave up");
|
||||
m_octave_knob->set_range(octave_min - 1, octave_max - 1);
|
||||
m_octave_knob->set_value(m_audio_engine.octave() - 1);
|
||||
|
|
@ -80,7 +80,7 @@ KnobsWidget::KnobsWidget(GWidget* parent, AudioEngine& audio_engine, MainWidget&
|
|||
m_octave_value->set_text(String::number(new_octave));
|
||||
};
|
||||
|
||||
m_wave_knob = GSlider::construct(Orientation::Vertical, m_knobs_container);
|
||||
m_wave_knob = GUI::Slider::construct(Orientation::Vertical, m_knobs_container);
|
||||
m_wave_knob->set_tooltip("C: cycle through waveforms");
|
||||
m_wave_knob->set_range(0, last_wave);
|
||||
m_wave_knob->set_value(last_wave - m_audio_engine.wave());
|
||||
|
|
@ -92,7 +92,7 @@ KnobsWidget::KnobsWidget(GWidget* parent, AudioEngine& audio_engine, MainWidget&
|
|||
};
|
||||
|
||||
constexpr int max_decay = 20;
|
||||
m_decay_knob = GSlider::construct(Orientation::Vertical, m_knobs_container);
|
||||
m_decay_knob = GUI::Slider::construct(Orientation::Vertical, m_knobs_container);
|
||||
m_decay_knob->set_range(0, max_decay);
|
||||
m_decay_knob->set_value(max_decay);
|
||||
m_decay_knob->on_value_changed = [this](int value) {
|
||||
|
|
@ -103,7 +103,7 @@ KnobsWidget::KnobsWidget(GWidget* parent, AudioEngine& audio_engine, MainWidget&
|
|||
};
|
||||
|
||||
constexpr int max_delay = 8;
|
||||
m_delay_knob = GSlider::construct(Orientation::Vertical, m_knobs_container);
|
||||
m_delay_knob = GUI::Slider::construct(Orientation::Vertical, m_knobs_container);
|
||||
m_delay_knob->set_range(0, max_delay);
|
||||
m_delay_knob->set_value(max_delay);
|
||||
m_delay_knob->on_value_changed = [this](int value) {
|
||||
|
|
|
|||
|
|
@ -29,12 +29,15 @@
|
|||
|
||||
#include <LibGUI/GFrame.h>
|
||||
|
||||
class GSlider;
|
||||
class GLabel;
|
||||
namespace GUI {
|
||||
class Label;
|
||||
class Slider;
|
||||
}
|
||||
|
||||
class AudioEngine;
|
||||
class MainWidget;
|
||||
|
||||
class KnobsWidget final : public GFrame {
|
||||
class KnobsWidget final : public GUI::Frame {
|
||||
C_OBJECT(KnobsWidget)
|
||||
public:
|
||||
virtual ~KnobsWidget() override;
|
||||
|
|
@ -42,28 +45,28 @@ public:
|
|||
void update_knobs();
|
||||
|
||||
private:
|
||||
KnobsWidget(GWidget* parent, AudioEngine&, MainWidget&);
|
||||
KnobsWidget(GUI::Widget* parent, AudioEngine&, MainWidget&);
|
||||
|
||||
AudioEngine& m_audio_engine;
|
||||
MainWidget& m_main_widget;
|
||||
|
||||
RefPtr<GWidget> m_labels_container;
|
||||
RefPtr<GLabel> m_octave_label;
|
||||
RefPtr<GLabel> m_wave_label;
|
||||
RefPtr<GLabel> m_decay_label;
|
||||
RefPtr<GLabel> m_delay_label;
|
||||
RefPtr<GUI::Widget> m_labels_container;
|
||||
RefPtr<GUI::Label> m_octave_label;
|
||||
RefPtr<GUI::Label> m_wave_label;
|
||||
RefPtr<GUI::Label> m_decay_label;
|
||||
RefPtr<GUI::Label> m_delay_label;
|
||||
|
||||
RefPtr<GWidget> m_values_container;
|
||||
RefPtr<GLabel> m_octave_value;
|
||||
RefPtr<GLabel> m_wave_value;
|
||||
RefPtr<GLabel> m_decay_value;
|
||||
RefPtr<GLabel> m_delay_value;
|
||||
RefPtr<GUI::Widget> m_values_container;
|
||||
RefPtr<GUI::Label> m_octave_value;
|
||||
RefPtr<GUI::Label> m_wave_value;
|
||||
RefPtr<GUI::Label> m_decay_value;
|
||||
RefPtr<GUI::Label> m_delay_value;
|
||||
|
||||
RefPtr<GWidget> m_knobs_container;
|
||||
RefPtr<GSlider> m_octave_knob;
|
||||
RefPtr<GSlider> m_wave_knob;
|
||||
RefPtr<GSlider> m_decay_knob;
|
||||
RefPtr<GSlider> m_delay_knob;
|
||||
RefPtr<GUI::Widget> m_knobs_container;
|
||||
RefPtr<GUI::Slider> m_octave_knob;
|
||||
RefPtr<GUI::Slider> m_wave_knob;
|
||||
RefPtr<GUI::Slider> m_decay_knob;
|
||||
RefPtr<GUI::Slider> m_delay_knob;
|
||||
|
||||
bool m_change_octave { true };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -36,30 +36,30 @@
|
|||
MainWidget::MainWidget(AudioEngine& audio_engine)
|
||||
: m_audio_engine(audio_engine)
|
||||
{
|
||||
set_layout(make<GVBoxLayout>());
|
||||
set_layout(make<GUI::VBoxLayout>());
|
||||
layout()->set_spacing(2);
|
||||
layout()->set_margins({ 2, 2, 2, 2 });
|
||||
set_fill_with_background_color(true);
|
||||
|
||||
m_wave_widget = WaveWidget::construct(this, audio_engine);
|
||||
m_wave_widget->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
m_wave_widget->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_wave_widget->set_preferred_size(0, 100);
|
||||
|
||||
m_roll_widget = RollWidget::construct(this, audio_engine);
|
||||
m_roll_widget->set_size_policy(SizePolicy::Fill, SizePolicy::Fill);
|
||||
m_roll_widget->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
|
||||
m_roll_widget->set_preferred_size(0, 300);
|
||||
|
||||
m_keys_and_knobs_container = GWidget::construct(this);
|
||||
m_keys_and_knobs_container->set_layout(make<GHBoxLayout>());
|
||||
m_keys_and_knobs_container = GUI::Widget::construct(this);
|
||||
m_keys_and_knobs_container->set_layout(make<GUI::HBoxLayout>());
|
||||
m_keys_and_knobs_container->layout()->set_spacing(2);
|
||||
m_keys_and_knobs_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
m_keys_and_knobs_container->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_keys_and_knobs_container->set_preferred_size(0, 100);
|
||||
m_keys_and_knobs_container->set_fill_with_background_color(true);
|
||||
|
||||
m_keys_widget = KeysWidget::construct(m_keys_and_knobs_container, audio_engine);
|
||||
|
||||
m_knobs_widget = KnobsWidget::construct(m_keys_and_knobs_container, audio_engine, *this);
|
||||
m_knobs_widget->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
|
||||
m_knobs_widget->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
m_knobs_widget->set_preferred_size(200, 0);
|
||||
}
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ void MainWidget::custom_event(Core::CustomEvent&)
|
|||
m_roll_widget->update_roll();
|
||||
}
|
||||
|
||||
void MainWidget::keydown_event(GKeyEvent& event)
|
||||
void MainWidget::keydown_event(GUI::KeyEvent& event)
|
||||
{
|
||||
// This is to stop held-down keys from creating multiple events.
|
||||
if (m_keys_pressed[event.key()])
|
||||
|
|
@ -91,7 +91,7 @@ void MainWidget::keydown_event(GKeyEvent& event)
|
|||
m_keys_widget->update();
|
||||
}
|
||||
|
||||
void MainWidget::keyup_event(GKeyEvent& event)
|
||||
void MainWidget::keyup_event(GUI::KeyEvent& event)
|
||||
{
|
||||
m_keys_pressed[event.key()] = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class RollWidget;
|
|||
class KeysWidget;
|
||||
class KnobsWidget;
|
||||
|
||||
class MainWidget final : public GWidget {
|
||||
class MainWidget final : public GUI::Widget {
|
||||
C_OBJECT(MainWidget)
|
||||
public:
|
||||
virtual ~MainWidget() override;
|
||||
|
|
@ -46,8 +46,8 @@ public:
|
|||
private:
|
||||
explicit MainWidget(AudioEngine&);
|
||||
|
||||
virtual void keydown_event(GKeyEvent&) override;
|
||||
virtual void keyup_event(GKeyEvent&) override;
|
||||
virtual void keydown_event(GUI::KeyEvent&) override;
|
||||
virtual void keyup_event(GUI::KeyEvent&) override;
|
||||
virtual void custom_event(Core::CustomEvent&) override;
|
||||
|
||||
void note_key_action(int key_code, Switch);
|
||||
|
|
@ -57,7 +57,7 @@ private:
|
|||
|
||||
RefPtr<WaveWidget> m_wave_widget;
|
||||
RefPtr<RollWidget> m_roll_widget;
|
||||
RefPtr<GWidget> m_keys_and_knobs_container;
|
||||
RefPtr<GUI::Widget> m_keys_and_knobs_container;
|
||||
RefPtr<KeysWidget> m_keys_widget;
|
||||
RefPtr<KnobsWidget> m_knobs_widget;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@
|
|||
constexpr int note_height = 20;
|
||||
constexpr int roll_height = note_count * note_height;
|
||||
|
||||
RollWidget::RollWidget(GWidget* parent, AudioEngine& audio_engine)
|
||||
: GScrollableWidget(parent)
|
||||
RollWidget::RollWidget(GUI::Widget* parent, AudioEngine& audio_engine)
|
||||
: ScrollableWidget(parent)
|
||||
, m_audio_engine(audio_engine)
|
||||
{
|
||||
set_frame_thickness(2);
|
||||
|
|
@ -50,7 +50,7 @@ RollWidget::~RollWidget()
|
|||
{
|
||||
}
|
||||
|
||||
void RollWidget::paint_event(GPaintEvent& event)
|
||||
void RollWidget::paint_event(GUI::PaintEvent& event)
|
||||
{
|
||||
int roll_width = widget_inner_rect().width();
|
||||
double note_width = static_cast<double>(roll_width) / m_horizontal_notes;
|
||||
|
|
@ -68,7 +68,7 @@ void RollWidget::paint_event(GPaintEvent& event)
|
|||
int notes_to_paint = paint_area / note_height;
|
||||
int key_pattern_index = (notes_per_octave - 1) - (note_offset % notes_per_octave);
|
||||
|
||||
GPainter painter(*this);
|
||||
GUI::Painter painter(*this);
|
||||
painter.translate(frame_thickness(), frame_thickness());
|
||||
painter.translate(0, -note_offset_remainder);
|
||||
|
||||
|
|
@ -99,10 +99,10 @@ void RollWidget::paint_event(GPaintEvent& event)
|
|||
key_pattern_index = notes_per_octave - 1;
|
||||
}
|
||||
|
||||
GFrame::paint_event(event);
|
||||
GUI::Frame::paint_event(event);
|
||||
}
|
||||
|
||||
void RollWidget::mousedown_event(GMouseEvent& event)
|
||||
void RollWidget::mousedown_event(GUI::MouseEvent& event)
|
||||
{
|
||||
if (!widget_inner_rect().contains(event.x(), event.y()))
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
class AudioEngine;
|
||||
|
||||
class RollWidget final : public GScrollableWidget {
|
||||
class RollWidget final : public GUI::ScrollableWidget {
|
||||
C_OBJECT(RollWidget)
|
||||
public:
|
||||
virtual ~RollWidget() override;
|
||||
|
|
@ -40,10 +40,10 @@ public:
|
|||
void update_roll();
|
||||
|
||||
private:
|
||||
RollWidget(GWidget* parent, AudioEngine&);
|
||||
RollWidget(GUI::Widget* parent, AudioEngine&);
|
||||
|
||||
virtual void paint_event(GPaintEvent&) override;
|
||||
virtual void mousedown_event(GMouseEvent& event) override;
|
||||
virtual void paint_event(GUI::PaintEvent&) override;
|
||||
virtual void mousedown_event(GUI::MouseEvent& event) override;
|
||||
|
||||
AudioEngine& m_audio_engine;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
#include <LibGUI/GPainter.h>
|
||||
#include <limits>
|
||||
|
||||
WaveWidget::WaveWidget(GWidget* parent, AudioEngine& audio_engine)
|
||||
: GFrame(parent)
|
||||
WaveWidget::WaveWidget(GUI::Widget* parent, AudioEngine& audio_engine)
|
||||
: GUI::Frame(parent)
|
||||
, m_audio_engine(audio_engine)
|
||||
{
|
||||
set_frame_thickness(2);
|
||||
|
|
@ -85,9 +85,9 @@ int WaveWidget::sample_to_y(int sample) const
|
|||
return y;
|
||||
}
|
||||
|
||||
void WaveWidget::paint_event(GPaintEvent& event)
|
||||
void WaveWidget::paint_event(GUI::PaintEvent& event)
|
||||
{
|
||||
GPainter painter(*this);
|
||||
GUI::Painter painter(*this);
|
||||
painter.fill_rect(frame_inner_rect(), Color::Black);
|
||||
painter.translate(frame_thickness(), frame_thickness());
|
||||
|
||||
|
|
@ -110,5 +110,5 @@ void WaveWidget::paint_event(GPaintEvent& event)
|
|||
prev_y = y;
|
||||
}
|
||||
|
||||
GFrame::paint_event(event);
|
||||
GUI::Frame::paint_event(event);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,18 +29,17 @@
|
|||
|
||||
#include <LibGUI/GFrame.h>
|
||||
|
||||
class GPainter;
|
||||
class AudioEngine;
|
||||
|
||||
class WaveWidget final : public GFrame {
|
||||
class WaveWidget final : public GUI::Frame {
|
||||
C_OBJECT(WaveWidget)
|
||||
public:
|
||||
virtual ~WaveWidget() override;
|
||||
|
||||
private:
|
||||
WaveWidget(GWidget* parent, AudioEngine&);
|
||||
WaveWidget(GUI::Widget* parent, AudioEngine&);
|
||||
|
||||
virtual void paint_event(GPaintEvent&) override;
|
||||
virtual void paint_event(GUI::PaintEvent&) override;
|
||||
|
||||
int sample_to_y(int sample) const;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,14 +39,14 @@
|
|||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
GApplication app(argc, argv);
|
||||
GUI::Application app(argc, argv);
|
||||
|
||||
auto audio_client = AClientConnection::construct();
|
||||
audio_client->handshake();
|
||||
|
||||
AudioEngine audio_engine;
|
||||
|
||||
auto window = GWindow::construct();
|
||||
auto window = GUI::Window::construct();
|
||||
auto main_widget = MainWidget::construct(audio_engine);
|
||||
window->set_main_widget(main_widget);
|
||||
window->set_title("Piano");
|
||||
|
|
@ -71,18 +71,18 @@ int main(int argc, char** argv)
|
|||
});
|
||||
audio_thread.start();
|
||||
|
||||
auto menubar = make<GMenuBar>();
|
||||
auto menubar = make<GUI::MenuBar>();
|
||||
|
||||
auto app_menu = GMenu::construct("Piano");
|
||||
app_menu->add_action(GCommonActions::make_quit_action([](auto&) {
|
||||
GApplication::the().quit(0);
|
||||
auto app_menu = GUI::Menu::construct("Piano");
|
||||
app_menu->add_action(GUI::CommonActions::make_quit_action([](auto&) {
|
||||
GUI::Application::the().quit(0);
|
||||
return;
|
||||
}));
|
||||
menubar->add_menu(move(app_menu));
|
||||
|
||||
auto help_menu = GMenu::construct("Help");
|
||||
help_menu->add_action(GAction::create("About", [&](const GAction&) {
|
||||
GAboutDialog::show("Piano", load_png("/res/icons/32x32/app-piano.png"), window);
|
||||
auto help_menu = GUI::Menu::construct("Help");
|
||||
help_menu->add_action(GUI::Action::create("About", [&](const GUI::Action&) {
|
||||
GUI::AboutDialog::show("Piano", load_png("/res/icons/32x32/app-piano.png"), window);
|
||||
}));
|
||||
menubar->add_menu(move(help_menu));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue