Skip to content
This repository has been archived by the owner on Jan 22, 2022. It is now read-only.

Commit

Permalink
Redesign completed. Lots of frontend fixes
Browse files Browse the repository at this point in the history
Redesing of messaging screen completed. Colors synced with chat background
  • Loading branch information
PAXANDDOS committed Jan 28, 2021
1 parent 6715757 commit f8cdc0d
Show file tree
Hide file tree
Showing 47 changed files with 69 additions and 185 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ uninstall:
@$(MAKE_M) $(LIBMX_DIR) $@
@$(MAKE_M) $(LIBCJSON_DIR) $@
@$(MAKE_M) $(LIBSQLITE_DIR) $@
rm database.db
@rm database.db

reinstall: uninstall all

Expand Down
Binary file modified client/data/chat-background/dark/dratini.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/chat-background/dark/pikachu.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/chat-background/default/magikarp.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/chat-background/default/pokeball.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/chat-background/light/lapras.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/chat-background/light/magnemite.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions client/data/css/chat_bg/chatbg2.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#scrollable_msg
{
background-color: #273255;
background-color: #1c2e55;
background-image: url("../../chat-background/default/pikachu.png");
background-size: 100%;
background-repeat: no-repeat;
}
#messanger
{
background-color: #273255;
background-color: #1c2e55;
}
5 changes: 3 additions & 2 deletions client/data/css/chat_bg/chatbg3.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#scrollable_msg
{
background-color: #1e2442;
background-color: #142042;
background-image: url("../../chat-background/default/pokeball.png");
background-size: 100%;
background-repeat: no-repeat;
}
#messanger
{
background-color: #1e2442;
background-color: #142042;
}
5 changes: 3 additions & 2 deletions client/data/css/chat_bg/chatbg4.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#scrollable_msg
{
background-color: #538dcb;
background-color: #178fce;
background-image: url("../../chat-background/default/magikarp.png");
background-size: 100%;
background-repeat: no-repeat;
}
#messanger
{
background-color: #538dcb;
background-color: #178fce;
}
5 changes: 3 additions & 2 deletions client/data/css/chat_bg_dark/chatbg2.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#scrollable_msg
{
background-color: #141414;
background-color: #0c0c0c;
background-image: url("../../chat-background/dark/umbreon.png");
background-size: 100%;
background-repeat: no-repeat;
}
#messanger
{
background-color: #141414;
background-color: #0c0c0c;
}
5 changes: 3 additions & 2 deletions client/data/css/chat_bg_dark/chatbg3.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#scrollable_msg
{
background-color: #2b2b2b;
background-color: #272727;
background-image: url("../../chat-background/dark/dratini.png");
background-size: 100%;
background-repeat: no-repeat;
}
#messanger
{
background-color: #2b2b2b;
background-color: #272727;
}
5 changes: 3 additions & 2 deletions client/data/css/chat_bg_dark/chatbg4.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#scrollable_msg
{
background-color: #272525;
background-color: #231f20;
background-image: url("../../chat-background/dark/pikachu.png");
background-size: 100%;
background-repeat: no-repeat;
}
#messanger
{
background-color: #272525;
background-color: #231f20;
}
5 changes: 3 additions & 2 deletions client/data/css/chat_bg_light/chatbg2.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#scrollable_msg
{
background-color: #ddf0f6;
background-color: #d6f0f7;
background-image: url("../../chat-background/light/lapras.png");
background-size: 100%;
background-repeat: no-repeat;
}
#messanger
{
background-color: #ddf0f6;
background-color: #d6f0f7;
}
5 changes: 3 additions & 2 deletions client/data/css/chat_bg_light/chatbg3.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#scrollable_msg
{
background-color: #d7eff9;
background-color: #ceeffa;
background-image: url("../../chat-background/light/starter.png");
background-size: 100%;
background-repeat: no-repeat;
}
#messanger
{
background-color: #d7eff9;
background-color: #ceeffa;
}
5 changes: 3 additions & 2 deletions client/data/css/chat_bg_light/chatbg4.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#scrollable_msg
{
background-color: #86bff4;
background-color: #64c0f6;
background-image: url("../../chat-background/light/magnemite.png");
background-size: 100%;
background-repeat: no-repeat;
}
#messanger
{
background-color: #86bff4;
background-color: #64c0f6;
}
3 changes: 2 additions & 1 deletion client/data/css/home_screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
border-radius: 13px;
background-size: 100%;
transition: 0.1s cubic-bezier(0.18,0.62,0.71,0.5);
opacity: 1;
opacity: 0.3;
}
#togroup_inner
{
Expand Down Expand Up @@ -98,6 +98,7 @@
#active
{
border-radius: 10px;
padding: 4px;
transition: 0.2s cubic-bezier(0.25, 0.46, 0.45, 0.94);
}
#active:hover
Expand Down
2 changes: 1 addition & 1 deletion client/data/css/msg_screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#adduser
{
background-repeat: no-repeat;
background-size: 22px;
background-size: 100%;
}
#dm_text
{
Expand Down
6 changes: 3 additions & 3 deletions client/data/css/themes/dark/msg_dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@
{
background-image: url("../../../images/create-group-dark.png");
background-size: 100%;
background-color: #353535;
box-shadow: inset 0 0 0 1.5px rgba(240, 240, 240, 0);
background-color: #202020;
}
#msggroup:hover
{
box-shadow: inset 0 0 0 2.5px #f0f0f0;
background-image: url("../../../images/create-group-dark-hover.png");
background-color: #e6e6e9;
}
#crgroup_box
{
Expand Down
4 changes: 2 additions & 2 deletions client/data/css/themes/default/msg_default.css
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@
background-image: url("../../../images/create-group.png");
background-size: 100%;
background-color: #18254e;
box-shadow: inset 0 0 0 1.5px rgba(69, 100, 167, 0);
}
#msggroup:hover
{
box-shadow: inset 0 0 0 2.5px #4564a7;
background-image: url("../../../images/create-group-hover.png");
background-color: #c1ceee;
}
#crgroup_box
{
Expand Down
4 changes: 2 additions & 2 deletions client/data/css/themes/light/msg_light.css
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@
background-image: url("../../../images/create-group-light.png");
background-size: 100%;
background-color: #ebebeb;
box-shadow: inset 0 0 0 1.5px rgba(52, 55, 64, 0);
}
#msggroup:hover
{
box-shadow: inset 0 0 0 2.5px #343740;
background-image: url("../../../images/create-group-light-hover.png");
background-color: #343740;
}
#crgroup_box
{
Expand Down
Binary file modified client/data/images/add-user-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/images/add-user-hover-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/images/add-user-hover-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/images/add-user-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/images/add-user-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/images/add-user.png
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/images/create-group-dark-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/images/create-group-dark.png
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/images/create-group-hover.png
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/images/create-group-light-hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/images/create-group-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/data/images/create-group.png
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/images/old/add-user-dark.png
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/images/old/add-user-hover-dark.png
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/images/old/add-user-hover-light.png
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/images/old/add-user-hover.png
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/images/old/add-user-light.png
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/images/old/add-user.png
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/images/old/create-group-dark.png
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/images/old/create-group-light.png
Binary file added client/data/images/old/create-group.png
6 changes: 1 addition & 5 deletions client/inc/client.h
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,7 @@ void events_click(GtkWidget *widget, GdkEventButton *event);
void status_click(GtkWidget *widget, GdkEventButton *event);
void settings_click(GtkWidget *widget, GdkEventButton *event);

void active1_click(GtkWidget *widget, GdkEventButton *event);
void active2_click(GtkWidget *widget, GdkEventButton *event);
void active3_click(GtkWidget *widget, GdkEventButton *event);
void active4_click(GtkWidget *widget, GdkEventButton *event);
void active5_click(GtkWidget *widget, GdkEventButton *event);
void active_click(GtkWidget *widget, GdkEventButton *event);

void adduser_click(GtkWidget *widget, GdkEventButton *event, gpointer search_field);
void attach_click(GtkWidget *widget, GdkEventButton *event);
Expand Down
21 changes: 1 addition & 20 deletions client/src/events_home.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,8 @@ void event_leave_notify(GtkWidget *widget) {

//--//--//--// //--//--//--//

void active1_click(GtkWidget *widget, GdkEventButton *event) {
void active_click(GtkWidget *widget, GdkEventButton *event) {
if(widget) {}
if(event) {}
}

void active2_click(GtkWidget *widget, GdkEventButton *event) {
if(widget) {}
if(event) {}
}

void active3_click(GtkWidget *widget, GdkEventButton *event) {
if(widget) {}
if(event) {}
}

void active4_click(GtkWidget *widget, GdkEventButton *event) {
if(widget) {}
if(event) {}
}

void active5_click(GtkWidget *widget, GdkEventButton *event) {
if(widget) {}
if(event) {}
}
2 changes: 2 additions & 0 deletions client/src/events_leftbar.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ void messages_click(GtkWidget *widget, GdkEventButton *event) {
void group_click(GtkWidget *widget, GdkEventButton *event) {
if(t_leftbar.active == 3) return;
if(event->type == GDK_BUTTON_PRESS && event->button == 1) {
create_notification(t_application.messanger, "Not available at the moment!", 1, LEFTBAR_W, 160, 0, 30);
// gtk_widget_unset_state_flags(GTK_WIDGET(t_leftbar.home_box), GTK_STATE_FLAG_LINK);
// gtk_widget_unset_state_flags(GTK_WIDGET(t_leftbar.msg_box), GTK_STATE_FLAG_LINK);
// gtk_widget_unset_state_flags(GTK_WIDGET(t_leftbar.events_box), GTK_STATE_FLAG_LINK);
Expand All @@ -55,6 +56,7 @@ void group_click(GtkWidget *widget, GdkEventButton *event) {
void events_click(GtkWidget *widget, GdkEventButton *event) {
if(t_leftbar.active == 4) return;
if(event->type == GDK_BUTTON_PRESS && event->button == 1) {
create_notification(t_application.messanger, "Not available at the moment!", 1, LEFTBAR_W, 230, 0, 30);
// gtk_widget_unset_state_flags(GTK_WIDGET(t_leftbar.home_box), GTK_STATE_FLAG_LINK);
// gtk_widget_unset_state_flags(GTK_WIDGET(t_leftbar.group_box), GTK_STATE_FLAG_LINK);
// gtk_widget_unset_state_flags(GTK_WIDGET(t_leftbar.msg_box), GTK_STATE_FLAG_LINK);
Expand Down
Loading

0 comments on commit f8cdc0d

Please sign in to comment.