Version 2.20b

Author: lukasmonk

bin/Code/Databases/WDB_Games.py

@@ -431,7 +431,7 @@ def show_current(self):
         if recno >= 0:
             self.grid_cambiado_registro(None, recno, None)
         else:
-            self.infoMove.modoPartida(Game.Game(), 0)
+            self.infoMove.game_mode(Game.Game(), 0)
 
     def grid_cambiado_registro(self, grid, row, oCol):
         if self.grid_num_datos(grid) > row >= 0:
@@ -442,13 +442,13 @@ def grid_cambiado_registro(self, grid, row, oCol):
                 p = Game.Game(fen=fen)
                 p.read_pv(pv)
                 p.is_finished()
-                self.infoMove.modoFEN(p, fen, -1)
+                self.infoMove.fen_mode(p, fen, -1)
             else:
                 p = Game.Game()
                 p.read_pv(pv)
                 p.assign_opening()
                 p.is_finished()
-                self.infoMove.modoPartida(p, 0)
+                self.infoMove.game_mode(p, 0)
 
     def tw_gobottom(self):
         self.grid.gobottom()

bin/Code/Databases/WDB_InfoMove.py

@@ -47,6 +47,8 @@ def mouseDoubleClickEvent(self, event):
 
 
 class WInfomove(QtWidgets.QWidget):
+    game: None
+
     def __init__(self, wb_database):
         QtWidgets.QWidget.__init__(self)
 
@@ -71,15 +73,15 @@ def __init__(self, wb_database):
         lybt, bt = QTVarios.ly_mini_buttons(self, "", siTiempo=True, siLibre=False, icon_size=24, siJugar=True)
 
         self.lbPGN = LBKey(self).anchoFijo(self.board.ancho).set_wrap()
-        self.lbPGN.setTextInteractionFlags(Qt.LinksAccessibleByMouse| Qt.LinksAccessibleByKeyboard)
+        self.lbPGN.setTextInteractionFlags(Qt.LinksAccessibleByMouse | Qt.LinksAccessibleByKeyboard)
         self.lbPGN.wowner = self
         self.lbPGN.set_font_type(puntos=configuration.x_pgn_fontpoints)
         Code.configuration.set_property(self.lbPGN, "pgn")
         self.lbPGN.setOpenExternalLinks(False)
         self.lbPGN.setAlignment(QtCore.Qt.AlignTop)
 
         def muestra_pos(txt):
-            self.colocatePartida(int(txt))
+            self.goto_move_num(int(txt))
 
         self.lbPGN.linkActivated.connect(muestra_pos)
 
@@ -122,7 +124,7 @@ def cambiado_board(self):
     def process_toolbar(self):
         getattr(self, self.sender().key)()
 
-    def modoPartida(self, game, move):
+    def game_mode(self, game, move):
         self.game = game
         if game.opening:
             txt = game.opening.tr_name
@@ -131,14 +133,14 @@ def modoPartida(self, game, move):
             self.lb_opening.set_text(txt)
         else:
             self.lb_opening.set_text("")
-        self.colocatePartida(move)
+        self.goto_move_num(move)
 
-    def modoFEN(self, game, fen, move):
+    def fen_mode(self, game, fen, move):
         self.game = game
         self.lb_opening.set_text(fen)
-        self.colocatePartida(move)
+        self.goto_move_num(move)
 
-    def colocatePartida(self, pos):
+    def goto_move_num(self, pos):
         if not len(self.game):
             self.lbPGN.game = None
             self.lbPGN.set_text("")
@@ -152,29 +154,31 @@ def colocatePartida(self, pos):
         p = self.game
 
         movenum = p.primeraJugada()
-        pgn = ""
-        style_number = "color:%s; font-weight: bold;" % Code.dic_colors["PGN_NUMBER"]
-        style_select = "color:%s;font-weight: bold;" % Code.dic_colors["PGN_SELECT"]
-        style_moves = "color:%s;" % Code.dic_colors["PGN_MOVES"]
+        li_pgn = []
+        style_number = f'color:{Code.dic_colors["PGN_NUMBER"]}'
+        style_select = f'color:{Code.dic_colors["PGN_SELECT"]};font-weight:bold;'
+        style_moves = f'color:{Code.dic_colors["PGN_MOVES"]}'
         if p.starts_with_black:
-            pgn += '<span style="%s">%d...</span>' % (style_number, movenum)
+            li_pgn.append(f'<span style="{style_number}">{movenum}...</span>')
             movenum += 1
             salta = 1
         else:
             salta = 0
         for n, move in enumerate(p.li_moves):
             if n % 2 == salta:
-                pgn += '<span style="%s">%d.</span>' % (style_number, movenum)
+                li_pgn.append(f'<span style="{style_number}">{movenum}.</span>')
                 movenum += 1
-
             xp = move.pgn_html(self.with_figurines)
             if n == pos:
-                xp = '<span style="%s">%s</span>' % (style_select, xp)
+                xp = f'<span style="{style_select}">{xp}</span>'
             else:
-                xp = '<span style="%s">%s</span>' % (style_moves, xp)
-
-            pgn += '<nobr><a href="%d" style="text-decoration:none;">%s</a></nobr> ' % (n, xp)
+                xp = f'<span style="{style_moves}">{xp}</span>'
 
+            li_pgn.append(f'<a href="{n}" style="text-decoration:none;">{xp}</a> ')
+        pgn = "".join(li_pgn)
+        if "O-" in pgn:
+            pgn = pgn.replace("O-O-O", "O\u2060-\u2060O-\u2060O").replace("O-O", "O\u2060-\u2060O")
+        self.lbPGN.set_text("")  # necesario para que no aparezca la selección
         self.lbPGN.set_text(pgn)
         self.lbPGN.game = self.game
         self.lbPGN.pos_move = pos
@@ -212,10 +216,10 @@ def MoverInicio(self):
         self.board.set_position(position)
 
     def MoverAtras(self):
-        self.colocatePartida(self.pos_move - 1)
+        self.goto_move_num(self.pos_move - 1)
 
     def MoverAdelante(self):
-        self.colocatePartida(self.pos_move + 1)
+        self.goto_move_num(self.pos_move + 1)
 
     def analizar_actual(self):
         lh = len(self.game)
@@ -232,11 +236,11 @@ def analizar_actual(self):
             self.board.is_white_bottom, self.pos_move, main_window=self,
             must_save=False
         )
-        self.lbPGN.set_text("") #necesario para que desaparezca la selección
-        self.colocatePartida(self.pos_move)
+        self.lbPGN.set_text("")  # necesario para que desaparezca la selección
+        self.goto_move_num(self.pos_move)
 
     def MoverFinal(self):
-        self.colocatePartida(99999)
+        self.goto_move_num(99999)
 
     def MoverJugar(self):
         self.board.play_current_position()

bin/Code/Databases/WDB_Players.py

@@ -320,7 +320,7 @@ def grid_cambiado_registro(self, grid, nfila, oCol):
                 pv = dt[nfila]["pv"]
                 game = Game.Game()
                 game.read_pv(pv)
-            self.infoMove.modoPartida(game, len(game) - 1)
+            self.infoMove.game_mode(game, len(game) - 1)
             grid.setFocus()
 
     def grid_color_fondo(self, grid, nfila, ocol):

bin/Code/Databases/WDB_Summary.py

@@ -374,7 +374,7 @@ def cambiaInfoMove(self):
             p.read_pv(pv)
             p.is_finished()
             p.assign_opening()
-            self.infoMove.modoPartida(p, 9999)
+            self.infoMove.game_mode(p, 9999)
             self.setFocus()
             self.grid.setFocus()
 

bin/Code/GM/WindowGM.py

@@ -518,7 +518,7 @@ def preferred_openings(self):
         menu.set_font(f)
         n_pos = 0
         for nli, bloque in enumerate(self.li_preferred_openings):
-            if type(bloque) == tuple:  # compatibilidad con versiones anteriores
+            if isinstance(bloque, tuple):  # compatibilidad con versiones anteriores
                 bloque = bloque[0]
                 self.li_preferred_openings[nli] = bloque
             menu.opcion((n_pos, bloque), bloque.tr_name, Iconos.PuntoVerde())

bin/Code/Kibitzers/WKibDatabases.py

@@ -14,7 +14,7 @@
 class InfoMoveReplace:
     board = None
 
-    def modoPartida(self, x, y):
+    def game_mode(self, x, y):
         return True
 
 

bin/Code/MainWindow/WInformation.py

@@ -352,11 +352,15 @@ def link_variation_pressed(self, selected_link):
         board.put_arrow_sc(var_move.from_sq, var_move.to_sq)
         if Code.configuration.x_show_rating:
             self.get_manager().show_rating(var_move)
+        if var_move.analysis and Code.configuration.x_show_bestmove:
+            self.get_manager().show_bestmove(var_move)
         self.mostrar()
 
         if variation is not None:
             manager = self.get_manager()
             manager.show_bar_kibitzers_variation(variation.copia(num_var_move))
+        else:
+            self.get_manager().put_view()
 
     def link_variation_edit(self, num_variation):
         self.edit(num_variation)

bin/Code/Manager.py

@@ -519,10 +519,7 @@ def put_view(self):
                         move_check = None
                 if move_check:
                     if move_check.analysis and self.configuration.x_show_bestmove:
-                        mrm, pos = move_check.analysis
-                        if pos:  # no se muestra la mejor move si es la realizada
-                            rm0 = mrm.best_rm_ordered()
-                            self.board.put_arrow_scvar([(rm0.from_sq, rm0.to_sq)])
+                        self.show_bestmove(move_check)
 
                     if self.configuration.x_show_rating:
                         self.show_rating(move_check)
@@ -586,6 +583,12 @@ def show_rating(self, move_check):
             poscelda = 1 if poscelda == 0 else 0
             self.board.put_rating(move_check.from_sq, move_check.to_sq, 1000, poscelda)
 
+    def show_bestmove(self, move_check):
+        mrm, pos = move_check.analysis
+        if pos:  # no se muestra la mejor move si es la realizada
+            rm0 = mrm.best_rm_ordered()
+            self.board.put_arrow_scvar([(rm0.from_sq, rm0.to_sq)])
+
     def si_check_kibitzers(self):
         return (self.state == ST_ENDGAME) or (not self.is_competitive)
 
@@ -854,18 +857,6 @@ def goto_firstposition(self):
         self.refresh_pgn()  # No se puede usar pgn_refresh, ya que se usa con gobottom en otros lados y aqui eso no funciona
         self.put_view()
 
-    # def ponteAlPrincipioColor(self):
-    #     if self.game.li_moves:
-    #         move = self.game.move(0)
-    #         self.set_position(move.position)
-    #         self.main_window.base.pgn.goto(0, 2 if move.position.is_white else 1)
-    #         self.board.put_arrow_sc(move.from_sq, move.to_sq)
-    #         self.refresh_pgn()  # No se puede usar pgn_refresh, ya que se usa con gobottom en otros lados
-    #         # y aqui eso no funciona
-    #         self.put_view()
-    #     else:
-    #         self.goto_firstposition()
-
     def pgnMueve(self, row, is_white):
         self.pgn.mueve(row, is_white)
         self.put_view()

bin/Code/Openings/POLAnalisis.py

@@ -493,7 +493,7 @@ def __init__(self, owner):
         self.tab_database = owner
         self.board = self.tab_database.tabsAnalisis.panelOpening.pboard.board
 
-    def modoPartida(self, x, y):
+    def game_mode(self, x, y):
         return True
 
 

bin/Code/Openings/POLBoard.py

@@ -81,7 +81,7 @@ def __init__(self, panelOpening, configuration):
         self.lbPGN.setOpenExternalLinks(False)
 
         def muestra_pos(txt):
-            self.colocatePartida(int(txt))
+            self.goto_move_num(int(txt))
 
         self.lbPGN.linkActivated.connect(muestra_pos)
 
@@ -210,7 +210,7 @@ def resetValues(self):
         self.cbVentaja.set_value(V_SIN)
         self.emComentario.set_text("")
 
-    def colocatePartida(self, pos):
+    def goto_move_num(self, pos):
         self.fenm2 = None
         num_jugadas = len(self.game)
         if num_jugadas == 0:
@@ -294,16 +294,16 @@ def activaPiezas(self):
             self.board.activate_side(color)
 
     def MoverInicio(self):
-        self.colocatePartida(0)
+        self.goto_move_num(0)
 
     def MoverAtras(self):
-        self.colocatePartida(self.pos_move - 1)
+        self.goto_move_num(self.pos_move - 1)
 
     def MoverAdelante(self):
-        self.colocatePartida(self.pos_move + 1)
+        self.goto_move_num(self.pos_move + 1)
 
     def MoverFinal(self):
-        self.colocatePartida(99999)
+        self.goto_move_num(99999)
 
     def MoverTiempo(self):
         if self.clock_running: