2
src/ap-menu-item.c | 5 +++++
3
src/applet-device-cdma.c | 11 ++++++++++-
4
src/applet-device-gsm.c | 11 ++++++++++-
5
src/applet-device-wifi.c | 4 ++++
6
src/applet-device-wired.c | 11 ++++++++++-
7
6 files changed, 51 insertions(+), 3 deletions(-)
9
Index: network-manager-applet-0.7.1.git.1.18a2bae084/src/ap-menu-item.c
10
===================================================================
11
--- network-manager-applet-0.7.1.git.1.18a2bae084.orig/src/ap-menu-item.c
12
+++ network-manager-applet-0.7.1.git.1.18a2bae084/src/ap-menu-item.c
13
@@ -46,16 +46,19 @@ nm_network_menu_item_init (NMNetworkMenu
17
gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (item), TRUE);
18
item->hbox = gtk_hbox_new (FALSE, 6);
19
item->ssid = gtk_label_new (NULL);
20
gtk_misc_set_alignment (GTK_MISC (item->ssid), 0.0, 0.5);
22
+ gtk_label_set_max_width_chars (GTK_LABEL (item->ssid), 5);
23
+ gtk_label_set_ellipsize (GTK_LABEL (item->ssid), PANGO_ELLIPSIZE_END);
25
item->detail = gtk_image_new ();
27
gtk_container_add (GTK_CONTAINER (item), item->hbox);
28
gtk_box_pack_start (GTK_BOX (item->hbox), item->ssid, TRUE, TRUE, 0);
29
gtk_box_pack_start (GTK_BOX (item->hbox), item->detail, FALSE, FALSE, 0);
31
item->strength = gtk_progress_bar_new ();
33
@@ -142,18 +145,20 @@ nm_network_menu_item_set_ssid (NMNetwork
35
g_return_if_fail (item != NULL);
36
g_return_if_fail (ssid != NULL);
38
display_ssid = nm_utils_ssid_to_utf8 ((const char *) ssid->data, ssid->len);
40
// FIXME: shouldn't happen; always coerce the SSID to _something_
41
gtk_label_set_text (GTK_LABEL (item->ssid), "<unknown>");
42
+ gtk_widget_set_tooltip_text (GTK_WIDGET (item->ssid), "<unknown>");
44
gtk_label_set_text (GTK_LABEL (item->ssid), display_ssid);
45
+ gtk_widget_set_tooltip_text (GTK_WIDGET (item->ssid), display_ssid);
46
g_free (display_ssid);
51
nm_network_menu_item_get_strength (NMNetworkMenuItem * item)
53
g_return_val_if_fail (item != NULL, 0);
54
Index: network-manager-applet-0.7.1.git.1.18a2bae084/src/applet-device-cdma.c
55
===================================================================
56
--- network-manager-applet-0.7.1.git.1.18a2bae084.orig/src/applet-device-cdma.c
57
+++ network-manager-applet-0.7.1.git.1.18a2bae084/src/applet-device-cdma.c
58
@@ -120,22 +120,27 @@ add_connection_items (NMDevice *device,
62
CdmaMenuItemInfo *info;
64
for (iter = connections; iter; iter = g_slist_next (iter)) {
65
NMConnection *connection = NM_CONNECTION (iter->data);
66
NMSettingConnection *s_con;
68
+ GtkWidget *item, *label;
70
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
71
item = gtk_check_menu_item_new_with_label (nm_setting_connection_get_id (s_con));
72
gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (item), TRUE);
74
+ label = gtk_bin_get_child (GTK_BIN (item));
75
+ gtk_label_set_ellipsize (GTK_LABEL (label), TRUE);
76
+ gtk_label_set_max_width_chars (GTK_LABEL (label), 30);
77
+ gtk_widget_set_tooltip_text (item, gtk_label_get_text (GTK_LABEL (label)));
79
if (connection == active)
80
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
82
info = g_slice_new0 (CdmaMenuItemInfo);
83
info->applet = applet;
84
info->device = g_object_ref (G_OBJECT (device));
85
info->connection = g_object_ref (connection);
87
@@ -249,16 +254,20 @@ cdma_add_menu_item (NMDevice *device,
90
label = gtk_bin_get_child (GTK_BIN (item));
91
bold_text = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
92
gtk_label_get_text (GTK_LABEL (label)));
93
gtk_label_set_markup (GTK_LABEL (label), bold_text);
96
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
97
+ gtk_label_set_max_width_chars (GTK_LABEL (label), 30);
98
+ gtk_widget_set_tooltip_text (item, gtk_label_get_text (GTK_LABEL (label)));
100
gtk_widget_set_sensitive (item, FALSE);
101
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
102
gtk_widget_show (item);
104
/* Notify user of unmanaged or unavailable device */
105
item = nma_menu_device_check_unusable (device, NULL);
107
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
108
Index: network-manager-applet-0.7.1.git.1.18a2bae084/src/applet-device-gsm.c
109
===================================================================
110
--- network-manager-applet-0.7.1.git.1.18a2bae084.orig/src/applet-device-gsm.c
111
+++ network-manager-applet-0.7.1.git.1.18a2bae084/src/applet-device-gsm.c
112
@@ -317,22 +317,27 @@ add_connection_items (NMDevice *device,
116
GSMMenuItemInfo *info;
118
for (iter = connections; iter; iter = g_slist_next (iter)) {
119
NMConnection *connection = NM_CONNECTION (iter->data);
120
NMSettingConnection *s_con;
122
+ GtkWidget *item, *label;
124
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
125
item = gtk_check_menu_item_new_with_label (nm_setting_connection_get_id (s_con));
126
gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (item), TRUE);
128
+ label = gtk_bin_get_child (GTK_BIN (item));
129
+ gtk_label_set_ellipsize (GTK_LABEL (label), TRUE);
130
+ gtk_label_set_max_width_chars (GTK_LABEL (label), 30);
131
+ gtk_widget_set_tooltip_text (item, gtk_label_get_text (GTK_LABEL (label)));
133
if (connection == active)
134
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
136
info = g_slice_new0 (GSMMenuItemInfo);
137
info->applet = applet;
138
info->device = g_object_ref (G_OBJECT (device));
139
info->connection = g_object_ref (connection);
141
@@ -452,16 +457,20 @@ gsm_add_menu_item (NMDevice *device,
144
label = gtk_bin_get_child (GTK_BIN (item));
145
bold_text = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
146
gtk_label_get_text (GTK_LABEL (label)));
147
gtk_label_set_markup (GTK_LABEL (label), bold_text);
150
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
151
+ gtk_label_set_max_width_chars (GTK_LABEL (label), 30);
152
+ gtk_widget_set_tooltip_text (item, gtk_label_get_text (GTK_LABEL (label)));
154
gtk_widget_set_sensitive (item, FALSE);
155
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
156
gtk_widget_show (item);
158
/* Notify user of unmanaged or unavailable device */
159
item = nma_menu_device_check_unusable (device, NULL);
161
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
162
Index: network-manager-applet-0.7.1.git.1.18a2bae084/src/applet-device-wifi.c
163
===================================================================
164
--- network-manager-applet-0.7.1.git.1.18a2bae084.orig/src/applet-device-wifi.c
165
+++ network-manager-applet-0.7.1.git.1.18a2bae084/src/applet-device-wifi.c
166
@@ -700,16 +700,20 @@ wireless_add_menu_item (NMDevice *device
169
label = gtk_bin_get_child (GTK_BIN (item));
170
bold_text = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
171
gtk_label_get_text (GTK_LABEL (label)));
172
gtk_label_set_markup (GTK_LABEL (label), bold_text);
175
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
176
+ gtk_label_set_max_width_chars (GTK_LABEL (label), 30);
177
+ gtk_widget_set_tooltip_text (item, gtk_label_get_text (GTK_LABEL (label)));
179
gtk_widget_set_sensitive (item, FALSE);
180
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
181
gtk_widget_show (item);
183
/* Notify user of unmanaged or unavailable device */
184
wireless_enabled = nm_client_wireless_get_enabled (applet->nm_client);
185
item = nma_menu_device_check_unusable (device, wireless_enabled ? NULL : _("wireless is disabled"));
187
Index: network-manager-applet-0.7.1.git.1.18a2bae084/src/applet-device-wired.c
188
===================================================================
189
--- network-manager-applet-0.7.1.git.1.18a2bae084.orig/src/applet-device-wired.c
190
+++ network-manager-applet-0.7.1.git.1.18a2bae084/src/applet-device-wired.c
191
@@ -113,23 +113,28 @@ add_connection_items (NMDevice *device,
195
WiredMenuItemInfo *info;
197
for (iter = connections; iter; iter = g_slist_next (iter)) {
198
NMConnection *connection = NM_CONNECTION (iter->data);
199
NMSettingConnection *s_con;
201
+ GtkWidget *item, *label;
203
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
204
item = gtk_check_menu_item_new_with_label (nm_setting_connection_get_id (s_con));
205
gtk_widget_set_sensitive (GTK_WIDGET (item), carrier);
206
gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (item), TRUE);
208
+ label = gtk_bin_get_child (GTK_BIN (item));
209
+ gtk_label_set_ellipsize (GTK_LABEL (label), TRUE);
210
+ gtk_label_set_max_width_chars (GTK_LABEL (label), 30);
211
+ gtk_widget_set_tooltip_text (item, gtk_label_get_text (GTK_LABEL (label)));
213
if (connection == active)
214
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
216
info = g_slice_new0 (WiredMenuItemInfo);
217
info->applet = applet;
218
info->device = g_object_ref (G_OBJECT (device));
219
info->connection = g_object_ref (connection);
221
@@ -214,16 +219,20 @@ wired_add_menu_item (NMDevice *device,
222
carrier = nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (device));
224
label = gtk_bin_get_child (GTK_BIN (item));
225
bold_text = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
226
gtk_label_get_text (GTK_LABEL (label)));
227
gtk_label_set_markup (GTK_LABEL (label), bold_text);
230
+ gtk_label_set_ellipsize (GTK_LABEL (label), TRUE);
231
+ gtk_label_set_max_width_chars (GTK_LABEL (label), 30);
232
+ gtk_widget_set_tooltip_text (item, gtk_label_get_text (GTK_LABEL (label)));
234
gtk_widget_set_sensitive (item, FALSE);
235
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
236
gtk_widget_show (item);
238
/* Notify user of unmanaged or unavailable device */
239
item = nma_menu_device_check_unusable (device, carrier ? NULL : _("disconnected"));
241
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);