diff options
author | Nico Schlömer <nico.schloemer@gmail.com> | 2022-03-07 19:48:02 +0100 |
---|---|---|
committer | Nico Schlömer <nico.schloemer@gmail.com> | 2022-03-07 19:48:02 +0100 |
commit | a1052372643cfb806fde9565be7fe8ea54f5affa (patch) | |
tree | e6f1d1967e23e3f461c281d63785517c99e95ac9 | |
parent | b8a5726c3c003eb47bd7588fba374faa175a1e44 (diff) |
use style= rather than []
-rw-r--r-- | src/tiptop/_battery.py | 3 | ||||
-rw-r--r-- | src/tiptop/_disk.py | 8 | ||||
-rw-r--r-- | src/tiptop/_mem.py | 3 | ||||
-rw-r--r-- | src/tiptop/_net.py | 9 |
4 files changed, 13 insertions, 10 deletions
diff --git a/src/tiptop/_battery.py b/src/tiptop/_battery.py index 2d6ed96..ca43862 100644 --- a/src/tiptop/_battery.py +++ b/src/tiptop/_battery.py @@ -1,6 +1,7 @@ import psutil from rich import box from rich.panel import Panel +from rich.text import Text from textual.widget import Widget from .braille_stream import BrailleStream @@ -28,7 +29,7 @@ class Battery(Widget): self.bat_stream.add_value(bat.percent) - self.panel.renderable = "[yellow]" + "\n".join(self.bat_stream.graph) + "[/]\n" + self.panel.renderable = Text("\n".join(self.bat_stream.graph), style="yellow") if bat.power_plugged: status = "charging" diff --git a/src/tiptop/_disk.py b/src/tiptop/_disk.py index 40bbf9e..d428a8e 100644 --- a/src/tiptop/_disk.py +++ b/src/tiptop/_disk.py @@ -120,11 +120,11 @@ class Disk(Widget): ] ) - self.table.columns[0]._cells[0] = ( - "[green]" + "\n".join(self.read_stream.graph) + "[/]" + self.table.columns[0]._cells[0] = Text( + "\n".join(self.read_stream.graph), style="green" ) - self.table.columns[0]._cells[1] = ( - "[blue]" + "\n".join(self.write_stream.graph) + "[/]" + self.table.columns[0]._cells[1] = Text( + "\n".join(self.write_stream.graph), style="blue" ) table = Table(box=None, expand=False, padding=(0, 1), show_header=True) diff --git a/src/tiptop/_mem.py b/src/tiptop/_mem.py index 7c009ef..869aa68 100644 --- a/src/tiptop/_mem.py +++ b/src/tiptop/_mem.py @@ -2,6 +2,7 @@ import psutil from rich import box from rich.panel import Panel from rich.table import Table +from rich.text import Text from textual.widget import Widget from ._helpers import sizeof_fmt @@ -82,7 +83,7 @@ class Mem(Widget): graph = "\n".join( [val_string + stream.graph[0][len(val_string) :]] + stream.graph[1:] ) - self.table.columns[0]._cells[k] = f"[{self.colors[k]}]{graph}[/]" + self.table.columns[0]._cells[k] = Text(graph, style=self.colors[k]) self.refresh() diff --git a/src/tiptop/_net.py b/src/tiptop/_net.py index 6234b98..aea1e5d 100644 --- a/src/tiptop/_net.py +++ b/src/tiptop/_net.py @@ -7,6 +7,7 @@ from rich import box from rich.console import Group from rich.panel import Panel from rich.table import Table +from rich.text import Text from textual.widget import Widget from .__about__ import __version__ @@ -168,11 +169,11 @@ class Net(Widget): ] ) - self.table.columns[0]._cells[0] = ( - "[green]" + "\n".join(self.recv_stream.graph) + "[/]" + self.table.columns[0]._cells[0] = Text( + "\n".join(self.recv_stream.graph), style="green" ) - self.table.columns[0]._cells[1] = ( - "[blue]" + "\n".join(self.sent_stream.graph) + "[/]" + self.table.columns[0]._cells[1] = Text( + "\n".join(self.sent_stream.graph), style="blue" ) self.refresh() |