From 6fe410ac241d85e19c67d73edf4604ef69763a41 Mon Sep 17 00:00:00 2001 From: Joe R Date: Thu, 28 Jul 2022 18:19:34 -0400 Subject: [PATCH] Corrections to status bar variables in Kivy. --- pysollib/kivy/menubar.py | 2 -- pysollib/kivy/tkconst.py | 10 ++++++++++ pysollib/pysolgtk/tkconst.py | 10 ++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pysollib/kivy/menubar.py b/pysollib/kivy/menubar.py index 4671c3d9..6332c54a 100644 --- a/pysollib/kivy/menubar.py +++ b/pysollib/kivy/menubar.py @@ -1346,8 +1346,6 @@ class PysolMenubarTk: tkopt.toolbar_size.set(opt.toolbar_size) tkopt.toolbar_relief.set(opt.toolbar_relief) tkopt.statusbar.set(opt.statusbar) - tkopt.num_cards.set(opt.num_cards) - tkopt.helpbar.set(opt.helpbar) tkopt.save_games_geometry.set(opt.save_games_geometry) tkopt.demo_logo.set(opt.demo_logo) tkopt.splashscreen.set(opt.splashscreen) diff --git a/pysollib/kivy/tkconst.py b/pysollib/kivy/tkconst.py index 4c0edc4c..ea24a9c6 100644 --- a/pysollib/kivy/tkconst.py +++ b/pysollib/kivy/tkconst.py @@ -65,3 +65,13 @@ TOOLBAR_BUTTONS = ( "quit", "player", ) + +STATUSBAR_ITEMS = ( + ('stuck', "'You Are Stuck' indicator"), + ('time', 'Playing time'), + ('moves', 'Moves/Total moves'), + ('gamenumber', 'Game number'), + ('stats', 'Games played: won/lost'), + ('info', 'Number of cards'), + ('help', 'Help info') +) diff --git a/pysollib/pysolgtk/tkconst.py b/pysollib/pysolgtk/tkconst.py index 43366477..15a4b8d4 100644 --- a/pysollib/pysolgtk/tkconst.py +++ b/pysollib/pysolgtk/tkconst.py @@ -53,3 +53,13 @@ TOOLBAR_BUTTONS = ( "quit", "player", ) + +STATUSBAR_ITEMS = ( + ('stuck', "'You Are Stuck' indicator"), + ('time', 'Playing time'), + ('moves', 'Moves/Total moves'), + ('gamenumber', 'Game number'), + ('stats', 'Games played: won/lost'), + ('info', 'Number of cards'), + ('help', 'Help info') +)