mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-02 22:48:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up StatusBar and use new StatusBarItems.

Browse source
This commit is contained in:
Andrew Resch 2007-11-19 07:33:43 +00:00
commit d8680af277
2 changed files with 28 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
deluge/ui/gtkui/queuedtorrents.py
View file

@ -84,9 +84,8 @@ class QueuedTorrents(component.Component):
self.on_button_add_clicked(None) self.on_button_add_clicked(None)
return return
# Make sure status bar info is showing # Make sure status bar info is showing
self.status_item = None
self.update_status_bar() self.update_status_bar()
# We only want the add button sensitive if we're connected to a host # We only want the add button sensitive if we're connected to a host
self.glade.get_widget("button_add").set_sensitive(True) self.glade.get_widget("button_add").set_sensitive(True)
self.run() self.run()

59
deluge/ui/gtkui/statusbar.py
View file

@ -43,6 +43,7 @@ class StatusBarItem:
self._widgets = [] self._widgets = []
self._ebox = gtk.EventBox() self._ebox = gtk.EventBox()
self._hbox = gtk.HBox() self._hbox = gtk.HBox()
self._hbox.set_spacing(5)
self._image = gtk.Image() self._image = gtk.Image()
self._label = gtk.Label() self._label = gtk.Label()
self._hbox.add(self._image) self._hbox.add(self._image)
@ -101,45 +102,39 @@ class StatusBar(component.Component):
frame = self.statusbar.get_children()[0] frame = self.statusbar.get_children()[0]
frame.remove(frame.get_children()[0]) frame.remove(frame.get_children()[0])
frame.add(self.hbox) frame.add(self.hbox)
self.statusbar.show_all()
# Show the not connected status bar # Show the not connected status bar
self.show_not_connected() self.show_not_connected()
def start(self): def start(self):
log.debug("StatusBar start..") log.debug("StatusBar start..")
# Add in images and labels # Add in images and labels
self.clear_statusbar() self.remove_item(self.not_connected_item)
image = gtk.Image() self.connections_item = StatusBarItem(
image.set_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_MENU) stock=gtk.STOCK_NETWORK)
self.hbox.pack_start(image, expand=False, fill=False) self.hbox.pack_start(
self.label_connections = gtk.Label() self.connections_item.get_eventbox(), expand=False, fill=False)
self.hbox.pack_start(self.label_connections, expand=False, fill=False) self.download_item = StatusBarItem(
image = gtk.Image() image=deluge.common.get_pixmap("downloading16.png"))
image.set_from_file(deluge.common.get_pixmap("downloading16.png")) self.hbox.pack_start(
self.hbox.pack_start(image, expand=False, fill=False) self.download_item.get_eventbox(), expand=False, fill=False)
self.label_download_speed = gtk.Label() self.upload_item = StatusBarItem(
self.hbox.pack_start(self.label_download_speed, image=deluge.common.get_pixmap("seeding16.png"))
expand=False, fill=False) self.hbox.pack_start(
image = gtk.Image() self.upload_item.get_eventbox(), expand=False, fill=False)
image.set_from_file(deluge.common.get_pixmap("seeding16.png"))
self.hbox.pack_start(image, expand=False, fill=False)
self.label_upload_speed = gtk.Label()
self.hbox.pack_start(self.label_upload_speed,
expand=False, fill=False)
self.statusbar.show_all()
def stop(self): def stop(self):
# When stopped, we just show the not connected thingy # When stopped, we just show the not connected thingy
self.remove_item(self.connections_item)
self.remove_item(self.download_item)
self.remove_item(self.upload_item)
self.show_not_connected() self.show_not_connected()
def show_not_connected(self): def show_not_connected(self):
self.clear_statusbar() self.not_connected_item = StatusBarItem(
image = gtk.Image() stock=gtk.STOCK_STOP, text=_("Not Connected"))
image.set_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) self.hbox.pack_start(
self.hbox.pack_start(image, expand=False, fill=False) self.not_connected_item.get_eventbox(), expand=False, fill=False)
label = gtk.Label(_("Not Connected"))
self.hbox.pack_start(label, expand=False, fill=False)
self.statusbar.show_all()
def add_item(self, image=None, stock=None, text=None, callback=None): def add_item(self, image=None, stock=None, text=None, callback=None):
"""Adds an item to the status bar""" """Adds an item to the status bar"""
@ -165,8 +160,8 @@ class StatusBar(component.Component):
max_connections = client.get_config_value("max_connections_global") max_connections = client.get_config_value("max_connections_global")
if max_connections < 0: if max_connections < 0:
max_connections = _("Unlimited") max_connections = _("Unlimited")
self.label_connections.set_text("%s (%s)" % ( self.connections_item.set_text("%s (%s)" % (
client.get_num_connections(), max_connections)) client.get_num_connections(), max_connections))
# Set the download speed label # Set the download speed label
@ -176,10 +171,10 @@ class StatusBar(component.Component):
else: else:
max_download_speed = "%s %s" % (max_download_speed, _("KiB/s")) max_download_speed = "%s %s" % (max_download_speed, _("KiB/s"))
self.label_download_speed.set_text("%s/s (%s)" % ( self.download_item.set_text("%s/s (%s)" % (
deluge.common.fsize(client.get_download_rate()), deluge.common.fsize(client.get_download_rate()),
max_download_speed)) max_download_speed))
# Set the upload speed label # Set the upload speed label
max_upload_speed = client.get_config_value("max_upload_speed") max_upload_speed = client.get_config_value("max_upload_speed")
if max_upload_speed < 0: if max_upload_speed < 0:
@ -187,7 +182,7 @@ class StatusBar(component.Component):
else: else:
max_upload_speed = "%s %s" % (max_upload_speed, _("KiB/s")) max_upload_speed = "%s %s" % (max_upload_speed, _("KiB/s"))
self.label_upload_speed.set_text("%s/s (%s)" % ( self.upload_item.set_text("%s/s (%s)" % (
deluge.common.fsize(client.get_upload_rate()), deluge.common.fsize(client.get_upload_rate()),
max_upload_speed)) max_upload_speed))