correzioni ad about per far vedere la versione

This commit is contained in:
2020-04-21 16:25:59 +02:00
parent 6332db4b1f
commit a6a2fde875
5 changed files with 6048 additions and 6047 deletions

View File

@@ -41,7 +41,7 @@
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QLabel" name="label"> <widget class="QLabel" name="lbl_ico">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
@@ -69,7 +69,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="lbl_info">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>

View File

@@ -25,23 +25,23 @@ class Ui_about(object):
icon.addPixmap(QtGui.QPixmap(":/ico/icons/icons8-info-80.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) icon.addPixmap(QtGui.QPixmap(":/ico/icons/icons8-info-80.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
about.setWindowIcon(icon) about.setWindowIcon(icon)
about.setModal(True) about.setModal(True)
self.label = QtWidgets.QLabel(about) self.lbl_ico = QtWidgets.QLabel(about)
self.label.setGeometry(QtCore.QRect(10, 10, 128, 128)) self.lbl_ico.setGeometry(QtCore.QRect(10, 10, 128, 128))
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.lbl_ico.sizePolicy().hasHeightForWidth())
self.label.setSizePolicy(sizePolicy) self.lbl_ico.setSizePolicy(sizePolicy)
self.label.setFrameShape(QtWidgets.QFrame.NoFrame) self.lbl_ico.setFrameShape(QtWidgets.QFrame.NoFrame)
self.label.setText("") self.lbl_ico.setText("")
self.label.setPixmap(QtGui.QPixmap(":/ico/icons/logo.png")) self.lbl_ico.setPixmap(QtGui.QPixmap(":/ico/icons/logo.png"))
self.label.setScaledContents(True) self.lbl_ico.setScaledContents(True)
self.label.setObjectName("label") self.lbl_ico.setObjectName("lbl_ico")
self.label_2 = QtWidgets.QLabel(about) self.lbl_info = QtWidgets.QLabel(about)
self.label_2.setGeometry(QtCore.QRect(150, 10, 601, 621)) self.lbl_info.setGeometry(QtCore.QRect(150, 10, 601, 621))
self.label_2.setTextFormat(QtCore.Qt.RichText) self.lbl_info.setTextFormat(QtCore.Qt.RichText)
self.label_2.setWordWrap(True) self.lbl_info.setWordWrap(True)
self.label_2.setObjectName("label_2") self.lbl_info.setObjectName("lbl_info")
self.retranslateUi(about) self.retranslateUi(about)
QtCore.QMetaObject.connectSlotsByName(about) QtCore.QMetaObject.connectSlotsByName(about)
@@ -49,7 +49,7 @@ class Ui_about(object):
def retranslateUi(self, about): def retranslateUi(self, about):
_translate = QtCore.QCoreApplication.translate _translate = QtCore.QCoreApplication.translate
about.setWindowTitle(_translate("about", "About SPEx")) about.setWindowTitle(_translate("about", "About SPEx"))
self.label_2.setText(_translate("about", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" self.lbl_info.setText(_translate("about", "<!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" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n" "p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt; font-weight:400; font-style:normal;\">\n" "</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt; font-weight:400; font-style:normal;\">\n"

File diff suppressed because it is too large Load Diff

View File

@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS><TS version="2.0" language="en" sourcelanguage="it_IT">
<TS version="2.1" language="en" sourcelanguage="it_IT">
<context> <context>
<name>bananaAdvOpt</name> <name>bananaAdvOpt</name>
<message> <message>
<location filename="../../../guimain.py" line="530"/> <location filename="../../../guimain.py" line="531"/>
<source>AdvancedOptions: Configurazione non accettata</source> <source>AdvancedOptions: Configurazione non accettata</source>
<translation>Advanced Options: Configuration not accepted</translation> <translation>Advanced Options: Configuration not accepted</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="536"/> <location filename="../../../guimain.py" line="537"/>
<source>Avanzate Globali</source> <source>Avanzate Globali</source>
<translation>Global Advanced Options</translation> <translation>Global Advanced Options</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="544"/> <location filename="../../../guimain.py" line="545"/>
<source>Parametri inseriti validi, configurazione accettata</source> <source>Parametri inseriti validi, configurazione accettata</source>
<translation>Valid input parameters, configuration accepted</translation> <translation>Valid input parameters, configuration accepted</translation>
</message> </message>
@@ -22,97 +21,97 @@
<context> <context>
<name>bananaMain</name> <name>bananaMain</name>
<message> <message>
<location filename="../../../guimain.py" line="46"/> <location filename="../../../guimain.py" line="47"/>
<source>Impostazioni Titolo</source> <source>Impostazioni Titolo</source>
<translation>Title Options</translation> <translation>Title Options</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="47"/> <location filename="../../../guimain.py" line="48"/>
<source>Selezione Output</source> <source>Selezione Output</source>
<translation>Select Output</translation> <translation>Select Output</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="92"/> <location filename="../../../guimain.py" line="93"/>
<source>MainWindow: Configurazione non accettata</source> <source>MainWindow: Configurazione non accettata</source>
<translation>MainWindow: Configuration not accepted</translation> <translation>MainWindow: Configuration not accepted</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="112"/> <location filename="../../../guimain.py" line="113"/>
<source>Prossima Tab</source> <source>Prossima Tab</source>
<translation>Next Tab</translation> <translation>Next Tab</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="117"/> <location filename="../../../guimain.py" line="118"/>
<source>Tab Precedente</source> <source>Tab Precedente</source>
<translation>Former Tab</translation> <translation>Former Tab</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="121"/> <location filename="../../../guimain.py" line="122"/>
<source>Apri Carica Preset</source> <source>Apri Carica Preset</source>
<translation>Open Load Preset</translation> <translation>Open Load Preset</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="122"/> <location filename="../../../guimain.py" line="123"/>
<source>Carica Preset</source> <source>Carica Preset</source>
<translation>Load Preset</translation> <translation>Load Preset</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="131"/> <location filename="../../../guimain.py" line="132"/>
<source>Riempio tutte le tab</source> <source>Riempio tutte le tab</source>
<translation>Fill all Tabs</translation> <translation>Fill all Tabs</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="136"/> <location filename="../../../guimain.py" line="137"/>
<source>Apri Salva Preset</source> <source>Apri Salva Preset</source>
<translation>Open Save Preset</translation> <translation>Open Save Preset</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="156"/> <location filename="../../../guimain.py" line="157"/>
<source>Apri Opzioni Avanzate</source> <source>Apri Opzioni Avanzate</source>
<translation>Open Advanced Options</translation> <translation>Open Advanced Options</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="163"/> <location filename="../../../guimain.py" line="164"/>
<source>Apri Opzioni Lingua</source> <source>Apri Opzioni Lingua</source>
<translation>Open Language Options</translation> <translation>Open Language Options</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="172"/> <location filename="../../../guimain.py" line="173"/>
<source>Apri Finestra About</source> <source>Apri Finestra About</source>
<translation>Open About Window</translation> <translation>Open About Window</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="176"/> <location filename="../../../guimain.py" line="177"/>
<source>Seleziona Cartella Sorgente</source> <source>Seleziona Cartella Sorgente</source>
<translation>Select Input Folder</translation> <translation>Select Input Folder</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="180"/> <location filename="../../../guimain.py" line="181"/>
<source>Selezionata Cartella Sorgente: {}</source> <source>Selezionata Cartella Sorgente: {}</source>
<translation>SelInput Folder Selected: {}</translation> <translation>SelInput Folder Selected: {}</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="185"/> <location filename="../../../guimain.py" line="186"/>
<source>Seleziona Cartella Destinazione</source> <source>Seleziona Cartella Destinazione</source>
<translation>Select Output Folder</translation> <translation>Select Output Folder</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="189"/> <location filename="../../../guimain.py" line="190"/>
<source>Selezionata Cartella Destinazione: {}</source> <source>Selezionata Cartella Destinazione: {}</source>
<translation>Output Folder Selected: {}</translation> <translation>Output Folder Selected: {}</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="197"/> <location filename="../../../guimain.py" line="198"/>
<source>Apro in directory: {}</source> <source>Apro in directory: {}</source>
<translation>Opening in directory:{}</translation> <translation>Opening in directory:{}</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="165"/> <location filename="../../../guimain.py" line="166"/>
<source>Lingua</source> <source>Lingua</source>
<translation>Language</translation> <translation>Language</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="165"/> <location filename="../../../guimain.py" line="166"/>
<source>Disponibili</source> <source>Disponibili</source>
<translation>Available</translation> <translation>Available</translation>
</message> </message>
@@ -120,27 +119,27 @@
<context> <context>
<name>bananaSelezOut</name> <name>bananaSelezOut</name>
<message> <message>
<location filename="../../../guimain.py" line="442"/> <location filename="../../../guimain.py" line="443"/>
<source>SelezUscita: Configurazione non accettata</source> <source>SelezUscita: Configurazione non accettata</source>
<translation>SelectOutput: Configuration not accepted</translation> <translation>SelectOutput: Configuration not accepted</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="446"/> <location filename="../../../guimain.py" line="447"/>
<source>Applico Impostazioni File Uscita</source> <source>Applico Impostazioni File Uscita</source>
<translation>Applying Output File Options</translation> <translation>Applying Output File Options</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="486"/> <location filename="../../../guimain.py" line="487"/>
<source>Sto SPLITTANDO, attendi..</source> <source>Sto SPLITTANDO, attendi..</source>
<translation>SPLITTING, please wait..</translation> <translation>SPLITTING, please wait..</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="487"/> <location filename="../../../guimain.py" line="488"/>
<source>Sto Splittando..</source> <source>Sto Splittando..</source>
<translation>Splitting..</translation> <translation>Splitting..</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="506"/> <location filename="../../../guimain.py" line="507"/>
<source>FINITO!</source> <source>FINITO!</source>
<translation>DONE!</translation> <translation>DONE!</translation>
</message> </message>
@@ -148,17 +147,17 @@
<context> <context>
<name>bananaTitolo</name> <name>bananaTitolo</name>
<message> <message>
<location filename="../../../guimain.py" line="252"/> <location filename="../../../guimain.py" line="253"/>
<source>Titolo: Configurazione non accettata</source> <source>Titolo: Configurazione non accettata</source>
<translation>Title: Configuration not accepted</translation> <translation>Title: Configuration not accepted</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="255"/> <location filename="../../../guimain.py" line="256"/>
<source>Mostro la finestra avanzate titolo</source> <source>Mostro la finestra avanzate titolo</source>
<translation>Show advanced options window</translation> <translation>Show advanced options window</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="260"/> <location filename="../../../guimain.py" line="261"/>
<source>Applico impostazioni Titolo</source> <source>Applico impostazioni Titolo</source>
<translation>Applying Title options</translation> <translation>Applying Title options</translation>
</message> </message>
@@ -166,17 +165,17 @@
<context> <context>
<name>bananaTitoloAvanzate</name> <name>bananaTitoloAvanzate</name>
<message> <message>
<location filename="../../../guimain.py" line="317"/> <location filename="../../../guimain.py" line="318"/>
<source>AvanzateTitolo: Configurazione non accettata</source> <source>AvanzateTitolo: Configurazione non accettata</source>
<translation>Title Advanced Options: Configuration not accepted</translation> <translation>Title Advanced Options: Configuration not accepted</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="371"/> <location filename="../../../guimain.py" line="372"/>
<source>Avanzate Titolo Accettate</source> <source>Avanzate Titolo Accettate</source>
<translation>Title Advanced Options Accepted</translation> <translation>Title Advanced Options Accepted</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="377"/> <location filename="../../../guimain.py" line="378"/>
<source>Avanzate Titolo Rifiutate</source> <source>Avanzate Titolo Rifiutate</source>
<translation>Title Advanced Options Rejected</translation> <translation>Title Advanced Options Rejected</translation>
</message> </message>

View File

@@ -23,6 +23,7 @@ from libsplit import bananaSPLITTER
from PyQt5.QtCore import QDir, QSize, QTranslator, pyqtSlot, pyqtSignal from PyQt5.QtCore import QDir, QSize, QTranslator, pyqtSlot, pyqtSignal
from PyQt5.QtWidgets import QMessageBox, QSizePolicy, QInputDialog from PyQt5.QtWidgets import QMessageBox, QSizePolicy, QInputDialog
from PyInstaller.config import CONF
#modo brutto per mettere la lista delle lingue in un posto solo #modo brutto per mettere la lista delle lingue in un posto solo
langlist = ['it','en'] langlist = ['it','en']
@@ -170,7 +171,7 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
def openAbout(self): def openAbout(self):
self.logger.debug(self.tr("Apri Finestra About")) self.logger.debug(self.tr("Apri Finestra About"))
self.spxabt=spexAbout() self.spxabt=spexAbout(confloader=self.conf)
def selezSorg(self): def selezSorg(self):
rv = PyQt5.QtWidgets.QFileDialog.getExistingDirectory(self,self.tr("Seleziona Cartella Sorgente"),self.conf.getParam('paths','INworkPath')) rv = PyQt5.QtWidgets.QFileDialog.getExistingDirectory(self,self.tr("Seleziona Cartella Sorgente"),self.conf.getParam('paths','INworkPath'))
@@ -567,6 +568,7 @@ class spexAbout(PyQt5.QtWidgets.QDialog):
PyQt5.QtWidgets.QDialog.__init__(self) PyQt5.QtWidgets.QDialog.__init__(self)
self.abt = Ui_about() self.abt = Ui_about()
self.abt.setupUi(self) self.abt.setupUi(self)
self.abt.lbl_info.setText(self.abt.lbl_info.text().replace('{ver}',confloader.getParam('version')))
self.show() self.show()
pass pass
############################################################# #############################################################