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

Commits:

2 changed files:

Changes:

  • gajim/data/gui/server_info.ui
    ... ... @@ -169,6 +169,45 @@
    169 169 
                 <property name="top_attach">0</property>
    170 170 
               </packing>
    171 171 
             </child>
    172 
    +        <child>
    173 
    +          <object class="GtkLabel">
    174 
    +            <property name="visible">True</property>
    175 
    +            <property name="can_focus">False</property>
    176 
    +            <property name="halign">end</property>
    177 
    +            <property name="label" translatable="yes">Proxy Type</property>
    178 
    +            <style>
    179 
    +              <class name="dim-label"/>
    180 
    +            </style>
    181 
    +          </object>
    182 
    +          <packing>
    183 
    +            <property name="left_attach">0</property>
    184 
    +            <property name="top_attach">2</property>
    185 
    +          </packing>
    186 
    +        </child>
    187 
    +        <child>
    188 
    +          <object class="GtkLabel" id="proxy_type">
    189 
    +            <property name="visible">True</property>
    190 
    +            <property name="can_focus">False</property>
    191 
    +            <property name="halign">start</property>
    192 
    +            <property name="label" translatable="yes">No proxy used</property>
    193 
    +            <property name="xalign">0</property>
    194 
    +          </object>
    195 
    +          <packing>
    196 
    +            <property name="left_attach">1</property>
    197 
    +            <property name="top_attach">2</property>
    198 
    +          </packing>
    199 
    +        </child>
    200 
    +        <child>
    201 
    +          <object class="GtkLabel" id="connection_protocol">
    202 
    +            <property name="visible">True</property>
    203 
    +            <property name="can_focus">False</property>
    204 
    +            <property name="halign">start</property>
    205 
    +          </object>
    206 
    +          <packing>
    207 
    +            <property name="left_attach">1</property>
    208 
    +            <property name="top_attach">1</property>
    209 
    +          </packing>
    210 
    +        </child>
    172 211 
             <child>
    173 212 
               <object class="GtkButton" id="cert_button">
    174 213 
                 <property name="label" translatable="yes">View _Certificate</property>
    ... ... @@ -182,7 +221,7 @@
    182 221 
               </object>
    183 222 
               <packing>
    184 223 
                 <property name="left_attach">0</property>
    185 
    -            <property name="top_attach">3</property>
    224 
    +            <property name="top_attach">4</property>
    186 225 
                 <property name="width">2</property>
    187 226 
               </packing>
    188 227 
             </child>
    ... ... @@ -191,27 +230,27 @@
    191 230 
                 <property name="visible">True</property>
    192 231 
                 <property name="can_focus">False</property>
    193 232 
                 <property name="halign">end</property>
    194 
    -            <property name="label" translatable="yes">Proxy</property>
    233 
    +            <property name="label" translatable="yes">Proxy Host</property>
    195 234 
                 <style>
    196 235 
                   <class name="dim-label"/>
    197 236 
                 </style>
    198 237 
               </object>
    199 238 
               <packing>
    200 239 
                 <property name="left_attach">0</property>
    201 
    -            <property name="top_attach">2</property>
    240 
    +            <property name="top_attach">3</property>
    202 241 
               </packing>
    203 242 
             </child>
    204 243 
             <child>
    205 
    -          <object class="GtkLabel" id="connection_proxy">
    244 
    +          <object class="GtkLabel" id="proxy_host">
    206 245 
                 <property name="visible">True</property>
    207 246 
                 <property name="can_focus">False</property>
    208 247 
                 <property name="halign">start</property>
    209 
    -            <property name="label" translatable="yes">No proxy used</property>
    248 
    +            <property name="label">-</property>
    210 249 
                 <property name="xalign">0</property>
    211 250 
               </object>
    212 251 
               <packing>
    213 252 
                 <property name="left_attach">1</property>
    214 
    -            <property name="top_attach">2</property>
    253 
    +            <property name="top_attach">3</property>
    215 254 
               </packing>
    216 255 
             </child>
    217 256 
             <child>
    ... ... @@ -226,7 +265,7 @@
    226 265 
               </object>
    227 266 
               <packing>
    228 267 
                 <property name="left_attach">0</property>
    229 
    -            <property name="top_attach">1</property>
    268 
    +            <property name="top_attach">0</property>
    230 269 
               </packing>
    231 270 
             </child>
    232 271 
             <child>
    ... ... @@ -241,17 +280,6 @@
    241 280 
               </object>
    242 281 
               <packing>
    243 282 
                 <property name="left_attach">0</property>
    244 
    -            <property name="top_attach">0</property>
    245 
    -          </packing>
    246 
    -        </child>
    247 
    -        <child>
    248 
    -          <object class="GtkLabel" id="connection_protocol">
    249 
    -            <property name="visible">True</property>
    250 
    -            <property name="can_focus">False</property>
    251 
    -            <property name="halign">start</property>
    252 
    -          </object>
    253 
    -          <packing>
    254 
    -            <property name="left_attach">1</property>
    255 283 
                 <property name="top_attach">1</property>
    256 284 
               </packing>
    257 285 
             </child>

  • gajim/gtk/server_info.py
    ... ... @@ -111,12 +111,11 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper):
    111 111 
             protocol = 'WebSocket' if is_websocket else 'TCP'
    112 112 
             self._ui.connection_protocol.set_text(protocol)
    113 113
    114 
    -        # host, proxy = app.connections[self.account].get_connection_info()
    115 114 
             # Connection proxy
    116 
    -        # if proxy:
    117 
    -        #    if proxy['type'] in ['http', 'socks5']:
    118 
    -        #        self._ui.connection_proxy.set_text(
    119 
    -        #            proxy['host'] + ':' + proxy['port'])
    115 
    +        proxy = client.proxy
    116 
    +        if proxy is not None:
    117 
    +            self._ui.proxy_type.set_text(proxy.type)
    118 
    +            self._ui.proxy_host.set_text(proxy.host)
    120 119
    121 120 
             self._ui.cert_button.set_sensitive(self.cert)
    122 121

    • —
    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.