Version 2.19c

Resources/Locale/zh/lang.ini

@@ -1,4 +1,4 @@
 NAME=简体中文
 AUTHOR=Zoushen
 PREVIOUS=Kevin Sicong Jiang,Stephen Yang
-%=100
+%=99

bin/Code/Board/Board.py

@@ -415,12 +415,23 @@ def crea(self):
         self.set_width()
 
     def calc_width_mx_piece(self):
-        at = min(QTUtil.desktop_height(), QTUtil.desktop_width()) - 50 - 64
         if self.siF11:
-            at += 50 + 64
+            sz_width, sz_height = QTUtil.desktop_size()
+            limit = min(sz_width, sz_height)
+        else:
+            sz_width, sz_height = QTUtil.desktop_size_available()
+            if sz_width > sz_height:
+                limit = sz_height
+            else:
+                limit = sz_width
+            if Code.configuration.x_tb_orientation_horizontal:
+                limit -= 80
+
+            limit -= 42
+
         tr = 1.0 * self.config_board.tamRecuadro() / 100.0
 
-        ap = int((1.0 * at - 16.0 * self.margin_pieces) / (8.0 + tr * 92.0 / 80))
+        ap = int((1.0 * limit - 16.0 * self.margin_pieces) / (8.0 + tr * 92.0 / 80))
         return ap
 
     def set_width(self):

bin/Code/Config/Configuration.py

@@ -186,6 +186,7 @@ def __init__(self, user):
         self.x_tb_fontpoints = 11
         self.x_tb_bold = False
         self.x_tb_icons = toolbutton_int(Qt.ToolButtonTextUnderIcon)
+        self.x_tb_orientation_horizontal = True
 
         self.x_cursor_thinking = True
 

bin/Code/Config/WindowConfig.py

@@ -164,6 +164,8 @@ def options(parent, configuration):
         (_("The text appears under the icon"), QtCore.Qt.ToolButtonTextUnderIcon),
     )
     form.combobox(_("Icons"), li, configuration.type_icons())
+    li_mto = [(_("Horizontal"), True), (_("Vertical"), False)]
+    form.combobox(_("Main Toolbar Orientation"), li_mto, configuration.x_tb_orientation_horizontal)
 
     form.separador()
     form.apart(_("Message windows"))
@@ -247,6 +249,7 @@ def options(parent, configuration):
             configuration.x_tb_fontpoints,
             configuration.x_tb_bold,
             qt_iconstb,
+            configuration.x_tb_orientation_horizontal,
             configuration.x_sizefont_messages,
         ) = li_asp1
 

bin/Code/Leagues/WLeagueWorker.py

@@ -376,11 +376,13 @@ def save_game_done(self):
     def terminar(self):
         self.is_closed = True
         Code.list_engine_managers.close_all()
+        self.close()
 
     def cancel_match(self):
         self.is_closed = True
         Code.list_engine_managers.close_all()
         self.league_work.cancel_match(self.xmatch.xid)
+        self.terminar()
 
     def closeEvent(self, event):
         self.terminar()

bin/Code/MainWindow/MainWindow.py

@@ -51,6 +51,7 @@ def __init__(self, manager, owner=None, extparam=None):
         self.board.set_dispatch_size(self.adjust_size)
         self.board.allowed_extern_resize(True)
         self.anchoAntesMaxim = None
+        self.resizing = False
 
         self.splitter = splitter = QtWidgets.QSplitter(self)
         splitter.addWidget(self.base)
@@ -258,18 +259,23 @@ def show_variations(self, titulo):
         return resp
 
     def adjust_size(self):
+        if self.resizing:
+            return
+        self.resizing = True
         if self.isMaximized():
             if not self.board.is_maximized():
                 self.board.maximize_size(self.activadoF11)
         else:
+            tb_height = self.base.tb.height() if Code.configuration.x_tb_orientation_horizontal else 0
             n = 0
-            while self.height() > self.board.ancho + self.base.tb.height() + 18:
+            while self.height() > self.board.ancho + tb_height + 18:
                 self.adjustSize()
                 self.refresh()
                 n += 1
                 if n > 3:
                     break
         self.refresh()
+        self.resizing = False
 
     def ajustaTamH(self):
         if not (self.isMaximized() or self.board.siF11):

bin/Code/MainWindow/WBase.py

@@ -74,6 +74,8 @@ def __init__(self, parent, manager):
         super(WBase, self).__init__(parent)
 
         self.parent = parent
+        if "MainWindow" in str(self.parent):
+            self.parent.base = self
         self.manager = manager
 
         self.configuration = Code.configuration
@@ -82,17 +84,17 @@ def __init__(self, parent, manager):
 
         self.setWindowIcon(Iconos.Aplicacion64())
 
-        self.create_board()
-
         self.create_toolbar()
 
+        self.create_board()
+
         self.analysis_bar = None
         self.create_analysis_bar()
 
         ly_bi = self.creaBloqueInformacion()
 
         ly_bb = Colocacion.H().control(self.analysis_bar).control(self.board)
-        ly_t = Colocacion.V().otro(ly_bb).relleno()
+        ly_t = Colocacion.V().otro(ly_bb).relleno().margen(0)
 
         self.with_shortcuts = True
 
@@ -101,10 +103,12 @@ def __init__(self, parent, manager):
 
         self.li_hide_replay = []
 
-        ly_ai = Colocacion.H().relleno().otroi(ly_t).otroi(ly_bi).relleno().margen(0)
-        ly = Colocacion.V().control(self.tb).relleno().otro(ly_ai).relleno().margen(2)
-        # ly_ai = Colocacion.H().relleno().control(self.tb).otroi(ly_t).otroi(ly_bi).relleno().margen(0)
-        # ly = Colocacion.V().relleno().otro(ly_ai).relleno().margen(2)
+        if self.configuration.x_tb_orientation_horizontal:
+            ly_ai = Colocacion.H().relleno().otroi(ly_t).otroi(ly_bi).relleno().margen(0)
+            ly = Colocacion.V().control(self.tb).relleno().otro(ly_ai).relleno().margen(2)
+        else:
+            ly_ai = Colocacion.H().relleno().control(self.tb).otroi(ly_t).otroi(ly_bi).relleno().margen(0)
+            ly = Colocacion.V().relleno().otro(ly_ai).relleno().margen(2)
 
         self.setLayout(ly)
 
@@ -115,7 +119,8 @@ def set_manager_active(self, manager):
 
     def create_toolbar(self):
         self.tb = QtWidgets.QToolBar("BASIC", self)
-        # self.tb.setOrientation(QtCore.Qt.Orientation.Vertical)
+        if not self.configuration.x_tb_orientation_horizontal:
+            self.tb.setOrientation(QtCore.Qt.Orientation.Vertical)
         icons_tb = self.configuration.type_icons()
         self.tb.setToolButtonStyle(icons_tb)
         sz = 32 if icons_tb == QtCore.Qt.ToolButtonTextUnderIcon else 16

bin/Code/QT/QTUtil.py

@@ -213,6 +213,16 @@ def desktop_size():
     return screen_geometry.width(), screen_geometry.height()
 
 
+def desktop_size_available():
+    if Code.main_window:
+        screen = get_screen(Code.main_window)
+        screen_geometry = screen.availableGeometry()
+    else:
+        desktop = QtWidgets.QDesktopWidget()
+        screen_geometry = desktop.availableGeometry()
+    return screen_geometry.width(), screen_geometry.height()
+
+
 def desktop_width():
     return desktop_size()[0]
 

bin/Code/Swiss/WSwissWorker.py

@@ -360,11 +360,13 @@ def save_game_done(self):
     def terminar(self):
         self.is_closed = True
         Code.list_engine_managers.close_all()
+        self.close()
 
     def cancel_match(self):
         self.is_closed = True
         Code.list_engine_managers.close_all()
         self.swiss_work.cancel_match(self.xmatch.xid)
+        self.terminar()
 
     def closeEvent(self, event):
         self.terminar()

bin/Code/Tactics/ManagerTactics.py

@@ -62,6 +62,8 @@ def reiniciar(self):
         else:
             self.game.set_position(cp)
 
+        self.game.set_first_comment(self.game_obj.first_comment, True)
+
         self.game_type = GT_TACTICS
 
         self.human_is_playing = False

bin/Code/Tournaments/WTournamentRun.py

@@ -195,7 +195,7 @@ def pon_estado(self, state):
         self.pon_toolbar(state)
 
     def pon_toolbar(self, state):
-        li_acciones = [(_("Close"), Iconos.Close(), self.close), None]
+        li_acciones = [(_("Cancel"), Iconos.Cancelar(), self.terminar), None]
         if state == ST_PLAYING:
             li_acciones.extend(
                 [
@@ -449,6 +449,8 @@ def terminar(self):
             self.torneo = None
             self.db_work = None
             Util.remove_file(self.file_work)
+            self.close()
+
 
     def closeEvent(self, event):
         self.terminar()
@@ -723,7 +725,7 @@ def test_is_finished(self):
 
         num_moves = len(self.game)
 
-        last_move = self.game.last_jg()
+        last_move: Move.Move = self.game.last_jg()
         if not last_move.analysis:
             return False
         mrm, pos = last_move.analysis
@@ -771,7 +773,7 @@ def adjudicator_score():
                     self.game.set_termination(TERMINATION_ADJUDICATION, result)
                     return True
             else:
-                if rs <= abs(p_ant):
+                if rs <= abs(p_ant) and rs <= abs(p_ult):
                     if (p_ant > 0 and p_ult > 0) or (p_ant < 0 and p_ult < 0):
                         if p_ult > 0:
                             win = WHITE if rm_ult.is_white else BLACK

bin/Code/__init__.py

@@ -103,7 +103,7 @@ def relative_root(path):
 
 
 BASE_VERSION = "B"  # Para el control de updates que necesitan reinstalar entero
-VERSION = "R 2.19b"
+VERSION = "R 2.19c"
 DEBUG = False
 DEBUG_ENGINES = False
 

bin/OS/win32/Engines/ufim/ufim802.epd

@@ -1 +1,4 @@
 5rk1/p1p2ppp/5n2/2pp4/6b1/1PNB1rPP/P1P2PK1/R4R2 b - - ce -67; De 3;
+rnbqk2r/3pppbp/2p3pn/1p6/p2PP3/P1N2N2/BPP2PPP/R1BQK2R b KQkq - ce -67; De 10;
+1k1r3r/pp1n1p2/3bpq2/Q1pp2pp/3P4/2P1PN1P/PP1N1PP1/R4RK1 w - - ce -82; De 10;
+1k1r3r/pp1n1p2/1b2pq2/3p3p/1Q4p1/1NP1PN1P/PP3PP1/R4RK1 w - - ce -245; De 9;

bin/bug.log

@@ -1 +1 @@
-Version R 2.19b
+Version R 2.19c