From 3b19191120e7022e683cbac45a3445ca87e02616 Mon Sep 17 00:00:00 2001 From: rr- Date: Thu, 8 Nov 2018 20:14:39 +0100 Subject: [PATCH] ui: use urwid constants --- pqcli/ui/custom_button.py | 6 +++--- pqcli/ui/data_table.py | 2 +- pqcli/ui/double_line_box.py | 4 +++- pqcli/ui/game_view.py | 20 ++++++++++---------- pqcli/ui/new_game_view.py | 4 ++-- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/pqcli/ui/custom_button.py b/pqcli/ui/custom_button.py index a5de435..3642fe2 100644 --- a/pqcli/ui/custom_button.py +++ b/pqcli/ui/custom_button.py @@ -17,13 +17,13 @@ class CustomButton(urwid.Button): self._w = urwid.AttrMap( urwid.Columns( [ - ("pack", urwid.Text("< ")), + (urwid.PACK, urwid.Text("< ")), urwid.SelectableIcon([label], _MAGIC), ( - "pack", + urwid.PACK, urwid.Text(f"[{hint}]" if hint else "", align="right"), ), - ("pack", urwid.Text(" >")), + (urwid.PACK, urwid.Text(" >")), ] ), "button", diff --git a/pqcli/ui/data_table.py b/pqcli/ui/data_table.py index 1abd8fb..0b661c2 100644 --- a/pqcli/ui/data_table.py +++ b/pqcli/ui/data_table.py @@ -28,7 +28,7 @@ class DataTable(urwid.Pile): urwid.Columns( list((*x, y) for x, y in zip(self._columns, widgets)) ), - ("pack", 1), + (urwid.PACK, 1), ) ) self._rows.append(widgets) diff --git a/pqcli/ui/double_line_box.py b/pqcli/ui/double_line_box.py index de2ea1d..a495450 100644 --- a/pqcli/ui/double_line_box.py +++ b/pqcli/ui/double_line_box.py @@ -23,7 +23,9 @@ class DoubleLineBox(urwid.AttrMap): ) super().__init__( - urwid.Pile([self.top_line_box, ("pack", self.bottom_line_box)]), + urwid.Pile( + [self.top_line_box, (urwid.PACK, self.bottom_line_box)] + ), "linebox", "linebox-focus", ) diff --git a/pqcli/ui/game_view.py b/pqcli/ui/game_view.py index e5f7bf4..0dc3909 100644 --- a/pqcli/ui/game_view.py +++ b/pqcli/ui/game_view.py @@ -30,7 +30,7 @@ class CharacterSheetView(DoubleLineBox): self.stat_texts = {stat: urwid.Text("") for stat in list(StatType)} self.exp_bar = CustomProgressBar() - data_table = DataTable(columns=[("weight", 1), ("weight", 1)]) + data_table = DataTable(columns=[(urwid.WEIGHT, 1), (urwid.WEIGHT, 1)]) data_table.add_row(urwid.Text("Name"), urwid.Text(player.name)) data_table.add_row(urwid.Text("Race"), urwid.Text(player.race.name)) data_table.add_row(urwid.Text("Class"), urwid.Text(player.class_.name)) @@ -75,7 +75,7 @@ class SpellBookView(CustomLineBox): def __init__(self, player: Player) -> None: self.player = player - self.data_table = DataTable(columns=[("weight", 3), ("pack",)]) + self.data_table = DataTable(columns=[(urwid.WEIGHT, 3), (urwid.PACK,)]) self.scrollable = Scrollable(self.data_table) self.player.spell_book.connect("add", self.sync_spell_add) @@ -110,7 +110,7 @@ class EquipmentView(CustomLineBox): self.value_texts = { equipment_type: urwid.Text("") for equipment_type in EquipmentType } - data_table = DataTable(columns=[("weight", 1), ("weight", 3)]) + data_table = DataTable(columns=[(urwid.WEIGHT, 1), (urwid.WEIGHT, 3)]) for equipment_type in EquipmentType: data_table.add_row( urwid.Text(equipment_type.value), @@ -139,7 +139,7 @@ class InventoryView(DoubleLineBox): self.player = player self.gold_text = urwid.Text("") - self.data_table = DataTable(columns=[("weight", 3), ("pack",)]) + self.data_table = DataTable(columns=[(urwid.WEIGHT, 3), (urwid.PACK,)]) self.data_table.add_row(urwid.Text("Gold"), self.gold_text) self.scrollable = Scrollable(self.data_table) self.encumbrance_bar = CustomProgressBar() @@ -215,7 +215,7 @@ class PlotView(DoubleLineBox): def __init__(self, player: Player) -> None: self.player = player - self.data_table = DataTable(columns=[("weight", 1)]) + self.data_table = DataTable(columns=[(urwid.WEIGHT, 1)]) self.scrollable = Scrollable(self.data_table) self.plot_bar = CustomProgressBar() @@ -263,7 +263,7 @@ class QuestBookView(DoubleLineBox): def __init__(self, player: Player) -> None: self.player = player - self.data_table = DataTable(columns=[("weight", 1)]) + self.data_table = DataTable(columns=[(urwid.WEIGHT, 1)]) self.quest_bar = CustomProgressBar() self.scrollable = Scrollable(self.data_table) @@ -356,7 +356,7 @@ class GameView(urwid.Pile): urwid.Columns( [ ( - "weight", + urwid.WEIGHT, 1, urwid.Pile( [ @@ -366,7 +366,7 @@ class GameView(urwid.Pile): ), ), ( - "weight", + urwid.WEIGHT, 2, urwid.Pile( [ @@ -376,7 +376,7 @@ class GameView(urwid.Pile): ), ), ( - "weight", + urwid.WEIGHT, 2, urwid.Pile( [(15, self.plot_view), self.quest_book_view] @@ -384,7 +384,7 @@ class GameView(urwid.Pile): ), ] ), - ("pack", self.task_view), + (urwid.PACK, self.task_view), ] ) diff --git a/pqcli/ui/new_game_view.py b/pqcli/ui/new_game_view.py index ea123ba..9ab544d 100644 --- a/pqcli/ui/new_game_view.py +++ b/pqcli/ui/new_game_view.py @@ -164,8 +164,8 @@ class NewGameView(urwid.Pile): ), urwid.Columns( [ - ("weight", 2, self.race_box), - ("weight", 2, self.class_box), + (urwid.WEIGHT, 2, self.race_box), + (urwid.WEIGHT, 2, self.class_box), urwid.Pile([(13, self.stats_box), buttons_box]), ] ),