From f160d6312f54f5bfd5b531f85128623296f65a4a Mon Sep 17 00:00:00 2001 From: hugosenari Date: Fri, 14 Sep 2018 15:15:03 +0100 Subject: [PATCH] [GTK3] Fix piecesbar warnings Fixes: - get_style to get_style_context - use str with gsignals --- deluge/ui/gtk3/piecesbar.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/deluge/ui/gtk3/piecesbar.py b/deluge/ui/gtk3/piecesbar.py index 389f2e1f8..427bd8f44 100644 --- a/deluge/ui/gtk3/piecesbar.py +++ b/deluge/ui/gtk3/piecesbar.py @@ -21,21 +21,22 @@ from gi.repository.Gtk import DrawingArea, ProgressBar from gi.repository.Pango import SCALE, Weight # isort:imports-firstparty +from deluge.common import PY2 from deluge.configmanager import ConfigManager COLOR_STATES = ['missing', 'waiting', 'downloading', 'completed'] class PiecesBar(DrawingArea): - # Draw in response to an expose-event - __gsignals__ = {b'draw': b'override'} + # Draw in response to an draw + __gsignals__ = {'draw': 'override'} if not PY2 else {b'draw': b'override'} def __init__(self): super(PiecesBar, self).__init__() # Get progress bar styles, in order to keep font consistency pb = ProgressBar() - pb_style = pb.get_style() - self.text_font = pb_style.font_desc + pb_style = pb.get_style_context() + self.text_font = pb_style.get_property('font', Gtk.StateFlags.NORMAL) self.text_font.set_weight(Weight.BOLD) # Done with the ProgressBar styles, don't keep refs of it del pb, pb_style @@ -61,7 +62,7 @@ class PiecesBar(DrawingArea): self.prev_height = self.height self.height = size.height - # Handle the expose-event by drawing + # Handle the draw by drawing def do_draw(self, event): # Create cairo context self.cr = self.window.cairo_create()