Philipp Hörist pushed to branch master at gajim / gajim

Commits:

3 changed files:

Changes:

  • gajim/common/const.py
    ... ... @@ -19,6 +19,7 @@ class AvatarSize(IntEnum):
    19 19 
         ROSTER = 32
    20 20 
         CHAT = 48
    21 21 
         NOTIFICATION = 48
    22 
    +    GROUP_INFO = 100
    22 23 
         TOOLTIP = 125
    23 24 
         VCARD = 200
    24 25 
         PUBLISH = 200

  • gajim/data/gui/groupchat_info_scrolled.ui
    1 1 
     <?xml version="1.0" encoding="UTF-8"?>
    2 
    -<!-- Generated with glade 3.22.1 -->
    2 
    +<!-- Generated with glade 3.22.2 -->
    3 3 
     <interface>
    4 4 
       <requires lib="gtk+" version="3.20"/>
    5 5 
       <object class="GtkGrid" id="info_grid">
    ... ... @@ -21,7 +21,7 @@
    21 21 
           </object>
    22 22 
           <packing>
    23 23 
             <property name="left_attach">0</property>
    24 
    -        <property name="top_attach">1</property>
    24 
    +        <property name="top_attach">2</property>
    25 25 
           </packing>
    26 26 
         </child>
    27 27 
         <child>
    ... ... @@ -37,7 +37,7 @@
    37 37 
           </object>
    38 38 
           <packing>
    39 39 
             <property name="left_attach">0</property>
    40 
    -        <property name="top_attach">2</property>
    40 
    +        <property name="top_attach">3</property>
    41 41 
           </packing>
    42 42 
         </child>
    43 43 
         <child>
    ... ... @@ -53,7 +53,7 @@
    53 53 
           </object>
    54 54 
           <packing>
    55 55 
             <property name="left_attach">0</property>
    56 
    -        <property name="top_attach">3</property>
    56 
    +        <property name="top_attach">4</property>
    57 57 
           </packing>
    58 58 
         </child>
    59 59 
         <child>
    ... ... @@ -69,7 +69,7 @@
    69 69 
           </object>
    70 70 
           <packing>
    71 71 
             <property name="left_attach">0</property>
    72 
    -        <property name="top_attach">4</property>
    72 
    +        <property name="top_attach">5</property>
    73 73 
           </packing>
    74 74 
         </child>
    75 75 
         <child>
    ... ... @@ -82,7 +82,7 @@
    82 82 
           </object>
    83 83 
           <packing>
    84 84 
             <property name="left_attach">1</property>
    85 
    -        <property name="top_attach">1</property>
    85 
    +        <property name="top_attach">2</property>
    86 86 
           </packing>
    87 87 
         </child>
    88 88 
         <child>
    ... ... @@ -99,7 +99,7 @@
    99 99 
           </object>
    100 100 
           <packing>
    101 101 
             <property name="left_attach">1</property>
    102 
    -        <property name="top_attach">2</property>
    102 
    +        <property name="top_attach">3</property>
    103 103 
           </packing>
    104 104 
         </child>
    105 105 
         <child>
    ... ... @@ -111,7 +111,7 @@
    111 111 
           </object>
    112 112 
           <packing>
    113 113 
             <property name="left_attach">1</property>
    114 
    -        <property name="top_attach">4</property>
    114 
    +        <property name="top_attach">5</property>
    115 115 
           </packing>
    116 116 
         </child>
    117 117 
         <child>
    ... ... @@ -123,7 +123,7 @@
    123 123 
           </object>
    124 124 
           <packing>
    125 125 
             <property name="left_attach">1</property>
    126 
    -        <property name="top_attach">8</property>
    126 
    +        <property name="top_attach">9</property>
    127 127 
           </packing>
    128 128 
         </child>
    129 129 
         <child>
    ... ... @@ -139,7 +139,7 @@
    139 139 
           </object>
    140 140 
           <packing>
    141 141 
             <property name="left_attach">0</property>
    142 
    -        <property name="top_attach">6</property>
    142 
    +        <property name="top_attach">7</property>
    143 143 
           </packing>
    144 144 
         </child>
    145 145 
         <child>
    ... ... @@ -155,7 +155,7 @@
    155 155 
           </object>
    156 156 
           <packing>
    157 157 
             <property name="left_attach">0</property>
    158 
    -        <property name="top_attach">5</property>
    158 
    +        <property name="top_attach">6</property>
    159 159 
           </packing>
    160 160 
         </child>
    161 161 
         <child>
    ... ... @@ -167,7 +167,7 @@
    167 167 
           </object>
    168 168 
           <packing>
    169 169 
             <property name="left_attach">1</property>
    170 
    -        <property name="top_attach">7</property>
    170 
    +        <property name="top_attach">8</property>
    171 171 
           </packing>
    172 172 
         </child>
    173 173 
         <child>
    ... ... @@ -183,7 +183,7 @@
    183 183 
           </object>
    184 184 
           <packing>
    185 185 
             <property name="left_attach">0</property>
    186 
    -        <property name="top_attach">9</property>
    186 
    +        <property name="top_attach">10</property>
    187 187 
             <property name="width">2</property>
    188 188 
           </packing>
    189 189 
         </child>
    ... ... @@ -203,7 +203,7 @@
    203 203 
           </object>
    204 204 
           <packing>
    205 205 
             <property name="left_attach">1</property>
    206 
    -        <property name="top_attach">5</property>
    206 
    +        <property name="top_attach">6</property>
    207 207 
           </packing>
    208 208 
         </child>
    209 209 
         <child>
    ... ... @@ -220,7 +220,7 @@
    220 220 
           </object>
    221 221 
           <packing>
    222 222 
             <property name="left_attach">0</property>
    223 
    -        <property name="top_attach">8</property>
    223 
    +        <property name="top_attach">9</property>
    224 224 
           </packing>
    225 225 
         </child>
    226 226 
         <child>
    ... ... @@ -237,7 +237,7 @@
    237 237 
           </object>
    238 238 
           <packing>
    239 239 
             <property name="left_attach">0</property>
    240 
    -        <property name="top_attach">7</property>
    240 
    +        <property name="top_attach">8</property>
    241 241 
           </packing>
    242 242 
         </child>
    243 243 
         <child>
    ... ... @@ -254,7 +254,7 @@
    254 254 
           </object>
    255 255 
           <packing>
    256 256 
             <property name="left_attach">1</property>
    257 
    -        <property name="top_attach">6</property>
    257 
    +        <property name="top_attach">7</property>
    258 258 
           </packing>
    259 259 
         </child>
    260 260 
         <child>
    ... ... @@ -272,7 +272,7 @@
    272 272 
           </object>
    273 273 
           <packing>
    274 274 
             <property name="left_attach">1</property>
    275 
    -        <property name="top_attach">3</property>
    275 
    +        <property name="top_attach">4</property>
    276 276 
           </packing>
    277 277 
         </child>
    278 278 
         <child>
    ... ... @@ -289,6 +289,19 @@
    289 289 
               <class name="large-header"/>
    290 290 
             </style>
    291 291 
           </object>
    292 
    +      <packing>
    293 
    +        <property name="left_attach">0</property>
    294 
    +        <property name="top_attach">1</property>
    295 
    +        <property name="width">2</property>
    296 
    +      </packing>
    297 
    +    </child>
    298 
    +    <child>
    299 
    +      <object class="GtkImage" id="avatar_image">
    300 
    +        <property name="visible">True</property>
    301 
    +        <property name="can_focus">False</property>
    302 
    +        <property name="margin_bottom">12</property>
    303 
    +        <property name="icon_size">6</property>
    304 
    +      </object>
    292 305 
           <packing>
    293 306 
             <property name="left_attach">0</property>
    294 307 
             <property name="top_attach">0</property>

  • gajim/gtk/groupchat_info.py
    ... ... @@ -26,6 +26,7 @@ from gajim.common.i18n import Q_
    26 26 
     from gajim.common.helpers import open_uri
    27 27 
     from gajim.common.helpers import get_groupchat_name
    28 28 
     from gajim.common.const import RFC5646_LANGUAGE_TAGS
    29 
    +from gajim.common.const import AvatarSize
    29 30
    30 31 
     from gajim.gtk.util import get_builder
    31 32 
     from gajim.gtk.util import make_href_markup
    ... ... @@ -150,6 +151,14 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow):
    150 151 
             self._ui.name.set_text(name)
    151 152 
             self._ui.name.set_visible(True)
    152 153
    154 
    +        # Set avatar
    155 
    +        surface = app.interface.avatar_storage.get_muc_surface(
    156 
    +            self._account,
    157 
    +            str(info.jid),
    158 
    +            AvatarSize.GROUP_INFO,
    159 
    +            self.get_scale_factor())
    160 
    +        self._ui.avatar_image.set_from_surface(surface)
    161 
    +
    153 162 
             # Set description
    154 163 
             has_desc = bool(info.muc_description)
    155 164 
             self._ui.description.set_text(info.muc_description or '')

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.