[Sugar-devel] [PATCH sugar, v3] Add menu to Control Panel/Network for proxy configuration

[Simon Schampijer]

On 02/03/2012 01:56 PM, Anish Mangal wrote:
> From: Aleksey Lim<alsroot at activitycentral.org>
>
> Both individual users and deployments need to be able to set a proxy for
> Sugar and activities to use. While we'd like the system to work that all
> out automatically (e.g. using WPAD [1]), this often isn't possible.  Common
> reasons include legacy ("inherited") setups and network uplinks simply being
> out of control of the user respectively deployment.
>
> For consistency between Sugar and Gnome (and to the benefit of existing users
> who currently switch to Gnome to change proxy settings), the layout of the
> Gnome proxy settings dialog has been mirrored as much as possible.
>
> This version of the patch also moves the menu from an independent CP
> item to under the existing Network configuration menu [2].
>
> [1] https://en.wikipedia.org/wiki/Web_Proxy_Autodiscovery_Protocol
> [2] http://meeting.sugarlabs.org/sugar-meeting/meetings/2012-01-31T15:02:06 >
> [Rebased the patch over sugar/mainline]
> Signed-off-by: Anish Mangal<anish at sugarlabs.org>
>
> [replaced description; merged fix-up patches from Aleksey; style fixes;
>   added WPAD hint; fixed needs_restart defaults bug]
> Signed-off-by: Sascha Silbe<silbe at activitycentral.com>
>
> [Moved the proxy configuration menu from a new CP menu to under the
> existing Network configuration CP]
> Signed-off-by: Ajay Garg<ajay at activitycentral.com>
>
> ---
> v1->v2: several bug and style fixes, added WPAD hint and line breaking
>          for labels, replaced description. No (other) changes to the
> 	layout.
>
> v2->v3: Moved from a new proxy menu in the CP to under the Network
> 	configuration menu

The patch does not work.

'''
diff --git a/extensions/cpsection/network/view.py 
b/extensions/cpsection/network/view.py
index 22cd0a5..bbd1199 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -189,8 +189,8 @@ class Network(SectionView):
          box_proxy = gtk.VBox()
          box_proxy.set_border_width(style.DEFAULT_SPACING * 2)
          box_proxy.set_spacing(style.DEFAULT_SPACING)
-        proxy_info = gtk.Label(_("Please enter the correct settings if
-            your network connects through a proxy."))
+        proxy_info = gtk.Label(_("Please enter the correct settings if"
+                                 "your network connects through a proxy."))
          proxy_info.set_alignment(0, 0)
          proxy_info.set_line_wrap(True)
          box_proxy.pack_start(proxy_info, expand=False)
'''

As well the designs from me were not taken into account, so the history 
of this Feature discussion has not really been followed. To me the 
Feature is not ready for merge like this in 0.96.

Regards,
    Simon