Update build script for client/server use.

This commit is contained in:
luxick
2018-03-07 15:26:22 +01:00
parent 8b0422b1b0
commit e5d0d92de2
20 changed files with 382 additions and 264 deletions

View File

@@ -1,4 +1,3 @@
import sql
from dsst_gtk3 import dialogs
@@ -12,7 +11,7 @@ class BaseDataHandlers:
def do_add_player(self, entry):
if entry.get_text():
sql.Player.create(name=entry.get_text())
# sql.Player.create(name=entry.get_text())
entry.set_text('')
self.app.reload()
@@ -21,16 +20,16 @@ class BaseDataHandlers:
def on_player_name_edited(self, _, index, value):
row = self.app.ui.get_object('all_players_store')[index]
sql.Player.update(name=value)\
.where(sql.Player.id == row[0])\
.execute()
# sql.Player.update(name=value)\
# .where(sql.Player.id == row[0])\
# .execute()
self.app.reload()
def on_player_hex_edited(self, _, index, value):
row = self.app.ui.get_object('all_players_store')[index]
sql.Player.update(hex_id=value)\
.where(sql.Player.id == row[0])\
.execute()
# sql.Player.update(hex_id=value)\
# .where(sql.Player.id == row[0])\
# .execute()
self.app.reload()
def do_add_drink(self, entry):
@@ -41,14 +40,14 @@ class BaseDataHandlers:
def on_drink_name_edited(self, _, index, value):
row = self.app.ui.get_object('drink_store')[index]
sql.Drink.update(name=value)\
.where(sql.Drink.id == row[0])\
.execute()
# sql.Drink.update(name=value)\
# .where(sql.Drink.id == row[0])\
# .execute()
self.app.reload()
def on_drink_vol_edited(self, _, index, value):
row = self.app.ui.get_object('drink_store')[index]
sql.Drink.update(vol=value) \
.where(sql.Drink.id == row[0]) \
.execute()
# sql.Drink.update(vol=value) \
# .where(sql.Drink.id == row[0]) \
# .execute()
self.app.reload()

View File

@@ -1,5 +1,4 @@
from gi.repository import Gtk
from dsst_gtk3 import dialogs

View File

@@ -1,4 +1,3 @@
import sql
from dsst_gtk3 import dialogs, util
@@ -14,16 +13,16 @@ class DialogHandlers:
player_id = util.get_combo_value(combo, 0)
if player_id:
self.app.ui.get_object('add_player_combo_box').set_active(-1)
player = sql.Player.get(sql.Player.id == player_id)
# player = sql.Player.get(sql.Player.id == player_id)
store = self.app.ui.get_object('episode_players_store')
if not any(row[0] == player_id for row in store):
store.append([player_id, player.name, player.hex_id])
# if not any(row[0] == player_id for row in store):
# store.append([player_id, player.name, player.hex_id])
def do_add_enemy(self, entry):
if entry.get_text():
store = self.app.ui.get_object('enemy_season_store')
enemy = sql.Enemy.create(name=entry.get_text(), season=self.app.get_selected_season_id())
store.append([enemy.name, False, 0, enemy.id])
# enemy = sql.Enemy.create(name=entry.get_text(), season=self.app.get_selected_season_id())
# store.append([enemy.name, False, 0, enemy.id])
entry.set_text('')
def do_manage_drinks(self, *_):

View File

@@ -6,8 +6,6 @@ from dsst_gtk3.handlers.base_data_handlers import BaseDataHandlers
from dsst_gtk3.handlers.dialog_handlers import DialogHandlers
from dsst_gtk3.handlers.death_handlers import DeathHandlers
from dsst_gtk3.handlers.victory_handlers import VictoryHandlers
import sql_func
import sql
class Handlers(SeasonHandlers, BaseDataHandlers, DialogHandlers, DeathHandlers, VictoryHandlers):
@@ -35,5 +33,4 @@ class Handlers(SeasonHandlers, BaseDataHandlers, DialogHandlers, DeathHandlers,
@staticmethod
def do_delete_database(*_):
sql_func.drop_tables()
sql_func.create_tables()
pass

View File

@@ -1,5 +1,4 @@
from data_access import sql
from dsst_gtk3 import dialogs
from dsst_gtk3 import dialogs, gtk_ui
class SeasonHandlers:
@@ -10,10 +9,10 @@ class SeasonHandlers:
def do_add_season(self, *_):
name = dialogs.enter_string_dialog(self.app.ui, 'Name for the new Season')
if name:
sql.Season.create(game_name=name, number=1)
self.app.reload()
def do_season_selected(self, *_):
self.app.season_changed = True
self.app.reload()
def do_add_episode(self, *_):
@@ -24,6 +23,7 @@ class SeasonHandlers:
self.app.reload()
def on_selected_episode_changed(self, *_):
self.app.ep_changed = True
self.app.reload()
def on_episode_double_click(self, *_):

View File

@@ -1,5 +1,4 @@
from gi.repository import Gtk
from dsst_gtk3 import dialogs