2004-11-02 Bryan Clark <clarkbw@cvs.gnome.org>
* panel-applet/menu-info.c: change from bold text to light colored, may cause problems with some themes, i've tested a lot and they seem fine. * panel-applet/NMWirelessApplet.c: fix strength tooltip git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@288 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:

committed by
Bryan W. Clark

parent
3c23d9c628
commit
47fab57a67
@@ -1,3 +1,11 @@
|
||||
2004-11-02 Bryan Clark <clarkbw@cvs.gnome.org>
|
||||
|
||||
* panel-applet/menu-info.c: change from bold text to light
|
||||
colored, may cause problems with some themes, i've tested a lot
|
||||
and they seem fine.
|
||||
|
||||
* panel-applet/NMWirelessApplet.c: fix strength tooltip
|
||||
|
||||
2004-11-01 Colin Walters <walters@verbum.org>
|
||||
|
||||
* src/NetworkManagerWireless.h, src/NetworkManagerWireless.c
|
||||
|
@@ -173,7 +173,7 @@ class network_tray:
|
||||
if self._is_wireless(device):
|
||||
try:
|
||||
if self._nm.number_wireless_devices() > 1:
|
||||
return device["info.product"]
|
||||
return device["pci.subsys_vendor"]
|
||||
else:
|
||||
return "Wireless Network"
|
||||
except:
|
||||
@@ -260,7 +260,7 @@ class network_tray:
|
||||
self._top_level_menu.show()
|
||||
|
||||
def _get_encrypted_icon(self):
|
||||
pb = gtk.gdk.pixbuf_new_from_file("../../../panel-applet/keyring.png")
|
||||
pb = gtk.gdk.pixbuf_new_from_file("/usr/share/icons/hicolor/16x16/stock/generic/stock_keyring.png")
|
||||
pb = pb.scale_simple(16,16,gtk.gdk.INTERP_NEAREST)
|
||||
_keyring = gtk.Image()
|
||||
_keyring.set_from_pixbuf(pb)
|
||||
@@ -273,19 +273,19 @@ class network_tray:
|
||||
|
||||
if active_device:
|
||||
if active_device["nm.type"] == self._nm.WIRED_DEVICE:
|
||||
pb = gtk.gdk.pixbuf_new_from_file("../../../panel-applet/wired.png")
|
||||
pb = gtk.gdk.pixbuf_new_from_file("../../../panel-applet/icons/nm-device-wired.png")
|
||||
pb = pb.scale_simple(16,16,gtk.gdk.INTERP_NEAREST)
|
||||
_wired_icon = gtk.Image()
|
||||
_wired_icon.set_from_pixbuf(pb)
|
||||
return _wired_icon
|
||||
elif active_device["nm.type"] == self._nm.WIRELESS_DEVICE:
|
||||
pb = gtk.gdk.pixbuf_new_from_file("../../../panel-applet/wireless-applet.png")
|
||||
pb = gtk.gdk.pixbuf_new_from_file("../../../panel-applet/icons/nm-device-wireless.png")
|
||||
pb = pb.scale_simple(16,16,gtk.gdk.INTERP_NEAREST)
|
||||
_wireless_icon = gtk.Image()
|
||||
_wireless_icon.set_from_pixbuf(pb)
|
||||
return _wireless_icon
|
||||
else:
|
||||
pb = gtk.gdk.pixbuf_new_from_file("../../../panel-applet/wireless-applet.png")
|
||||
pb = gtk.gdk.pixbuf_new_from_file("../../../panel-applet/icons/nm-device-wireless.png")
|
||||
pb = pb.scale_simple(16,16,gtk.gdk.INTERP_NEAREST)
|
||||
_nothing_icon = gtk.Image()
|
||||
_nothing_icon.set_from_pixbuf(pb)
|
||||
|
@@ -312,7 +312,7 @@ nmwa_update_state (NMWirelessApplet *applet)
|
||||
pixbuf = applet->wireless_25_icon;
|
||||
else
|
||||
pixbuf = applet->wireless_00_icon;
|
||||
tip = g_strdup_printf (_("Wireless network connection (%d%%)"), applet->active_device->strength);
|
||||
tip = g_strdup_printf (_("Wireless network connection (%d%%)"), strength);
|
||||
}
|
||||
else
|
||||
tip = g_strdup (_("Wireless network connection"));
|
||||
|
@@ -169,7 +169,7 @@ nm_menu_network_update (NMMenuNetwork *menu_network,
|
||||
else
|
||||
text = g_strdup (ngettext ("Wireless Network", "Wireless Networks", n_essids));
|
||||
|
||||
markup = g_markup_printf_escaped ("<b>%s</b>", text);
|
||||
markup = g_markup_printf_escaped ("<span foreground=\"#aaaaaa\">%s</span>", text);
|
||||
gtk_label_set_markup (GTK_LABEL (menu_network->label), markup);
|
||||
g_free (markup);
|
||||
g_free (text);
|
||||
|
Reference in New Issue
Block a user