Daniel Brötzmann pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/data/style/gajim.css
    ... ... @@ -67,9 +67,15 @@
    67 67
     }
    
    68 68
     
    
    69 69
     .profile-scrolled {
    
    70
    -    border: 1px solid;
    
    70
    +    border: 1px solid @borders;
    
    71 71
         border-radius: 4px;
    
    72
    -    border-color: @borders;
    
    72
    +}
    
    73
    +.profile-scrolled-read textview {
    
    74
    +    background: transparent;
    
    75
    +}
    
    76
    +.profile-scrolled-read textview text {
    
    77
    +    background: transparent;
    
    78
    +    color: @theme_text_color;
    
    73 79
     }
    
    74 80
     
    
    75 81
     /* Emoticon Popover */
    

  • gajim/gtk/vcard_grid.py
    ... ... @@ -79,7 +79,7 @@
    79 79
         'role': {'value': ''},
    
    80 80
         'url': {'value': ''},
    
    81 81
         'key': {'value': '', 'value_type': 'text'},
    
    82
    -    'note': {'value': ''},
    
    82
    +    'note': {'value': '', 'value_type': 'text'},
    
    83 83
     }
    
    84 84
     
    
    85 85
     
    
    ... ... @@ -142,7 +142,7 @@ def __init__(self, account):
    142 142
                 'org': TextEntryProperty,
    
    143 143
                 'url': TextEntryProperty,
    
    144 144
                 'key': KeyProperty,
    
    145
    -            'note': TextEntryProperty,
    
    145
    +            'note': MultiLineProperty,
    
    146 146
             }
    
    147 147
     
    
    148 148
             self.set_column_spacing(12)
    
    ... ... @@ -592,6 +592,41 @@ def _on_text_changed(self, entry, _param):
    592 592
             self._value_label.set_value(text)
    
    593 593
     
    
    594 594
     
    
    595
    +class MultiLineProperty(VCardProperty):
    
    596
    +    def __init__(self, prop, _account):
    
    597
    +        VCardProperty.__init__(self, prop)
    
    598
    +
    
    599
    +        self._edit_text_view = ValueTextView(prop)
    
    600
    +        self._edit_text_view.show()
    
    601
    +
    
    602
    +        self._edit_scrolled = Gtk.ScrolledWindow()
    
    603
    +        self._edit_scrolled.set_policy(Gtk.PolicyType.NEVER,
    
    604
    +                                       Gtk.PolicyType.AUTOMATIC)
    
    605
    +        self._edit_scrolled.add(self._edit_text_view)
    
    606
    +        self._edit_scrolled.set_valign(Gtk.Align.CENTER)
    
    607
    +        self._edit_scrolled.set_size_request(350, 100)
    
    608
    +        self._edit_scrolled.get_style_context().add_class('profile-scrolled')
    
    609
    +
    
    610
    +        self._read_text_view = ValueTextView(prop)
    
    611
    +        self._read_text_view.set_sensitive(False)
    
    612
    +        self._read_text_view.set_left_margin(0)
    
    613
    +        self._read_text_view.show()
    
    614
    +
    
    615
    +        self._read_scrolled = Gtk.ScrolledWindow()
    
    616
    +        self._read_scrolled.set_policy(Gtk.PolicyType.NEVER,
    
    617
    +                                       Gtk.PolicyType.AUTOMATIC)
    
    618
    +        self._read_scrolled.add(self._read_text_view)
    
    619
    +        self._read_scrolled.set_valign(Gtk.Align.CENTER)
    
    620
    +        self._read_scrolled.set_size_request(350, 100)
    
    621
    +        self._read_scrolled.get_style_context().add_class(
    
    622
    +            'profile-scrolled-read')
    
    623
    +
    
    624
    +        self._edit_widgets.append(self._edit_scrolled)
    
    625
    +        self._read_widgets.append(self._read_scrolled)
    
    626
    +
    
    627
    +        self._third_column = [self._edit_scrolled, self._read_scrolled]
    
    628
    +
    
    629
    +
    
    595 630
     class DateProperty(VCardProperty):
    
    596 631
         def __init__(self, prop, account):
    
    597 632
             VCardProperty.__init__(self, prop)