Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits:
-
d3202015
by wurstsalat at 2021-12-02T19:30:20+01:00
-
6129f010
by wurstsalat at 2021-12-02T19:33:22+01:00
3 changed files:
Changes:
| ... | ... | @@ -147,6 +147,25 @@ |
| 147 | 147 |
<property name="position">1</property>
|
| 148 | 148 |
</packing>
|
| 149 | 149 |
</child>
|
| 150 |
+ <child>
|
|
| 151 |
+ <object class="GtkLabel" id="contact_jid_label">
|
|
| 152 |
+ <property name="visible">True</property>
|
|
| 153 |
+ <property name="can-focus">False</property>
|
|
| 154 |
+ <property name="margin-bottom">6</property>
|
|
| 155 |
+ <property name="selectable">True</property>
|
|
| 156 |
+ <property name="ellipsize">end</property>
|
|
| 157 |
+ <property name="single-line-mode">True</property>
|
|
| 158 |
+ <property name="max-width-chars">50</property>
|
|
| 159 |
+ <style>
|
|
| 160 |
+ <class name="dim-label"/>
|
|
| 161 |
+ </style>
|
|
| 162 |
+ </object>
|
|
| 163 |
+ <packing>
|
|
| 164 |
+ <property name="expand">False</property>
|
|
| 165 |
+ <property name="fill">True</property>
|
|
| 166 |
+ <property name="position">2</property>
|
|
| 167 |
+ </packing>
|
|
| 168 |
+ </child>
|
|
| 150 | 169 |
<child>
|
| 151 | 170 |
<!-- n-columns=2 n-rows=2 -->
|
| 152 | 171 |
<object class="GtkGrid" id="group_chat_grid">
|
| ... | ... | @@ -186,7 +205,7 @@ |
| 186 | 205 |
<object class="GtkLabel">
|
| 187 | 206 |
<property name="visible">True</property>
|
| 188 | 207 |
<property name="can-focus">False</property>
|
| 189 |
- <property name="halign">start</property>
|
|
| 208 |
+ <property name="halign">end</property>
|
|
| 190 | 209 |
<property name="label" translatable="yes">Affiliation</property>
|
| 191 | 210 |
<style>
|
| 192 | 211 |
<class name="dim-label"/>
|
| ... | ... | @@ -212,7 +231,7 @@ |
| 212 | 231 |
<packing>
|
| 213 | 232 |
<property name="expand">False</property>
|
| 214 | 233 |
<property name="fill">True</property>
|
| 215 |
- <property name="position">2</property>
|
|
| 234 |
+ <property name="position">3</property>
|
|
| 216 | 235 |
</packing>
|
| 217 | 236 |
</child>
|
| 218 | 237 |
</object>
|
| ... | ... | @@ -107,7 +107,15 @@ def __init__(self, account, contact, page=None): |
| 107 | 107 |
self._load_avatar()
|
| 108 | 108 |
|
| 109 | 109 |
self._ui.contact_name_label.set_text(contact.name)
|
| 110 |
+ self._ui.contact_jid_label.set_text(str(contact.jid))
|
|
| 111 |
+ self._ui.contact_jid_label.set_tooltip_text(str(contact.jid))
|
|
| 112 |
+ |
|
| 110 | 113 |
if contact.is_pm_contact:
|
| 114 |
+ if contact.real_jid is not None:
|
|
| 115 |
+ self._ui.contact_jid_label.set_text(
|
|
| 116 |
+ str(contact.real_jid.bare))
|
|
| 117 |
+ self._ui.contact_jid_label.set_tooltip_text(
|
|
| 118 |
+ str(contact.real_jid.bare))
|
|
| 111 | 119 |
self._ui.role_label.set_text(get_uf_role(contact.role))
|
| 112 | 120 |
self._ui.affiliation_label.set_text(
|
| 113 | 121 |
get_uf_affiliation(contact.affiliation))
|
| ... | ... | @@ -604,7 +604,7 @@ def __init__(self, prop, _account): |
| 604 | 604 |
Gtk.PolicyType.AUTOMATIC)
|
| 605 | 605 |
self._edit_scrolled.add(self._edit_text_view)
|
| 606 | 606 |
self._edit_scrolled.set_valign(Gtk.Align.CENTER)
|
| 607 |
- self._edit_scrolled.set_size_request(350, 100)
|
|
| 607 |
+ self._edit_scrolled.set_size_request(-1, 100)
|
|
| 608 | 608 |
self._edit_scrolled.get_style_context().add_class('profile-scrolled')
|
| 609 | 609 |
|
| 610 | 610 |
self._read_text_view = ValueTextView(prop)
|
| ... | ... | @@ -617,7 +617,7 @@ def __init__(self, prop, _account): |
| 617 | 617 |
Gtk.PolicyType.AUTOMATIC)
|
| 618 | 618 |
self._read_scrolled.add(self._read_text_view)
|
| 619 | 619 |
self._read_scrolled.set_valign(Gtk.Align.CENTER)
|
| 620 |
- self._read_scrolled.set_size_request(350, 100)
|
|
| 620 |
+ self._read_scrolled.set_size_request(-1, 100)
|
|
| 621 | 621 |
self._read_scrolled.get_style_context().add_class(
|
| 622 | 622 |
'profile-scrolled-read')
|
| 623 | 623 |
|