gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 04:48:00 +01:00
Code Issues Projects Releases Wiki Activity

Fixed typo in the testing release, added ralink correct signal strength info to experimental release, fixed wired connection bug in experimental release

Browse Source
This commit is contained in:
imdano
2007-07-25 09:04:39 +00:00
parent a984110b49
commit f1eb03fa85
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
daemon.py
View File

@@ -737,10 +737,11 @@ class ConnectionWizard(dbus.service.Object):
print "profileList = ",profileList print "profileList = ",profileList
for profile in profileList: for profile in profileList:
print "profile = ", profile print "profile = ", profile
if config.get(profile,"default") == "True": if config.has_option(profile,"default"):
print "removing existing default" if config.get(profile,"default") == "True":
config.set(profile,"default", False) print "removing existing default"
self.SaveWiredNetworkProfile(profile) config.set(profile,"default", False)
self.SaveWiredNetworkProfile(profile)
#end function UnsetWiredDefault #end function UnsetWiredDefault
@dbus.service.method('org.wicd.daemon.config') @dbus.service.method('org.wicd.daemon.config')
@@ -749,8 +750,9 @@ class ConnectionWizard(dbus.service.Object):
config.read(self.wired_conf) config.read(self.wired_conf)
profileList = config.sections() profileList = config.sections()
for profile in profileList: for profile in profileList:
if config.get(profile,"default") == "True": if config.has_option(profile,"default"):
return profile if config.get(profile,"default") == "True":
return profile
return None return None
@dbus.service.method('org.wicd.daemon.config') @dbus.service.method('org.wicd.daemon.config')

32
gui.py
View File

@@ -330,14 +330,24 @@ class PrettyWirelessNetworkEntry(PrettyNetworkEntry):
def setSignalStrength(self,strength): def setSignalStrength(self,strength):
strength = int(strength) strength = int(strength)
if strength > 75: if daemon.GetWPADriver() == 'ralink legacy':
self.image.set_from_file("images/signal-100.png") if strength <= 60:
elif strength > 50: self.image.set_from_file("images/signal-100.png")
self.image.set_from_file("images/signal-75.png") elif strength <= 70:
elif strength > 25: self.image.set_from_file("images/signal-75.png")
self.image.set_from_file("images/signal-50.png") elif strength <= 80:
self.image.set_from_file("images/signal-50.png")
else:
self.image.set_from_file("images/signal-25.png")
else: else:
self.image.set_from_file("images/signal-25.png") if strength > 75:
self.image.set_from_file("images/signal-100.png")
elif strength > 50:
self.image.set_from_file("images/signal-75.png")
elif strength > 25:
self.image.set_from_file("images/signal-50.png")
else:
self.image.set_from_file("images/signal-25.png")
self.expander.setSignalStrength(strength) self.expander.setSignalStrength(strength)
def setMACAddress(self,address): def setMACAddress(self,address):
@@ -744,7 +754,13 @@ class WirelessNetworkEntry(NetworkEntry):
self.vboxEncryptionInformation.show_all() self.vboxEncryptionInformation.show_all()
def setSignalStrength(self,strength): def setSignalStrength(self,strength):
self.lblStrength.set_label(str(strength) + "%") if daemon.GetWPADriver() == 'ralink legacy':
ending = "dBm"
start = "-"
else:
ending = "%"
start = ""
self.lblStrength.set_label(start + str(strength) + ending)
def setMACAddress(self,address): def setMACAddress(self,address):
self.lblMAC.set_label(str(address)) self.lblMAC.set_label(str(address))