gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-03-12 04:25:47 +01:00
Code Issues Projects Releases Wiki Activity

Merged r401 of mainline 1.6.

Browse Source
This commit is contained in:
Andrew Psaltis
2009-05-23 00:36:54 -04:00
parent 6d00df2675 bb7563a4af
commit 64c86a31a1
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL
View File

@@ -10,7 +10,9 @@ are a few dependencies:
6. a graphical sudo application (gksu, kdesu, and ktsuss are supported), 6. a graphical sudo application (gksu, kdesu, and ktsuss are supported),
while optional, is strongly recommended while optional, is strongly recommended
7. urwid (if you want to use the curses client - needs version >=0.9.8.3) 7. urwid (if you want to use the curses client - needs version >=0.9.8.3)
8. pm-utils (optional for suspend/resume integration - needs version >=1.2.4) 8. pm-utils (optional for suspend/resume integration)
Wicd supports using versions >=1.2.4 -- earlier versions may work just
fine, but they are completely unsupported here.
If you are installing from a bzr pull and you want If you are installing from a bzr pull and you want
the native language translations, first run this: the native language translations, first run this:

18
wicd/gui.py
View File

@@ -511,11 +511,11 @@ class appGui(object):
printLine = True # In this case we print a separator. printLine = True # In this case we print a separator.
wirednet = WiredNetworkEntry() wirednet = WiredNetworkEntry()
self.network_list.pack_start(wirednet, False, False) self.network_list.pack_start(wirednet, False, False)
wirednet.connect_button.connect("button-press-event", self.connect, wirednet.connect_button.connect("clicked", self.connect,
"wired", 0, wirednet) "wired", 0, wirednet)
wirednet.disconnect_button.connect("button-press-event", self.disconnect, wirednet.disconnect_button.connect("clicked", self.disconnect,
"wired", 0, wirednet) "wired", 0, wirednet)
wirednet.advanced_button.connect("button-press-event", wirednet.advanced_button.connect("clicked",
self.edit_advanced, "wired", 0, self.edit_advanced, "wired", 0,
wirednet) wirednet)
@@ -533,13 +533,13 @@ class appGui(object):
printLine = True printLine = True
tempnet = WirelessNetworkEntry(x) tempnet = WirelessNetworkEntry(x)
self.network_list.pack_start(tempnet, False, False) self.network_list.pack_start(tempnet, False, False)
tempnet.connect_button.connect("button-press-event", tempnet.connect_button.connect("clicked",
self.connect, "wireless", x, self.connect, "wireless", x,
tempnet) tempnet)
tempnet.disconnect_button.connect("button-press-event", tempnet.disconnect_button.connect("clicked",
self.disconnect, "wireless", self.disconnect, "wireless",
x, tempnet) x, tempnet)
tempnet.advanced_button.connect("button-press-event", tempnet.advanced_button.connect("clicked",
self.edit_advanced, "wireless", self.edit_advanced, "wireless",
x, tempnet) x, tempnet)
else: else:
@@ -598,7 +598,7 @@ class appGui(object):
return True return True
def edit_advanced(self, widget, event, ttype, networkid, networkentry): def edit_advanced(self, widget, ttype, networkid, networkentry):
""" Display the advanced settings dialog. """ Display the advanced settings dialog.
Displays the advanced settings dialog and saves any changes made. Displays the advanced settings dialog and saves any changes made.
@@ -649,7 +649,7 @@ class appGui(object):
return False return False
return True return True
def connect(self, widget, event, nettype, networkid, networkentry): def connect(self, widget, nettype, networkid, networkentry):
""" Initiates the connection process in the daemon. """ """ Initiates the connection process in the daemon. """
cancel_button = self.wTree.get_widget("cancel_button") cancel_button = self.wTree.get_widget("cancel_button")
cancel_button.set_sensitive(True) cancel_button.set_sensitive(True)
@@ -663,7 +663,7 @@ class appGui(object):
wired.ConnectWired() wired.ConnectWired()
self.update_statusbar() self.update_statusbar()
def disconnect(self, widget, event, nettype, networkid, networkentry): def disconnect(self, widget, nettype, networkid, networkentry):
""" Disconnects from the given network. """ Disconnects from the given network.
Keyword arguments: Keyword arguments:

4
wicd/netentry.py
View File

@@ -238,7 +238,7 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
""" Build the wired settings dialog. """ """ Build the wired settings dialog. """
AdvancedSettingsDialog.__init__(self) AdvancedSettingsDialog.__init__(self)
self.des = self.connect("destroy", self.destroy_called) self.des = self.connect("destroy", self.destroy_called)
self.script_button.connect("button-press-event", self.edit_scripts) self.script_button.connect("clicked", self.edit_scripts)
self.prof_name = name self.prof_name = name
def set_net_prop(self, option, value): def set_net_prop(self, option, value):
@@ -335,7 +335,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
# Connect signals. # Connect signals.
self.chkbox_encryption.connect("toggled", self.toggle_encryption) self.chkbox_encryption.connect("toggled", self.toggle_encryption)
self.combo_encryption.connect("changed", self.change_encrypt_method) self.combo_encryption.connect("changed", self.change_encrypt_method)
self.script_button.connect("button-press-event", self.edit_scripts) self.script_button.connect("clicked", self.edit_scripts)
self.des = self.connect("destroy", self.destroy_called) self.des = self.connect("destroy", self.destroy_called)
def destroy_called(self, *args): def destroy_called(self, *args):