|
|
@@ -10,18 +10,20 @@ import (
|
|
|
|
|
|
. "wartank/app/lev0/types"
|
|
|
"wartank/desktop/win_add_bot"
|
|
|
+ "wartank/desktop/win_main/frm_bot_param"
|
|
|
"wartank/desktop/win_main/frm_status"
|
|
|
)
|
|
|
|
|
|
// Главное окно приложения
|
|
|
type WinMain struct {
|
|
|
- ctx IKernelCtx
|
|
|
- winMain *tk.Window
|
|
|
- listBot *tk.ListboxWidget
|
|
|
- btnBotAdd *tk.ButtonWidget
|
|
|
- dictBot map[string]bool
|
|
|
- chBotAdd chan ИБот
|
|
|
- frmStatus *frm_status.FrmStatus
|
|
|
+ ctx IKernelCtx
|
|
|
+ winMain *tk.Window
|
|
|
+ listBot *tk.ListboxWidget
|
|
|
+ btnBotAdd *tk.ButtonWidget
|
|
|
+ dictBot map[string]bool
|
|
|
+ chBotAdd chan ИБот
|
|
|
+ frmStatus *frm_status.FrmStatus
|
|
|
+ frmBotForce *frm_bot_param.FrmBotParam
|
|
|
}
|
|
|
|
|
|
var (
|
|
|
@@ -51,9 +53,6 @@ func (sf *WinMain) new() {
|
|
|
tk.WmWithdraw(sf.winMain)
|
|
|
tk.WmMinSize(sf.winMain, 640, 480)
|
|
|
sf.winMain.Configure(tk.Padx(0), tk.Pady(0))
|
|
|
- { // Панель статуса
|
|
|
-
|
|
|
- }
|
|
|
{ // Панель списка ботов
|
|
|
frmListBot := sf.winMain.Frame(tk.Border(1), tk.Relief(tk.SUNKEN))
|
|
|
tk.Pack(frmListBot, tk.Fill(tk.FILL_Y), tk.Side(tk.LEFT))
|
|
|
@@ -70,7 +69,7 @@ func (sf *WinMain) new() {
|
|
|
sf.btnBotAdd = frmListBot.Button(tk.Txt("Добавить"), tk.Command(sf.botAdd))
|
|
|
tk.Pack(sf.btnBotAdd, tk.Fill(tk.FILL_X))
|
|
|
}
|
|
|
- frmStateBot := sf.winMain.Frame(tk.Border(1), tk.Relief(tk.SUNKEN))
|
|
|
+ frmStateBot := sf.winMain.TFrame(tk.Border(1), tk.Relief(tk.SUNKEN))
|
|
|
{ // Панель состояния бота
|
|
|
tk.Pack(frmStateBot, tk.Fill(tk.FILL_BOTH), tk.Expand(true))
|
|
|
lblStateBot := frmStateBot.Label(tk.Txt("Состояние бота"),
|
|
|
@@ -81,23 +80,8 @@ func (sf *WinMain) new() {
|
|
|
tk.Pack(lblStateBot, tk.Side(tk.TOP), tk.Fill(tk.FILL_X))
|
|
|
|
|
|
}
|
|
|
- { // Панель силы бота
|
|
|
- frmBotForce := frmStateBot.Frame(tk.Border(1), tk.Relief(tk.SUNKEN))
|
|
|
- tk.Pack(frmBotForce, tk.Side(tk.LEFT), tk.Fill(tk.FILL_Y))
|
|
|
-
|
|
|
- лблПараметрыБота := frmBotForce.Label(tk.Txt("Параметры"),
|
|
|
- tk.Background("#888"),
|
|
|
- tk.Border(1),
|
|
|
- tk.Relief(tk.GROOVE),
|
|
|
- )
|
|
|
- tk.Pack(лблПараметрыБота, tk.Side(tk.TOP), tk.Fill(tk.FILL_X))
|
|
|
-
|
|
|
- лблАтака := frmBotForce.Label(tk.Txt("Атака"),
|
|
|
- tk.Border(1),
|
|
|
- tk.Relief(tk.GROOVE),
|
|
|
- )
|
|
|
- tk.Pack(лблАтака, tk.Side(tk.TOP), tk.Fill(tk.FILL_X))
|
|
|
- }
|
|
|
+ // Панель силы бота
|
|
|
+ sf.frmBotForce = frm_bot_param.NewFrmBotParam(frmStateBot)
|
|
|
tk.WmProtocol(sf.winMain, tk.WM_DELETE_WINDOW, tk.Command(sf.quit))
|
|
|
sf.liveUpdate()
|
|
|
}
|