time out

LICENSE

@@ -4,8 +4,7 @@ This repository includes:
 For on related licenses for these binaries and libraries see https://github.com/lightvector/KataGo
 
 2. Icons from www.flaticon.com, used with permission with the following attributions:
-- New game/Save game/Load game/Configure icons/Flag icons: made by or derived from work by Freepik from www.flaticon.com
-- Next/Previous icons: derived from work by RoundIcons from www.flaticon.com
+- Save game/Load game/Elements of the configure icons/Flag icons: derived from work by Freepik from www.flaticon.com
 
 3. The True Type Font DIGITAL-7 version 1.02 by Sizenko Alexander, which is free for non-commercial use.
 

katrain/gui.kv

@@ -203,13 +203,13 @@
         Label:
             size_hint: 0.075, 0.5
         NavIconButton:
-            icon: 'img/flaticon/previous999.png'
+            icon: 'img/Previous-End.png'
             on_press: root.katrain('undo',999)
         NavIconButton:
-            icon: 'img/flaticon/previous5.png'
+            icon: 'img/Previous-5.png'
             on_press: root.katrain('undo',5)
         NavIconButton:
-            icon: 'img/flaticon/previous.png'
+            icon: 'img/Previous.png'
             on_press: root.katrain('undo')
         MDFloatLayout:
             size_hint: 0.05, 1
@@ -227,16 +227,16 @@
                 player: 'W'
                 text: ''
         NavIconButton:
-            icon: 'img/flaticon/next.png'
+            icon: 'img/Next.png'
             on_press: root.katrain('redo')
         NavIconButton:
-            icon: 'img/flaticon/next5.png'
+            icon: 'img/Next-5.png'
             on_press: root.katrain('redo',5)
         NavIconButton:
-            icon: 'img/flaticon/next999.png'
+            icon: 'img/Next-End.png'
             on_press: root.katrain('redo',999)
         NavIconButton:
-            icon: 'img/forward_-_child.png'
+            icon: 'img/Branch.png'
             on_press: root.katrain('switch-branch',1)
     ClickableLabel:
         pos_hint: {'center_x': 0.85,'center_y':0.5}
@@ -765,7 +765,7 @@
     background_color: BOX_BACKGROUND_COLOR
     MDFloatLayout:
         size_hint: None, 1
-        width: self.height
+        width: self.height + 16
         Image:
             id:image
             source: root.icon
@@ -892,38 +892,38 @@
         item_height: root.item_height
         MainMenuItem:
             text: i18n._('menu:newgame')
-            icon: 'img/flaticon/newgame.png'
+            icon: 'img/New-Game.png'
             shortcut: 'Ctrl-N'
             on_action: root.katrain("new-game-popup")
             height: root.item_height
         MainMenuItem:
             text: i18n._('menu:save')
-            icon: 'img/flaticon/floppy-disk.png'
+            icon: 'img/Save-Game.png'
             shortcut: 'Ctrl-S'
             on_action: root.katrain("output-sgf")
         MainMenuItem:
             text: i18n._('menu:load')
-            icon: 'img/flaticon/folder.png'
+            icon: 'img/Load-Game.png'
             shortcut: 'Ctrl-L'
             on_action: root.katrain("analyze-sgf-popup")
         MainMenuItem:
             text: i18n._('menu:clocksettings')
-            icon: 'img/flaticon/cogwheel.png'
+            icon: 'img/Time-Settings.png'
             shortcut: 'F5'
             on_action: root.katrain('timer-popup')
         MainMenuItem:
             text: i18n._('menu:teachsettings')
-            icon: 'img/flaticon/graduate.png'
+            icon: 'img/Teaching-Settings.png'
             shortcut: 'F6'
             on_action: root.katrain('teacher-popup')
         MainMenuItem:
             text: i18n._('menu:aisettings')
-            icon: 'img/flaticon/ai.png'
+            icon: 'img/AI-Settings.png'
             shortcut: 'F7'
             on_action: root.katrain('ai-popup')
         MainMenuItem:
             text: i18n._('menu:settings')
-            icon: 'img/flaticon/settings.png'
+            icon: 'img/General-Settings.png'
             shortcut: 'F8'
             on_action: root.katrain('config-popup')
     MenuLabel:

katrain/gui/controlspanel.py

@@ -116,10 +116,10 @@ class ControlsPanel(BoxLayout):
                 else:
                     current_node.time_used = 0
                 time_remaining = byo_len - current_node.time_used
-                while time_remaining < 0:
+                while time_remaining < 0 and player.periods_used < byo_num:
                     current_node.time_used -= byo_len
                     time_remaining += byo_len
                     player.periods_used += 1
             time_remaining = byo_len - current_node.time_used
             periods_rem = byo_num - player.periods_used
-            self.timer.state = (time_remaining, periods_rem, ai)
+            self.timer.state = (max(0,time_remaining), max(0,periods_rem), ai)

katrain/gui/kivyutils.py

@@ -369,8 +369,8 @@ class CollapsablePanel(MDBoxLayout):
     height_open = NumericProperty(None)
 
     state = OptionProperty("open", options=["open", "close"])
-    close_icon = "img/flaticon/previous5.png"
-    open_icon = "img/flaticon/next5.png"
+    close_icon = "img/Previous-5.png"
+    open_icon = "img/Next-5.png"
 
     def __init__(self, **kwargs):
         self.header, self.contents, self.open_close_button = None, None, None