[Git][gajim/gajim][master] ServerInfo: Add proxy info - Commits

17 Mar 2020


      Philipp Hörist pushed to branch master at gajim / gajim
Commits:
0f70fcdd by Daniel Brötzmann at 2020-03-17T20:30:35+01:00
ServerInfo: Add proxy info
- - - - -
2 changed files:
- gajim/data/gui/server_info.ui
- gajim/gtk/server_info.py
Changes:
=====================================
gajim/data/gui/server_info.ui
=====================================
@@ -169,6 +169,45 @@
             <property name="top_attach">0</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="label" translatable="yes">Proxy Type</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="proxy_type">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">No proxy used</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="connection_protocol">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkButton" id="cert_button">
             <property name="label" translatable="yes">View _Certificate</property>
@@ -182,7 +221,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
+            <property name="top_attach">4</property>
             <property name="width">2</property>
           </packing>
         </child>
@@ -191,27 +230,27 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Proxy</property>
+            <property name="label" translatable="yes">Proxy Host</property>
             <style>
               <class name="dim-label"/>
             </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="connection_proxy">
+          <object class="GtkLabel" id="proxy_host">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">No proxy used</property>
+            <property name="label">-</property>
             <property name="xalign">0</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
         <child>
@@ -226,7 +265,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
@@ -241,17 +280,6 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="connection_protocol">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
             <property name="top_attach">1</property>
           </packing>
         </child>
=====================================
gajim/gtk/server_info.py
=====================================
@@ -111,12 +111,11 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper):
         protocol = 'WebSocket' if is_websocket else 'TCP'
         self._ui.connection_protocol.set_text(protocol)
-        # host, proxy = app.connections[self.account].get_connection_info()
         # Connection proxy
-        # if proxy:
-        #    if proxy['type'] in ['http', 'socks5']:
-        #        self._ui.connection_proxy.set_text(
-        #            proxy['host'] + ':' + proxy['port'])
+        proxy = client.proxy
+        if proxy is not None:
+            self._ui.proxy_type.set_text(proxy.type)
+            self._ui.proxy_host.set_text(proxy.host)
self._ui.cert_button.set_sensitive(self.cert)
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f70fcdd1a9333ac0886db4fb01c7ae9c...
-- 
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f70fcdd1a9333ac0886db4fb01c7ae9c...
You're receiving this email because of your account on dev.gajim.org.





    