diff --git a/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo3.py b/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo3.py index 963a583..384d731 100644 --- a/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo3.py +++ b/bananaSPLIT/UserInterface/compiledUI/avanzatetitolo3.py @@ -13,12 +13,15 @@ class Ui_advtitolo3(object): def setupUi(self, advtitolo3): advtitolo3.setObjectName("advtitolo3") advtitolo3.setWindowModality(QtCore.Qt.WindowModal) - advtitolo3.resize(480, 452) + advtitolo3.resize(480, 524) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(advtitolo3.sizePolicy().hasHeightForWidth()) advtitolo3.setSizePolicy(sizePolicy) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(":/icons/icons8-smartphone-ram-100.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + advtitolo3.setWindowIcon(icon) self.gridLayout = QtWidgets.QGridLayout(advtitolo3) self.gridLayout.setObjectName("gridLayout") self.line = QtWidgets.QFrame(advtitolo3) @@ -154,3 +157,4 @@ class Ui_advtitolo3(object): self.label_2.setText(_translate("advtitolo3", "Suffisso Titolo")) +import resources_rc diff --git a/bananaSPLIT/UserInterface/compiledUI/selezout.py b/bananaSPLIT/UserInterface/compiledUI/selezout.py index f2d4dd2..5b3d426 100644 --- a/bananaSPLIT/UserInterface/compiledUI/selezout.py +++ b/bananaSPLIT/UserInterface/compiledUI/selezout.py @@ -12,9 +12,51 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_selezout(object): def setupUi(self, selezout): selezout.setObjectName("selezout") - selezout.resize(577, 400) - self.gridLayout_2 = QtWidgets.QGridLayout(selezout) - self.gridLayout_2.setObjectName("gridLayout_2") + selezout.resize(718, 573) + self.verticalLayout_2 = QtWidgets.QVBoxLayout(selezout) + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.lbl_lingua = QtWidgets.QLabel(selezout) + font = QtGui.QFont() + font.setPointSize(10) + self.lbl_lingua.setFont(font) + self.lbl_lingua.setObjectName("lbl_lingua") + self.verticalLayout_2.addWidget(self.lbl_lingua) + self.line_2 = QtWidgets.QFrame(selezout) + self.line_2.setFrameShape(QtWidgets.QFrame.HLine) + self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line_2.setObjectName("line_2") + self.verticalLayout_2.addWidget(self.line_2) + self.horizontalLayout_3 = QtWidgets.QHBoxLayout() + self.horizontalLayout_3.setObjectName("horizontalLayout_3") + self.cmb_lingua = QtWidgets.QComboBox(selezout) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cmb_lingua.sizePolicy().hasHeightForWidth()) + self.cmb_lingua.setSizePolicy(sizePolicy) + self.cmb_lingua.setFrame(True) + self.cmb_lingua.setModelColumn(0) + self.cmb_lingua.setObjectName("cmb_lingua") + self.horizontalLayout_3.addWidget(self.cmb_lingua) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_3.addItem(spacerItem) + self.verticalLayout_2.addLayout(self.horizontalLayout_3) + self.lbl_indicazioni = QtWidgets.QLabel(selezout) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lbl_indicazioni.sizePolicy().hasHeightForWidth()) + self.lbl_indicazioni.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setPointSize(10) + self.lbl_indicazioni.setFont(font) + self.lbl_indicazioni.setObjectName("lbl_indicazioni") + self.verticalLayout_2.addWidget(self.lbl_indicazioni) + self.line = QtWidgets.QFrame(selezout) + self.line.setFrameShape(QtWidgets.QFrame.HLine) + self.line.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line.setObjectName("line") + self.verticalLayout_2.addWidget(self.line) self.verticalLayout = QtWidgets.QVBoxLayout() self.verticalLayout.setSizeConstraint(QtWidgets.QLayout.SetMaximumSize) self.verticalLayout.setObjectName("verticalLayout") @@ -37,30 +79,23 @@ class Ui_selezout(object): self.rad_file.setFont(font) self.rad_file.setObjectName("rad_file") self.verticalLayout.addWidget(self.rad_file) - self.gridLayout_2.addLayout(self.verticalLayout, 5, 0, 1, 1) - spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_2.addItem(spacerItem, 9, 1, 1, 1) - self.line_2 = QtWidgets.QFrame(selezout) - self.line_2.setFrameShape(QtWidgets.QFrame.HLine) - self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken) - self.line_2.setObjectName("line_2") - self.gridLayout_2.addWidget(self.line_2, 1, 0, 1, 4) - self.lbl_lingua = QtWidgets.QLabel(selezout) + self.verticalLayout_2.addLayout(self.verticalLayout) + self.lbl_indicazioni_2 = QtWidgets.QLabel(selezout) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lbl_indicazioni_2.sizePolicy().hasHeightForWidth()) + self.lbl_indicazioni_2.setSizePolicy(sizePolicy) font = QtGui.QFont() font.setPointSize(10) - self.lbl_lingua.setFont(font) - self.lbl_lingua.setObjectName("lbl_lingua") - self.gridLayout_2.addWidget(self.lbl_lingua, 0, 0, 1, 1) - self.line = QtWidgets.QFrame(selezout) - self.line.setFrameShape(QtWidgets.QFrame.HLine) - self.line.setFrameShadow(QtWidgets.QFrame.Sunken) - self.line.setObjectName("line") - self.gridLayout_2.addWidget(self.line, 4, 0, 1, 4) + self.lbl_indicazioni_2.setFont(font) + self.lbl_indicazioni_2.setObjectName("lbl_indicazioni_2") + self.verticalLayout_2.addWidget(self.lbl_indicazioni_2) self.line_3 = QtWidgets.QFrame(selezout) self.line_3.setFrameShape(QtWidgets.QFrame.HLine) self.line_3.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_3.setObjectName("line_3") - self.gridLayout_2.addWidget(self.line_3, 7, 0, 1, 4) + self.verticalLayout_2.addWidget(self.line_3) self.gridLayout = QtWidgets.QGridLayout() self.gridLayout.setObjectName("gridLayout") self.chk_removeDuplicates = QtWidgets.QCheckBox(selezout) @@ -98,51 +133,45 @@ class Ui_selezout(object): self.lin_specialChars = QtWidgets.QLineEdit(selezout) self.lin_specialChars.setObjectName("lin_specialChars") self.horizontalLayout.addWidget(self.lin_specialChars) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout.addItem(spacerItem1) self.gridLayout.addLayout(self.horizontalLayout, 2, 0, 1, 2) - self.gridLayout_2.addLayout(self.gridLayout, 8, 0, 1, 4) - self.btn_split = QtWidgets.QPushButton(selezout) - self.btn_split.setMinimumSize(QtCore.QSize(75, 0)) - self.btn_split.setMaximumSize(QtCore.QSize(75, 16777215)) - font = QtGui.QFont() - font.setPointSize(10) - self.btn_split.setFont(font) - self.btn_split.setObjectName("btn_split") - self.gridLayout_2.addWidget(self.btn_split, 9, 3, 1, 1) - self.lbl_indicazioni = QtWidgets.QLabel(selezout) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lbl_indicazioni.sizePolicy().hasHeightForWidth()) - self.lbl_indicazioni.setSizePolicy(sizePolicy) - font = QtGui.QFont() - font.setPointSize(10) - self.lbl_indicazioni.setFont(font) - self.lbl_indicazioni.setObjectName("lbl_indicazioni") - self.gridLayout_2.addWidget(self.lbl_indicazioni, 3, 0, 1, 1) - self.lbl_indicazioni_2 = QtWidgets.QLabel(selezout) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lbl_indicazioni_2.sizePolicy().hasHeightForWidth()) - self.lbl_indicazioni_2.setSizePolicy(sizePolicy) - font = QtGui.QFont() - font.setPointSize(10) - self.lbl_indicazioni_2.setFont(font) - self.lbl_indicazioni_2.setObjectName("lbl_indicazioni_2") - self.gridLayout_2.addWidget(self.lbl_indicazioni_2, 6, 0, 1, 1) + self.verticalLayout_2.addLayout(self.gridLayout) + spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_2.addItem(spacerItem2) + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.btn_indietro = QtWidgets.QPushButton(selezout) - self.btn_indietro.setMinimumSize(QtCore.QSize(75, 0)) + self.btn_indietro.setMinimumSize(QtCore.QSize(100, 40)) self.btn_indietro.setMaximumSize(QtCore.QSize(75, 16777215)) font = QtGui.QFont() - font.setPointSize(10) + font.setPointSize(11) self.btn_indietro.setFont(font) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(":/icons/icons8-arrow-80-back.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.btn_indietro.setIcon(icon) + self.btn_indietro.setIconSize(QtCore.QSize(25, 25)) self.btn_indietro.setObjectName("btn_indietro") - self.gridLayout_2.addWidget(self.btn_indietro, 9, 2, 1, 1) - self.cmb_lingua = QtWidgets.QComboBox(selezout) - self.cmb_lingua.setFrame(True) - self.cmb_lingua.setModelColumn(0) - self.cmb_lingua.setObjectName("cmb_lingua") - self.gridLayout_2.addWidget(self.cmb_lingua, 2, 0, 1, 1) + self.horizontalLayout_2.addWidget(self.btn_indietro) + spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_2.addItem(spacerItem3) + self.btn_split = QtWidgets.QPushButton(selezout) + self.btn_split.setMinimumSize(QtCore.QSize(100, 0)) + self.btn_split.setMaximumSize(QtCore.QSize(16777215, 16777215)) + font = QtGui.QFont() + font.setPointSize(12) + self.btn_split.setFont(font) + self.btn_split.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor)) + self.btn_split.setLayoutDirection(QtCore.Qt.RightToLeft) + self.btn_split.setAutoFillBackground(False) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(":/icons/icons8-banana-split-80.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.btn_split.setIcon(icon1) + self.btn_split.setIconSize(QtCore.QSize(50, 50)) + self.btn_split.setFlat(False) + self.btn_split.setObjectName("btn_split") + self.horizontalLayout_2.addWidget(self.btn_split) + self.verticalLayout_2.addLayout(self.horizontalLayout_2) self.retranslateUi(selezout) QtCore.QMetaObject.connectSlotsByName(selezout) @@ -150,18 +179,19 @@ class Ui_selezout(object): def retranslateUi(self, selezout): _translate = QtCore.QCoreApplication.translate selezout.setWindowTitle(_translate("selezout", "Seleziona Linuga e Output")) + self.lbl_lingua.setText(_translate("selezout", "Seleziona la lingua degli articoli")) + self.lbl_indicazioni.setText(_translate("selezout", "Seleziona il tipo di file da salvare")) self.rad_mainbodyEFile.setText(_translate("selezout", "Bodyfile + File singoli")) self.rad_mainbody.setText(_translate("selezout", "Bodyfile")) self.rad_file.setText(_translate("selezout", "File singoli")) - self.lbl_lingua.setText(_translate("selezout", "Seleziona la lingua degli articoli")) + self.lbl_indicazioni_2.setText(_translate("selezout", "Altre Opzioni ")) self.chk_removeDuplicates.setText(_translate("selezout", "Tenta rimozione duplicati")) self.chk_includeTitle.setText(_translate("selezout", "Includi titolo all\'interno del file")) self.chk_removeBreakWord.setText(_translate("selezout", "Rimuovi interruzioni parola (a capo)")) self.chk_cleaDestFolder.setText(_translate("selezout", "Svuota cartella di destinazione")) self.label.setText(_translate("selezout", "Caratteri speciali da rimuovere ")) - self.btn_split.setText(_translate("selezout", "SPLITTA!")) - self.lbl_indicazioni.setText(_translate("selezout", "Seleziona il tipo di file da salvare")) - self.lbl_indicazioni_2.setText(_translate("selezout", "Altre Opzioni ")) self.btn_indietro.setText(_translate("selezout", "Indietro")) + self.btn_split.setText(_translate("selezout", "SPLITTA!")) +import resources_rc diff --git a/bananaSPLIT/UserInterface/compiledUI/titolow.py b/bananaSPLIT/UserInterface/compiledUI/titolow.py index 6abfa52..dea23d5 100644 --- a/bananaSPLIT/UserInterface/compiledUI/titolow.py +++ b/bananaSPLIT/UserInterface/compiledUI/titolow.py @@ -12,10 +12,15 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_titolo(object): def setupUi(self, titolo): titolo.setObjectName("titolo") - titolo.resize(480, 443) + titolo.resize(719, 573) self.gridLayout = QtWidgets.QGridLayout(titolo) self.gridLayout.setObjectName("gridLayout") self.label = QtWidgets.QLabel(titolo) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) + self.label.setSizePolicy(sizePolicy) font = QtGui.QFont() font.setPointSize(10) self.label.setFont(font) @@ -48,6 +53,14 @@ class Ui_titolo(object): self.lyt_nchars = QtWidgets.QHBoxLayout() self.lyt_nchars.setObjectName("lyt_nchars") self.lbl_ncarat = QtWidgets.QLabel(titolo) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lbl_ncarat.sizePolicy().hasHeightForWidth()) + self.lbl_ncarat.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setPointSize(9) + self.lbl_ncarat.setFont(font) self.lbl_ncarat.setObjectName("lbl_ncarat") self.lyt_nchars.addWidget(self.lbl_ncarat) self.spn_ncarat = QtWidgets.QSpinBox(titolo) @@ -72,6 +85,12 @@ class Ui_titolo(object): self.line_2.setObjectName("line_2") self.gridLayout.addWidget(self.line_2, 13, 0, 1, 3) self.lbl_impotit = QtWidgets.QLabel(titolo) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lbl_impotit.sizePolicy().hasHeightForWidth()) + self.lbl_impotit.setSizePolicy(sizePolicy) + self.lbl_impotit.setMinimumSize(QtCore.QSize(0, 40)) font = QtGui.QFont() font.setPointSize(10) self.lbl_impotit.setFont(font) @@ -98,9 +117,14 @@ class Ui_titolo(object): self.lyt_buttons = QtWidgets.QHBoxLayout() self.lyt_buttons.setObjectName("lyt_buttons") self.btn_avanzate = QtWidgets.QPushButton(titolo) + self.btn_avanzate.setMinimumSize(QtCore.QSize(120, 40)) font = QtGui.QFont() - font.setPointSize(10) + font.setPointSize(11) self.btn_avanzate.setFont(font) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(":/icons/icons8-smartphone-ram-100.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.btn_avanzate.setIcon(icon) + self.btn_avanzate.setIconSize(QtCore.QSize(30, 30)) self.btn_avanzate.setObjectName("btn_avanzate") self.lyt_buttons.addWidget(self.btn_avanzate) spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) @@ -108,15 +132,26 @@ class Ui_titolo(object): self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.btn_indietro = QtWidgets.QPushButton(titolo) + self.btn_indietro.setMinimumSize(QtCore.QSize(100, 40)) font = QtGui.QFont() - font.setPointSize(10) + font.setPointSize(11) self.btn_indietro.setFont(font) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(":/icons/icons8-arrow-80-back.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.btn_indietro.setIcon(icon1) + self.btn_indietro.setIconSize(QtCore.QSize(25, 25)) self.btn_indietro.setObjectName("btn_indietro") self.horizontalLayout_2.addWidget(self.btn_indietro) self.btn_avanti = QtWidgets.QPushButton(titolo) + self.btn_avanti.setMinimumSize(QtCore.QSize(100, 40)) font = QtGui.QFont() - font.setPointSize(10) + font.setPointSize(11) self.btn_avanti.setFont(font) + self.btn_avanti.setLayoutDirection(QtCore.Qt.RightToLeft) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(":/icons/icons8-arrow-80.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.btn_avanti.setIcon(icon2) + self.btn_avanti.setIconSize(QtCore.QSize(25, 25)) self.btn_avanti.setObjectName("btn_avanti") self.horizontalLayout_2.addWidget(self.btn_avanti) self.lyt_buttons.addLayout(self.horizontalLayout_2) @@ -175,7 +210,7 @@ class Ui_titolo(object): self.rad_datausa.setText(_translate("titolo", "MM DD YYYY, es. 12 31 2000 (us)")) 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.lbl_impotit.setText(_translate("titolo", "Impostazioni nome file in uscita")) self.chk_docnum.setText(_translate("titolo", "Numero documento")) self.chk_data.setText(_translate("titolo", "Data")) self.btn_avanzate.setText(_translate("titolo", "Avanzate")) @@ -189,3 +224,4 @@ class Ui_titolo(object): self.rad_altro.setText(_translate("titolo", "Altro:")) +import resources_rc diff --git a/bananaSPLIT/UserInterface/icons8-arrow-80-back.png b/bananaSPLIT/UserInterface/icons8-arrow-80-back.png new file mode 100644 index 0000000..0513d39 Binary files /dev/null and b/bananaSPLIT/UserInterface/icons8-arrow-80-back.png differ