From 9ec74ff4bd92d601d6f52473fafc09dd27411882 Mon Sep 17 00:00:00 2001 From: Emanuele Date: Sun, 8 Mar 2020 14:23:33 +0100 Subject: [PATCH] cose cambiate in interfaccia e main --- .../UserInterface/compiledUI/selezout.py | 7 +------ .../UserInterface/compiledUI/titolow.py | 1 + bananaSPLIT/UserInterface/selezout.ui | 21 ++++--------------- bananaSPLIT/guimain.py | 6 ++---- 4 files changed, 8 insertions(+), 27 deletions(-) diff --git a/bananaSPLIT/UserInterface/compiledUI/selezout.py b/bananaSPLIT/UserInterface/compiledUI/selezout.py index ea35f0d..e023a79 100644 --- a/bananaSPLIT/UserInterface/compiledUI/selezout.py +++ b/bananaSPLIT/UserInterface/compiledUI/selezout.py @@ -30,9 +30,6 @@ class Ui_selezout(object): self.gridLayout.addWidget(self.btn_indietro, 8, 1, 1, 1) self.cmb_lingua = QtWidgets.QComboBox(selezout) self.cmb_lingua.setObjectName("cmb_lingua") - self.cmb_lingua.addItem("") - self.cmb_lingua.addItem("") - self.cmb_lingua.addItem("") self.gridLayout.addWidget(self.cmb_lingua, 2, 0, 1, 1) self.lbl_indicazioni = QtWidgets.QLabel(selezout) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) @@ -73,6 +70,7 @@ class Ui_selezout(object): font = QtGui.QFont() font.setPointSize(10) self.rad_mainbodyEFile.setFont(font) + self.rad_mainbodyEFile.setChecked(True) self.rad_mainbodyEFile.setObjectName("rad_mainbodyEFile") self.verticalLayout.addWidget(self.rad_mainbodyEFile) self.rad_mainbody = QtWidgets.QRadioButton(selezout) @@ -98,9 +96,6 @@ class Ui_selezout(object): _translate = QtCore.QCoreApplication.translate selezout.setWindowTitle(_translate("selezout", "Seleziona Linuga e Output")) self.btn_indietro.setText(_translate("selezout", "Indietro")) - self.cmb_lingua.setItemText(0, _translate("selezout", "Inglese")) - self.cmb_lingua.setItemText(1, _translate("selezout", "Italiano")) - self.cmb_lingua.setItemText(2, _translate("selezout", "Russo")) self.lbl_indicazioni.setText(_translate("selezout", "Seleziona il tipo di file da salvare")) self.btn_avanti.setText(_translate("selezout", "Avanti")) self.lbl_lingua.setText(_translate("selezout", "Seleziona la lingua degli articoli")) diff --git a/bananaSPLIT/UserInterface/compiledUI/titolow.py b/bananaSPLIT/UserInterface/compiledUI/titolow.py index 8bf28f0..568f9d5 100644 --- a/bananaSPLIT/UserInterface/compiledUI/titolow.py +++ b/bananaSPLIT/UserInterface/compiledUI/titolow.py @@ -155,6 +155,7 @@ class Ui_titolo(object): self.btngrp_divisore.addButton(self.rad_altro) self.horizontalLayout_4.addWidget(self.rad_altro) self.lin_altro = QtWidgets.QLineEdit(titolo) + self.lin_altro.setText("") self.lin_altro.setObjectName("lin_altro") self.horizontalLayout_4.addWidget(self.lin_altro) self.lyt_sep.setLayout(2, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_4) diff --git a/bananaSPLIT/UserInterface/selezout.ui b/bananaSPLIT/UserInterface/selezout.ui index 4433c24..50313fa 100644 --- a/bananaSPLIT/UserInterface/selezout.ui +++ b/bananaSPLIT/UserInterface/selezout.ui @@ -46,23 +46,7 @@ - - - - Inglese - - - - - Italiano - - - - - Russo - - - + @@ -153,6 +137,9 @@ Bodyfile + File singoli + + true + diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py index 4a9813b..5c1f4bc 100644 --- a/bananaSPLIT/guimain.py +++ b/bananaSPLIT/guimain.py @@ -19,11 +19,9 @@ from libfancylogger import fancyLogger from libconfload import bananaCONF from libsplit import bananaSPLITTER -from PyQt5.QtCore import QDir,pyqtSignal -from slugify import slugify +from PyQt5.QtCore import QDir -class bananaMain(PyQt5.QtWidgets.QMainWindow): - +class bananaMain(PyQt5.QtWidgets.QMainWindow): def __init__(self): PyQt5.QtWidgets.QMainWindow.__init__(self) try: