From 7f13d109d7a724e8c2c505a6165dbf4b0187f5c7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 6 Feb 2013 17:15:07 -0500 Subject: [PATCH] network: Sort out symbolic icons In bug 689638, the designers only asked for the list icons to be symbolic, not the big icons in the page headings. The current code was failing on both ends: virtual devices like vlan still had non-symbolic icons in the list, and several pages (e.g mobile and proxy) had symbolic icons in the headings. https://bugzilla.gnome.org/show_bug.cgi?id=693001 --- panels/network/cc-network-panel.c | 6 +++--- panels/network/net-device-ethernet.c | 2 +- panels/network/net-device-simple.c | 2 +- panels/network/net-proxy.c | 2 +- panels/network/net-virtual-device.c | 2 +- panels/network/network-mobile.ui | 2 +- panels/network/network-proxy.ui | 2 +- panels/network/network-vpn.ui | 2 +- panels/network/panel-common.c | 20 +++++++++++++------- panels/network/panel-common.h | 3 ++- 10 files changed, 25 insertions(+), 18 deletions(-) diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c index c6d512f55..06f223203 100644 --- a/panels/network/cc-network-panel.c +++ b/panels/network/cc-network-panel.c @@ -625,7 +625,7 @@ state_changed_cb (NMDevice *device, "liststore_devices")); gtk_list_store_set (store, &iter, - PANEL_DEVICES_COLUMN_ICON, panel_device_to_icon_name (device), + PANEL_DEVICES_COLUMN_ICON, panel_device_to_icon_name (device, TRUE), -1); } @@ -704,7 +704,7 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device) gtk_list_store_append (liststore_devices, &iter); gtk_list_store_set (liststore_devices, &iter, - PANEL_DEVICES_COLUMN_ICON, panel_device_to_icon_name (device), + PANEL_DEVICES_COLUMN_ICON, panel_device_to_icon_name (device, TRUE), PANEL_DEVICES_COLUMN_SORT, panel_device_to_sortable_string (device), PANEL_DEVICES_COLUMN_OBJECT, net_device, -1); @@ -1136,7 +1136,7 @@ panel_add_virtual_device (CcNetworkPanel *panel, NMConnection *connection) gtk_list_store_append (liststore_devices, &iter); gtk_list_store_set (liststore_devices, &iter, - PANEL_DEVICES_COLUMN_ICON, "network-wired", + PANEL_DEVICES_COLUMN_ICON, "network-wired-symbolic", PANEL_DEVICES_COLUMN_SORT, "2", PANEL_DEVICES_COLUMN_OBJECT, net_virt, -1); diff --git a/panels/network/net-device-ethernet.c b/panels/network/net-device-ethernet.c index 5b7788219..ba9c81205 100644 --- a/panels/network/net-device-ethernet.c +++ b/panels/network/net-device-ethernet.c @@ -218,7 +218,7 @@ device_ethernet_refresh_ui (NetDeviceEthernet *device) widget = GTK_WIDGET (gtk_builder_get_object (device->builder, "image_device")); gtk_image_set_from_icon_name (GTK_IMAGE (widget), - panel_device_to_icon_name (nm_device), + panel_device_to_icon_name (nm_device, FALSE), GTK_ICON_SIZE_DIALOG); widget = GTK_WIDGET (gtk_builder_get_object (device->builder, "device_off_switch")); diff --git a/panels/network/net-device-simple.c b/panels/network/net-device-simple.c index 2fb4c9af7..f7a1dfce9 100644 --- a/panels/network/net-device-simple.c +++ b/panels/network/net-device-simple.c @@ -108,7 +108,7 @@ nm_device_simple_refresh_ui (NetDeviceSimple *device_simple) g_object_bind_property (device_simple, "title", widget, "label", 0); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "image_device")); gtk_image_set_from_icon_name (GTK_IMAGE (widget), - panel_device_to_icon_name (nm_device), + panel_device_to_icon_name (nm_device, FALSE), GTK_ICON_SIZE_DIALOG); /* set up the device on/off switch */ diff --git a/panels/network/net-proxy.c b/panels/network/net-proxy.c index 28898a1a0..5e8505b6f 100644 --- a/panels/network/net-proxy.c +++ b/panels/network/net-proxy.c @@ -398,7 +398,7 @@ net_proxy_init (NetProxy *proxy) widget = GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder, "image_proxy_device")); gtk_image_set_from_icon_name (GTK_IMAGE (widget), - "preferences-system-network-symbolic", + "preferences-system-network", GTK_ICON_SIZE_DIALOG); widget = GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder, "label_proxy_device")); diff --git a/panels/network/net-virtual-device.c b/panels/network/net-virtual-device.c index d0d4ce4e5..f8567f993 100644 --- a/panels/network/net-virtual-device.c +++ b/panels/network/net-virtual-device.c @@ -166,7 +166,7 @@ net_virtual_device_refresh (NetObject *object) /* set device kind */ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "image_device")); gtk_image_set_from_icon_name (GTK_IMAGE (widget), - disconnected ? "network-wired-disconnected-symbolic" : "network-wired-symbolic", + disconnected ? "network-wired-disconnected" : "network-wired", GTK_ICON_SIZE_DIALOG); /* set up the device on/off switch */ diff --git a/panels/network/network-mobile.ui b/panels/network/network-mobile.ui index d36cf73d0..7d473cf46 100644 --- a/panels/network/network-mobile.ui +++ b/panels/network/network-mobile.ui @@ -32,7 +32,7 @@ start 1 48 - network-cellular-connected-symbolic + network-cellular-connected 6 diff --git a/panels/network/network-proxy.ui b/panels/network/network-proxy.ui index 4e5a72294..be4aa759d 100644 --- a/panels/network/network-proxy.ui +++ b/panels/network/network-proxy.ui @@ -57,7 +57,7 @@ start 1 48 - preferences-system-network-symbolic + preferences-system-network 6 diff --git a/panels/network/network-vpn.ui b/panels/network/network-vpn.ui index 66f30bff8..565461cc8 100644 --- a/panels/network/network-vpn.ui +++ b/panels/network/network-vpn.ui @@ -38,7 +38,7 @@ start 1 48 - network-vpn-symbolic + network-vpn 6 diff --git a/panels/network/panel-common.c b/panels/network/panel-common.c index 5b48f9eee..b71eee21d 100644 --- a/panels/network/panel-common.c +++ b/panels/network/panel-common.c @@ -36,7 +36,7 @@ * panel_device_to_icon_name: **/ const gchar * -panel_device_to_icon_name (NMDevice *device) +panel_device_to_icon_name (NMDevice *device, gboolean symbolic) { const gchar *value = NULL; NMDeviceState state; @@ -45,25 +45,31 @@ panel_device_to_icon_name (NMDevice *device) case NM_DEVICE_TYPE_ETHERNET: state = nm_device_get_state (device); if (state <= NM_DEVICE_STATE_DISCONNECTED) { - value = "network-wired-disconnected-symbolic"; + value = symbolic ? "network-wired-disconnected-symbolic" + : "network-wired-disconnected"; } else { - value = "network-wired-symbolic"; + value = symbolic ? "network-wired-symbolic" + : "network-wired"; } break; case NM_DEVICE_TYPE_WIFI: case NM_DEVICE_TYPE_BT: case NM_DEVICE_TYPE_OLPC_MESH: - value = "network-wireless-signal-excellent-symbolic"; + value = symbolic ? "network-wireless-signal-excellent-symbolic" + : "network-wireless-signal-excellent"; break; case NM_DEVICE_TYPE_MODEM: caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device)); if ((caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) || (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)) { - value = "network-wireless-signal-excellent-symbolic"; + value = symbolic ? "network-wireless-signal-excellent-symbolic" + : "network-wireless-signal-excellent"; + break; } - break; + /* fall thru */ default: - value = "network-idle-symbolic"; + value = symbolic ? "network-idle-symbolic" + : "network-idle"; break; } return value; diff --git a/panels/network/panel-common.h b/panels/network/panel-common.h index a8d1be188..89e75e8ea 100644 --- a/panels/network/panel-common.h +++ b/panels/network/panel-common.h @@ -30,7 +30,8 @@ G_BEGIN_DECLS -const gchar *panel_device_to_icon_name (NMDevice *device); +const gchar *panel_device_to_icon_name (NMDevice *device, + gboolean symbolic); const gchar *panel_device_to_localized_string (NMDevice *device); const gchar *panel_device_to_sortable_string (NMDevice *device); const gchar *panel_ap_mode_to_localized_string (NM80211Mode mode);