gui redesign in progress..

INSTALL.md

@@ -38,6 +38,16 @@
     * If you prefer not to install, run without installing using `python3 -m katrain`
 * A binary for KataGo is included, but if you have compiled your own, point the 'engine/katago' setting to the relevant KataGo v1.4+ binary.
 
+## Troubleshooting 
+
+Older linux machines may have trouble installing, you can try to manually install dependencies to resolve some issues.
+
+* `sudo apt-get install pkg-config libgl-dev opencl-headers ocl-icd-opencl-dev `
+* `pip3 install -U cython wheel setuptools`
+* `pip3 install kivy==2.0.0rc2 kivymd==1.104.1`
+
+In case KataGo does not start, an alternative is to go [here](https://github.com/lightvector/KataGo) and compile KataGo yourself.
+
 # Configuring the GPU(s) KataGo uses
 
 In most cases KataGo detects your configuration correctly, automatically searching for OpenCL devices and select the highest scoring device. 

katrain/__main__.py

@@ -1,4 +1,6 @@
 from kivy.config import Config  # isort:skip
+from kivy.uix.screenmanager import Screen
+
 ICON = "img/icon.png"
 Config.set("kivy", "window_icon", ICON)  # isort:skip  # set icon
 Config.set("input", "mouse", "mouse,multitouch_on_demand")  # isort:skip  # no red dots on right click
@@ -32,7 +34,7 @@ from katrain.gui.popups import NewGamePopup, ConfigPopup, LoadSGFPopup
 __version__ = "1.0.6"
 
 
-class KaTrainGui(BoxLayout):
+class KaTrainGui(Screen):
     """Top level class responsible for tying everything together"""
     zen = BooleanProperty(False)
 
@@ -122,26 +124,23 @@ class KaTrainGui(BoxLayout):
 
         # Handle prisoners and next player display
         prisoners = self.game.prisoner_count
-        top, bot = self.board_controls.black_prisoners.__self__, self.board_controls.white_prisoners.__self__  # no weakref
+        top, bot = [w.__self__ for w in self.board_controls.circles]  # no weakref
         if self.game.next_player == "W":
             top, bot = bot, top
         self.board_controls.mid_circles_container.clear_widgets()
         self.board_controls.mid_circles_container.add_widget(bot)
         self.board_controls.mid_circles_container.add_widget(top)
-        self.board_controls.black_prisoners.text = str(prisoners["W"])
+        self.controls.players['W'].captures = prisoners["W"]
-        self.board_controls.white_prisoners.text = str(prisoners["B"])
+        self.controls.players['B'].captures = prisoners["B"]
 
         # update engine status dot
         if not self.engine or not self.engine.katago_process or self.engine.katago_process.poll() is not None:
-            self.board_controls.engine_status_col = self.config("board_ui/engine_down_col")
+            self.controls.engine_status_col = self.config("board_ui/engine_down_col")
-        elif len(self.engine.queries) >= 4:
-            self.board_controls.engine_status_col = self.config("board_ui/engine_busy_col")
-        elif len(self.engine.queries) >= 2:
-            self.board_controls.engine_status_col = self.config("board_ui/engine_little_busy_col")
         elif len(self.engine.queries) == 0:
-            self.board_controls.engine_status_col = self.config("board_ui/engine_ready_col")
+            self.controls.engine_status_col = self.config("board_ui/engine_ready_col")
         else:
-            self.board_controls.engine_status_col = self.config("board_ui/engine_almost_done_col")
+            self.controls.engine_status_col = self.config("board_ui/engine_busy_col")
+
         # redraw
         if redraw_board:
             Clock.schedule_once(self.board_gui.draw_board, -1)
@@ -286,7 +285,6 @@ class KaTrainGui(BoxLayout):
             return  # if in new game or load, don't allow keyboard shortcuts
 
         shortcuts = {
-            "q": self.analysis_controls.show_children,
             "w": self.analysis_controls.eval,
             "e": self.analysis_controls.hints,
             "r": self.analysis_controls.ownership,
@@ -310,7 +308,7 @@ class KaTrainGui(BoxLayout):
         elif keycode[1]==            "spacebar":
             self.controls.timer.paused = not self.controls.timer.paused
         elif keycode[1] in ["`", "~", "m"]:
-            self.controls_box.hidden = not self.controls_box.hidden
+            self.zen = not self.zen
         elif keycode[1] in ["up", "z"]:
             self("undo", 1 + ("shift" in modifiers) * 9 + ("ctrl" in modifiers) * 999)
         elif keycode[1] in ["down", "x"]:
@@ -337,7 +335,8 @@ class KaTrainApp(MDApp):
         self.gui = KaTrainGui()
         self.title = f"KaTrain v{__version__}"
         self.theme_cls.theme_style = "Dark"
-        self.theme_cls.primary_palette = "DeepPurple"
+        self.theme_cls.primary_palette = "Blue"
+
         Window.bind(on_request_close=self.on_request_close)
         return self.gui
 

katrain/gui.kv

@@ -21,24 +21,34 @@
 #:set LIGHTBLUE  [0.3,0.7,0.9,1]
 #:set YELLOW [0.8,0.8,0.1,1]
 
+
 #:set SCORE_COLOR LIGHTBLUE
 #:set POINTLOSS_COLOR YELLOW
 #:set WINRATE_COLOR GREEN
 
+#:set BUTTON_DISABLED_COLOR (0.5,0.5,0.5,1)
 #:set BACKGROUND_COLOR      [36/255,48/255,62/255,1]
 #:set BOX_BACKGROUND_COLOR  [46/255,65/255,88/255,1]
+#:set TEXT_COLOR            WHITE
 
 
 # mixins
+<OutlineColor>:
+    canvas.before:
+        Color:
+            rgb: root.outline_color
+        Line:
+            rectangle:  (*self.pos,*self.size)
+            width: root.outline_width
+
 <BackgroundColor>:
     canvas.before:
         Color:
-            rgb: root.background
+            rgb: root.background_color
         Rectangle:
             pos: self.pos
             size: self.size
 
-<ToolTipBehavior>:
 
 <ToolTipLabel>:
     size_hint: None, None
@@ -58,7 +68,36 @@
             width: 1.1
             rectangle: (*self.pos,*self.size)
 
-# widgets
+# new widgets
+
+<SmallMDFlatButton>:
+    outline_color: root.color
+    disabled_color: BUTTON_DISABLED_COLOR
+    text_color: root.color
+    background_color: BOX_BACKGROUND_COLOR
+    size: (dp(100),dp(33))
+    font_size: sp(20)
+    MDLabel:
+        id: label
+        text: root.text
+        font_size: root.font_size
+        font_name: root.font_name if root.font_name is not None else self.font_name
+        size_hint_x: None
+        text_size: (None, root.height)
+        height: self.texture_size[1]
+        theme_text_color: 'Custom'
+        text_color: root.text_color
+        valign: 'middle'
+        halign: 'center'
+
+<SmallMDFlatToggleButton>:
+    text_color: root.color if self.state=='down' else self.disabled_color
+    outline_color: root.color if self.state=='down' else self.disabled_color
+
+
+# -- old widgets
+
+
 
 <StyledButton>:
     color: WHITE
@@ -151,14 +190,11 @@
         mipmap: True
 
 <LightLabel>:
-    color: WHITE
+    color: TEXT_COLOR
     text_size: self.size # don't overflow these
     halign: 'center'
     valign: 'center'
 
-<LargeLabel@LightLabel>:
-    bold: True
-
 <TimerLabel@Label>
     color: GREEN
     font_size: 0.85*self.size[1]
@@ -169,7 +205,7 @@
     font_name: 'img/fonts/digital-7.ttf'
 
 <ScaledLightLabel>: # popups
-    color: WHITE
+    color: TEXT_COLOR
     font_size: 0.45*self.size[1]/self.num_lines
 
 <LightHelpLabel>:
@@ -178,12 +214,6 @@
     valign: 'center'
     multiline: True
 
-<CheckBoxHintLabel@Label+ToolTipBehavior>:
-    font_size: 0.4*self.size[1]
-    color: BLACK
-    halign: 'center'
-    valign: 'center'
-    size: self.texture_size
 
 <ClickableLabel@ButtonBehavior+LightLabel>:
     color: WHITE
@@ -223,7 +253,7 @@
             rgba: BLACK
         Ellipse:
             pos: self.pos[0] + self.width/2 - min(self.height,self.width) * root.radius, self.pos[1]  + self.height/2 - min(self.height,self.width)  * root.radius
-            size: min(self.height,self.width) * 2 * root.radius, min(self.height,self.width)  * 2* root.radius
+            size: min(self.height,self.width) * 2 * root.radius, min(self.height,self.width)  * 2 * root.radius
 
 <WhiteCircleWithText@BaseCircleWithText>:
     color: BLACK
@@ -248,13 +278,19 @@
     size: self.parent.height, self.parent.height
     katrain: app.gui
 
+<BoardControlsButton@MDFillRoundFlatIconButton>:
+    md_bg_color: BOX_BACKGROUND_COLOR
+
 <BadukPanControls>:
     katrain: app.gui
-    black_prisoners: black_prisoners
+    circles: [black_circle,white_circle]
-    white_prisoners: white_prisoners
     mid_circles_container: mid_circles_container
     pass_btn: pass_btn
-    engine_status_col: 0.8,0,0,1
+    hamburger: hamburger
+    analysis_button: analysis_button
+    HamburgerButton:
+        id: hamburger
+        on_press: root.nav_drawer.set_state("open")
     Label:
         size_hint: 0.05, 1
     BoxLayout:
@@ -285,16 +321,18 @@
             size_hint: 0.1, 1
             on_press: root.katrain('undo')
     FloatLayout:
-        size_hint: 0.2, 1
+        size_hint: 0.1, 1
         id: mid_circles_container
         BlackCircleWithText:
-            id: black_prisoners
+            id: black_circle
-            pos: (self.parent.pos[0]-self.height/3,self.parent.pos[1]) if self.parent else (0,0)
+            text: ''
-            radius: 0.4
+            pos: (self.parent.pos[0]-self.height/5,self.parent.pos[1]) if self.parent else (0,0)
+            radius: 0.3
         WhiteCircleWithText:
-            id: white_prisoners
+            id: white_circle
-            pos: (self.parent.pos[0]+self.height/3,self.parent.pos[1]) if self.parent else (0,0)
+            text: ''
-            radius: 0.4
+            pos: (self.parent.pos[0]+self.height/5,self.parent.pos[1]) if self.parent else (0,0)
+            radius: 0.3
     BoxLayout:
         size_hint: 0.3, 1
         padding: [0, self.size[1]*0.3]
@@ -315,119 +353,73 @@
     BoxLayout:
         size_hint: 0.2, 1
         padding: 0.2 * self.size[1]
-        StyledButton:
+        BoardControlsButton:
-            text: 'AI Move'
+            id: analysis_button
-            tooltip_text: '[enter]\nPlay an AI move\nusing the\nselected strategy.'
+            text: 'Analysis'
-            on_press: if not self.last_touch or self.last_touch.button=="left": root.katrain("ai-move",None)
+            icon: 'settings'
-            font_size: 0.6*self.size[1]
+            on_press: root.open_analysis_menu()
-    ClickableLabel:
-        size_hint: 0.025, 1
-        canvas:
-            Color:
-                rgba: root.engine_status_col
-            Ellipse:
-                pos: self.pos[0] + self.width/2 - self.height/5, self.pos[1]  + self.height/2 - self.height/5
-                size: self.height/2.5,self.height/2.5
-            Color:
-                rgba: BLACK
-            Line:
-                circle: self.pos[0] + self.width/2, self.pos[1] + self.height/2, self.height/5 - 1
-                width: 1.1
-        on_press: root.katrain.controls.set_status("This simply indicates the Engine status, going from green (idle) to orange (processing many queries). It turns red when the engine has crashed or fails to start.")
     Label:
         size_hint: 0.025, 1
 
 
 <HamburgerButton@MDFloatingActionButton>:
-    icon: 'img/flaticon/hamburger.png'
+    icon: 'menu'
     size_hint: None, 1
     width: self.height
 
-<AnalysisControls@BoxLayout>:
-    katrain: app.gui
-    show_children: show_children
-    eval: eval
-    policy: policy
-    hints: hints
-    ownership: ownership
-    analyze_extra: analyze_extra
-    analyze_equalize: analyze_equalize
-    analyze_sweep: analyze_sweep
-    HamburgerButton:
-    GridLayout:
-        cols: 5
-        rows: 2
-        size_hint: 0.5, 1
-        CheckBoxHintLabel:
-            text: 'next\nmoves'
-            tooltip_text: '[q]\nShow all next moves\nplayed from the current position'
-        CheckBoxHintLabel:
-            text: 'all\ndots'
-            tooltip_text: '[w]\nShow evaluation dots\non stones for all moves'
-        CheckBoxHintLabel:
-            text: 'top\nmoves'
-            tooltip_text: '[e]\nShow top\npredicted moves'
-        CheckBoxHintLabel:
-            text: 'show\nowner'
-            tooltip_text: '[r]\nShow predicted ownership\nof each intersection'
-        CheckBoxHintLabel:
-            text: 'NN\npolicy'
-            tooltip_text: "[t]\nShow Policy top moves\n(i.e. with no 'reading')"
-        CheckBox:
-            id: show_children
-            active: True
-            on_active: root.katrain.update_state()
-        CheckBox:
-            id: eval
-            on_active: root.katrain.update_state()
-        CheckBox:
-            id: hints
-            on_active: root.katrain.update_state()
-        CheckBox:
-            id: ownership
-            on_active: root.katrain.update_state()
-        CheckBox:
-            id: policy
-            on_active: root.katrain.update_state()
-    BoxLayout:
-        spacing:1
-        padding: 1,2,1,2
-        size_hint: 0.5, 1
-        StyledButton:
-            id: analyze_extra
-            text: 'Extra'
-            tooltip_text: '[a]\nExtra analysis\nto increase accuracy\nof top move predictions\nand score difference'
-            size_hint: 1, 1
-            on_press: if not self.last_touch or self.last_touch.button=="left": root.katrain("analyze-extra","extra")
-        StyledButton:
-            id: analyze_equalize
-            text: 'Equalize'
-            tooltip_text: '[s]\nAnalysis of all\npredicted top moves\nwith the same accuracy'
-            size_hint: 1, 1
-            on_press: if not self.last_touch or self.last_touch.button=="left": root.katrain("analyze-extra","equalize")
-        StyledButton:
-            id: analyze_sweep
-            text: 'Sweep'
-            tooltip_text: '[d]\nFast analysis\nof all legal moves'
-            size_hint: 1, 1
-            on_press: if not self.last_touch or self.last_touch.button=="left": root.katrain("analyze-extra","sweep")
-
 # ---------- components of right pane -------
 
 <ControlPanelSection@BoxLayout+BackgroundColor>:
-    background: BOX_BACKGROUND_COLOR
+    background_color: BOX_BACKGROUND_COLOR
 
-<PlayerInfo@BoxLayout>:
+<PlayerInfo@MDBoxLayout>:
+    captures: 0
+    name: 'Player'
+    description: '...'
     BlackCircleWithText:
-        text: '0'
+        text: str(root.captures)
         size_hint: 0.2, 1
-        id: captures
+        radius: 0.75
-    Label:
+        canvas.before:
-        id: description
+            Color:
+                rgb: [1,0,0,1]
+            Line:
+                rectangle:  (*self.pos,*self.size)
+                width: 1
+    MDBoxLayout:
+        size_hint: 0.8, 1
+        orientation: 'vertical'
+        Label:
+            text: root.name
+        Label:
+            text: root.description
+
 
 <PonderInfo@ControlPanelSection>:
-    LightLabel:
+    engine_status_col: [1,1,1,1]
-        text: 'AI\nBusy'
+    MDBoxLayout:
+        orientation: 'vertical'
+        LightLabel:
+            size_hint: 1, 0.5
+            text: 'AI\nStatus'
+            font_size: self.height/3
+            halign: 'center'
+            valign: 'middle'
+        ClickableLabel:
+            size_hint: 1, 0.5
+            canvas:
+                Color:
+                    rgba: root.engine_status_col
+                Ellipse:
+                    pos: self.pos[0] + self.width/2 - self.width/6, self.pos[1]  + self.height/2  - self.width/6
+                    size: self.width/3, self.width/3
+                Color:
+                    rgba: BLACK
+                Line:
+                    circle: self.pos[0] + self.width/2, self.pos[1] + self.height/2, self.width/6
+                    width: 1
+            on_press: app.gui.controls.set_status("This simply indicates the Engine status, going from green (idle) to orange (processing queries). It turns red when the engine has crashed or fails to start.")
+
 
 <PauseButton@MDFloatingActionButton+ToggleButtonBehavior>:
     icon: 'img/flaticon/pause.png'
@@ -472,16 +464,11 @@
     size: self.texture_size
 
 <ScoreGraph>:
+    background_color:  BOX_BACKGROUND_COLOR
     whalf: root.pos[1]+self.height*0.25
     bhalf: root.pos[1]+self.height*0.75
     mid:  root.pos[1]+self.height*0.5
     right_edge: root.pos[0] + root.width
-    canvas.before:
-        Color:
-            rgb: BOX_BACKGROUND_COLOR
-        Rectangle:
-            pos:  root.pos
-            size: root.size
     canvas:
         Color:
             rgba: GRAPH_CENTER_COLOR
@@ -528,8 +515,9 @@
         pos: root.right_edge - self.width-1, root.pos[1]
         text: 'W+' + str(int(root.y_scale))
 
-<StatsBox@BoxLayout>
+<StatsBox@BoxLayout+BackgroundColor>
     orientation: 'vertical'
+    background_color: BOX_BACKGROUND_COLOR
     score: score
     win_rate: win_rate
     score_change: score_change
@@ -540,7 +528,7 @@
         color: WINRATE_COLOR
     CensorableLabel:
         id: score
-        label: 'Score Estimate'
+        label: 'Score'
         text: ''
         color: SCORE_COLOR
     CensorableLabel:
@@ -550,22 +538,13 @@
         color: POINTLOSS_COLOR
 
 <ScrollableLabel>:
+    background_color: BOX_BACKGROUND_COLOR
+    outline_color: [0,0,0,0]
     do_scroll_x: False
     scroll_type: ['bars']
     bar_width: 5
     bar_color: BUTTON_COLOR
     label: label
-    canvas.before:
-        Color:
-            rgba: root.border_color
-        Line:
-            rectangle: [self.pos[0],self.pos[1]+1,self.width-1,self.height-2]
-            width:1
-        Color:
-            rgba: [*[(c+1)/2 for c in root.border_color[:3]], root.border_color[3]]
-        Line:
-            rectangle: [self.pos[0]+1,self.pos[1]+2,self.width-3,self.height-3]
-            width:1
     Label:
         id: label
         markup: root.markup
@@ -594,7 +573,7 @@
     button_controls: app.gui and app.gui.button_controls
     orientation: 'vertical'
     players: {'B':B_player,'W':W_player}
-    ponder: ponder
+    engine_status_col: [1,1,1,1]
     timer:timer
     graph: graph
     stats: stats
@@ -614,6 +593,7 @@
         spacing: CP_SPACING
         PonderInfo:
             id: ponder
+            engine_status_col: root.engine_status_col
             size_hint_x: 0.2
         Timer:
             id: timer
@@ -632,6 +612,7 @@
             id: status
             size_hint: 1, None
             height: 50 #min(self.parent.height*0.66,self.label.text_size[1])
+            outline_color: RED
         ScrollableLabel:
             id: info
             markup: True
@@ -646,36 +627,15 @@
             height: min( (len(self._lines)+0.7) * self.line_height, self.parent.height - status.height - 2.7*self.line_height)
 
 
-<RHSButton>:
+<RHSButton@SmallMDFlatButton>:
     size: self.parent.button_size
-    on_press: print(self.height, self.parent.height, self.parent.parent.height)
+    font_size: self.height * 0.7
-    _color: self.color
+
-    canvas.before:
+<RHSToggleButton@SmallMDFlatToggleButton>:
-        Color:
+    size: self.parent.button_size
-            rgba: BOX_BACKGROUND_COLOR
+    font_size: self.height * 0.7
-        Rectangle:
+    on_press: app.gui.controls.check_hide_show()
-            size: root.size
-            pos: root.pos
-        Color:
-            rgba: root._color
-        Line:
-            width: 1
-            rectangle: (self.x, self.y, self.width, self.height)
-    MDLabel:
-        text: root.text
-        font_size: root.height * 0.7
-        font_name: root.font_name if root.font_name is not None else self.font_name
-        size_hint_x: None
-        text_size: (None, root.height)
-        height: self.texture_size[1]
-        theme_text_color: 'Custom'
-        text_color: root._color
-        valign: 'middle'
-        halign: 'center'
 
-#:set RHS_BUTTON_UP_COLOR (0.5,0.5,0.5,1)
-<RHSToggleButton@RHSButton+ToggleButtonBehavior>:
-    _color: root.color if self.state=='down' else RHS_BUTTON_UP_COLOR
 
 <ButtonBox@MDBoxLayout>
     orientation: 'vertical'
@@ -691,19 +651,26 @@
 
 <RightButtonControls>:
     orientation: 'vertical'
-    button_size: (self.size[1] * 0.15 , self.size[1] * 0.04)
+    button_size: (self.size[1] * 0.08 , self.size[1] * 0.04)
     size_hint_x: None
-    width: self.button_size[0] + 2*CP_PADDING
+    width: self.minimum_width # if not self.parent.zen else 1
     padding: CP_PADDING, CP_PADDING
     spacing: CP_SPACING
     info: info
     note: note
+    eval: eval
+    policy: policy
+    hints: hints
+    ownership: ownership
+    analyze_extra: analyze_extra
+    analyze_equalize: analyze_equalize
+    analyze_sweep: analyze_sweep
     graph: {'winrate': winrate_graph,'score':score_graph,'points':points_graph}
     ButtonBoxHolder:
         size_hint_y: PLAYER_BOX_HEIGHT
         ButtonBox:
             RHSButton:
-                text: 'PASS'
+                text: 'Pass'
     ButtonBoxHolder:
         size_hint_y: TIMER_BOX_HEIGHT
         ButtonBox:
@@ -726,7 +693,7 @@
                 group: 'graph'
                 id: score_graph
             RHSToggleButton:
-                text: 'Point Loss'
+                text: 'Loss'
                 group: 'graph'
                 color: POINTLOSS_COLOR
                 id: points_graph
@@ -742,11 +709,11 @@
                 color: SCORE_COLOR
                 state: "down"
             RHSToggleButton:
-                text: 'Point Loss'
+                text: 'Loss'
                 color: POINTLOSS_COLOR
                 state: "down"
     ButtonBoxHolder:
-        size_hint_y: INFO_BOX_HEIGHT
+        size_hint_y: INFO_BOX_HEIGHT * 0.25
         ButtonBox:
             RHSToggleButton:
                 id: info
@@ -759,177 +726,58 @@
                 text: 'Note'
                 color: GREEN
                 group: "text"
-
+    ButtonBoxHolder:
-
+        size_hint_y: INFO_BOX_HEIGHT * 0.75
-
+        ButtonBox:
-
+            RHSToggleButton:
-<OldControls@BoxLayout>
-    orientation: 'horizontal'
-    BoxLayout: # ----------- analyze -----------
-        size_hint: 0,1
-        id: analyze_tab
-        padding: [3,3]
-        opacity: 0
-        orientation: 'vertical'
-        GridLayout:
-            cols: 5
-            rows: 2
-            size_hint: 1, 0.3
-            CheckBoxHintLabel:
-                text: 'next\nmoves'
-                tooltip_text: '[q]\nShow all next moves\nplayed from the current position'
-            CheckBoxHintLabel:
-                text: 'all\ndots'
-                tooltip_text: '[w]\nShow evaluation dots\non stones for all moves'
-            CheckBoxHintLabel:
-                text: 'top\nmoves'
-                tooltip_text: '[e]\nShow top\npredicted moves'
-            CheckBoxHintLabel:
-                text: 'show\nowner'
-                tooltip_text: '[r]\nShow predicted ownership\nof each intersection'
-            CheckBoxHintLabel:
-                text: 'NN\npolicy'
-                tooltip_text: "[t]\nShow Policy top moves\n(i.e. with no 'reading')"
-            CheckBox:
-                id: show_children
-                active: True
-                on_active: root.katrain.update_state()
-            CheckBox:
                 id: eval
-                on_active: root.katrain.update_state()
+                text: 'Dots'
-            CheckBox:
+                color: WHITE
-                id: hints
+            RHSToggleButton:
-                on_active: root.katrain.update_state()
-            CheckBox:
                 id: ownership
-                on_active: root.katrain.update_state()
+                text: 'Territory'
-            CheckBox:
+                color: WHITE
+            RHSToggleButton:
                 id: policy
-                on_active: root.katrain.update_state()
+                text: 'Policy'
-        BoxLayout:
+                color: WHITE
-            spacing:1
+            RHSToggleButton:
-            padding: 1,2,1,2
+                id: hints
-            size_hint: 1,0.2
+                text: 'Top Moves'
-            LightLabel:
+                color: WHITE
-                text: 'Analysis'
+            RHSButton:
-                size_hint: 1, 1
-                multiline: False
-                font_size: 0.45*self.size[1]
-            StyledButton:
                 id: analyze_extra
                 text: 'Extra'
                 tooltip_text: '[a]\nExtra analysis\nto increase accuracy\nof top move predictions\nand score difference'
-                size_hint: 1, 1
                 on_press: if not self.last_touch or self.last_touch.button=="left": root.katrain("analyze-extra","extra")
-            StyledButton:
+            RHSButton:
                 id: analyze_equalize
                 text: 'Equalize'
                 tooltip_text: '[s]\nAnalysis of all\npredicted top moves\nwith the same accuracy'
-                size_hint: 1, 1
                 on_press: if not self.last_touch or self.last_touch.button=="left": root.katrain("analyze-extra","equalize")
-            StyledButton:
+            RHSButton:
                 id: analyze_sweep
                 text: 'Sweep'
                 tooltip_text: '[d]\nFast analysis\nof all legal moves'
-                size_hint: 1, 1
                 on_press: if not self.last_touch or self.last_touch.button=="left": root.katrain("analyze-extra","sweep")
-        ScoreGraph:
-            id: graph
-            size_hint: 1,0.7
-        BoxLayout:
-            orientation: 'vertical'
-            size_hint: 1,0.3
-            spacing: 3
 
-    BoxLayout: # ----------- play -----------
-        orientation: 'vertical'
-        size_hint: 1,1
-        opacity: 1
-        id: play_tab
-        Label:
-            size_hint: 1,0.02
-        GridLayout:
-            cols: 4
-            rows: 2
-            spacing: 1
-            padding: 1
-            size_hint: 1,0.125
-            BlackCircleWithText:
-                text: 'B'
-                size_hint: 0.1, 1
-            ToggleButtonContainer:
-                size_hint: 0.6, 1
-                id: B_player_mode
-                options: PLAYER_MODE_VALUES
-                labels: PLAYER_MODES
-                tooltips: PLAYER_TOOLTIPS
-                on_selection: root.katrain.update_state()
-            StyledSpinner:
-                id: B_AI_mode
-                values: ['Default']
-                size_hint: 0.3, 1
-                on_text: if B_player_mode.children: B_player_mode.children[0].trigger_action(duration=0)
-            Label:
-                size_hint: None,1
-                width: 3
-            WhiteCircleWithText:
-                text: 'W'
-                size_hint: 0.1, 1
-            ToggleButtonContainer:
-                size_hint: 0.6, 1
-                id: W_player_mode
-                options: PLAYER_MODE_VALUES
-                labels: PLAYER_MODES
-                tooltips: PLAYER_TOOLTIPS
-                on_selection: root.katrain.update_state()
-            StyledSpinner:
-                id: W_AI_mode
-                size_hint: 0.3, 1
-                values: ['Default']
-                on_text: if W_player_mode.children: W_player_mode.children[0].trigger_action(duration=0)
-        BoxLayout:
-            size_hint: 1,0.05
-            padding: 5,0
-            spacing: 1
-            StyledButton:
-                text: 'Configure Teacher'
-                tooltip_text: "Undos, dots, and\nSGF output settings"
-                on_release: if not self.last_touch or self.last_touch.button=="left": root.configure_teacher()
-                size_hint: 1.425, 1
-            StyledButton:
-                text: 'Configure AIs'
-                tooltip_text: "Strength Settings per AI"
-                on_release: if not self.last_touch or self.last_touch.button=="left": root.configure_ais()
 
-        Label:
+<ContentNavigationDrawer@MDBoxLayout+BackgroundColor>:
-            size_hint: 1,0.1
+    orientation: 'vertical'
-    BoxLayout:
+    background_color: BOX_BACKGROUND_COLOR
-        orientation: 'horizontal'
+    Label:
-        size_hint: 1, None
+        text: 'sdafs'
-        spacing: 2
+    Label:
-        padding: 2
+        text: 'sdafs'
-        height: self.width * 0.25
+    MDFlatButton:
-        StyledIconButton:
+        text: 'size'
-            icon: 'img/flaticon/go-game.png'
+        on_press: print(self.size,self.parent.size,self.parent.parent.size,self.parent.parent.parent.size,self.parent.parent.parent.parent.size)
-            tooltip_text: '[Ctrl-N]\nNew Game'
+    MDFlatButton:
-            size_hint: 0.25, 1
+        text: 'pos'
-            on_release: if not self.last_touch or self.last_touch.button=="left": root.katrain("new-game-popup")
+        on_press: print(self.pos,self.parent.pos,self.parent.parent.pos,self.parent.parent.parent.pos,self.parent.parent.parent.parent.pos,self.parent.parent.parent.parent)
-        StyledIconButton:
-            icon: 'img/flaticon/open-folder.png'
-            tooltip_text: '[Ctrl-L]\nLoad Game'
-            size_hint: 0.25, 1
-            on_release: if not self.last_touch or self.last_touch.button=="left": root.katrain("analyze-sgf-popup")
-        StyledIconButton:
-            icon: 'img/flaticon/bar.png'
-            tooltip_text: '[Ctrl-S]\nSave Game'
-            size_hint: 0.25, 1
-            on_release: if not self.last_touch or self.last_touch.button=="left": root.katrain('output-sgf')
-        StyledIconButton:
-            icon: 'img/flaticon/gears.png'
-            tooltip_text: 'General Settings'
-            size_hint: 0.25, 1
-            on_release: if not self.last_touch or self.last_touch.button=="left": root.katrain('config-popup')
 
+<GuiContents@MDBoxLayout+BackgroundColor>
+    background_color: BACKGROUND_COLOR
 
 <KaTrainGui>:
     board_gui: board_gui
@@ -937,33 +785,40 @@
     board_controls: board_controls
     analysis_controls: analysis_controls
     button_controls: button_controls
+    analysis_controls: button_controls
     zen: False
-    canvas.before:
+    NavigationLayout:
-        Color:
+        ScreenManager:
-            rgb: BACKGROUND_COLOR
+            Screen:
-        Rectangle:
+                name: 'gui'
-            pos: self.pos
+                GuiContents:
-            size: self.size
+                    MDBoxLayout:
-    BoxLayout:
+                        orientation: 'vertical'
-        orientation: 'vertical'
+                        padding: CP_PADDING, 0
-        padding: CP_PADDING, 0
+                        BadukPanWidget:
-        AnalysisControls:
+                            id: board_gui
-            id: analysis_controls
+                        BadukPanControls:
-            size_hint_y: None
+                            id: board_controls
-            height: min(100,self.width / 13.5)
+                            nav_drawer: nav_drawer
-        BadukPanWidget:
+                            size_hint_y: None
-            id: board_gui
+                            height: max(dp(75),self.width / 13.5)
-        BadukPanControls:
+                    ControlsPanel:
-            id: board_controls
+                        id: controls
-            size_hint_y: None
+                        size_hint_x: None
-            height: min(100,self.width / 13.5)
+                        width: 0 if root.zen else self.height * 0.35
-    ControlsPanel:
+                        opacity: 0 if root.zen else 1
-        id: controls
+                    RightButtonControls:
-        size_hint_x: None
+                        id: button_controls
-        width: 0 if root.zen else self.height * 0.4
+        MyNavigationDrawer:
-        opacity: 0 if root.zen else 1
+            id: nav_drawer
-    RightButtonControls:
+            state: "close"
-        id: button_controls
+            width: self.height / 3
+            y: board_gui.pos[1]+CP_SPACING
+            swipe_edge_width: 0
+            ContentNavigationDrawer:
+                nav_drawer: nav_drawer
+
+
 
 
 <LoadSGFPopup>:

katrain/gui/badukpan.py

@@ -7,6 +7,8 @@ from kivy.graphics.context_instructions import Color
 from kivy.graphics.vertex_instructions import Ellipse, Line, Rectangle
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.widget import Widget
+from kivymd.uix.boxlayout import MDBoxLayout
+from kivymd.uix.menu import MDDropdownMenu
 
 from katrain.core.common import OUTPUT_DEBUG, evaluation_class, PLAYER_AI
 from katrain.core.game import Move
@@ -306,22 +308,21 @@ class BadukPanWidget(Widget):
             self.active_pv_moves = []
 
             # children of current moves in undo / review
-            if katrain.analysis_controls.show_children.active:
+            alpha = self.ui_config["ghost_alpha"]
-                alpha = self.ui_config["ghost_alpha"]
+            for child_node in current_node.children:
-                for child_node in current_node.children:
+                points_lost = child_node.points_lost
-                    points_lost = child_node.points_lost
+                move = child_node.move
-                    move = child_node.move
+                if move and move.coords is not None:
-                    if move and move.coords is not None:
+                    if points_lost is None:
-                        if points_lost is None:
+                        evalcol = None
-                            evalcol = None
+                    else:
-                        else:
+                        evalcol = copy.copy(self.eval_color(points_lost))
-                            evalcol = copy.copy(self.eval_color(points_lost))
+                        evalcol[3] = alpha
-                            evalcol[3] = alpha
+                    # if ((teaching and child_node.auto_undo) or katrain.controls.play_analyze_mode == "analyze") and child_node.analysis_ready: # TODO:?
-                        # if ((teaching and child_node.auto_undo) or katrain.controls.play_analyze_mode == "analyze") and child_node.analysis_ready: # TODO:?
+                    if child_node.analysis_ready:
-                        if child_node.analysis_ready:
+                        self.active_pv_moves.append((move.coords, child_node.candidate_moves[0]["pv"], child_node))
-                            self.active_pv_moves.append((move.coords, child_node.candidate_moves[0]["pv"], child_node))
+                    scale = self.ui_config["child_scale"]
-                        scale = self.ui_config["child_scale"]
+                    self.draw_stone(move.coords[0], move.coords[1], (*stone_color[move.player][:3], alpha), None, None, evalcol, evalscale=scale, scale=scale)
-                        self.draw_stone(move.coords[0], move.coords[1], (*stone_color[move.player][:3], alpha), None, None, evalcol, evalscale=scale, scale=scale)
 
             # hints or PV
             if katrain.analysis_controls.hints.active and not game_ended and not lock_ai:
@@ -393,5 +394,18 @@ class BadukPanWidget(Widget):
         self.set_animating_pv(pv_str[1:].split(" "), self.katrain.controls.active_comment_node.parent)
 
 
-class BadukPanControls(BoxLayout):
+class BadukPanControls(MDBoxLayout):
-    pass
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.analysis_menu = None
+        Clock.schedule_once(self.init_menus,1)
+
+    def init_menus(self,_dt):
+        menu_items = [{"icon": "git", "text": f"Item {i}"} for i in range(5)]
+        self.analysis_menu = MDDropdownMenu(
+            caller=self.analysis_button, items=menu_items, width_mult=4
+        )
+
+    def open_analysis_menu(self):
+        if self.analysis_menu:
+            self.analysis_menu.open()

katrain/gui/controlspanel.py

@@ -25,6 +25,11 @@ class ControlsPanel(BoxLayout):
         self.periods_used = {"B": 0, "W": 0}
         Clock.schedule_interval(self.update_timer, 0.07)
 
+    def check_hide_show(self, *_args):
+        pass
+
+
+
     def set_status(self, msg, at_node=None):
         self.status_msg = msg
         self.status_node = at_node or self.katrain and self.katrain.game and self.katrain.game.current_node

katrain/gui/kivyutils.py

@@ -7,6 +7,7 @@ from kivy.clock import Clock
 from kivy.core.text import Label as CoreLabel
 from kivy.core.window import Window
 from kivy.graphics import *
+from kivy.metrics import dp, sp
 from kivy.properties import BooleanProperty, ListProperty, NumericProperty, ObjectProperty, StringProperty
 from kivy.uix.behaviors import ToggleButtonBehavior
 from kivy.uix.boxlayout import BoxLayout
@@ -25,29 +26,44 @@ from kivymd.uix.behaviors import RectangularRippleBehavior
 from kivymd.uix.boxlayout import MDBoxLayout
 from kivymd.uix.button import MDRectangleFlatButton, BaseButton
 from kivymd.uix.label import MDLabel
+from kivymd.uix.navigationdrawer import MDNavigationDrawer
 
 
+class BackgroundColor(Widget):
+    background_color = ListProperty([1, 1, 1, 0])
+
+class OutlineColor(Widget):
+    outline_color = ListProperty([1, 1, 1, 0])
+    outline_width = NumericProperty(1)
+
 class RightButtonControls(MDBoxLayout):
     button_size = ListProperty([100,33])
 
-class RHSButton(RectangularRippleBehavior,BaseButton):
+class SmallMDFlatButton(RectangularRippleBehavior,BaseButton,BackgroundColor,OutlineColor):
-    button_label = BooleanProperty(True)
     text = StringProperty("")
+    text_color = ListProperty([1,1,1,1])
     color = ListProperty([1, 1, 1, 1])
-    _color = ListProperty([1,1,1,1])
+    font_size = NumericProperty(sp(20))
+
+class SmallMDFlatToggleButton(SmallMDFlatButton,ToggleButtonBehavior):
+    @property
+    def active(self):
+        return self.state=='down'
 
 class LightLabel(MDLabel):
     pass
 
+class BackgroundLabel(MDLabel,BackgroundColor):
+    pass
+
+
 class CensorableLabel(MDBoxLayout):
     text = StringProperty("")
     label = StringProperty("")
     color = ListProperty([1, 1, 1, 1])
 
 
-
+class ScoreGraph(BackgroundLabel):
-
-class ScoreGraph(Label):
     nodes = ListProperty([])
     score_points = ListProperty([])
     winrate_points = ListProperty([])
@@ -105,13 +121,11 @@ class ScoreGraph(Label):
         self.on_size()
 
 
-# --- not checked
+class ToolTipLabel(MDLabel):
-
-class ToolTipLabel(Label):
     pass
 
 
-class ToolTipBehavior(Widget):
+class ToolTipBehavior(object):
     tooltip_text = StringProperty("")
 
     def __init__(self, **kwargs):
@@ -145,30 +159,36 @@ class ToolTipBehavior(Widget):
         self.tooltip.text = self.tooltip_text
         Window.add_widget(self.tooltip)
 
+class MyNavigationDrawer(MDNavigationDrawer):
+    def on_touch_up(self, touch):
+        if self.status == "opened" and  self.close_on_click and not self.collide_point(touch.ox, touch.oy):
+                self.set_state("close", animation=True)
+                return True
+        return super().on_touch_up(touch)
 
 
 
+class BaseCircleWithText(LightLabel):
+    radius = NumericProperty(0.48)
+
 class ScaledLightLabel(LightLabel, ToolTipBehavior):
     num_lines = NumericProperty(1)
 
 
+# --- not checked
+
+
+
+
 class LightHelpLabel(ScaledLightLabel):
     pass
 
 
-class BackgroundColor(Widget):
-    background = ListProperty([1, 1, 1, 0])
 
-
+class ScrollableLabel(ScrollView,BackgroundColor,OutlineColor):
-class BackgroundLabel(Label, BackgroundColor):
-    pass
-
-
-class ScrollableLabel(ScrollView):
     __events__ = ["on_ref_press"]
     text = StringProperty("")
     markup = BooleanProperty(False)
-    border_color = ListProperty([0, 0, 0, 1])
 
     def on_ref_press(self, ref):
         pass
@@ -265,9 +285,6 @@ class ToggleButtonContainer(GridLayout):
             return self.options[0]
 
 
-class BaseCircleWithText(LightLabel):
-    radius = NumericProperty(0.48)
-
 
 class LabelledTextInput(TextInput):
     input_property = StringProperty("")

katrain/gui/popups.py

@@ -269,7 +269,7 @@ class ConfigTeacherPopup(QuickConfigGui):
         for i, (thr, undos, color) in enumerate(zip(thresholds, undos, colors)):
             thrbox.add_widget(LabelledFloatInput(text=str(thr), input_property=f"eval_thresholds::{i}"))
             thrbox.add_widget(LabelledFloatInput(text=str(undos), input_property=f"num_undo_prompts::{i}"))
-            thrbox.add_widget(BackgroundLabel(background=color[:3]))
+            thrbox.add_widget(BackgroundLabel(background_color=color[:3]))
             thrbox.add_widget(LabelledCheckBox(text=str(color[3] == 1), input_property=f"alpha::{i}"))
             thrbox.add_widget(LabelledCheckBox(size_hint=(0.5, 1), text=str(self.sgf_settings["save_feedback"][i]), input_property=f"save_feedback::{i}"))
         self.add_widget(thrbox)

setup.py

@@ -39,11 +39,12 @@ setup(
         "wheel", "setuptools",
         "importlib_resources ;python_version<'3.7'",
         "cython>=0.24,<=0.29.14,!=0.27,!=0.27.2", # kivy wants this
-        "kivy>=2.0.0rc2",
+        "kivy_deps.glew;platform_system=='Windows'",
+        "kivy_deps.sdl2;platform_system=='Windows'",
+        "kivy_deps.gstreamer;platform_system=='Windows'",
+        "kivy>=1.11 ;python_version<'3.8'",
+        "kivy>=2.0.0rc2 ;python_version>='3.8'",
         "kivymd>=0.104.0",
-# "kivy_deps.glew;platform_system=='Windows'",
-#        "kivy_deps.sdl2;platform_system=='Windows'",
-#        "kivy_deps.gstreamer;platform_system=='Windows'",
      ],
     python_requires=">=3.6, <4",
     entry_points={"console_scripts": ["katrain=katrain.__main__:run_app"]},