diff --git a/src/ui/conference_window.ui b/src/ui/conference_window.ui index 7ec2309..393bae2 100644 --- a/src/ui/conference_window.ui +++ b/src/ui/conference_window.ui @@ -123,8 +123,11 @@ along with Venom. If not, see . + 46 True False + 6 + 6 True @@ -140,6 +143,9 @@ along with Venom. If not, see . 6 + True diff --git a/src/ui/contact_list_widget.ui b/src/ui/contact_list_widget.ui index 5537985..383d493 100644 --- a/src/ui/contact_list_widget.ui +++ b/src/ui/contact_list_widget.ui @@ -1,7 +1,7 @@ - - False - - - True - False - 12 - vertical - - - True - True - True - win.show_user - Show user details - - - False - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - True - True - app.preferences - _Preferences - - - False - True - 2 - - - - - True - True - True - app.about - About - - - False - True - 3 - - - - - True - False - - - False - True - 4 - - - - - True - True - True - app.logout - Logout - - - False - True - 5 - - - - - True - True - True - app.quit - _Quit - - - False - True - 6 - - - - - - - True - False - - - True - True - True - app_menu_popover - - - True - False - 22 - friend-symbolic - - - - - - False - True - 0 - - - - - True - True - True - Change your status - - - - - - - False - True - end - 1 - - - - - True - False - center - vertical - - - True - False - username - end - 1 - 0 - - - - True - True - 0 - - - - - True - False - statusmessage - end - 1 - 0 - - - - True - True - 1 - - - - - True - True - 2 - - - - - True - False - 26 - offline - - - True - False - - - - - - False - 6 - - - True - True - edit-find-symbolic - False - False - - - - + + 46 False - + + True + False + 12 + vertical + 6 + + + True + False + 12 + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + center + vertical + + + True + False + name + end + 15 + 0 + + + False + True + 0 + + + + + True + False + message + end + 15 + 0 + + + + + + + False + True + 1 + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + True + True + win.show_user + Account Settings + + + False + True + 1 + + + + + True + True + True + app.logout + Log Out + + + False + True + 2 + + + + + True + False + + + False + True + 3 + + + + + True + True + True + app.preferences + _Preferences + + + False + True + 4 + + + + + True + False + + + False + True + 5 + + + + + True + True + True + app.about + _About + + + False + True + 6 + + + + + True + True + True + app.quit + _Quit + + + False + True + 7 + + + + + + + True + False + + + True + True + True + app_menu_popover + + + True + False + gtk-missing-image + 22 + + + + + + False + True + 0 + + + + + True + True + True + Change your status + + + True + False + 26 + offline + + + + + + False + True + end + 1 + + + + + True + False + center + vertical + + + True + False + username + end + 1 + 0 + + + + True + True + 0 + + + + + True + False + statusmessage + end + 1 + 0 + + + + True + True + 1 + + + + + True + True + 2 + diff --git a/src/ui/conversation_window.ui b/src/ui/conversation_window.ui index a65fb6f..1019163 100644 --- a/src/ui/conversation_window.ui +++ b/src/ui/conversation_window.ui @@ -453,8 +453,11 @@ along with Venom. If not, see . + 46 True False + 6 + 6 True @@ -470,6 +473,9 @@ along with Venom. If not, see . 6 + True @@ -481,6 +487,7 @@ along with Venom. If not, see . True False + 6 True @@ -496,9 +503,6 @@ along with Venom. If not, see . face-smile-symbolic - False @@ -520,9 +524,6 @@ along with Venom. If not, see . mail-attachment-symbolic - False @@ -530,9 +531,6 @@ along with Venom. If not, see . 1 - False diff --git a/src/ui/custom.css b/src/ui/custom.css index 357c07e..c92a399 100644 --- a/src/ui/custom.css +++ b/src/ui/custom.css @@ -108,13 +108,6 @@ border-right: 6px solid @theme_bg_color; } -.message-arrow { - margin-top: 6px; - border-top: 6px solid transparent; - border-bottom: 6px solid transparent; - border-right: 6px solid @theme_bg_color; -} - .message-arrow-outgoing { margin-top: 6px; border-top: 6px solid transparent; @@ -122,11 +115,6 @@ border-left: 6px solid @theme_bg_color; } -/* .conversation row { - box-shadow: 0px 1px 2px 1px alpha(black, 0.2); - margin: 1px 6px 3px 6px; -} */ - .separated row { border-bottom: 1px solid @theme_bg_color; } diff --git a/src/view/ContactListWidget.vala b/src/view/ContactListWidget.vala index 2f50f1e..054b699 100644 --- a/src/view/ContactListWidget.vala +++ b/src/view/ContactListWidget.vala @@ -1,7 +1,7 @@ /* * ContactListWidget.vala * - * Copyright (C) 2017-2018 Venom authors and contributors + * Copyright (C) 2017-2019 Venom authors and contributors * * This file is part of Venom. * @@ -29,6 +29,9 @@ namespace Venom { [GtkChild] private Gtk.Label username; [GtkChild] private Gtk.Label statusmessage; [GtkChild] private Gtk.Image userimage; + [GtkChild] private Gtk.Label menu_username; + [GtkChild] private Gtk.Label menu_statusmessage; + [GtkChild] private Gtk.Image menu_userimage; [GtkChild] private Gtk.ListBox contact_list; [GtkChild] private Gtk.Image image_status; [GtkChild] private Gtk.MenuButton user_status_menu; @@ -36,7 +39,6 @@ namespace Venom { [GtkChild] private Gtk.Label friend_request_label; [GtkChild] private Gtk.Revealer conference_invite_revealer; [GtkChild] private Gtk.Label conference_invite_label; - [GtkChild] private Gtk.Box placeholder; private unowned Gtk.ListBoxRow ? selected_row; private ListModel contact_list_model; @@ -52,11 +54,12 @@ namespace Venom { var menu_model = builder.get_object("menu") as GLib.MenuModel; user_status_menu.set_menu_model(menu_model); - user_status_menu.set_image(image_status); - view_model.bind_property("username", username, "label", GLib.BindingFlags.SYNC_CREATE); view_model.bind_property("statusmessage", statusmessage, "label", GLib.BindingFlags.SYNC_CREATE); view_model.bind_property("userimage", userimage, "pixbuf", GLib.BindingFlags.SYNC_CREATE); + view_model.bind_property("username", menu_username, "label", GLib.BindingFlags.SYNC_CREATE); + view_model.bind_property("statusmessage", menu_statusmessage, "label", GLib.BindingFlags.SYNC_CREATE); + view_model.bind_property("userimage", menu_userimage, "pixbuf", GLib.BindingFlags.SYNC_CREATE); view_model.bind_property("image-status", image_status, "icon-name", GLib.BindingFlags.SYNC_CREATE); view_model.bind_property("friend-request-visible", friend_request_revealer, "reveal-child", GLib.BindingFlags.SYNC_CREATE); view_model.bind_property("friend-request-label", friend_request_label, "label", GLib.BindingFlags.SYNC_CREATE); @@ -66,7 +69,6 @@ namespace Venom { contact_list.button_press_event.connect(on_button_pressed); contact_list.popup_menu.connect(on_popup_menu); contact_list.row_activated.connect(on_row_activated); - contact_list.set_placeholder(placeholder); settings_database.notify["enable-compact-contacts"].connect(refresh_contacts);