dovrebbe essere pronta la versione con le traduzioni funzionanti

2020-04-21 16:14:30 +02:00
parent ce5495fce4
commit 535bb9d4e9
10 changed files with 4725 additions and 4699 deletions
--- a/bananaSPLIT/UserInterface/compiledUI/mainwindow.py
+++ b/bananaSPLIT/UserInterface/compiledUI/mainwindow.py
@@ -242,7 +242,7 @@ class Ui_mainwin(object):
        self.actionOpzioni = QtWidgets.QAction(mainwin)
        self.actionOpzioni.setObjectName("actionOpzioni")
        self.actionLingua = QtWidgets.QAction(mainwin)
-        self.actionLingua.setEnabled(False)
+        self.actionLingua.setEnabled(True)
        icon6 = QtGui.QIcon()
        icon6.addPixmap(QtGui.QPixmap(":/ico/icons/icons8-globe-earth-80.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
        self.actionLingua.setIcon(icon6)
@@ -285,7 +285,7 @@ class Ui_mainwin(object):
        self.txt_log.setHtml(_translate("mainwin", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:7.8pt; font-weight:400; font-style:normal;\">\n"
+"</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:6.6pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:7pt;\"><br /></p></body></html>"))
        self.btn_cartellasorg.setText(_translate("mainwin", "-> "))
        self.btn_cartelladest.setText(_translate("mainwin", "-> "))
--- a/bananaSPLIT/UserInterface/compiledUI/resources_rc.py
+++ b/bananaSPLIT/UserInterface/compiledUI/resources_rc.py
--- a/bananaSPLIT/UserInterface/mainwindow.ui
+++ b/bananaSPLIT/UserInterface/mainwindow.ui
@@ -149,7 +149,7 @@
       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:6.6pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:7pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="textInteractionFlags">
@@ -485,7 +485,7 @@ p, li { white-space: pre-wrap; }
  </action>
  <action name="actionLingua">
   <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
   </property>
   <property name="icon">
    <iconset resource="resources/resources.qrc">
--- a/bananaSPLIT/UserInterface/resources/translations/guimain_en.ts
+++ b/bananaSPLIT/UserInterface/resources/translations/guimain_en.ts
@@ -4,17 +4,17 @@
 <context>
    <name>bananaAdvOpt</name>
    <message>
-        <location filename="../../../guimain.py" line="522"/>
+        <location filename="../../../guimain.py" line="530"/>
        <source>AdvancedOptions: Configurazione non accettata</source>
        <translation>Advanced Options: Configuration not accepted</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="528"/>
+        <location filename="../../../guimain.py" line="536"/>
        <source>Avanzate Globali</source>
        <translation>Global Advanced Options</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="536"/>
+        <location filename="../../../guimain.py" line="544"/>
        <source>Parametri inseriti validi, configurazione accettata</source>
        <translation>Valid input parameters, configuration accepted</translation>
    </message>
@@ -22,115 +22,125 @@
 <context>
    <name>bananaMain</name>
    <message>
-        <location filename="../../../guimain.py" line="44"/>
+        <location filename="../../../guimain.py" line="46"/>
        <source>Impostazioni Titolo</source>
        <translation>Title Options</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="45"/>
+        <location filename="../../../guimain.py" line="47"/>
        <source>Selezione Output</source>
        <translation>Select Output</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="90"/>
+        <location filename="../../../guimain.py" line="92"/>
        <source>MainWindow: Configurazione non accettata</source>
        <translation>MainWindow: Configuration not accepted</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="110"/>
+        <location filename="../../../guimain.py" line="112"/>
        <source>Prossima Tab</source>
        <translation>Next Tab</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="115"/>
+        <location filename="../../../guimain.py" line="117"/>
        <source>Tab Precedente</source>
        <translation>Former Tab</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="119"/>
+        <location filename="../../../guimain.py" line="121"/>
        <source>Apri Carica Preset</source>
        <translation>Open Load Preset</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="120"/>
+        <location filename="../../../guimain.py" line="122"/>
        <source>Carica Preset</source>
        <translation>Load Preset</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="129"/>
+        <location filename="../../../guimain.py" line="131"/>
        <source>Riempio tutte le tab</source>
        <translation>Fill all Tabs</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="134"/>
+        <location filename="../../../guimain.py" line="136"/>
        <source>Apri Salva Preset</source>
        <translation>Open Save Preset</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="154"/>
+        <location filename="../../../guimain.py" line="156"/>
        <source>Apri Opzioni Avanzate</source>
        <translation>Open Advanced Options</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="160"/>
+        <location filename="../../../guimain.py" line="163"/>
        <source>Apri Opzioni Lingua</source>
        <translation>Open Language Options</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="164"/>
+        <location filename="../../../guimain.py" line="172"/>
        <source>Apri Finestra About</source>
        <translation>Open About Window</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="168"/>
+        <location filename="../../../guimain.py" line="176"/>
        <source>Seleziona Cartella Sorgente</source>
        <translation>Select Input Folder</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="172"/>
+        <location filename="../../../guimain.py" line="180"/>
        <source>Selezionata Cartella Sorgente: {}</source>
        <translation>SelInput Folder Selected: {}</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="177"/>
+        <location filename="../../../guimain.py" line="185"/>
        <source>Seleziona Cartella Destinazione</source>
        <translation>Select Output Folder</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="181"/>
+        <location filename="../../../guimain.py" line="189"/>
        <source>Selezionata Cartella Destinazione: {}</source>
        <translation>Output Folder Selected: {}</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="189"/>
+        <location filename="../../../guimain.py" line="197"/>
        <source>Apro in directory: {}</source>
        <translation>Opening in directory:{}</translation>
    </message>
+    <message>
+        <location filename="../../../guimain.py" line="165"/>
+        <source>Lingua</source>
+        <translation>Language</translation>
+    </message>
+    <message>
+        <location filename="../../../guimain.py" line="165"/>
+        <source>Disponibili</source>
+        <translation>Available</translation>
+    </message>
 </context>
 <context>
    <name>bananaSelezOut</name>
    <message>
-        <location filename="../../../guimain.py" line="434"/>
+        <location filename="../../../guimain.py" line="442"/>
        <source>SelezUscita: Configurazione non accettata</source>
        <translation>SelectOutput: Configuration not accepted</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="438"/>
+        <location filename="../../../guimain.py" line="446"/>
        <source>Applico Impostazioni File Uscita</source>
        <translation>Applying Output File Options</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="478"/>
+        <location filename="../../../guimain.py" line="486"/>
        <source>Sto SPLITTANDO, attendi..</source>
        <translation>SPLITTING, please wait..</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="479"/>
+        <location filename="../../../guimain.py" line="487"/>
        <source>Sto Splittando..</source>
        <translation>Splitting..</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="498"/>
+        <location filename="../../../guimain.py" line="506"/>
        <source>FINITO!</source>
        <translation>DONE!</translation>
    </message>
@@ -138,17 +148,17 @@
 <context>
    <name>bananaTitolo</name>
    <message>
-        <location filename="../../../guimain.py" line="244"/>
+        <location filename="../../../guimain.py" line="252"/>
        <source>Titolo: Configurazione non accettata</source>
        <translation>Title: Configuration not accepted</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="247"/>
+        <location filename="../../../guimain.py" line="255"/>
        <source>Mostro la finestra avanzate titolo</source>
        <translation>Show advanced options window</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="252"/>
+        <location filename="../../../guimain.py" line="260"/>
        <source>Applico impostazioni Titolo</source>
        <translation>Applying Title options</translation>
    </message>
@@ -156,17 +166,17 @@
 <context>
    <name>bananaTitoloAvanzate</name>
    <message>
-        <location filename="../../../guimain.py" line="309"/>
+        <location filename="../../../guimain.py" line="317"/>
        <source>AvanzateTitolo: Configurazione non accettata</source>
        <translation>Title Advanced Options: Configuration not accepted</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="363"/>
+        <location filename="../../../guimain.py" line="371"/>
        <source>Avanzate Titolo Accettate</source>
        <translation>Title Advanced Options Accepted</translation>
    </message>
    <message>
-        <location filename="../../../guimain.py" line="369"/>
+        <location filename="../../../guimain.py" line="377"/>
        <source>Avanzate Titolo Rifiutate</source>
        <translation>Title Advanced Options Rejected</translation>
    </message>
--- a/bananaSPLIT/UserInterface/resources/translations/libconfload_en.ts
+++ b/bananaSPLIT/UserInterface/resources/translations/libconfload_en.ts
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US" sourcelanguage="it_IT">
+<!DOCTYPE TS><TS version="2.0" language="en_US" sourcelanguage="it_IT">
 <context>
    <name>bananaCONF</name>
    <message>
@@ -26,9 +25,9 @@
    <message>
        <location filename="../../../libbananasplit/libconfload.py" line="44"/>
        <source>Impossibile leggere la configurazione:{}
- 									Controlla il file a riga: {} e colonna:{}</source>
+ <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>Controlla il file a riga: {} e colonna:{}</source>
        <translation>Cannot read configuration: {}
- 									Check files for rows: {} and colums: {}</translation>
+ <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>Check files for rows: {} and colums: {}</translation>
    </message>
    <message>
        <location filename="../../../libbananasplit/libconfload.py" line="47"/>
--- a/bananaSPLIT/UserInterface/resources/translations/libsplit_en.ts
+++ b/bananaSPLIT/UserInterface/resources/translations/libsplit_en.ts
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US" sourcelanguage="it_IT">
+<!DOCTYPE TS><TS version="2.0" language="en_US" sourcelanguage="it_IT">
 <context>
    <name>bananaSPLITTER</name>
    <message>
@@ -65,8 +64,8 @@
    </message>
    <message>
        <location filename="../../../libbananasplit/libsplit.py" line="273"/>
-        <source>E&apos; successo qualcosa mentre stavo cercando il nome della pubblicazione,									controlla i file di uscita! [{}]</source>
-        <translation>Soemthing happen while seraching for the publication name, 									chek output files! [{}]</translation>
+        <source>E&apos; successo qualcosa mentre stavo cercando il nome della pubblicazione,<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>controlla i file di uscita! [{}]</source>
+        <translation>Soemthing happen while seraching for the publication name, <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>chek output files! [{}]</translation>
    </message>
    <message>
        <location filename="../../../libbananasplit/libsplit.py" line="292"/>
@@ -76,11 +75,11 @@
    <message>
        <location filename="../../../libbananasplit/libsplit.py" line="190"/>
        <source>Ho individuato una separatore valido prima che si chiusesse l&apos;articolo precedente, controlla i tuoi file in uscita!
-			L&apos;errore dovrebbe essere intorno all&apos;articolo {} ma non sono sicuro! 
-			[{}]</source>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/>L&apos;errore dovrebbe essere intorno all&apos;articolo {} ma non sono sicuro! 
+<byte value="x9"/><byte value="x9"/><byte value="x9"/>[{}]</source>
        <translation>Valid separator found before the previous article ended, check output files!
-			The error should be around article {} but I&apos;m not sure!
-			[{}]</translation>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/>The error should be around article {} but I&apos;m not sure!
+<byte value="x9"/><byte value="x9"/><byte value="x9"/>[{}]</translation>
    </message>
    <message>
        <location filename="../../../libbananasplit/libsplit.py" line="327"/>
@@ -107,11 +106,11 @@
    <message>
        <location filename="../../../libbananasplit/libsplit.py" line="310"/>
        <source>Ho individuato una separatore valido prima che si chiusesse l&apos;articolo precedente, controlla i tuoi file in uscita!
-					L&apos;errore dovrebbe essere intorno all&apos;articolo {} ma non sono sicuro! 
-		[{}]</source>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>L&apos;errore dovrebbe essere intorno all&apos;articolo {} ma non sono sicuro! 
+<byte value="x9"/><byte value="x9"/>[{}]</source>
        <translation>Found a valid separator before the previous article ended, check output files!
-					The error should be around article {} but I&apos;m not sure!
-		[{}]</translation>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>The error should be around article {} but I&apos;m not sure!
+<byte value="x9"/><byte value="x9"/>[{}]</translation>
    </message>
    <message>
        <location filename="../../../libbananasplit/libsplit.py" line="350"/>
--- a/bananaSPLIT/UserInterface/resources/translations/mainwindow_en.ts
+++ b/bananaSPLIT/UserInterface/resources/translations/mainwindow_en.ts
@@ -30,7 +30,7 @@
        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:6.6pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:7pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
--- a/bananaSPLIT/UserInterface/resources/translations/titolow_en.qm
+++ b/bananaSPLIT/UserInterface/resources/translations/titolow_en.qm
--- a/bananaSPLIT/conf/defaults.json
+++ b/bananaSPLIT/conf/defaults.json
@@ -1,11 +1,13 @@
 {
-	"version": "v1.4",
+	"version": "v1.41",
 	"paths": {
 		"lastUsed": "defaults.json",
 		"configurationPath": "./conf/",
 		"INworkPath": "C://",
 		"OUTworkPath": "C://",
-		"fileList": []
+		"fileList": [
+			"bdlog.txt"
+		]
 	},
 	"docStruct": {
 		"fileVersNew": false,
--- a/bananaSPLIT/guimain.py
+++ b/bananaSPLIT/guimain.py
@@ -22,8 +22,10 @@ from libconfload import bananaCONF
 from libsplit import bananaSPLITTER

 from PyQt5.QtCore import QDir, QSize, QTranslator, pyqtSlot, pyqtSignal
-from PyQt5.QtWidgets import QMessageBox, QSizePolicy
+from PyQt5.QtWidgets import QMessageBox, QSizePolicy, QInputDialog

+#modo brutto per mettere la lista delle lingue in un posto solo
+langlist = ['it','en']

 class bananaMain(PyQt5.QtWidgets.QMainWindow):	
 	def __init__(self, logger=None, confloader=None):
@@ -157,9 +159,15 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 		pass
 	
 	def openLanguage(self):
+		global langlist
 		self.logger.debug(self.tr("Apri Opzioni Lingua"))
-		pass
-	
+		flag = False
+		lang,flag = QInputDialog.getItem(self, self.tr("Lingua"), self.tr("Disponibili"), langlist, 0, False)
+		if flag:
+			self.conf.setParam(('settings','uiLang'),lang)
+		else:
+			pass
+		
 	def openAbout(self):
 		self.logger.debug(self.tr("Apri Finestra About"))
 		self.spxabt=spexAbout()