Skip to content

Commit

Permalink
fixed avatars
Browse files Browse the repository at this point in the history
  • Loading branch information
@YaroslavChuiko
YaroslavChuiko committed Feb 6, 2022
1 parent 55f9f7b commit 1b35a53
Show file tree
Hide file tree
Showing 13 changed files with 204 additions and 222 deletions.
Binary file added client/data/img/chat_avatars/avatar1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/data/img/chat_avatars/avatar2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/data/img/chat_avatars/avatar3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/data/img/chat_avatars/avatar4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/data/img/chat_avatars/avatar5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/data/img/chat_avatars/avatar6.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions client/data/styles/leftbar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@

.chatlist_item_avatar {
/* background-color: yellow; */
/*PINK*/
/* background-color: rgb(233, 30, 99); */
/*AMBER*/
/* background-color: rgb(255, 193, 7); */
/*YELLOW*/
/* background-color: rgb(255, 235, 59); */
/*LIME*/
Expand All @@ -90,12 +86,16 @@
/* background-color: rgb(255, 152, 0); */
/*GREEN*/
/* background-color: rgb(76, 175, 80); */
/* LIGHT GREEN */
/* background-color: rgb(139, 195, 74); */
/*PINK*/
/* background-color: rgb(233, 30, 99); */
/*AMBER*/
/* background-color: rgb(255, 193, 7); */
/*DEEP PURPLE*/
/* background-color: rgb(103, 58, 183); */
/* LIGHT GREEN */
/* background-color: rgb(139, 195, 74); */
/* PURPLE */
background-color: rgb(156, 39, 176);
/* background-color: rgb(156, 39, 176); */
/* background-image: url("../img/user-avatar4.png"); */
/* background-size: 25px 25px; */
/* background-size: contain;
Expand Down
2 changes: 2 additions & 0 deletions client/inc/client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ gboolean draw_chat_avatar(GtkWidget *widget, cairo_t *cr, gpointer data);
//AUTH
void build_login_menu();
void build_signup_menu();

void build_chat_screen();
void build_leftbar(GtkWidget *chat_screen);

//AUTH EVENTS
void signup_button_click(GtkWidget *widget, gpointer data);
Expand Down
159 changes: 0 additions & 159 deletions client/src/gui/build_chat_screen.c
View file
Original file line number Diff line number Diff line change
@@ -1,164 +1,5 @@
#include "../../inc/client.h"

void build_leftbar(GtkWidget *chat_screen)
{
GtkWidget *left_bar = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_size_request(GTK_WIDGET(left_bar), LEFT_BAR_W, WINDOW_HEIGHT);
gtk_grid_attach(GTK_GRID(chat_screen), left_bar, 0, 0, 1, 1);
add_class(left_bar, "leftbar");

//header block
GtkWidget *header_block = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
add_class(header_block, "leftbar_header_block");

GtkWidget *header_label = gtk_label_new("Messages");
add_class(header_label, "leftbar_header_label");

GtkWidget *create_new_chat_btn = gtk_event_box_new();
add_class(create_new_chat_btn, "event_switch_auth_menu");
g_signal_connect(G_OBJECT(create_new_chat_btn), "enter-notify-event", G_CALLBACK(on_crossing), NULL);
g_signal_connect(G_OBJECT(create_new_chat_btn), "leave-notify-event", G_CALLBACK(on_crossing), NULL);
g_signal_connect(G_OBJECT(create_new_chat_btn), "button_press_event", G_CALLBACK(popup_create_chat_menu), chat_screen);
GtkWidget *create_chat_label = gtk_label_new("+ New chat");
add_class(create_chat_label, "switch_auth_menu_label");
gtk_container_add(GTK_CONTAINER(create_new_chat_btn), create_chat_label);

gtk_box_pack_start(GTK_BOX(header_block), header_label, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(header_block), create_new_chat_btn, FALSE, FALSE, 0);
//

// search block
GtkWidget *search_block = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
// gtk_widget_set_size_request(GTK_WIDGET(search_block), 350, 40);
add_class(search_block, "search_block");

GtkWidget *search_field = gtk_entry_new();
gtk_entry_set_placeholder_text(GTK_ENTRY(search_field), "Search");
gtk_widget_set_name(search_field, "global_search_field");
add_class(search_field, "input-field");
add_class(search_field, "input-field--search");
g_signal_connect(G_OBJECT(search_field), "changed", G_CALLBACK(search_field_change_event), NULL);

// GtkWidget *clear_field_btn = gtk_button_new_with_label("X");
GtkWidget *clear_field_btn = gtk_button_new();
gtk_widget_set_size_request(GTK_WIDGET(clear_field_btn), 45, 45);
add_class(clear_field_btn, "clear_search_btn");
// gtk_widget_grab_focus(clear_field_btn);
g_signal_connect(G_OBJECT(clear_field_btn), "enter-notify-event", G_CALLBACK(on_crossing), NULL);
g_signal_connect(G_OBJECT(clear_field_btn), "leave-notify-event", G_CALLBACK(on_crossing), NULL);
g_signal_connect(G_OBJECT(clear_field_btn), "clicked", G_CALLBACK(clear_search_field), search_field);

gtk_box_pack_start(GTK_BOX(search_block), search_field, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(search_block), clear_field_btn, false, false, 0);
//

// chatlist
GtkWidget *scrollable_wrap = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_set_name(scrollable_wrap, "chatlist_scrollable_wrap");
add_class(scrollable_wrap, "scrollable_wrap");

GtkWidget *chatlist = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_widget_set_name(chatlist, "chatlist");
add_class(chatlist, "chatlist");
// gtk_widget_set_tooltip_text(chatlist, "chatlist");
gtk_container_add(GTK_CONTAINER(scrollable_wrap), chatlist);
// gtk_widget_hide(gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(scrollable_wrap)));
//

GtkWidget *leftbar_footer = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
add_class(leftbar_footer, "leftbar_footer");

GtkWidget *user_avatar = gtk_drawing_area_new();
gtk_widget_set_size_request(GTK_WIDGET(user_avatar), 27, 27);
// g_signal_connect(G_OBJECT(user_avatar), "draw", G_CALLBACK(draw_user_avatar), NULL); // Получить avatar пользовтеля
gtk_widget_set_halign(user_avatar, GTK_ALIGN_START);
gtk_widget_set_valign(user_avatar, GTK_ALIGN_CENTER);
gtk_box_pack_start(GTK_BOX(leftbar_footer), user_avatar, FALSE, FALSE, 0);

GtkWidget *username = gtk_label_new(utils->current_user->name);
gtk_widget_set_name(username, "leftbar_footer_username");
gtk_widget_set_halign(GTK_WIDGET(username), GTK_ALIGN_START);
gtk_widget_set_valign(GTK_WIDGET(username), GTK_ALIGN_CENTER);
gtk_box_pack_start(GTK_BOX(leftbar_footer), username, false, false, 0);
add_class(username, "leftbar_footer_username");

// GtkWidget *logout_btn = gtk_event_box_new();
// add_class(logout_btn, "event_switch_auth_menu");
// gtk_widget_set_halign(GTK_WIDGET(logout_btn), GTK_ALIGN_CENTER);
// gtk_widget_set_valign(GTK_WIDGET(logout_btn), GTK_ALIGN_START);
// g_signal_connect(G_OBJECT(logout_btn), "enter-notify-event", G_CALLBACK(on_crossing), NULL);
// g_signal_connect(G_OBJECT(logout_btn), "leave-notify-event", G_CALLBACK(on_crossing), NULL);
// g_signal_connect(G_OBJECT(logout_btn), "button_press_event", G_CALLBACK(build_confirm_logout_window), NULL);
// GtkWidget *logout_label = gtk_label_new("Log out");
// add_class(logout_label, "switch_auth_menu_label");
// gtk_container_add(GTK_CONTAINER(logout_btn), logout_label);
// gtk_box_pack_start(GTK_BOX(leftbar_footer), logout_btn, FALSE, FALSE, 0);

GtkWidget *menubar = gtk_menu_bar_new();
g_signal_connect(G_OBJECT(menubar), "enter-notify-event", G_CALLBACK(on_crossing), NULL);
g_signal_connect(G_OBJECT(menubar), "leave-notify-event", G_CALLBACK(on_crossing), NULL);
add_class(menubar, "menubar");
GtkWidget *menu = gtk_menu_new();
add_class(menu, "menubar_menu");
GtkWidget *change_login_btn = gtk_menu_item_new_with_label("Change login");
g_signal_connect(change_login_btn, "activate", G_CALLBACK(build_change_login_window), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_login_btn);
GtkWidget *change_password_btn = gtk_menu_item_new_with_label("Change password");
g_signal_connect(change_password_btn, "activate", G_CALLBACK(build_change_password_window), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_password_btn);
GtkWidget *change_avatar_btn = gtk_menu_item_new_with_label("Change avatar");
g_signal_connect(change_avatar_btn, "activate", G_CALLBACK(build_change_avatar_window), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_avatar_btn);
GtkWidget *delete_account_btn = gtk_menu_item_new_with_label("Delete account");
g_signal_connect(delete_account_btn, "activate", G_CALLBACK(build_confirm_delete_account_window), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), delete_account_btn);
GtkWidget *logout_btn = gtk_menu_item_new_with_label("Log out");
g_signal_connect(logout_btn, "activate", G_CALLBACK(build_confirm_logout_window), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), logout_btn);

gtk_widget_set_halign(GTK_WIDGET(menubar), GTK_ALIGN_CENTER);
gtk_widget_set_valign(GTK_WIDGET(menubar), GTK_ALIGN_START);
// add_class(menubar, "chat");
gtk_box_pack_end(GTK_BOX(leftbar_footer), menubar, FALSE, FALSE, 0);

GtkWidget *edit_profile_btn = gtk_menu_item_new_with_label("");
// GtkWidget *edit_profile_btn = gtk_menu_item_new();
gtk_widget_set_size_request(GTK_WIDGET(edit_profile_btn), 30, 30);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(edit_profile_btn), menu);
gtk_menu_shell_append(GTK_MENU_SHELL(menubar), edit_profile_btn);
// add_class(edit_profile_btn, "switch_auth_menu_label");
add_class(edit_profile_btn, "edit_profile_btn");

/*GtkWidget *change_login_btn = gtk_event_box_new();
add_class(change_login_btn, "event_switch_auth_menu");
gtk_widget_set_halign(GTK_WIDGET(change_login_btn), GTK_ALIGN_CENTER);
gtk_widget_set_valign(GTK_WIDGET(change_login_btn), GTK_ALIGN_START);
g_signal_connect(G_OBJECT(change_login_btn), "enter-notify-event", G_CALLBACK(on_crossing), NULL);
g_signal_connect(G_OBJECT(change_login_btn), "leave-notify-event", G_CALLBACK(on_crossing), NULL);
g_signal_connect(G_OBJECT(change_login_btn), "button_press_event", G_CALLBACK(build_change_login_window), NULL);
GtkWidget *change_login_label = gtk_label_new("Change login");
add_class(change_login_label, "switch_auth_menu_label");
gtk_container_add(GTK_CONTAINER(change_login_btn), change_login_label);
gtk_box_pack_start(GTK_BOX(leftbar_footer), change_login_btn, FALSE, FALSE, 0);
GtkWidget *change_password_btn = gtk_event_box_new();
add_class(change_password_btn, "event_switch_auth_menu");
gtk_widget_set_halign(GTK_WIDGET(change_password_btn), GTK_ALIGN_CENTER);
gtk_widget_set_valign(GTK_WIDGET(change_password_btn), GTK_ALIGN_START);
g_signal_connect(G_OBJECT(change_password_btn), "enter-notify-event", G_CALLBACK(on_crossing), NULL);
g_signal_connect(G_OBJECT(change_password_btn), "leave-notify-event", G_CALLBACK(on_crossing), NULL);
g_signal_connect(G_OBJECT(change_password_btn), "button_press_event", G_CALLBACK(build_change_password_window), NULL);
GtkWidget *change_password_label = gtk_label_new("Change password");
add_class(change_password_label, "switch_auth_menu_label");
gtk_container_add(GTK_CONTAINER(change_password_btn), change_password_label);
gtk_box_pack_start(GTK_BOX(leftbar_footer), change_password_btn, FALSE, FALSE, 0);*/

gtk_box_pack_start(GTK_BOX(left_bar), header_block, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(left_bar), search_block, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(left_bar), scrollable_wrap, true, true, 0);
gtk_box_pack_start(GTK_BOX(left_bar), leftbar_footer, false, false, 0);
}

void build_start_messaging_label()
{
GtkWidget *chat_container = get_widget_by_name_r(main_window, "chat");
Expand Down
Loading

0 comments on commit 1b35a53

Please sign in to comment.