From db45018cc65ebda82fbbcefb835c002ab950216a Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Tue, 26 Oct 2010 14:44:31 +0100 Subject: [PATCH] Use different icon name for network in places when theme is not Mint-X --- debian/changelog | 3 ++- usr/lib/linuxmint/mintMenu/plugins/places.py | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7190f0d..c016161 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ mintmenu (5.1.6) julia; urgency=low * Highlighted apps now appear in bold, as opposed to using the fg[gtk.SELECTED] color (to avoid white on white issues with certain themes) + * Network icon in places uses "network-workgroup" icon name when the theme is not Mint-X. - -- Clement Lefebvre Tue, 26 Oct 2010 13:57:00 +0000 + -- Clement Lefebvre Tue, 26 Oct 2010 14:44:00 +0000 mintmenu (5.1.5) julia; urgency=low diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/lib/linuxmint/mintMenu/plugins/places.py index a715e69..05b3bf7 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/places.py +++ b/usr/lib/linuxmint/mintMenu/plugins/places.py @@ -135,7 +135,7 @@ class pluginclass( object ): # Allow plugin to be minimized to the left plugin pane self.sticky = self.gconf.get( "bool", "sticky", False ) self.minimized = self.gconf.get( "bool", "minimized", False ) - + def ClearAll(self): for child in self.placesBtnHolder.get_children(): child.destroy() @@ -159,8 +159,13 @@ class pluginclass( object ): self.placesBtnHolder.pack_start( Button2, False, False ) self.mintMenuWin.setTooltip( Button2, _("Open your personal folder") ) - if ( self.shownetwork == True ): - Button3 = easyButton( "notification-network-ethernet-connected", self.iconsize, [_("Network")], -1, -1 ) + if ( self.shownetwork == True ): + gconftheme = EasyGConf( "/desktop/gnome/interface/" ) + icon_theme = gconftheme.get("string", "icon_theme", "Mint-X") + if "Mint-X" in icon_theme: + Button3 = easyButton( "notification-network-ethernet-connected", self.iconsize, [_("Network")], -1, -1) + else: + Button3 = easyButton( "network-workgroup", self.iconsize, [_("Network")], -1, -1) Button3.connect( "clicked", self.ButtonClicked, "nautilus network:" ) Button3.show() self.placesBtnHolder.pack_start( Button3, False, False )