Ticket #2962: chat.patch
| File chat.patch, 8.2 KB (added by anonymous, 3 years ago) |
|---|
-
src/chat_control.py
diff -uBbwr src/chat_control.py /usr/share/gajim/src/chat_control.py
old new 279 279 # setting the bg color of the eventbox and the fg of the name_label 280 280 banner_eventbox = self.xml.get_widget('banner_eventbox') 281 281 banner_name_label = self.xml.get_widget('banner_name_label') 282 banner_status_label = self.xml.get_widget('banner_status_label') 282 283 self.disconnect_style_event(banner_name_label) 284 self.disconnect_style_event(banner_status_label) 283 285 if bgcolor: 284 286 banner_eventbox.modify_bg(gtk.STATE_NORMAL, 285 287 gtk.gdk.color_parse(bgcolor)) … … 289 291 if textcolor: 290 292 banner_name_label.modify_fg(gtk.STATE_NORMAL, 291 293 gtk.gdk.color_parse(textcolor)) 294 banner_status_label.modify_fg(gtk.STATE_NORMAL, 295 gtk.gdk.color_parse(textcolor)) 292 296 default_fg = False 293 297 else: 294 298 default_fg = True 295 299 if default_bg or default_fg: 296 300 self._on_style_set_event(banner_name_label, None, default_fg, 297 301 default_bg) 302 fg_color = banner_status_label.style.fg[gtk.STATE_SELECTED] 303 banner_status_label.modify_fg(gtk.STATE_NORMAL, fg_color) 298 304 299 305 def disconnect_style_event(self, widget): 300 306 if self.style_event_id: … … 1023 1029 jid = contact.jid 1024 1030 1025 1031 banner_name_label = self.xml.get_widget('banner_name_label') 1032 banner_status_label = self.xml.get_widget('banner_status_label') 1033 status_text = "" 1034 1026 1035 name = contact.get_shown_name() 1027 1036 if self.resource: 1028 1037 name += '/' + self.resource … … 1050 1059 status = contact.status 1051 1060 if status is not None: 1052 1061 banner_name_label.set_ellipsize(pango.ELLIPSIZE_END) 1053 status = helpers.reduce_chars_newlines(status, max_lines = 2)1062 status = helpers.reduce_chars_newlines(status, max_lines = 1) 1054 1063 status_escaped = gtkgui_helpers.escape_for_pango_markup(status) 1055 1064 1056 1065 font_attrs, font_attrs_small = self.get_font_attrs() … … 1080 1089 label_text = '<span %s>%s</span><span %s>%s</span>' % \ 1081 1090 (font_attrs, name, font_attrs_small, acct_info) 1082 1091 if status_escaped: 1083 label_text += '\n<span %s>%s</span>' %\1092 status_text = '<span %s>%s</span>' %\ 1084 1093 (font_attrs_small, status_escaped) 1085 1094 banner_eventbox = self.xml.get_widget('banner_eventbox') 1086 1095 self.status_tooltip.set_tip(banner_eventbox, status) … … 1089 1098 self.status_tooltip.disable() 1090 1099 # setup the label that holds name and jid 1091 1100 banner_name_label.set_markup(label_text) 1101 banner_status_label.set_markup(status_text) 1092 1102 1093 1103 def on_toggle_gpg_togglebutton(self, widget): 1094 1104 gajim.config.set_per('contacts', self.contact.jid, 'gpg_enabled', -
data/glade/message_window.glade
diff -uBbwr data/glade/message_window.glade /usr/share/gajim/data/glade/message_window.glade
old new 104 104 </child> 105 105 106 106 <child> 107 <widget class="GtkVBox" id="vbox110"> 108 <property name="visible">True</property> 109 <property name="homogeneous">False</property> 110 <property name="spacing">0</property> 111 112 <child> 107 113 <widget class="GtkLabel" id="banner_name_label"> 108 114 <property name="visible">True</property> 109 <property name="label"><span weight="heavy" size="large">Contact name</span> 110 Status message</property> 115 <property name="label"><span weight="heavy" size="large">Contact name</span></property> 111 116 <property name="use_underline">False</property> 112 117 <property name="use_markup">True</property> 113 118 <property name="justify">GTK_JUSTIFY_LEFT</property> 114 119 <property name="wrap">False</property> 115 120 <property name="selectable">False</property> 116 <property name="xalign">0.0500000007451</property>121 <property name="xalign">0</property> 117 122 <property name="yalign">0.5</property> 118 <property name="xpad">0</property> 119 <property name="ypad">5</property> 120 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> 123 <property name="xpad">5</property> 124 <property name="ypad">0</property> 125 <property name="ellipsize">PANGO_ELLIPSIZE_END</property> 126 <property name="width_chars">-1</property> 127 <property name="single_line_mode">False</property> 128 <property name="angle">0</property> 129 </widget> 130 <packing> 131 <property name="padding">0</property> 132 <property name="expand">False</property> 133 <property name="fill">False</property> 134 </packing> 135 </child> 136 137 <child> 138 <widget class="GtkLabel" id="banner_status_label"> 139 <property name="visible">True</property> 140 <property name="can_focus">True</property> 141 <property name="label" translatable="yes">Status message</property> 142 <property name="use_underline">False</property> 143 <property name="use_markup">True</property> 144 <property name="justify">GTK_JUSTIFY_LEFT</property> 145 <property name="wrap">False</property> 146 <property name="selectable">True</property> 147 <property name="xalign">0</property> 148 <property name="yalign">0.5</property> 149 <property name="xpad">5</property> 150 <property name="ypad">0</property> 151 <property name="ellipsize">PANGO_ELLIPSIZE_END</property> 121 152 <property name="width_chars">-1</property> 122 153 <property name="single_line_mode">False</property> 123 154 <property name="angle">0</property> 124 155 </widget> 125 156 <packing> 126 157 <property name="padding">0</property> 158 <property name="expand">False</property> 159 <property name="fill">False</property> 160 </packing> 161 </child> 162 </widget> 163 <packing> 164 <property name="padding">5</property> 127 165 <property name="expand">True</property> 128 166 <property name="fill">True</property> 129 167 </packing>
