diff --git a/gajim/chat_control.py b/gajim/chat_control.py index a05641c7c..7d3d3ab88 100644 --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -868,6 +868,11 @@ class ChatControl(ChatControlBase): self.authentication_button.set_tooltip_text(tooltip) self.widget_set_visible(self.authentication_button, not visible) + context = self.msg_scrolledwindow.get_style_context() + if visible: + context.add_class('authentication') + else: + context.remove_class('authentication') self.lock_image.set_sensitive(visible) def _on_authentication_button_clicked(self, widget): diff --git a/gajim/chat_control_base.py b/gajim/chat_control_base.py index c1a0b30fa..23c5045b9 100644 --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -333,12 +333,13 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.msg_scrolledwindow = ScrolledWindow() self.msg_scrolledwindow.set_max_content_height(100) self.msg_scrolledwindow.set_min_content_height(23) + self.msg_scrolledwindow.get_style_context().add_class('scrolledtextview') self.msg_scrolledwindow.set_property('shadow_type', Gtk.ShadowType.IN) self.msg_scrolledwindow.add(self.msg_textview) hbox = self.xml.get_object('hbox') - hbox.pack_end(self.msg_scrolledwindow, True, True, 0) + hbox.pack_start(self.msg_scrolledwindow, True, True, 0) id_ = self.msg_textview.connect('key_press_event', self._on_message_textview_key_press_event) diff --git a/gajim/data/gui/chat_control.ui b/gajim/data/gui/chat_control.ui index 68d69a2eb..db4abefe6 100644 --- a/gajim/data/gui/chat_control.ui +++ b/gajim/data/gui/chat_control.ui @@ -598,10 +598,36 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 + + + True + True + True + Show a list of emoticons (Alt+M) + none + + + True + False + face-smile + + + + + + False + True + 0 + + + + + - ChatControl-AuthenticationButton True False True @@ -616,16 +642,18 @@ 1 + False False - 0 + end + 2 - - - False @@ -644,27 +672,6 @@ True False - - - True - True - True - Show a list of emoticons (Alt+M) - none - - - True - False - face-smile - - - - - False - True - 0 - - True @@ -687,7 +694,7 @@ False True - 1 + 0 @@ -700,7 +707,7 @@ False True - 2 + 1 @@ -726,7 +733,7 @@ False False - 3 + 2 @@ -749,7 +756,7 @@ False True - 4 + 3 @@ -770,7 +777,7 @@ False True - 5 + 4 @@ -791,7 +798,7 @@ False True - 6 + 5 @@ -818,7 +825,7 @@ False True - 7 + 6 @@ -845,7 +852,7 @@ False True - 8 + 7 @@ -871,7 +878,7 @@ False True - 9 + 8 @@ -884,7 +891,7 @@ False True - 10 + 9 @@ -911,7 +918,7 @@ False True - 11 + 10 @@ -932,7 +939,7 @@ False True - 12 + 11 @@ -1035,7 +1042,7 @@ audio-mic-volume-low False True - 13 + 12 @@ -1046,15 +1053,9 @@ audio-mic-volume-low True True - 14 + 13 - - - - - - False diff --git a/gajim/data/gui/groupchat_control.ui b/gajim/data/gui/groupchat_control.ui index be7fbf398..e6dc78287 100644 --- a/gajim/data/gui/groupchat_control.ui +++ b/gajim/data/gui/groupchat_control.ui @@ -126,46 +126,6 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - - - ChatControl-AuthenticationButton - True - False - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - none - - - True - False - gtk-dialog-authentication - 1 - - - - - False - False - 0 - - - - - - - - False - False - 1 - - - - - 34 - True - False True @@ -180,6 +140,10 @@ face-smile + False @@ -187,6 +151,49 @@ 0 + + + + + + True + False + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + none + + + True + False + gtk-dialog-authentication + 1 + + + + + + False + False + end + 2 + + + + + False + False + 1 + + + + + 34 + True + False True @@ -209,19 +216,7 @@ False True - 1 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - True - 2 + 0 @@ -246,7 +241,7 @@ False False - 3 + 1 @@ -271,7 +266,7 @@ False False - 4 + 2 @@ -297,7 +292,7 @@ False False - 5 + 3 @@ -322,7 +317,7 @@ False False - 6 + 4 @@ -334,7 +329,7 @@ False True - 7 + 5 @@ -359,7 +354,7 @@ False False - 8 + 6 @@ -370,7 +365,7 @@ True True - 9 + 7 @@ -391,15 +386,9 @@ False True - 10 + 8 - - - - - - False diff --git a/gajim/data/style/gajim.css b/gajim/data/style/gajim.css index 62c782586..83c6b9267 100644 --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -1,7 +1,28 @@ /* Gajim Application CSS File */ -/* ChatControl */ -#ChatControl-AuthenticationButton { padding-top: 0px; padding-bottom: 0px} +.msgtextview-button { + padding: 0px 5px 0px 5px; + background-color: @theme_base_color; + border: 1px solid; + border-radius: 0px; + border-color: @borders; + } + +.msgtextview-button:hover, .msgtextview-button:checked { + color: @theme_base_color; + border-color: @borders; + text-shadow: none; + -gtk-icon-shadow: none; + box-shadow: none; + background-image: none; + } + + +.msgtextview-button.left { border-right: none; } +.msgtextview-button.right { border-left: none; } + +.scrolledtextview { border-left:none; } +.scrolledtextview.authentication { border-right:none; } /* VCardWindow */ .VCard-GtkLinkButton { padding-left: 5px; border-left: none; } diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py index af20f9e8f..dedd459be 100644 --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -801,6 +801,11 @@ class GroupchatControl(ChatControlBase): self.authentication_button.set_tooltip_text(tooltip) self.widget_set_visible(self.authentication_button, not visible) + context = self.msg_scrolledwindow.get_style_context() + if visible: + context.add_class('authentication') + else: + context.remove_class('authentication') self.lock_image.set_sensitive(visible) def _on_authentication_button_clicked(self, widget): diff --git a/gajim/message_textview.py b/gajim/message_textview.py index e856d1a0a..bcaa81cdf 100644 --- a/gajim/message_textview.py +++ b/gajim/message_textview.py @@ -42,7 +42,7 @@ class MessageTextView(Gtk.TextView): Gtk.TextView.__init__(self) # set properties - self.set_border_width(1) + self.set_border_width(3) self.set_accepts_tab(True) self.set_editable(True) self.set_cursor_visible(True)