From e8c7accf55e9ab840a886a34a06c341a15a5afc0 Mon Sep 17 00:00:00 2001 From: Emanuele Date: Sat, 29 Feb 2020 18:12:01 +0100 Subject: [PATCH] interfacce aggiornate e ricompilate --- .../compiledUI/avanzatetitolo.py | 5 +- .../compiledUI/avanzatetitolo2.py | 5 +- .../compiledUI/avanzatetitolo3.py | 5 +- .../UserInterface/compiledUI/mainwindow.py | 5 +- .../compiledUI/opzioniavanzate.py | 5 +- .../UserInterface/compiledUI/selezout.py | 5 +- .../UserInterface/compiledUI/titolow.py | 108 ++++++++++-------- bananaSPLIT/UserInterface/titolow.ui | 56 +++++++-- 8 files changed, 125 insertions(+), 69 deletions(-) diff --git a/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo.py b/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo.py index 3037977..a4d0af8 100644 --- a/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo.py +++ b/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo.py @@ -2,11 +2,10 @@ # Form implementation generated from reading ui file 'avanzatetitolo.ui' # -# Created by: PyQt5 UI code generator 5.14.1 +# Created by: PyQt5 UI code generator 5.12.1 # # WARNING! All changes made in this file will be lost! - from PyQt5 import QtCore, QtGui, QtWidgets @@ -101,3 +100,5 @@ class Ui_advtitolo(object): self.lbl_numero.setText(_translate("advtitolo", "Numero")) self.btn_avanti.setText(_translate("advtitolo", "Avanti")) self.btn_indietro.setText(_translate("advtitolo", "Indietro")) + + diff --git a/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo2.py b/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo2.py index 5bf0065..cc5f6ef 100644 --- a/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo2.py +++ b/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo2.py @@ -2,11 +2,10 @@ # Form implementation generated from reading ui file 'avanzatetitolo2.ui' # -# Created by: PyQt5 UI code generator 5.14.1 +# Created by: PyQt5 UI code generator 5.12.1 # # WARNING! All changes made in this file will be lost! - from PyQt5 import QtCore, QtGui, QtWidgets @@ -113,3 +112,5 @@ class Ui_advtitolo2(object): self.rad_nt.setText(_translate("advtitolo2", "Numero, Titolo")) self.btn_annulla.setText(_translate("advtitolo2", "Annulla")) self.btn_ok.setText(_translate("advtitolo2", "OK")) + + diff --git a/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo3.py b/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo3.py index 19bdeca..963a583 100644 --- a/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo3.py +++ b/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo3.py @@ -2,11 +2,10 @@ # Form implementation generated from reading ui file 'avanzatetitolo3.ui' # -# Created by: PyQt5 UI code generator 5.14.1 +# Created by: PyQt5 UI code generator 5.12.1 # # WARNING! All changes made in this file will be lost! - from PyQt5 import QtCore, QtGui, QtWidgets @@ -153,3 +152,5 @@ class Ui_advtitolo3(object): self.btn_annulla.setText(_translate("advtitolo3", "Annulla")) self.btn_OK.setText(_translate("advtitolo3", "OK")) self.label_2.setText(_translate("advtitolo3", "Suffisso Titolo")) + + diff --git a/bananaSPLIT/UserInterface/compiledUI/mainwindow.py b/bananaSPLIT/UserInterface/compiledUI/mainwindow.py index bbcc7b1..8532759 100644 --- a/bananaSPLIT/UserInterface/compiledUI/mainwindow.py +++ b/bananaSPLIT/UserInterface/compiledUI/mainwindow.py @@ -2,11 +2,10 @@ # Form implementation generated from reading ui file 'mainwindow.ui' # -# Created by: PyQt5 UI code generator 5.14.1 +# Created by: PyQt5 UI code generator 5.12.1 # # WARNING! All changes made in this file will be lost! - from PyQt5 import QtCore, QtGui, QtWidgets @@ -188,3 +187,5 @@ class Ui_mainwin(object): self.actionOpzioni.setText(_translate("mainwin", "Opzioni")) self.actionLingua.setText(_translate("mainwin", "Lingua Interfaccia")) self.actionAvanzate.setText(_translate("mainwin", "Avanzate")) + + diff --git a/bananaSPLIT/UserInterface/compiledUI/opzioniavanzate.py b/bananaSPLIT/UserInterface/compiledUI/opzioniavanzate.py index 6017732..3736c87 100644 --- a/bananaSPLIT/UserInterface/compiledUI/opzioniavanzate.py +++ b/bananaSPLIT/UserInterface/compiledUI/opzioniavanzate.py @@ -2,11 +2,10 @@ # Form implementation generated from reading ui file 'opzioniavanzate.ui' # -# Created by: PyQt5 UI code generator 5.14.1 +# Created by: PyQt5 UI code generator 5.12.1 # # WARNING! All changes made in this file will be lost! - from PyQt5 import QtCore, QtGui, QtWidgets @@ -257,3 +256,5 @@ class Ui_advoption(object): self.label.setText(_translate("advoption", "Seleziona le opzioni predefinite")) self.btn_annulla.setText(_translate("advoption", "Annulla")) self.btn_ok.setText(_translate("advoption", "OK")) + + diff --git a/bananaSPLIT/UserInterface/compiledUI/selezout.py b/bananaSPLIT/UserInterface/compiledUI/selezout.py index c6128c1..ea35f0d 100644 --- a/bananaSPLIT/UserInterface/compiledUI/selezout.py +++ b/bananaSPLIT/UserInterface/compiledUI/selezout.py @@ -2,11 +2,10 @@ # Form implementation generated from reading ui file 'selezout.ui' # -# Created by: PyQt5 UI code generator 5.14.1 +# Created by: PyQt5 UI code generator 5.12.1 # # WARNING! All changes made in this file will be lost! - from PyQt5 import QtCore, QtGui, QtWidgets @@ -108,3 +107,5 @@ class Ui_selezout(object): self.rad_mainbodyEFile.setText(_translate("selezout", "Bodyfile + File singoli")) self.rad_mainbody.setText(_translate("selezout", "Bodyfile")) self.rad_file.setText(_translate("selezout", "File singoli")) + + diff --git a/bananaSPLIT/UserInterface/compiledUI/titolow.py b/bananaSPLIT/UserInterface/compiledUI/titolow.py index c05877e..8bf28f0 100644 --- a/bananaSPLIT/UserInterface/compiledUI/titolow.py +++ b/bananaSPLIT/UserInterface/compiledUI/titolow.py @@ -2,11 +2,10 @@ # Form implementation generated from reading ui file 'titolow.ui' # -# Created by: PyQt5 UI code generator 5.14.1 +# Created by: PyQt5 UI code generator 5.12.1 # # WARNING! All changes made in this file will be lost! - from PyQt5 import QtCore, QtGui, QtWidgets @@ -22,40 +21,51 @@ class Ui_titolo(object): self.label.setFont(font) self.label.setObjectName("label") self.gridLayout.addWidget(self.label, 8, 0, 1, 2) - self.verticalLayout = QtWidgets.QVBoxLayout() - self.verticalLayout.setObjectName("verticalLayout") + self.lyt_date = QtWidgets.QVBoxLayout() + self.lyt_date.setObjectName("lyt_date") self.rad_datajpn = QtWidgets.QRadioButton(titolo) self.rad_datajpn.setChecked(True) self.rad_datajpn.setObjectName("rad_datajpn") - self.verticalLayout.addWidget(self.rad_datajpn) + self.lyt_date.addWidget(self.rad_datajpn) self.rad_dataita = QtWidgets.QRadioButton(titolo) self.rad_dataita.setObjectName("rad_dataita") - self.verticalLayout.addWidget(self.rad_dataita) + self.lyt_date.addWidget(self.rad_dataita) self.rad_datausa = QtWidgets.QRadioButton(titolo) self.rad_datausa.setObjectName("rad_datausa") - self.verticalLayout.addWidget(self.rad_datausa) - self.gridLayout.addLayout(self.verticalLayout, 3, 0, 1, 3) - self.chc_titolo = QtWidgets.QCheckBox(titolo) + self.lyt_date.addWidget(self.rad_datausa) + self.gridLayout.addLayout(self.lyt_date, 3, 0, 1, 3) + self.chk_titolo = QtWidgets.QCheckBox(titolo) font = QtGui.QFont() font.setPointSize(10) - self.chc_titolo.setFont(font) - self.chc_titolo.setObjectName("chc_titolo") - self.gridLayout.addWidget(self.chc_titolo, 4, 0, 1, 2) + self.chk_titolo.setFont(font) + self.chk_titolo.setObjectName("chk_titolo") + self.gridLayout.addWidget(self.chk_titolo, 4, 0, 1, 2) self.line_3 = QtWidgets.QFrame(titolo) self.line_3.setFrameShape(QtWidgets.QFrame.HLine) self.line_3.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_3.setObjectName("line_3") self.gridLayout.addWidget(self.line_3, 7, 0, 1, 3) - self.horizontalLayout = QtWidgets.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") + self.lyt_nchars = QtWidgets.QHBoxLayout() + self.lyt_nchars.setObjectName("lyt_nchars") self.lbl_ncarat = QtWidgets.QLabel(titolo) self.lbl_ncarat.setObjectName("lbl_ncarat") - self.horizontalLayout.addWidget(self.lbl_ncarat) + self.lyt_nchars.addWidget(self.lbl_ncarat) self.spn_ncarat = QtWidgets.QSpinBox(titolo) - self.spn_ncarat.setMinimum(1) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.spn_ncarat.sizePolicy().hasHeightForWidth()) + self.spn_ncarat.setSizePolicy(sizePolicy) + self.spn_ncarat.setMinimumSize(QtCore.QSize(50, 0)) + self.spn_ncarat.setWrapping(True) + self.spn_ncarat.setButtonSymbols(QtWidgets.QAbstractSpinBox.UpDownArrows) + self.spn_ncarat.setMinimum(3) + self.spn_ncarat.setMaximum(32) self.spn_ncarat.setObjectName("spn_ncarat") - self.horizontalLayout.addWidget(self.spn_ncarat) - self.gridLayout.addLayout(self.horizontalLayout, 5, 0, 1, 3) + self.lyt_nchars.addWidget(self.spn_ncarat) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.lyt_nchars.addItem(spacerItem) + self.gridLayout.addLayout(self.lyt_nchars, 5, 0, 1, 3) self.line_2 = QtWidgets.QFrame(titolo) self.line_2.setFrameShape(QtWidgets.QFrame.HLine) self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken) @@ -72,29 +82,29 @@ class Ui_titolo(object): self.line.setFrameShadow(QtWidgets.QFrame.Sunken) self.line.setObjectName("line") self.gridLayout.addWidget(self.line, 1, 0, 1, 3) - self.chc_docnum = QtWidgets.QCheckBox(titolo) + self.chk_docnum = QtWidgets.QCheckBox(titolo) font = QtGui.QFont() font.setPointSize(10) - self.chc_docnum.setFont(font) - self.chc_docnum.setChecked(True) - self.chc_docnum.setObjectName("chc_docnum") - self.gridLayout.addWidget(self.chc_docnum, 6, 0, 1, 2) - self.chc_data = QtWidgets.QCheckBox(titolo) + self.chk_docnum.setFont(font) + self.chk_docnum.setChecked(True) + self.chk_docnum.setObjectName("chk_docnum") + self.gridLayout.addWidget(self.chk_docnum, 6, 0, 1, 2) + self.chk_data = QtWidgets.QCheckBox(titolo) font = QtGui.QFont() font.setPointSize(10) - self.chc_data.setFont(font) - self.chc_data.setObjectName("chc_data") - self.gridLayout.addWidget(self.chc_data, 2, 0, 1, 1) - self.horizontalLayout_3 = QtWidgets.QHBoxLayout() - self.horizontalLayout_3.setObjectName("horizontalLayout_3") + self.chk_data.setFont(font) + self.chk_data.setObjectName("chk_data") + self.gridLayout.addWidget(self.chk_data, 2, 0, 1, 1) + self.lyt_buttons = QtWidgets.QHBoxLayout() + self.lyt_buttons.setObjectName("lyt_buttons") self.btn_avanzate = QtWidgets.QPushButton(titolo) font = QtGui.QFont() font.setPointSize(10) self.btn_avanzate.setFont(font) self.btn_avanzate.setObjectName("btn_avanzate") - self.horizontalLayout_3.addWidget(self.btn_avanzate) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_3.addItem(spacerItem) + self.lyt_buttons.addWidget(self.btn_avanzate) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.lyt_buttons.addItem(spacerItem1) self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.btn_indietro = QtWidgets.QPushButton(titolo) @@ -109,35 +119,35 @@ class Ui_titolo(object): self.btn_avanti.setFont(font) self.btn_avanti.setObjectName("btn_avanti") self.horizontalLayout_2.addWidget(self.btn_avanti) - self.horizontalLayout_3.addLayout(self.horizontalLayout_2) - self.gridLayout.addLayout(self.horizontalLayout_3, 14, 0, 1, 3) - self.formLayout = QtWidgets.QFormLayout() - self.formLayout.setObjectName("formLayout") + self.lyt_buttons.addLayout(self.horizontalLayout_2) + self.gridLayout.addLayout(self.lyt_buttons, 14, 0, 1, 3) + self.lyt_sep = QtWidgets.QFormLayout() + self.lyt_sep.setObjectName("lyt_sep") self.rad_spazio = QtWidgets.QRadioButton(titolo) self.rad_spazio.setObjectName("rad_spazio") self.btngrp_divisore = QtWidgets.QButtonGroup(titolo) self.btngrp_divisore.setObjectName("btngrp_divisore") self.btngrp_divisore.addButton(self.rad_spazio) - self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.rad_spazio) + self.lyt_sep.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.rad_spazio) self.rad_virgola = QtWidgets.QRadioButton(titolo) self.rad_virgola.setObjectName("rad_virgola") self.btngrp_divisore.addButton(self.rad_virgola) - self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.rad_virgola) + self.lyt_sep.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.rad_virgola) self.rad_piu = QtWidgets.QRadioButton(titolo) self.rad_piu.setObjectName("rad_piu") self.btngrp_divisore.addButton(self.rad_piu) - self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.rad_piu) + self.lyt_sep.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.rad_piu) self.rad_tratt = QtWidgets.QRadioButton(titolo) font = QtGui.QFont() font.setPointSize(8) self.rad_tratt.setFont(font) self.rad_tratt.setObjectName("rad_tratt") self.btngrp_divisore.addButton(self.rad_tratt) - self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.rad_tratt) + self.lyt_sep.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.rad_tratt) self.rad_trattbass = QtWidgets.QRadioButton(titolo) self.rad_trattbass.setObjectName("rad_trattbass") self.btngrp_divisore.addButton(self.rad_trattbass) - self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.rad_trattbass) + self.lyt_sep.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.rad_trattbass) self.horizontalLayout_4 = QtWidgets.QHBoxLayout() self.horizontalLayout_4.setObjectName("horizontalLayout_4") self.rad_altro = QtWidgets.QRadioButton(titolo) @@ -147,10 +157,10 @@ class Ui_titolo(object): self.lin_altro = QtWidgets.QLineEdit(titolo) self.lin_altro.setObjectName("lin_altro") self.horizontalLayout_4.addWidget(self.lin_altro) - self.formLayout.setLayout(2, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_4) - self.gridLayout.addLayout(self.formLayout, 9, 0, 1, 1) - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout.addItem(spacerItem1, 9, 1, 1, 1) + self.lyt_sep.setLayout(2, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_4) + self.gridLayout.addLayout(self.lyt_sep, 9, 0, 1, 1) + spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout.addItem(spacerItem2, 9, 1, 1, 1) self.retranslateUi(titolo) QtCore.QMetaObject.connectSlotsByName(titolo) @@ -162,11 +172,11 @@ class Ui_titolo(object): self.rad_datajpn.setText(_translate("titolo", "YYYY MM DD, es. 2000 12 31")) self.rad_dataita.setText(_translate("titolo", "DD MM YYYY, es. 31 12 2000")) self.rad_datausa.setText(_translate("titolo", "MM DD YYYY, es. 12 31 2000")) - self.chc_titolo.setText(_translate("titolo", "Titolo articolo")) + self.chk_titolo.setText(_translate("titolo", "Titolo articolo")) self.lbl_ncarat.setText(_translate("titolo", "Numero di caratteri")) self.lbl_impotit.setText(_translate("titolo", "Impostazioni nome file")) - self.chc_docnum.setText(_translate("titolo", "Numero documento")) - self.chc_data.setText(_translate("titolo", "Data")) + self.chk_docnum.setText(_translate("titolo", "Numero documento")) + self.chk_data.setText(_translate("titolo", "Data")) self.btn_avanzate.setText(_translate("titolo", "Avanzate")) self.btn_indietro.setText(_translate("titolo", "Indietro")) self.btn_avanti.setText(_translate("titolo", "Avanti")) @@ -176,3 +186,5 @@ class Ui_titolo(object): self.rad_tratt.setText(_translate("titolo", "-")) self.rad_trattbass.setText(_translate("titolo", "_")) self.rad_altro.setText(_translate("titolo", "Altro:")) + + diff --git a/bananaSPLIT/UserInterface/titolow.ui b/bananaSPLIT/UserInterface/titolow.ui index 29c37da..50c0261 100644 --- a/bananaSPLIT/UserInterface/titolow.ui +++ b/bananaSPLIT/UserInterface/titolow.ui @@ -27,7 +27,7 @@ - + @@ -55,7 +55,7 @@ - + 10 @@ -74,7 +74,7 @@ - + @@ -84,11 +84,45 @@ + + + 0 + 0 + + + + + 50 + 0 + + + + true + + + QAbstractSpinBox::UpDownArrows + - 1 + 3 + + + 32 + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -118,7 +152,7 @@ - + 10 @@ -133,7 +167,7 @@ - + 10 @@ -145,7 +179,7 @@ - + @@ -202,7 +236,7 @@ - + @@ -271,7 +305,11 @@ - + + + + +