Stat info for current episode.
This commit is contained in:
luxick
@@ -1,3 +1,5 @@
|
|||||||
|
from collections import Counter
|
||||||
|
|
||||||
import gi
|
import gi
|
||||||
gi.require_version('Gtk', '3.0')
|
gi.require_version('Gtk', '3.0')
|
||||||
from gi.repository import Gtk
|
from gi.repository import Gtk
|
||||||
@@ -53,13 +55,15 @@ class GtkUi:
|
|||||||
if season_id is None or season_id == -1:
|
if season_id is None or season_id == -1:
|
||||||
return
|
return
|
||||||
# Rebuild episodes store
|
# Rebuild episodes store
|
||||||
ep_id = self.get_selected_episode_id()
|
|
||||||
selection = self.ui.get_object('episodes_tree_view').get_selection()
|
selection = self.ui.get_object('episodes_tree_view').get_selection()
|
||||||
# selection.handler_block_by_func(self.handlers.on_selected_episode_changed)
|
selection.handler_block_by_func(self.handlers.on_selected_episode_changed)
|
||||||
store = self.ui.get_object('episodes_store')
|
model, selected_paths = selection.get_selected_rows()
|
||||||
store.clear()
|
model.clear()
|
||||||
for episode in sql_func.get_episodes_for_season(season_id):
|
for episode in sql_func.get_episodes_for_season(season_id):
|
||||||
store.append([episode.id, episode.number, str(episode.date)])
|
model.append([episode.id, episode.number, str(episode.date)])
|
||||||
|
if selected_paths:
|
||||||
|
selection.select_path(selected_paths[0])
|
||||||
|
selection.handler_unblock_by_func(self.handlers.on_selected_episode_changed)
|
||||||
|
|
||||||
# Load player stats for season
|
# Load player stats for season
|
||||||
player_stats = {}
|
player_stats = {}
|
||||||
@@ -72,7 +76,10 @@ class GtkUi:
|
|||||||
for name, stats in player_stats.items():
|
for name, stats in player_stats.items():
|
||||||
store.append([name, stats[0], stats[1]])
|
store.append([name, stats[0], stats[1]])
|
||||||
# Load enemy stats for season
|
# Load enemy stats for season
|
||||||
enemy_stats = {enemy.name: [0, 0, enemy.id] for enemy in sql.Season.get(sql.Season.id == season_id).enemies}
|
season = sql.Season.get(sql.Season.id == season_id)
|
||||||
|
enemy_stats = {
|
||||||
|
enemy.name: [False, len(sql.Death.select().where(sql.Death.enemy == enemy)), enemy.id]
|
||||||
|
for enemy in season.enemies}
|
||||||
store = self.ui.get_object('enemy_season_store')
|
store = self.ui.get_object('enemy_season_store')
|
||||||
store.clear()
|
store.clear()
|
||||||
for name, stats in enemy_stats.items():
|
for name, stats in enemy_stats.items():
|
||||||
@@ -84,10 +91,31 @@ class GtkUi:
|
|||||||
episode_id = self.get_selected_episode_id()
|
episode_id = self.get_selected_episode_id()
|
||||||
if not episode_id:
|
if not episode_id:
|
||||||
return
|
return
|
||||||
|
episode = sql.Episode.get(sql.Episode.id == episode_id)
|
||||||
store = self.ui.get_object('episode_players_store')
|
store = self.ui.get_object('episode_players_store')
|
||||||
store.clear()
|
store.clear()
|
||||||
for player in sql.Episode.get(sql.Episode.id == self.get_selected_episode_id()).players:
|
for player in episode.players:
|
||||||
store.append([player.id, player.name, player.hex_id])
|
store.append([player.id, player.name, player.hex_id])
|
||||||
|
# Reload death store for notebook view
|
||||||
|
store = self.ui.get_object('episode_deaths_store')
|
||||||
|
store.clear()
|
||||||
|
for death in episode.deaths:
|
||||||
|
penalties = [x.drink.name for x in death.penalties]
|
||||||
|
penalties = [f'{number}x {drink}' for drink, number in Counter(penalties).items()]
|
||||||
|
penalty_string = ', '.join(penalties)
|
||||||
|
store.append([death.id, death.player.name, death.enemy.name, penalty_string])
|
||||||
|
|
||||||
|
# Stat grid
|
||||||
|
self.ui.get_object('ep_death_count_label').set_text(str(len(episode.deaths)))
|
||||||
|
drink_count = sum(len(death.penalties) for death in episode.deaths)
|
||||||
|
self.ui.get_object('ep_drinks_label').set_text(str(drink_count))
|
||||||
|
cl_booze = sum(len(death.penalties) * death.penalties[0].size for death in episode.deaths)
|
||||||
|
self.ui.get_object('ep_booze_label').set_text(str(cl_booze) + "cl")
|
||||||
|
enemy_list = [death.enemy.name for death in episode.deaths]
|
||||||
|
sorted_list = Counter(enemy_list).most_common(1)
|
||||||
|
if sorted_list:
|
||||||
|
enemy_name, deaths = sorted_list[0]
|
||||||
|
self.ui.get_object('ep_enemy_name_label').set_text(f'{enemy_name} ({deaths} Deaths)')
|
||||||
|
|
||||||
def get_selected_season_id(self) -> int:
|
def get_selected_season_id(self) -> int:
|
||||||
"""Read ID of the selected season from the UI
|
"""Read ID of the selected season from the UI
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
from gi.repository import Gtk
|
||||||
from dsst_gtk3 import dialogs, gtk_ui
|
from dsst_gtk3 import dialogs, gtk_ui
|
||||||
|
|
||||||
|
|
||||||
@@ -9,8 +10,9 @@ class DeathHandlers:
|
|||||||
def do_add_death(self, *_):
|
def do_add_death(self, *_):
|
||||||
ep_id = self.app.get_selected_episode_id()
|
ep_id = self.app.get_selected_episode_id()
|
||||||
result = dialogs.show_edit_death_dialog(self.app.ui, ep_id)
|
result = dialogs.show_edit_death_dialog(self.app.ui, ep_id)
|
||||||
if result:
|
if result == Gtk.ResponseType.OK:
|
||||||
self.app.reload_for_season()
|
self.app.reload_for_season()
|
||||||
|
self.app.reload_for_episode()
|
||||||
|
|
||||||
def on_penalty_drink_changed(self, widget, path, text):
|
def on_penalty_drink_changed(self, widget, path, text):
|
||||||
self.app.ui.get_object('player_penalties_store')[path][2] = text
|
self.app.ui.get_object('player_penalties_store')[path][2] = text
|
||||||
@@ -23,7 +23,7 @@ class DialogHandlers:
|
|||||||
if entry.get_text():
|
if entry.get_text():
|
||||||
store = self.app.ui.get_object('enemy_season_store')
|
store = self.app.ui.get_object('enemy_season_store')
|
||||||
enemy = sql.Enemy.create(name=entry.get_text(), season=self.app.get_selected_season_id())
|
enemy = sql.Enemy.create(name=entry.get_text(), season=self.app.get_selected_season_id())
|
||||||
store.append([enemy.name, False, 0])
|
store.append([enemy.name, False, 0, enemy.id])
|
||||||
entry.set_text('')
|
entry.set_text('')
|
||||||
|
|
||||||
def do_manage_drinks(self, *_):
|
def do_manage_drinks(self, *_):
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import gi
|
import gi
|
||||||
import sql_func
|
|
||||||
gi.require_version('Gtk', '3.0')
|
gi.require_version('Gtk', '3.0')
|
||||||
from gi.repository import Gtk
|
from gi.repository import Gtk
|
||||||
from dsst_gtk3.handlers.season_handlers import SeasonHandlers
|
from dsst_gtk3.handlers.season_handlers import SeasonHandlers
|
||||||
from dsst_gtk3.handlers.base_data_handlers import BaseDataHandlers
|
from dsst_gtk3.handlers.base_data_handlers import BaseDataHandlers
|
||||||
from dsst_gtk3.handlers.dialog_handlers import DialogHandlers
|
from dsst_gtk3.handlers.dialog_handlers import DialogHandlers
|
||||||
from dsst_gtk3.handlers.death_handlers import DeathHandlers
|
from dsst_gtk3.handlers.death_handlers import DeathHandlers
|
||||||
|
from dsst_sql import sql_func
|
||||||
|
|
||||||
|
|
||||||
class Handlers(SeasonHandlers, BaseDataHandlers, DialogHandlers, DeathHandlers):
|
class Handlers(SeasonHandlers, BaseDataHandlers, DialogHandlers, DeathHandlers):
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class SeasonHandlers:
|
|||||||
name = dialogs.enter_string_dialog(self.app.ui, 'Name for the new Season')
|
name = dialogs.enter_string_dialog(self.app.ui, 'Name for the new Season')
|
||||||
if name:
|
if name:
|
||||||
sql.Season.create(game_name=name, number=1)
|
sql.Season.create(game_name=name, number=1)
|
||||||
self.app.reload_seasons()
|
self.app.reload_base_data()
|
||||||
|
|
||||||
def do_season_selected(self, *_):
|
def do_season_selected(self, *_):
|
||||||
self.app.reload_for_season()
|
self.app.reload_for_season()
|
||||||
|
|||||||
@@ -810,6 +810,7 @@
|
|||||||
<placeholder/>
|
<placeholder/>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="GtkListStore" id="episode_victories_store"/>
|
||||||
<object class="GtkListStore" id="episodes_store">
|
<object class="GtkListStore" id="episodes_store">
|
||||||
<columns>
|
<columns>
|
||||||
<!-- column-name id -->
|
<!-- column-name id -->
|
||||||
@@ -1512,14 +1513,210 @@
|
|||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox" id="deaths_container">
|
<object class="GtkBox" id="deaths_container">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="spacing">5</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="orientation">vertical</property>
|
<property name="orientation">vertical</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="ep_stat_label">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">[Episode Stats]</property>
|
||||||
|
<property name="justify">center</property>
|
||||||
|
<attributes>
|
||||||
|
<attribute name="weight" value="bold"/>
|
||||||
|
</attributes>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkGrid">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="row_spacing">5</property>
|
||||||
|
<property name="column_spacing">2</property>
|
||||||
|
<property name="column_homogeneous">True</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">Total Deaths:</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">Total Drinks:</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">Hardest Enemy:</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">3</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">Most Deaths:</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">4</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">Total Booze:</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">2</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="ep_death_count_label">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">[DeathCount]</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="ep_drinks_label">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">[DrinkCount]</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="ep_booze_label">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">[ToatalBooze]</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">2</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="ep_enemy_name_label">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">3</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="ep_worst_player_label">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">4</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<placeholder/>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkSeparator">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="orientation">vertical</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="orientation">vertical</property>
|
||||||
|
<property name="spacing">2</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="margin_left">2</property>
|
||||||
|
<property name="label" translatable="yes">Deaths this episode</property>
|
||||||
|
<property name="xalign">0</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkScrolledWindow">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="shadow_type">in</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkTreeView" id="episode_deaths_tree_view">
|
<object class="GtkTreeView" id="episode_deaths_tree_view">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="model">episode_deaths_store</property>
|
<property name="model">episode_deaths_store</property>
|
||||||
|
<property name="search_column">0</property>
|
||||||
<child internal-child="selection">
|
<child internal-child="selection">
|
||||||
<object class="GtkTreeSelection"/>
|
<object class="GtkTreeSelection"/>
|
||||||
</child>
|
</child>
|
||||||
@@ -1557,10 +1754,71 @@
|
|||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">True</property>
|
<property name="expand">True</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
<property name="position">0</property>
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="margin_left">2</property>
|
||||||
|
<property name="label" translatable="yes">Victories this episode</property>
|
||||||
|
<property name="xalign">0</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">2</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkScrolledWindow">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="shadow_type">in</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkTreeView" id="episode_victories_tree_view">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="model">episode_victories_store</property>
|
||||||
|
<child internal-child="selection">
|
||||||
|
<object class="GtkTreeSelection"/>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkTreeViewColumn">
|
||||||
|
<property name="title" translatable="yes">Player</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkCellRendererText"/>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkTreeViewColumn">
|
||||||
|
<property name="title" translatable="yes">Enemy</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkCellRendererText"/>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">True</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">3</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">True</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
@@ -1572,36 +1830,18 @@
|
|||||||
<object class="GtkLabel" id="deaths_tab">
|
<object class="GtkLabel" id="deaths_tab">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="label" translatable="yes">Episode Deaths</property>
|
<property name="label" translatable="yes">Episode Stats</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="position">1</property>
|
<property name="position">1</property>
|
||||||
<property name="tab_fill">False</property>
|
<property name="tab_fill">False</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
|
||||||
<object class="GtkBox" id="victories_container">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="orientation">vertical</property>
|
|
||||||
<child>
|
<child>
|
||||||
<placeholder/>
|
<placeholder/>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="position">2</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child type="tab">
|
<child type="tab">
|
||||||
<object class="GtkLabel" id="victories_tab">
|
<placeholder/>
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="label" translatable="yes">Episode Victories</property>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="position">2</property>
|
|
||||||
<property name="tab_fill">False</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
@@ -1703,71 +1943,6 @@
|
|||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="margin_left">5</property>
|
|
||||||
<property name="margin_right">5</property>
|
|
||||||
<property name="margin_top">5</property>
|
|
||||||
<property name="margin_bottom">5</property>
|
|
||||||
<property name="label" translatable="yes">All Drinks</property>
|
|
||||||
<property name="xalign">0</property>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="fill">True</property>
|
|
||||||
<property name="position">2</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkScrolledWindow">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="shadow_type">in</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkTreeView" id="drink_tree_view">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="vexpand">True</property>
|
|
||||||
<property name="model">drink_store</property>
|
|
||||||
<property name="search_column">0</property>
|
|
||||||
<child internal-child="selection">
|
|
||||||
<object class="GtkTreeSelection"/>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkTreeViewColumn">
|
|
||||||
<property name="title" translatable="yes">Name</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkCellRendererText"/>
|
|
||||||
<attributes>
|
|
||||||
<attribute name="text">1</attribute>
|
|
||||||
</attributes>
|
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkTreeViewColumn">
|
|
||||||
<property name="title" translatable="yes">Vol.</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkCellRendererText"/>
|
|
||||||
<attributes>
|
|
||||||
<attribute name="text">2</attribute>
|
|
||||||
</attributes>
|
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">True</property>
|
|
||||||
<property name="fill">True</property>
|
|
||||||
<property name="position">3</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkLabel">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="margin_left">5</property>
|
|
||||||
<property name="margin_right">5</property>
|
|
||||||
<property name="margin_top">5</property>
|
<property name="margin_top">5</property>
|
||||||
<property name="margin_bottom">5</property>
|
<property name="margin_bottom">5</property>
|
||||||
<property name="label" translatable="yes">Enemies This Season</property>
|
<property name="label" translatable="yes">Enemies This Season</property>
|
||||||
@@ -1776,7 +1951,7 @@
|
|||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
<property name="position">4</property>
|
<property name="position">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
@@ -1828,6 +2003,69 @@
|
|||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">True</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">3</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="margin_left">5</property>
|
||||||
|
<property name="margin_right">5</property>
|
||||||
|
<property name="margin_top">5</property>
|
||||||
|
<property name="margin_bottom">5</property>
|
||||||
|
<property name="label" translatable="yes">All Drinks</property>
|
||||||
|
<property name="xalign">0</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">4</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkScrolledWindow">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="shadow_type">in</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkTreeView" id="drink_tree_view">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="vexpand">True</property>
|
||||||
|
<property name="model">drink_store</property>
|
||||||
|
<property name="search_column">0</property>
|
||||||
|
<child internal-child="selection">
|
||||||
|
<object class="GtkTreeSelection"/>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkTreeViewColumn">
|
||||||
|
<property name="title" translatable="yes">Name</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkCellRendererText"/>
|
||||||
|
<attributes>
|
||||||
|
<attribute name="text">1</attribute>
|
||||||
|
</attributes>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkTreeViewColumn">
|
||||||
|
<property name="title" translatable="yes">Vol.</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkCellRendererText"/>
|
||||||
|
<attributes>
|
||||||
|
<attribute name="text">2</attribute>
|
||||||
|
</attributes>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">True</property>
|
<property name="expand">True</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
|
|||||||
@@ -75,9 +75,9 @@ class Death(Model):
|
|||||||
class Penalty(Model):
|
class Penalty(Model):
|
||||||
id = AutoField()
|
id = AutoField()
|
||||||
size = DecimalField()
|
size = DecimalField()
|
||||||
ForeignKeyField(Drink)
|
drink = ForeignKeyField(Drink)
|
||||||
ForeignKeyField(Player, backref='penalties')
|
player = ForeignKeyField(Player, backref='penalties')
|
||||||
ForeignKeyField(Death, backref='penalties')
|
death = ForeignKeyField(Death, backref='penalties')
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
database = db
|
database = db
|
||||||
|
|||||||
Reference in New Issue
Block a user