From f7b77db942df099ae14bf8c57279d25c966d2e7f Mon Sep 17 00:00:00 2001 From: Emanuele Date: Tue, 21 Apr 2020 15:29:15 +0200 Subject: [PATCH] corretto errore per cui non importava tutte le traduzioni --- .../resources/translations/guimain_en.qm | Bin 16 -> 1647 bytes .../resources/translations/guimain_en.ts | 108 ++++++++++-------- bananaSPLIT/guimain.py | 38 +++--- bananaSPLIT/scripts/compileUI.py | 14 ++- bananaSPLIT/scripts/releaseLanguages.py | 4 + 5 files changed, 93 insertions(+), 71 deletions(-) diff --git a/bananaSPLIT/UserInterface/resources/translations/guimain_en.qm b/bananaSPLIT/UserInterface/resources/translations/guimain_en.qm index be651eede2edc9cb0da5c140b31664afee169fa8..f0b18ea2c1fe0bb50fef78cf6418999fddfd1595 100644 GIT binary patch literal 1647 zcma)6J!lj`82#=i8uDl2Z@_>PK?q_IMVlbPnHW%F61_<5%-rsH3~XkW-MNcNOk^!WesBggxX>Nv$NymARVYMkGaiYyDPvWHF2B*nY`A2w*--T|xl#jIV{6{AwQdZLH* zYIR)}O98hP5lm^txZ?<8xJeYQl?IX04Wz_q1m!5iuua2(4nsN4*$6Kr<-n*Pig>uH z3i0S|4QN9Z_gh;LUxy~Dv1B9CXiwWxXQh%R>Xo*4+3x5^{}rUF#iD)|Td1{~tYAYW<5${b1!xwK H=~U_u0PJ=r literal 16 YcmcE7ks@*G{hX<16=n7(EZln+07b?KzW@LL diff --git a/bananaSPLIT/UserInterface/resources/translations/guimain_en.ts b/bananaSPLIT/UserInterface/resources/translations/guimain_en.ts index 187d8f2..9ef9d6f 100644 --- a/bananaSPLIT/UserInterface/resources/translations/guimain_en.ts +++ b/bananaSPLIT/UserInterface/resources/translations/guimain_en.ts @@ -1,19 +1,20 @@ - + + bananaAdvOpt - + AdvancedOptions: Configurazione non accettata - + Avanzate Globali - + Parametri inseriti validi, configurazione accettata @@ -23,113 +24,113 @@ Impostazioni Titolo - + Title Settings Selezione Output - + Output Selection - + MainWindow: Configurazione non accettata - + - + Prossima Tab - + Next Tab - + Tab Precedente - + Previous Tab - + Apri Carica Preset - + Open Load Preset - + Carica Preset - + Load Preset - + Riempio tutte le tab - + Filling all Tabs - + Apri Salva Preset - + Opena Save Preset - + Apri Opzioni Avanzate - + Open Advanced Options - + Apri Opzioni Lingua - + Open Language Settings - + Apri Finestra About - + Open About Window - + Seleziona Cartella Sorgente - + Select Source Folder - + Selezionata Cartella Sorgente: {} - + Selected Source Folder: {} - + Seleziona Cartella Destinazione - + Select Destination Folder - + Selezionata Cartella Destinazione: {} - + Selected Destination Folder: {} - + Apro in directory: {} - + Opening Directory: {} bananaSelezOut - + SelezUscita: Configurazione non accettata - + Applico Impostazioni File Uscita - + Sto SPLITTANDO, attendi.. - + Sto Splittando.. - + FINITO! @@ -137,17 +138,17 @@ bananaTitolo - + Titolo: Configurazione non accettata - + Mostro la finestra avanzate titolo - + Applico impostazioni Titolo @@ -155,19 +156,32 @@ bananaTitoloAvanzate - + AvanzateTitolo: Configurazione non accettata - + Avanzate Titolo Accettate - + Avanzate Titolo Rifiutate + + init + + + Impostazioni Titolo + Title Settings + + + + Selezione Output + Output Selection + + diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py index d72ccc8..e7d87cc 100644 --- a/bananaSPLIT/guimain.py +++ b/bananaSPLIT/guimain.py @@ -24,6 +24,7 @@ from libsplit import bananaSPLITTER from PyQt5.QtCore import QDir, QSize, QTranslator, pyqtSlot, pyqtSignal from PyQt5.QtWidgets import QMessageBox, QSizePolicy + class bananaMain(PyQt5.QtWidgets.QMainWindow): def __init__(self, logger=None, confloader=None): PyQt5.QtWidgets.QMainWindow.__init__(self) @@ -578,28 +579,23 @@ if __name__ == '__main__': conf.use(conf.getParam('paths', 'lastUsed')) iflan = conf.getParam('settings','uiLang') + trlist = [f":/tr/translations/guimain_{iflan}.qm", + f":/tr/translations/libconfload_{iflan}.qm", + f":/tr/translations/libsplit_{iflan}.qm", + f":/tr/translations/mainwindow_{iflan}.qm", + f":/tr/translations/avanzatetitolo3_{iflan}.qm", + f":/tr/translations/titolow_{iflan}.qm", + f":/tr/translations/selezout_{iflan}.qm", + f":/tr/translations/about_{iflan}.qm"] + qtrlist=[] + if iflan != 'it': - p = QTranslator() - pp = QTranslator() - ppp = QTranslator() - t = QTranslator() - tt = QTranslator() - ttt = QTranslator() - tttt = QTranslator() - print(p.load(f":/tr/translations/guimain_{iflan}.qm")) - print(pp.load(f":/tr/translations/libconfload_{iflan}.qm")) - print(ppp.load(f":/tr/translations/libsplit_{iflan}.qm")) - print(t.load(f":/tr/translations/mainwindow_{iflan}.qm")) - print(tt.load(f":/tr/translations/avanzatetitolo3_{iflan}.qm")) - print(ttt.load(f":/tr/translations/titolow_{iflan}.qm")) - print(tttt.load(f":/tr/translations/selezout_{iflan}.qm")) - app.installTranslator(p) - app.installTranslator(pp) - app.installTranslator(ppp) - app.installTranslator(t) - app.installTranslator(tt) - app.installTranslator(ttt) - app.installTranslator(tttt) + LOGGER.debug("Carico Traduzioni: ") + for tr in trlist: + qtr = QTranslator() + print(qtr.load(tr),f" {tr}") + app.installTranslator(qtr) + qtrlist.append(qtr) except Exception as e: print(f"Errore main: {e}") diff --git a/bananaSPLIT/scripts/compileUI.py b/bananaSPLIT/scripts/compileUI.py index 418f551..c1818b7 100644 --- a/bananaSPLIT/scripts/compileUI.py +++ b/bananaSPLIT/scripts/compileUI.py @@ -5,9 +5,7 @@ Created on 24 nov 2019 ''' import os, glob, subprocess -if __name__ == '__main__': - os.chdir("..\\UserInterface") - print(os.getcwd()) +def updateInterfaces(): uifiles = glob.glob("*.ui") for f in uifiles: command = r"pyuic5.exe "+f @@ -16,10 +14,20 @@ if __name__ == '__main__': fp = open(r".\\CompiledUI\\"+f.replace("ui","py"), 'w') fp.write(str(rv.stdout, encoding='utf-8').replace('\r', '')) fp.close() + +def updateResources(): command = r'pyrcc5.exe '+'.\\resources\\resources.qrc' print (command) rv = subprocess.run(command, capture_output=True) fp = open(r".\\compiledUI\\resources_rc.py", 'w') fp.write(str(rv.stdout, encoding='utf-8').replace('\r', '')) fp.close() + +if __name__ == '__main__': + os.chdir("..\\UserInterface") + print(os.getcwd()) + updateInterfaces() + updateResources() + + pass \ No newline at end of file diff --git a/bananaSPLIT/scripts/releaseLanguages.py b/bananaSPLIT/scripts/releaseLanguages.py index ac66f34..eea0af6 100644 --- a/bananaSPLIT/scripts/releaseLanguages.py +++ b/bananaSPLIT/scripts/releaseLanguages.py @@ -5,10 +5,14 @@ Created on 10 apr 2020 ''' import os,glob import subprocess +from bananaSPLIT.scripts.compileUI import updateResources if __name__ == '__main__': tsfiles = glob.glob("..\\UserInterface\\resources\\translations\\*.ts") for ts in tsfiles: tso = "..\\UserInterface\\resources\\translations\\"+os.path.splitext((os.path.split(ts)[1]))[0]+".qm" subprocess.run(f'lrelease.exe {ts} -qm {tso}') + os.chdir("..\\UserInterface") + #print(os.getcwd()) + #updateResources() pass \ No newline at end of file