diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py index 2e19560..607b4d4 100644 --- a/bananaSPLIT/guimain.py +++ b/bananaSPLIT/guimain.py @@ -16,7 +16,8 @@ from libfancylogger import fancyLogger from libconfload import bananaCONF from libsplit import bananaSPLITTER -from PyQt5.QtCore import QDir +from PyQt5.QtCore import QDir,pyqtSignal +from slugify.slugify import slugify class bananaMain(PyQt5.QtWidgets.QMainWindow): def __init__(self): @@ -33,10 +34,10 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow): # inizializzazione interfaccia self.ui = Ui_mainwin() self.ui.setupUi(self) - self.titolo = bananaTitolo(self.conf) - self.titoloav = bananaTitoloAvanzate(self.conf) - self.selezout = bananaSelezOut(self.conf) - self.advopt = bananaAdvOpt(self.conf) + self.titolo = bananaTitolo(self.conf, self.logger) + self.titoloav = bananaTitoloAvanzate(self.conf, self.logger) + self.selezout = bananaSelezOut(self.conf, self.logger) + self.advopt = bananaAdvOpt(self.conf, self.logger) #popola le tab con le finestre giuste self.ui.wgt_main.addTab(self.titolo, "Titolo") @@ -140,53 +141,83 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow): ############################################################# class bananaTitolo(PyQt5.QtWidgets.QWidget): - def __init__(self, confloader=None): + def __init__(self, confloader=None, logger=None): PyQt5.QtWidgets.QWidget.__init__(self) self.titoloui = Ui_titolo() self.titoloui.setupUi(self) self.conf = confloader + self.log = logger if self.conf is not None: - self.advtitolo = bananaTitoloAvanzate(self.conf) self.titoloui.btn_avanzate.clicked.connect(self.spawnAvanzate) + self.titoloui.btn_avanti.clicked.connect(self.applica) + self.advtitolo = bananaTitoloAvanzate(self.conf) + self.advtitolo.okSig.connect(self.avanzateOk) + self.advtitolo.koSig.connect(self.avanzateKo) pass def spawnAvanzate(self): + self.log.debug("Mostro la finestra avanzate titolo") self.advtitolo.show() pass + def avanzateOk(self): + self.log.debug("Avanzate Accettate") + pass + + def avanzateKo(self): + self.log.debug("Avanzate Rifiutate") + pass + + def applica(self): + self.log.info("Applico impostazioni Titolo") + pass + class bananaTitoloAvanzate(PyQt5.QtWidgets.QWidget): - def __init__(self, confloader=None): + okSig = pyqtSignal(bool, name="OK") + koSig = pyqtSignal(bool, name="KO") + + def __init__(self, confloader=None, logger=None): PyQt5.QtWidgets.QWidget.__init__(self) self.titoloavui = Ui_advtitolo() self.titoloavui.setupUi(self) self.titoloavui.btn_OK.clicked.connect(self.returnOk) self.titoloavui.btn_annulla.clicked.connect(self.returnKo) self.conf = confloader + self.log = logger + pass def returnOk(self): + self.okSig.emit(True) + self.hide() pass def returnKo(self): + self.koSig.emit(False) + self.hide() pass class bananaSelezOut(PyQt5.QtWidgets.QWidget): - def __init__(self, confloader=None): + def __init__(self, confloader=None, logger=None): PyQt5.QtWidgets.QWidget.__init__(self) self.selezoutui = Ui_selezout() self.selezoutui.setupUi(self) + self.conf = confloader + self.log = logger pass class bananaAdvOpt(PyQt5.QtWidgets.QWidget): - def __init__(self, confloader=None): + def __init__(self, confloader=None, logger=None): PyQt5.QtWidgets.QWidget.__init__(self) self.advoptui = Ui_advoption() self.advoptui.setupUi(self) + self.conf = confloader + self.log = logger pass class bananaSplitterInterface(PyQt5.QtWidgets.QWidget): - def __init__(self, confloader=None): + def __init__(self, confloader=None, logger=None): PyQt5.QtWidgets.QWidget.__init__(self) pass diff --git a/bananaSPLIT/libbananasplit/defaults.json b/bananaSPLIT/libbananasplit/defaults.json index 703cd9f..1a0b441 100644 --- a/bananaSPLIT/libbananasplit/defaults.json +++ b/bananaSPLIT/libbananasplit/defaults.json @@ -4,13 +4,23 @@ "lastUsed": "defaults.json", "configurationPath": "D:\\Emanuele\\Documenti\\workspace\\bananaSPLIT\\", "INworkPath": "D:\\Emanuele\\Documenti\\workspace\\bananaSPLIT\\TestFiles\\", - "OUTworkPath": "H:\\", - "OUTnameFormat": "TEST_{docnum}_{year:04d}{month:02d}{day:02d}_{title}.txt" + "OUTworkPath": "H:\\" }, "docStruct": { + "language": "scelto da languageconf.json", "docSep": "\\s*Copyright [(0-9)]+", "dateFormat": "{month} {day:d}, {year:d}{}", - "language": "scelto da languageconf.json" + "outPrefix": "DEFP", + "outSuffix": "DEFS", + "outDateFormat": "{year:04d}{month:02d}{day:02d}", + "outInterFormat": "{docnum}_{date}_{title}", + "outNameFormat": "{prefisso}_{inter}_{suffisso}.txt", + "outDate": true, + "outNumber": true, + "outTitle": true, + "numberPos": 1, + "datePos": 2, + "titlePos": 3 }, "settings": { "encoding": "utf-8",