From f1570150753bca7c7095aa45877283e2266acbab Mon Sep 17 00:00:00 2001 From: lukasmonk Date: Wed, 27 Sep 2017 21:00:16 +0200 Subject: [PATCH] Version 10.13 --- Code/GestorRoutes.py | 4 +- Code/Init.py | 2 +- Code/Procesador.py | 2 +- Code/QT/InfoBase.py | 2 +- Code/QT/PantallaAlbumes.py | 2 +- Code/QT/PantallaGM.py | 3 +- Code/QT/Tablero.py | 7 +- .../Routes/Transsiberian/level1/config.ini | 2 +- Locale/ru/lang.ini | 4 +- Lucas.py | 2 +- bug.log | 2 +- pyqt2pyside.py | 105 ------------------ 12 files changed, 17 insertions(+), 120 deletions(-) delete mode 100644 pyqt2pyside.py diff --git a/Code/GestorRoutes.py b/Code/GestorRoutes.py index 6a20f29..0f39200 100644 --- a/Code/GestorRoutes.py +++ b/Code/GestorRoutes.py @@ -660,11 +660,11 @@ def siguienteJugada(self): if self.estado == kFinJuego: return - fenM2 = self.partida.ultPosicion.fenM2() - if not self.dicFen.get(fenM2, None): + if self.partida.numJugadas() == self.nDicMoves: self.lineaTerminada() return + fenM2 = self.partida.ultPosicion.fenM2() self.estado = kJugando self.siJuegaHumano = False diff --git a/Code/Init.py b/Code/Init.py index 66461d8..c69dbf1 100644 --- a/Code/Init.py +++ b/Code/Init.py @@ -1,5 +1,5 @@ DEBUG = False -VERSION = "10.12a" +VERSION = "10.13" import os import sys diff --git a/Code/Procesador.py b/Code/Procesador.py index e061821..96cc39f 100644 --- a/Code/Procesador.py +++ b/Code/Procesador.py @@ -72,7 +72,7 @@ def iniciaConUsuario(self, user): self.user = user - self.web = "http://www-lucaschess.rhcloud.com" + self.web = "http://lucaschess.pythonanywhere.com" self.blog = "http://lucaschess.blogspot.com" self.liOpcionesInicio = [k_terminar, k_play, diff --git a/Code/QT/InfoBase.py b/Code/QT/InfoBase.py index 3497ce8..6f36273 100644 --- a/Code/QT/InfoBase.py +++ b/Code/QT/InfoBase.py @@ -110,7 +110,7 @@ def version(num, liBase, liResto): return txt # Version 10 - liBase = ["Remes", "Max Aloyau", "Alfonso Solbes", "tico-tico", "Nils Andersson", "Bernhard"] + liBase = ["Remes", "Max Aloyau", "Alfonso Solbes", "tico-tico", "Nils Andersson", "Bernhard", "Ed Smith"] liResto = ["Immortalchess forum", ] txt += version(10, liBase, liResto) diff --git a/Code/QT/PantallaAlbumes.py b/Code/QT/PantallaAlbumes.py index 32e4d6a..8f0bc76 100644 --- a/Code/QT/PantallaAlbumes.py +++ b/Code/QT/PantallaAlbumes.py @@ -52,7 +52,7 @@ def __init__(self, wowner, procesador, album): layout.controlc(pb, fila * 2, col) layout.controlc(lb, fila * 2 + 1, col) - mensaje = _("Select an slot to play against and get its image if you win") if pte else "" + mensaje = _("Select a slot to play against and get its image if you win") if pte else "" lb = Controles.LB(self, mensaje) pbExit = Controles.PB(self, _("Close"), self.quit, plano=False).ponIcono(Iconos.MainMenu()) diff --git a/Code/QT/PantallaGM.py b/Code/QT/PantallaGM.py index f13d9b3..f8c4717 100644 --- a/Code/QT/PantallaGM.py +++ b/Code/QT/PantallaGM.py @@ -602,8 +602,7 @@ def importarGM(ownerGM): os.remove(ficht) except: pass - web = "http://www-lucaschess.rhcloud.com/static/GM" - # web = "http://lucaschess.pythonanywhere.com/static/gm" + web = "http://lucaschess.pythonanywhere.com/static/gm" me = QTUtil2.mensEspera.inicio(ownerGM, _("Reading the list of grandmasters from the web")) siError = False try: diff --git a/Code/QT/Tablero.py b/Code/QT/Tablero.py index bff00cf..53b0070 100644 --- a/Code/QT/Tablero.py +++ b/Code/QT/Tablero.py @@ -155,8 +155,11 @@ def exec_kb_buffer(self, key, flags): elif key == Qt.Key_N and siAlt: self.pantalla.gestor.rightMouse(False, False, True) # ALT-C -> show captures - elif key == Qt.Key_C and siAlt: - self.pantalla.gestor.rightMouse(False, True, False) + elif key == Qt.Key_C: + if siAlt: + self.pantalla.gestor.rightMouse(False, True, False) + else: + okseguir = True else: okseguir = True diff --git a/IntFiles/Routes/Transsiberian/level1/config.ini b/IntFiles/Routes/Transsiberian/level1/config.ini index 56697d5..afdf22e 100644 --- a/IntFiles/Routes/Transsiberian/level1/config.ini +++ b/IntFiles/Routes/Transsiberian/level1/config.ini @@ -29,7 +29,7 @@ 10=Q,1 11=R,1 12=PP,0 -13=P_R,0 +13=PR,0 14=P,0 15=P,1 16=M3,M diff --git a/Locale/ru/lang.ini b/Locale/ru/lang.ini index ceb8274..f1be762 100644 --- a/Locale/ru/lang.ini +++ b/Locale/ru/lang.ini @@ -1,3 +1,3 @@ -NAME=Российский +NAME=Pусский AUTHOR=Nils Andersson,Reinhard,Vladimir,Slavik Pavlov -%=99 +%=100 diff --git a/Lucas.py b/Lucas.py index 93f1e16..8ced08f 100644 --- a/Lucas.py +++ b/Lucas.py @@ -3,7 +3,7 @@ # ============================================================================== # Author : Lucas Monge, lukasmonk@gmail.com -# Web : http://www-lucaschess.rhcloud.com +# Web : http://lucaschess.pythonanywhere.com/ # Blog : http://lucaschess.blogspot.com/ # Licence : GPL # ============================================================================== diff --git a/bug.log b/bug.log index 63baad4..19ea521 100644 --- a/bug.log +++ b/bug.log @@ -1 +1 @@ -Version 10.12a +Version 10.13 diff --git a/pyqt2pyside.py b/pyqt2pyside.py deleted file mode 100644 index 1679de3..0000000 --- a/pyqt2pyside.py +++ /dev/null @@ -1,105 +0,0 @@ -# -*- coding: latin-1 -*- -import sys - -select = raw_input( "Select GUI pyqt or pyside : " ) - -if select == "pyqt" : - siPyside = False -elif select == "pyside" : - siPyside = True -else : - print "Goodbye" - sys.exit() - -# Especiales ---------------------------------------------------------------------------------------------- -def hazRoot( siPyside ) : - for fich in ( "lucas.py", ) : - f = open( fich, "rb") - txt = "" - for linea in f : - if siPyside : - if linea.startswith( "import sip" ) or linea.startswith( "sip.setapi" ) : - linea = "#" + linea - else : - if linea.startswith( "#import sip" ) or linea.startswith( "#sip.setapi" ) : - linea = linea.replace( "#", "" ) - txt += linea - f.close() - q = open( fich, "wb") - q.write( txt ) - q.close() - -def hazQTUtil2( siPyside ) : - fich = "Code/QT/QTUtil2.py" - f = open( fich, "rb") - txt = "" - for linea in f : - if "if resp : #+pyside" in linea : - if siPyside : - linea = " if resp : #+pyside\n" - else : - linea = " #if resp : #+pyside\n" - elif "resp = resp[0] #+pyside" in linea : - if siPyside : - linea = " resp = resp[0] #+pyside\n" - else : - linea = " #resp = resp[0] #+pyside\n" - txt += linea - f.close() - q = open( fich, "wb") - q.write( txt ) - q.close() - -def hazInfo( siPyside ) : - fich = "Code/QT/Info.py" - f = open( fich, "rb") - txt = "" - for linea in f : - if "ABOUT_GUI" in linea : - if siPyside : - linea = ' ( _( "ABOUT_GUI" ), "PySide - LGPL", "http://www.pyside.org/" ),\n' - else : - linea = ' ( _( "ABOUT_GUI" ), "PyQt4 - GPL", "http://www.riverbankcomputing.co.uk" ),\n' - txt += linea - f.close() - q = open( fich, "wb") - q.write( txt ) - q.close() -# Fin especiales ---------------------------------------------------------------------------------------------- - -import os, os.path - - -def hazFich( fichero, siPyside ) : - if fichero.endswith( ".py" ): - print fichero - li = [] - f = open( fichero, "rb" ) - vpyqt = "from PyQt4 import" - vpyside = "from PySide import" - for linea in f : - if siPyside : - if linea.startswith( vpyqt ) : - linea = linea.replace( vpyqt, vpyside ) - else : - if linea.startswith( vpyside ) : - linea = linea.replace( vpyside, vpyqt ) - li.append( linea ) - f.close() - q = open( fichero, "wb" ) - q.write( "".join(li)) - q.close() - -#~ ############################################################################################ -def hazDir( carpeta, siPyside ) : - for fd in os.listdir( carpeta ) : - fd = carpeta + "/" + fd - if os.path.isfile( fd ) : - hazFich( fd, siPyside ) - -hazRoot(siPyside) -hazQTUtil2(siPyside) -hazInfo(siPyside) -hazDir( "Code", siPyside ) -hazDir( "Code/QT", siPyside ) -# hazFich( "mosca.py", siPyside )