applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: show a device header for the proxy device

Browse source 
This is the first half of #644981, although I need help from the designers for the rest.
This commit is contained in:
Richard Hughes 2011-03-17 09:45:56 +00:00
parent b83d43d0cd
commit d7e7cf2278
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
panels/network/cc-network-panel.c
View file

@ -1018,15 +1018,10 @@ nm_device_refresh_device_ui (CcNetworkPanel *panel, NetDevice *device)
/* we have a new device */ /* we have a new device */
nm_device = net_device_get_nm_device (device); nm_device = net_device_get_nm_device (device);
g_debug ("selected device is: %s", nm_device_get_udi (nm_device));
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"hbox_device_header"));
gtk_widget_set_visible (widget, TRUE);
type = nm_device_get_device_type (nm_device); type = nm_device_get_device_type (nm_device);
g_debug ("device %s type %i", nm_device_get_udi (nm_device), type); g_debug ("device %s type %i", nm_device_get_udi (nm_device), type);
/* set device icon */ /* set header icon */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"image_device")); "image_device"));
gtk_image_set_from_icon_name (GTK_IMAGE (widget), gtk_image_set_from_icon_name (GTK_IMAGE (widget),
@ -1329,11 +1324,6 @@ nm_device_refresh_vpn_ui (CcNetworkPanel *panel, NetVpn *vpn)
const gchar *apath; const gchar *apath;
NMVPNConnectionState state; NMVPNConnectionState state;
/* show the header */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"hbox_device_header"));
gtk_widget_set_visible (widget, TRUE);
sw = GTK_WIDGET (gtk_builder_get_object (priv->builder, sw = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"device_off_switch")); "device_off_switch"));
gtk_widget_set_visible (sw, TRUE); gtk_widget_set_visible (sw, TRUE);
@ -1432,13 +1422,30 @@ refresh_ui (CcNetworkPanel *panel)
/* this is the proxy settings device */ /* this is the proxy settings device */
if (object == NULL) { if (object == NULL) {
/* set header to something sane */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"hbox_device_header")); "image_device"));
gtk_widget_set_visible (widget, FALSE); gtk_image_set_from_icon_name (GTK_IMAGE (widget),
"preferences-system-network",
GTK_ICON_SIZE_DIALOG);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"label_device"));
gtk_label_set_label (GTK_LABEL (widget),
_("Proxy"));
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"label_status"));
gtk_label_set_label (GTK_LABEL (widget), "");
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"notebook_types")); "notebook_types"));
gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 2); gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 2);
/* hide the slider until we get some more detail in the mockup */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"device_off_switch"));
gtk_widget_hide (widget);
/* we shoulnd't be able to delete the proxy device */ /* we shoulnd't be able to delete the proxy device */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"remove_toolbutton")); "remove_toolbutton"));