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

IRCClient: Add a toolbar with some actions.

Browse source
This commit is contained in:
Andreas Kling 2019-03-15 23:24:40 +01:00
parent b54ab06595
commit 3a3aa74b2e
13 changed files with 76 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Applications/IRCClient/IRCAppWindow.cpp
View file

@ -4,6 +4,9 @@
#include <LibGUI/GStackWidget.h>
#include <LibGUI/GTableView.h>
#include <LibGUI/GBoxLayout.h>
#include <LibGUI/GToolBar.h>
#include <LibGUI/GAction.h>
#include <stdio.h>
IRCAppWindow::IRCAppWindow()
: GWindow()
@ -43,11 +46,28 @@ void IRCAppWindow::setup_client()
void IRCAppWindow::setup_widgets()
{
auto* widget = new GWidget(nullptr);
widget->set_fill_with_background_color(true);
set_main_widget(widget);
widget->set_layout(make<GBoxLayout>(Orientation::Horizontal));
widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
auto* window_list = new GTableView(widget);
printf("main_widget: %s{%p}\n", widget->class_name(), widget);
auto join_action = GAction::create("Join channel", GraphicsBitmap::load_from_file(GraphicsBitmap::Format::RGBA32, "/res/icons/16x16/irc-join.rgb", { 16, 16 }), [] (auto&) {
printf("FIXME: Implement join action\n");
});
auto part_action = GAction::create("Part from channel", GraphicsBitmap::load_from_file(GraphicsBitmap::Format::RGBA32, "/res/icons/16x16/irc-part.rgb", { 16, 16 }), [] (auto&) {
printf("FIXME: Implement part action\n");
});
auto* toolbar = new GToolBar(widget);
toolbar->add_action(join_action.copy_ref());
toolbar->add_action(part_action.copy_ref());
auto* horizontal_container = new GWidget(widget);
printf("horizontal_widget: %s{%p}\n", horizontal_container->class_name(), horizontal_container);
horizontal_container->set_layout(make<GBoxLayout>(Orientation::Horizontal));
auto* window_list = new GTableView(horizontal_container);
window_list->set_headers_visible(false);
window_list->set_alternating_row_colors(false);
window_list->set_model(OwnPtr<IRCClientWindowListModel>(m_client.client_window_list_model()));
@ -57,7 +77,8 @@ void IRCAppWindow::setup_widgets()
m_container->set_active_widget(&window);
};
m_container = new GStackWidget(widget);
m_container = new GStackWidget(horizontal_container);
printf("m_container: %s{%p}\n", ((GWidget*)m_container)->class_name(), m_container);
create_subwindow(IRCClientWindow::Server, "Server");
}

7
Applications/IRCClient/IRCClient.cpp
View file

@ -11,6 +11,8 @@
#include <unistd.h>
#include <stdio.h>
//#define IRC_DEBUG
enum IRCNumeric {
RPL_NAMREPLY = 353,
RPL_ENDOFNAMES = 366,
@ -201,6 +203,7 @@ void IRCClient::join_channel(const String& channel_name)
void IRCClient::handle(const Message& msg, const String&)
{
#ifdef IRC_DEBUG
printf("IRCClient::execute: prefix='%s', command='%s', arguments=%d\n",
msg.prefix.characters(),
msg.command.characters(),
@ -212,6 +215,7 @@ void IRCClient::handle(const Message& msg, const String&)
printf(" [%d]: %s\n", i, arg.characters());
++i;
}
#endif
bool is_numeric;
int numeric = msg.command.to_uint(is_numeric);
@ -285,7 +289,9 @@ void IRCClient::handle_privmsg(const Message& msg)
auto sender_nick = parts[0];
auto target = msg.arguments[0];
#ifdef IRC_DEBUG
printf("handle_privmsg: sender_nick='%s', target='%s'\n", sender_nick.characters(), target.characters());
#endif
if (sender_nick.is_empty())
return;
@ -353,7 +359,6 @@ void IRCClient::handle_join(const Message& msg)
void IRCClient::handle_namreply(const Message& msg)
{
printf("NAMREPLY:\n");
if (msg.arguments.size() < 4)
return;

2
Applications/TextEditor/main.cpp
View file

@ -22,7 +22,7 @@ int main(int argc, char** argv)
widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
auto* toolbar = new GToolBar(widget);
auto* text_editor = new GTextEditor(widget);
auto* text_editor = new GTextEditor(GTextEditor::MultiLine, widget);
auto* statusbar = new GStatusBar(widget);
text_editor->on_cursor_change = [statusbar] (GTextEditor& editor) {