Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
564068c2
by Daniel Brötzmann at 2019-08-15T08:13:02Z
-
6c9c4c1a
by Daniel Brötzmann at 2019-08-15T08:13:30Z
7 changed files:
- gajim/chat_control.py
- gajim/data/gui/chat_control.ui
- gajim/data/gui/groupchat_control.ui
- gajim/data/gui/groupchat_info_scrolled.ui
- gajim/data/style/gajim.css
- gajim/groupchat_control.py
- gajim/gtk/groupchat_info.py
Changes:
| ... | ... | @@ -732,8 +732,6 @@ class ChatControl(ChatControlBase): |
| 732 | 732 |
|
| 733 | 733 |
status = contact.status
|
| 734 | 734 |
if status is not None:
|
| 735 |
- banner_name_label.set_ellipsize(Pango.EllipsizeMode.END)
|
|
| 736 |
- self.banner_status_label.set_ellipsize(Pango.EllipsizeMode.END)
|
|
| 737 | 735 |
status_reduced = helpers.reduce_chars_newlines(status, max_lines=1)
|
| 738 | 736 |
else:
|
| 739 | 737 |
status_reduced = ''
|
| ... | ... | @@ -364,15 +364,14 @@ |
| 364 | 364 |
<property name="visible">True</property>
|
| 365 | 365 |
<property name="can_focus">False</property>
|
| 366 | 366 |
<child>
|
| 367 |
- <object class="GtkBox" id="hbox3004">
|
|
| 367 |
+ <object class="GtkBox">
|
|
| 368 | 368 |
<property name="visible">True</property>
|
| 369 | 369 |
<property name="can_focus">False</property>
|
| 370 |
+ <property name="spacing">6</property>
|
|
| 370 | 371 |
<child>
|
| 371 | 372 |
<object class="GtkEventBox" id="avatar_eventbox">
|
| 372 | 373 |
<property name="visible">True</property>
|
| 373 | 374 |
<property name="can_focus">False</property>
|
| 374 |
- <property name="margin_top">5</property>
|
|
| 375 |
- <property name="margin_bottom">5</property>
|
|
| 376 | 375 |
<property name="visible_window">False</property>
|
| 377 | 376 |
<child>
|
| 378 | 377 |
<object class="GtkImage" id="avatar_image">
|
| ... | ... | @@ -395,17 +394,22 @@ |
| 395 | 394 |
<property name="visible">True</property>
|
| 396 | 395 |
<property name="can_focus">False</property>
|
| 397 | 396 |
<property name="valign">center</property>
|
| 398 |
- <property name="margin_left">5</property>
|
|
| 399 | 397 |
<property name="hexpand">True</property>
|
| 400 |
- <property name="row_spacing">2</property>
|
|
| 398 |
+ <property name="row_spacing">3</property>
|
|
| 399 |
+ <property name="column_spacing">3</property>
|
|
| 401 | 400 |
<child>
|
| 402 | 401 |
<object class="GtkLabel" id="banner_name_label">
|
| 403 | 402 |
<property name="name">ChatControl-BannerNameLabel</property>
|
| 404 | 403 |
<property name="visible">True</property>
|
| 405 | 404 |
<property name="can_focus">False</property>
|
| 406 |
- <property name="label"><span weight="heavy" size="large">Contact name</span></property>
|
|
| 407 |
- <property name="use_markup">True</property>
|
|
| 405 |
+ <property name="halign">start</property>
|
|
| 406 |
+ <property name="hexpand">True</property>
|
|
| 407 |
+ <property name="label">Contact name</property>
|
|
| 408 |
+ <property name="ellipsize">end</property>
|
|
| 408 | 409 |
<property name="xalign">0</property>
|
| 410 |
+ <style>
|
|
| 411 |
+ <class name="large-header"/>
|
|
| 412 |
+ </style>
|
|
| 409 | 413 |
</object>
|
| 410 | 414 |
<packing>
|
| 411 | 415 |
<property name="left_attach">0</property>
|
| ... | ... | @@ -418,12 +422,16 @@ |
| 418 | 422 |
<property name="name">ChatControl-BannerLabel</property>
|
| 419 | 423 |
<property name="visible">True</property>
|
| 420 | 424 |
<property name="can_focus">False</property>
|
| 425 |
+ <property name="halign">start</property>
|
|
| 421 | 426 |
<property name="hexpand">True</property>
|
| 422 | 427 |
<property name="label">label</property>
|
| 423 |
- <property name="use_markup">True</property>
|
|
| 424 | 428 |
<property name="selectable">True</property>
|
| 429 |
+ <property name="ellipsize">end</property>
|
|
| 425 | 430 |
<property name="xalign">0</property>
|
| 426 | 431 |
<signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/>
|
| 432 |
+ <style>
|
|
| 433 |
+ <class name="dim-label"/>
|
|
| 434 |
+ </style>
|
|
| 427 | 435 |
</object>
|
| 428 | 436 |
<packing>
|
| 429 | 437 |
<property name="left_attach">1</property>
|
| ... | ... | @@ -115,19 +115,21 @@ |
| 115 | 115 |
<property name="visible">True</property>
|
| 116 | 116 |
<property name="can_focus">False</property>
|
| 117 | 117 |
<child>
|
| 118 |
- <object class="GtkBox" id="hbox3024">
|
|
| 118 |
+ <object class="GtkBox">
|
|
| 119 | 119 |
<property name="visible">True</property>
|
| 120 | 120 |
<property name="can_focus">False</property>
|
| 121 |
+ <property name="spacing">6</property>
|
|
| 121 | 122 |
<child>
|
| 122 | 123 |
<object class="GtkImage" id="gc_banner_status_image">
|
| 124 |
+ <property name="width_request">48</property>
|
|
| 125 |
+ <property name="height_request">48</property>
|
|
| 123 | 126 |
<property name="visible">True</property>
|
| 124 | 127 |
<property name="can_focus">False</property>
|
| 125 | 128 |
<property name="stock">gtk-missing-image</property>
|
| 126 | 129 |
</object>
|
| 127 | 130 |
<packing>
|
| 128 | 131 |
<property name="expand">False</property>
|
| 129 |
- <property name="fill">False</property>
|
|
| 130 |
- <property name="padding">5</property>
|
|
| 132 |
+ <property name="fill">True</property>
|
|
| 131 | 133 |
<property name="position">0</property>
|
| 132 | 134 |
</packing>
|
| 133 | 135 |
</child>
|
| ... | ... | @@ -136,10 +138,15 @@ |
| 136 | 138 |
<property name="name">GroupChatControl-BannerNameLabel</property>
|
| 137 | 139 |
<property name="visible">True</property>
|
| 138 | 140 |
<property name="can_focus">False</property>
|
| 139 |
- <property name="label"><span weight="heavy" size="large">room jid</span></property>
|
|
| 140 |
- <property name="use_markup">True</property>
|
|
| 141 |
+ <property name="hexpand">True</property>
|
|
| 142 |
+ <property name="label">Group Chat Name</property>
|
|
| 141 | 143 |
<property name="selectable">True</property>
|
| 144 |
+ <property name="ellipsize">end</property>
|
|
| 145 |
+ <property name="single_line_mode">True</property>
|
|
| 142 | 146 |
<property name="xalign">0</property>
|
| 147 |
+ <style>
|
|
| 148 |
+ <class name="large-header"/>
|
|
| 149 |
+ </style>
|
|
| 143 | 150 |
</object>
|
| 144 | 151 |
<packing>
|
| 145 | 152 |
<property name="expand">False</property>
|
| ... | ... | @@ -8,22 +8,6 @@ |
| 8 | 8 |
<property name="halign">center</property>
|
| 9 | 9 |
<property name="row_spacing">6</property>
|
| 10 | 10 |
<property name="column_spacing">12</property>
|
| 11 |
- <child>
|
|
| 12 |
- <object class="GtkLabel" id="name_label">
|
|
| 13 |
- <property name="can_focus">False</property>
|
|
| 14 |
- <property name="no_show_all">True</property>
|
|
| 15 |
- <property name="halign">end</property>
|
|
| 16 |
- <property name="valign">start</property>
|
|
| 17 |
- <property name="label" translatable="yes">Name</property>
|
|
| 18 |
- <style>
|
|
| 19 |
- <class name="dim-label"/>
|
|
| 20 |
- </style>
|
|
| 21 |
- </object>
|
|
| 22 |
- <packing>
|
|
| 23 |
- <property name="left_attach">0</property>
|
|
| 24 |
- <property name="top_attach">0</property>
|
|
| 25 |
- </packing>
|
|
| 26 |
- </child>
|
|
| 27 | 11 |
<child>
|
| 28 | 12 |
<object class="GtkLabel" id="address_label">
|
| 29 | 13 |
<property name="visible">True</property>
|
| ... | ... | @@ -88,22 +72,6 @@ |
| 88 | 72 |
<property name="top_attach">4</property>
|
| 89 | 73 |
</packing>
|
| 90 | 74 |
</child>
|
| 91 |
- <child>
|
|
| 92 |
- <object class="GtkLabel" id="name">
|
|
| 93 |
- <property name="can_focus">False</property>
|
|
| 94 |
- <property name="no_show_all">True</property>
|
|
| 95 |
- <property name="halign">start</property>
|
|
| 96 |
- <property name="valign">start</property>
|
|
| 97 |
- <property name="selectable">True</property>
|
|
| 98 |
- <property name="ellipsize">end</property>
|
|
| 99 |
- <property name="single_line_mode">True</property>
|
|
| 100 |
- <property name="max_width_chars">40</property>
|
|
| 101 |
- </object>
|
|
| 102 |
- <packing>
|
|
| 103 |
- <property name="left_attach">1</property>
|
|
| 104 |
- <property name="top_attach">0</property>
|
|
| 105 |
- </packing>
|
|
| 106 |
- </child>
|
|
| 107 | 75 |
<child>
|
| 108 | 76 |
<object class="GtkLabel" id="address">
|
| 109 | 77 |
<property name="visible">True</property>
|
| ... | ... | @@ -206,16 +174,17 @@ |
| 206 | 174 |
<object class="GtkLabel">
|
| 207 | 175 |
<property name="visible">True</property>
|
| 208 | 176 |
<property name="can_focus">False</property>
|
| 209 |
- <property name="halign">end</property>
|
|
| 177 |
+ <property name="halign">center</property>
|
|
| 210 | 178 |
<property name="valign">start</property>
|
| 211 | 179 |
<property name="label" translatable="yes">Configuration</property>
|
| 212 | 180 |
<style>
|
| 213 |
- <class name="dim-label"/>
|
|
| 181 |
+ <class name="bold16"/>
|
|
| 214 | 182 |
</style>
|
| 215 | 183 |
</object>
|
| 216 | 184 |
<packing>
|
| 217 | 185 |
<property name="left_attach">0</property>
|
| 218 | 186 |
<property name="top_attach">9</property>
|
| 187 |
+ <property name="width">2</property>
|
|
| 219 | 188 |
</packing>
|
| 220 | 189 |
</child>
|
| 221 | 190 |
<child>
|
| ... | ... | @@ -307,7 +276,24 @@ |
| 307 | 276 |
</packing>
|
| 308 | 277 |
</child>
|
| 309 | 278 |
<child>
|
| 310 |
- <placeholder/>
|
|
| 279 |
+ <object class="GtkLabel" id="name">
|
|
| 280 |
+ <property name="can_focus">False</property>
|
|
| 281 |
+ <property name="no_show_all">True</property>
|
|
| 282 |
+ <property name="halign">center</property>
|
|
| 283 |
+ <property name="valign">start</property>
|
|
| 284 |
+ <property name="selectable">True</property>
|
|
| 285 |
+ <property name="ellipsize">end</property>
|
|
| 286 |
+ <property name="single_line_mode">True</property>
|
|
| 287 |
+ <property name="max_width_chars">40</property>
|
|
| 288 |
+ <style>
|
|
| 289 |
+ <class name="large-header"/>
|
|
| 290 |
+ </style>
|
|
| 291 |
+ </object>
|
|
| 292 |
+ <packing>
|
|
| 293 |
+ <property name="left_attach">0</property>
|
|
| 294 |
+ <property name="top_attach">0</property>
|
|
| 295 |
+ <property name="width">2</property>
|
|
| 296 |
+ </packing>
|
|
| 311 | 297 |
</child>
|
| 312 | 298 |
</object>
|
| 313 | 299 |
</interface>
|
| ... | ... | @@ -9,11 +9,6 @@ |
| 9 | 9 |
.gajim-state-tab-muc-msg {
|
| 10 | 10 |
color: rgb(0, 0, 205)
|
| 11 | 11 |
}
|
| 12 |
-.gajim-banner {
|
|
| 13 |
- font-size: 13pt;
|
|
| 14 |
- font-weight: 700
|
|
| 15 |
- }
|
|
| 16 |
- |
|
| 17 | 12 |
|
| 18 | 13 |
.chatcontrol-actionbar-button {
|
| 19 | 14 |
padding: 0px 5px 0px 5px;
|
| ... | ... | @@ -43,8 +38,6 @@ |
| 43 | 38 |
|
| 44 | 39 |
.chatcontrol-separator {margin-bottom: 5px;}
|
| 45 | 40 |
|
| 46 |
-#SubjectPopover box { padding: 10px; }
|
|
| 47 |
- |
|
| 48 | 41 |
.link-button { min-height: 0px }
|
| 49 | 42 |
|
| 50 | 43 |
/* VCardWindow */
|
| ... | ... | @@ -280,6 +280,7 @@ class GroupchatControl(ChatControlBase): |
| 280 | 280 |
self.banner_actionbar = self.xml.get_object('banner_actionbar')
|
| 281 | 281 |
self.hide_roster_button = Gtk.Button.new_from_icon_name(
|
| 282 | 282 |
'go-next-symbolic', Gtk.IconSize.MENU)
|
| 283 |
+ self.hide_roster_button.set_valign(Gtk.Align.CENTER)
|
|
| 283 | 284 |
self.hide_roster_button.connect('clicked',
|
| 284 | 285 |
lambda *args: self.show_roster())
|
| 285 | 286 |
self.banner_actionbar.pack_end(self.hide_roster_button)
|
| ... | ... | @@ -1072,7 +1073,7 @@ class GroupchatControl(ChatControlBase): |
| 1072 | 1073 |
if self.is_connected:
|
| 1073 | 1074 |
if self.contact.avatar_sha:
|
| 1074 | 1075 |
surface = app.interface.get_avatar(self.contact,
|
| 1075 |
- AvatarSize.ROSTER,
|
|
| 1076 |
+ AvatarSize.CHAT,
|
|
| 1076 | 1077 |
self.scale_factor)
|
| 1077 | 1078 |
banner_status_img.set_from_surface(surface)
|
| 1078 | 1079 |
return
|
| ... | ... | @@ -1103,7 +1104,6 @@ class GroupchatControl(ChatControlBase): |
| 1103 | 1104 |
Draw the text in the fat line at the top of the window that houses the
|
| 1104 | 1105 |
room jid
|
| 1105 | 1106 |
"""
|
| 1106 |
- self.name_label.set_ellipsize(Pango.EllipsizeMode.END)
|
|
| 1107 | 1107 |
self.name_label.set_text(self.room_name)
|
| 1108 | 1108 |
|
| 1109 | 1109 |
def _nec_update_avatar(self, obj):
|
| ... | ... | @@ -144,7 +144,6 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): |
| 144 | 144 |
has_name = bool(info.muc_name)
|
| 145 | 145 |
self._ui.name.set_text(info.muc_name or '')
|
| 146 | 146 |
self._ui.name.set_visible(has_name)
|
| 147 |
- self._ui.name_label.set_visible(has_name)
|
|
| 148 | 147 |
|
| 149 | 148 |
# Set description
|
| 150 | 149 |
has_desc = bool(info.muc_description)
|