diff --git a/data/gui/chat_control.ui b/data/gui/chat_control.ui index 98dea8392..b53b4124d 100644 --- a/data/gui/chat_control.ui +++ b/data/gui/chat_control.ui @@ -38,9 +38,9 @@ True False - 0 <b>1</b> True + 0 @@ -286,6 +286,10 @@ True + 7 + 7 + 5 + 7 1 @@ -296,13 +300,11 @@ True False vertical + 5 True False - 3 - 3 - 1 True @@ -332,9 +334,9 @@ True False - 0 <span weight="heavy" size="large">Contact name</span> True + 0 True @@ -346,10 +348,10 @@ True False - 0 label True True + 0 @@ -498,11 +500,11 @@ True False vertical + 6 60 True - 3 in @@ -519,6 +521,7 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 True @@ -529,8 +532,8 @@ False + True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-dialog-authentication 1 @@ -538,7 +541,7 @@ False - True + False 0 @@ -546,7 +549,6 @@ True True - 3 never never in @@ -563,7 +565,7 @@ False - True + False 1 @@ -878,7 +880,6 @@ none False vertical - menu adjustment1 audio-volume-muted audio-volume-high @@ -911,9 +912,7 @@ audio-volume-medium True none False - 0.4699999988079071 vertical - menu adjustment2 audio-mic-volume-muted audio-mic-volume-high @@ -976,6 +975,7 @@ audio-mic-volume-low _Send + 80 True True True @@ -984,6 +984,7 @@ audio-mic-volume-low Send message image4 True + True False @@ -996,6 +997,7 @@ audio-mic-volume-low False True + end 2 diff --git a/data/gui/groupchat_control.ui b/data/gui/groupchat_control.ui index cb95242c7..9285bb981 100644 --- a/data/gui/groupchat_control.ui +++ b/data/gui/groupchat_control.ui @@ -12,15 +12,16 @@ True - 3 + 7 + 7 + 5 + 7 vertical + 5 True False - 3 - 3 - 1 True @@ -49,9 +50,9 @@ True False - 0 <span weight="heavy" size="large">room jid</span> True + 0 True @@ -63,10 +64,10 @@ True False - 0 label True True + 0 True @@ -94,7 +95,6 @@ True True - 3 495 True @@ -103,6 +103,7 @@ 0 True False + 4 vertical 6 @@ -150,6 +151,7 @@ 100 True True + 4 never in @@ -178,6 +180,7 @@ + 34 True False @@ -407,12 +410,14 @@ _Send + 80 True True True Send message image1 True + True False diff --git a/src/chat_control.py b/src/chat_control.py index 453ed45e9..bb1a3ae24 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1475,6 +1475,15 @@ class ChatControl(ChatControlBase): # Add lock image to show chat encryption self.lock_image = self.xml.get_object('lock_image') + # Remove padding from authentication button or else it will + # be higher than the message box + style_provider = Gtk.CssProvider() + css = 'GtkButton { padding-top: 0px; padding-bottom: 0px}' + style_provider.load_from_data(css.encode()) + context = self.authentication_button.get_style_context() + context.add_provider(style_provider, + Gtk.STYLE_PROVIDER_PRIORITY_USER) + # Convert to GC icon img = self.xml.get_object('convert_to_gc_button_image') img.set_from_pixbuf(gtkgui_helpers.load_icon(