Daniel Brötzmann pushed to branch master at gajim / gajim
Commits: 819629d5 by wurstsalat at 2021-05-24T17:38:32+02:00 Profile: Use textview for multi line Note element
- - - - -
2 changed files:
- gajim/data/style/gajim.css - gajim/gtk/vcard_grid.py
Changes:
===================================== gajim/data/style/gajim.css ===================================== @@ -67,9 +67,15 @@ }
.profile-scrolled { - border: 1px solid; + border: 1px solid @borders; border-radius: 4px; - border-color: @borders; +} +.profile-scrolled-read textview { + background: transparent; +} +.profile-scrolled-read textview text { + background: transparent; + color: @theme_text_color; }
/* Emoticon Popover */
===================================== gajim/gtk/vcard_grid.py ===================================== @@ -79,7 +79,7 @@ 'role': {'value': ''}, 'url': {'value': ''}, 'key': {'value': '', 'value_type': 'text'}, - 'note': {'value': ''}, + 'note': {'value': '', 'value_type': 'text'}, }
@@ -142,7 +142,7 @@ def __init__(self, account): 'org': TextEntryProperty, 'url': TextEntryProperty, 'key': KeyProperty, - 'note': TextEntryProperty, + 'note': MultiLineProperty, }
self.set_column_spacing(12) @@ -592,6 +592,41 @@ def _on_text_changed(self, entry, _param): self._value_label.set_value(text)
+class MultiLineProperty(VCardProperty): + def __init__(self, prop, _account): + VCardProperty.__init__(self, prop) + + self._edit_text_view = ValueTextView(prop) + self._edit_text_view.show() + + self._edit_scrolled = Gtk.ScrolledWindow() + self._edit_scrolled.set_policy(Gtk.PolicyType.NEVER, + Gtk.PolicyType.AUTOMATIC) + self._edit_scrolled.add(self._edit_text_view) + self._edit_scrolled.set_valign(Gtk.Align.CENTER) + self._edit_scrolled.set_size_request(350, 100) + self._edit_scrolled.get_style_context().add_class('profile-scrolled') + + self._read_text_view = ValueTextView(prop) + self._read_text_view.set_sensitive(False) + self._read_text_view.set_left_margin(0) + self._read_text_view.show() + + self._read_scrolled = Gtk.ScrolledWindow() + self._read_scrolled.set_policy(Gtk.PolicyType.NEVER, + Gtk.PolicyType.AUTOMATIC) + self._read_scrolled.add(self._read_text_view) + self._read_scrolled.set_valign(Gtk.Align.CENTER) + self._read_scrolled.set_size_request(350, 100) + self._read_scrolled.get_style_context().add_class( + 'profile-scrolled-read') + + self._edit_widgets.append(self._edit_scrolled) + self._read_widgets.append(self._read_scrolled) + + self._third_column = [self._edit_scrolled, self._read_scrolled] + + class DateProperty(VCardProperty): def __init__(self, prop, account): VCardProperty.__init__(self, prop)
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/819629d50e0c51b87ea13a9af2027153c...