modifiche interfaccia + dialoghi per selezione cartelle, pronto per il

merge
This commit is contained in:
2019-12-13 16:11:38 +01:00
parent 86e5dcc135
commit a6aeee5d89
7 changed files with 140 additions and 98 deletions

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@
/.pydevproject /.pydevproject
bananaSPLIT/build bananaSPLIT/build
bananaSPLIT.exe.spec bananaSPLIT.exe.spec
/TestFiles/

View File

@@ -20,20 +20,7 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="3" column="2"> <item row="0" column="0" colspan="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="lbl_titoloschermata"> <widget class="QLabel" name="lbl_titoloschermata">
<property name="font"> <property name="font">
<font> <font>
@@ -45,41 +32,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="1" column="0" colspan="3">
<layout class="QVBoxLayout" name="verticalLayout"> <widget class="Line" name="line">
<item> <property name="orientation">
<widget class="QSpinBox" name="spn_data"> <enum>Qt::Horizontal</enum>
<property name="minimum"> </property>
<number>0</number> </widget>
</property>
<property name="maximum">
<number>3</number>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spn_titolo">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>3</number>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spn_numero">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>3</number>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="3">
<widget class="QLabel" name="lbl_istruzioni"> <widget class="QLabel" name="lbl_istruzioni">
<property name="font"> <property name="font">
<font> <font>
@@ -131,6 +91,40 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="1">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QSpinBox" name="spn_data">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>3</number>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spn_titolo">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>3</number>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spn_numero">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>3</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0"> <item row="4" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
@@ -144,27 +138,33 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="5" column="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QPushButton" name="btn_avanti">
<property name="text">
<string>Avanti</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="btn_indietro"> <widget class="QPushButton" name="btn_indietro">
<property name="text"> <property name="text">
<string>Indietro</string> <string>Indietro</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="4">
<widget class="QPushButton" name="btn_avanti">
<property name="text">
<string>Avanti</string>
</property>
</widget>
</item>
<item row="3" column="2" colspan="3">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>266</width>
<height>71</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

View File

@@ -20,38 +20,23 @@ class Ui_advtitolo(object):
advtitolo.setSizePolicy(sizePolicy) advtitolo.setSizePolicy(sizePolicy)
self.gridLayout = QtWidgets.QGridLayout(advtitolo) self.gridLayout = QtWidgets.QGridLayout(advtitolo)
self.gridLayout.setObjectName("gridLayout") self.gridLayout.setObjectName("gridLayout")
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.gridLayout.addItem(spacerItem, 3, 2, 1, 1)
self.lbl_titoloschermata = QtWidgets.QLabel(advtitolo) self.lbl_titoloschermata = QtWidgets.QLabel(advtitolo)
font = QtGui.QFont() font = QtGui.QFont()
font.setPointSize(11) font.setPointSize(11)
self.lbl_titoloschermata.setFont(font) self.lbl_titoloschermata.setFont(font)
self.lbl_titoloschermata.setObjectName("lbl_titoloschermata") self.lbl_titoloschermata.setObjectName("lbl_titoloschermata")
self.gridLayout.addWidget(self.lbl_titoloschermata, 0, 0, 1, 2) self.gridLayout.addWidget(self.lbl_titoloschermata, 0, 0, 1, 3)
self.verticalLayout = QtWidgets.QVBoxLayout() self.line = QtWidgets.QFrame(advtitolo)
self.verticalLayout.setObjectName("verticalLayout") self.line.setFrameShape(QtWidgets.QFrame.HLine)
self.spn_data = QtWidgets.QSpinBox(advtitolo) self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
self.spn_data.setMinimum(0) self.line.setObjectName("line")
self.spn_data.setMaximum(3) self.gridLayout.addWidget(self.line, 1, 0, 1, 3)
self.spn_data.setObjectName("spn_data")
self.verticalLayout.addWidget(self.spn_data)
self.spn_titolo = QtWidgets.QSpinBox(advtitolo)
self.spn_titolo.setMinimum(0)
self.spn_titolo.setMaximum(3)
self.spn_titolo.setObjectName("spn_titolo")
self.verticalLayout.addWidget(self.spn_titolo)
self.spn_numero = QtWidgets.QSpinBox(advtitolo)
self.spn_numero.setMinimum(0)
self.spn_numero.setMaximum(3)
self.spn_numero.setObjectName("spn_numero")
self.verticalLayout.addWidget(self.spn_numero)
self.gridLayout.addLayout(self.verticalLayout, 3, 1, 1, 1)
self.lbl_istruzioni = QtWidgets.QLabel(advtitolo) self.lbl_istruzioni = QtWidgets.QLabel(advtitolo)
font = QtGui.QFont() font = QtGui.QFont()
font.setPointSize(10) font.setPointSize(10)
self.lbl_istruzioni.setFont(font) self.lbl_istruzioni.setFont(font)
self.lbl_istruzioni.setObjectName("lbl_istruzioni") self.lbl_istruzioni.setObjectName("lbl_istruzioni")
self.gridLayout.addWidget(self.lbl_istruzioni, 2, 0, 1, 2) self.gridLayout.addWidget(self.lbl_istruzioni, 2, 0, 1, 3)
self.verticalLayout_2 = QtWidgets.QVBoxLayout() self.verticalLayout_2 = QtWidgets.QVBoxLayout()
self.verticalLayout_2.setObjectName("verticalLayout_2") self.verticalLayout_2.setObjectName("verticalLayout_2")
self.lbl_data = QtWidgets.QLabel(advtitolo) self.lbl_data = QtWidgets.QLabel(advtitolo)
@@ -73,19 +58,34 @@ class Ui_advtitolo(object):
self.lbl_numero.setObjectName("lbl_numero") self.lbl_numero.setObjectName("lbl_numero")
self.verticalLayout_2.addWidget(self.lbl_numero) self.verticalLayout_2.addWidget(self.lbl_numero)
self.gridLayout.addLayout(self.verticalLayout_2, 3, 0, 1, 1) self.gridLayout.addLayout(self.verticalLayout_2, 3, 0, 1, 1)
spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.verticalLayout = QtWidgets.QVBoxLayout()
self.gridLayout.addItem(spacerItem1, 4, 0, 1, 1) self.verticalLayout.setObjectName("verticalLayout")
self.line = QtWidgets.QFrame(advtitolo) self.spn_data = QtWidgets.QSpinBox(advtitolo)
self.line.setFrameShape(QtWidgets.QFrame.HLine) self.spn_data.setMinimum(0)
self.line.setFrameShadow(QtWidgets.QFrame.Sunken) self.spn_data.setMaximum(3)
self.line.setObjectName("line") self.spn_data.setObjectName("spn_data")
self.gridLayout.addWidget(self.line, 1, 0, 1, 2) self.verticalLayout.addWidget(self.spn_data)
self.btn_avanti = QtWidgets.QPushButton(advtitolo) self.spn_titolo = QtWidgets.QSpinBox(advtitolo)
self.btn_avanti.setObjectName("btn_avanti") self.spn_titolo.setMinimum(0)
self.gridLayout.addWidget(self.btn_avanti, 5, 2, 1, 1) self.spn_titolo.setMaximum(3)
self.spn_titolo.setObjectName("spn_titolo")
self.verticalLayout.addWidget(self.spn_titolo)
self.spn_numero = QtWidgets.QSpinBox(advtitolo)
self.spn_numero.setMinimum(0)
self.spn_numero.setMaximum(3)
self.spn_numero.setObjectName("spn_numero")
self.verticalLayout.addWidget(self.spn_numero)
self.gridLayout.addLayout(self.verticalLayout, 3, 1, 1, 1)
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.gridLayout.addItem(spacerItem, 4, 0, 1, 1)
self.btn_indietro = QtWidgets.QPushButton(advtitolo) self.btn_indietro = QtWidgets.QPushButton(advtitolo)
self.btn_indietro.setObjectName("btn_indietro") self.btn_indietro.setObjectName("btn_indietro")
self.gridLayout.addWidget(self.btn_indietro, 5, 1, 1, 1) self.gridLayout.addWidget(self.btn_indietro, 5, 3, 1, 1)
self.btn_avanti = QtWidgets.QPushButton(advtitolo)
self.btn_avanti.setObjectName("btn_avanti")
self.gridLayout.addWidget(self.btn_avanti, 5, 4, 1, 1)
spacerItem1 = QtWidgets.QSpacerItem(266, 71, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.gridLayout.addItem(spacerItem1, 3, 2, 1, 3)
self.retranslateUi(advtitolo) self.retranslateUi(advtitolo)
QtCore.QMetaObject.connectSlotsByName(advtitolo) QtCore.QMetaObject.connectSlotsByName(advtitolo)
@@ -98,7 +98,7 @@ class Ui_advtitolo(object):
self.lbl_data.setText(_translate("advtitolo", "Data")) self.lbl_data.setText(_translate("advtitolo", "Data"))
self.lbl_titolo.setText(_translate("advtitolo", "Titolo")) self.lbl_titolo.setText(_translate("advtitolo", "Titolo"))
self.lbl_numero.setText(_translate("advtitolo", "Numero")) self.lbl_numero.setText(_translate("advtitolo", "Numero"))
self.btn_avanti.setText(_translate("advtitolo", "Avanti"))
self.btn_indietro.setText(_translate("advtitolo", "Indietro")) self.btn_indietro.setText(_translate("advtitolo", "Indietro"))
self.btn_avanti.setText(_translate("advtitolo", "Avanti"))

View File

@@ -56,6 +56,7 @@ class Ui_selezout(object):
font = QtGui.QFont() font = QtGui.QFont()
font.setPointSize(10) font.setPointSize(10)
self.rad_mainbodyEFile.setFont(font) self.rad_mainbodyEFile.setFont(font)
self.rad_mainbodyEFile.setChecked(True)
self.rad_mainbodyEFile.setObjectName("rad_mainbodyEFile") self.rad_mainbodyEFile.setObjectName("rad_mainbodyEFile")
self.verticalLayout.addWidget(self.rad_mainbodyEFile) self.verticalLayout.addWidget(self.rad_mainbodyEFile)
self.rad_mainbody = QtWidgets.QRadioButton(selezout) self.rad_mainbody = QtWidgets.QRadioButton(selezout)

View File

@@ -154,6 +154,25 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="label">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>Nella Cartella Destinazione verranno create delle sottocartelle con il nome dei file sorgenti nei queli saranno salvati i file destinazione di quella sorgente </string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse</set>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

View File

@@ -115,6 +115,9 @@
<property name="text"> <property name="text">
<string>Bodyfile + File singoli</string> <string>Bodyfile + File singoli</string>
</property> </property>
<property name="checked">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>

View File

@@ -9,6 +9,7 @@ from mainwindow import Ui_mainwin
from selezout import Ui_selezout from selezout import Ui_selezout
from titolow import Ui_titolo from titolow import Ui_titolo
from avanzatetitolo import Ui_advtitolo from avanzatetitolo import Ui_advtitolo
from PyQt5.Qt import QFileDialog
class bananaMain(PyQt5.QtWidgets.QMainWindow): class bananaMain(PyQt5.QtWidgets.QMainWindow):
def __init__(self): def __init__(self):
@@ -23,14 +24,20 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
self.ui.wgt_main.addTab(self.titoloavanzate, "AvanzateTitolo") self.ui.wgt_main.addTab(self.titoloavanzate, "AvanzateTitolo")
self.ui.wgt_main.addTab(self.selezout, "SelezioneOutput") self.ui.wgt_main.addTab(self.selezout, "SelezioneOutput")
# connetti bottoni avanti
self.ui.btn_avanti.clicked.connect(self.nextTab) self.ui.btn_avanti.clicked.connect(self.nextTab)
self.titolo.titoloui.btn_avanti.clicked.connect(self.nextTab) self.titolo.titoloui.btn_avanti.clicked.connect(self.nextTab)
self.titoloavanzate.titoloavanzateui.btn_avanti.clicked.connect(self.nextTab) self.titoloavanzate.titoloavanzateui.btn_avanti.clicked.connect(self.nextTab)
self.selezout.selezoutui.btn_avanti.clicked.connect(self.nextTab) self.selezout.selezoutui.btn_avanti.clicked.connect(self.nextTab)
#connetti bottoni indietro
self.titolo.titoloui.btn_indietro.clicked.connect(self.prevTab) self.titolo.titoloui.btn_indietro.clicked.connect(self.prevTab)
self.titoloavanzate.titoloavanzateui.btn_indietro.clicked.connect(self.prevTab) self.titoloavanzate.titoloavanzateui.btn_indietro.clicked.connect(self.prevTab)
self.selezout.selezoutui.btn_indietro.clicked.connect(self.prevTab) self.selezout.selezoutui.btn_indietro.clicked.connect(self.prevTab)
#connetti bottoni selezione cartelle
self.ui.btn_cartellasorg.clicked.connect(self.selezSorg)
self.ui.btn_cartelladest.clicked.connect(self.selezDest)
pass pass
def nextTab(self): def nextTab(self):
@@ -40,6 +47,18 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
def prevTab(self): def prevTab(self):
self.ui.wgt_main.setCurrentIndex(self.ui.wgt_main.currentIndex()-1) self.ui.wgt_main.setCurrentIndex(self.ui.wgt_main.currentIndex()-1)
pass pass
def openFileDialog(self, name):
return PyQt5.QtWidgets.QFileDialog.getExistingDirectory(self,name)
def selezSorg(self):
print(self.openFileDialog("Seleziona Cartella Sorgente"))
pass
def selezDest(self):
print(self.openFileDialog("Seleziona Cartella Destinazione"))
pass
############################################################# #############################################################
####################### INTERFACES ########################## ####################### INTERFACES ##########################
@@ -66,7 +85,6 @@ class bananaSelezOut(PyQt5.QtWidgets.QWidget):
self.selezoutui.setupUi(self) self.selezoutui.setupUi(self)
pass pass
############################################################# #############################################################
####################### MAIN ################################ ####################### MAIN ################################
############################################################# #############################################################