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

Removed network expanders

Browse Source
This commit is contained in:
Adam Blackburn
2009-01-09 20:40:30 +08:00
parent bff4f961e7
commit db2d00b2b4
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wicd/netentry.py
View File

@@ -495,7 +495,6 @@ class NetworkEntry(gtk.HBox):
wired = dbus_ifaces["wired"] wired = dbus_ifaces["wired"]
wireless = dbus_ifaces["wireless"] wireless = dbus_ifaces["wireless"]
gtk.HBox.__init__(self, False, 2) gtk.HBox.__init__(self, False, 2)
self.expander = gtk.Expander()
self.image = gtk.Image() self.image = gtk.Image()
self.pack_start(self.image, False, False) self.pack_start(self.image, False, False)
@@ -512,8 +511,6 @@ class NetworkEntry(gtk.HBox):
# Set up the VBox that goes in the gtk.Expander # Set up the VBox that goes in the gtk.Expander
self.expander_vbox = gtk.VBox(False, 1) self.expander_vbox = gtk.VBox(False, 1)
self.expander_vbox.show() self.expander_vbox.show()
self.expander_vbox.pack_start(self.expander)
self.expander_vbox.pack_start(self.connect_hbox, False, False)
self.pack_end(self.expander_vbox) self.pack_end(self.expander_vbox)
# Set up the advanced settings button # Set up the advanced settings button
@@ -545,7 +542,8 @@ class NetworkEntry(gtk.HBox):
aligner = gtk.Alignment(xscale=1.0) aligner = gtk.Alignment(xscale=1.0)
aligner.add(self.vbox_top) aligner.add(self.vbox_top)
aligner.set_padding(0, 0, 15, 0) aligner.set_padding(0, 0, 15, 0)
self.expander.add(aligner) self.expander_vbox.pack_start(aligner)
self.expander_vbox.pack_start(self.connect_hbox, False, False)
def destroy_called(self, *args): def destroy_called(self, *args):
""" Clean up everything. """ """ Clean up everything. """
@@ -564,10 +562,8 @@ class WiredNetworkEntry(NetworkEntry):
#self.image.set_from_icon_name("network-wired", 6) #self.image.set_from_icon_name("network-wired", 6)
self.image.set_from_file(wpath.images + "wired.png") self.image.set_from_file(wpath.images + "wired.png")
self.image.show() self.image.show()
self.expander.show()
self.connect_button.show() self.connect_button.show()
self.expander.set_label(language['wired_network'])
#self.reset_static_checkboxes() #self.reset_static_checkboxes()
self.is_full_gui = True self.is_full_gui = True
@@ -628,11 +624,8 @@ class WiredNetworkEntry(NetworkEntry):
else: else:
self.combo_profile_names.set_active(0) self.combo_profile_names.set_active(0)
print "wired profiles found" print "wired profiles found"
self.expander.set_expanded(False)
else: else:
print "no wired profiles found" print "no wired profiles found"
if not wired.GetAlwaysShowWiredInterface():
self.expander.set_expanded(True)
self.profile_help.show() self.profile_help.show()
self.check_enable() self.check_enable()
self.wireddis = self.connect("destroy", self.destroy_called) self.wireddis = self.connect("destroy", self.destroy_called)
@@ -793,13 +786,10 @@ class WirelessNetworkEntry(NetworkEntry):
wireless.GetWirelessProperty(networkID, wireless.GetWirelessProperty(networkID,
'encryption_method')) 'encryption_method'))
# The the expander label. # self.expander.set_label(self._escape(self.essid) + " " +
self.expander.set_use_markup(True) # self.lbl_strength.get_label() + " " +
# self.lbl_encryption.get_label() + " " +
self.expander.set_label(self._escape(self.essid) + " " + # self.lbl_mac.get_label())
self.lbl_strength.get_label() + " " +
self.lbl_encryption.get_label() + " " +
self.lbl_mac.get_label())
# Pack the network status HBox. # Pack the network status HBox.
self.hbox_status.pack_start(self.lbl_strength, True, True) self.hbox_status.pack_start(self.lbl_strength, True, True)