From 104f8e4f7be7b9505e50ab0bafe096d87d0b01e6 Mon Sep 17 00:00:00 2001 From: Emanuele Date: Thu, 2 Jan 2020 16:45:28 +0100 Subject: [PATCH] aggiunti prefisso e suffisso alle avanzatenome --- bananaSPLIT/guimain.py | 15 ++++++++++----- bananaSPLIT/libbananasplit/defaults.json | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py index ad4e3be..2e19560 100644 --- a/bananaSPLIT/guimain.py +++ b/bananaSPLIT/guimain.py @@ -16,6 +16,8 @@ from libfancylogger import fancyLogger from libconfload import bananaCONF from libsplit import bananaSPLITTER +from PyQt5.QtCore import QDir + class bananaMain(PyQt5.QtWidgets.QMainWindow): def __init__(self): PyQt5.QtWidgets.QMainWindow.__init__(self) @@ -116,6 +118,9 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow): self.conf.setParam(keys=('paths','INworkPath',), val=rv) self.ui.lbl_sorg.setText(rv) self.logger.debug("Selezionata Cartella Sorgente: {}".format(rv)) + fl = QDir(rv).entryList() + for f in fl: + self.ui.lst_files.addItem(PyQt5.QtWidgets.QListWidgetItem(f)) pass def selezDest(self): @@ -149,7 +154,6 @@ class bananaTitolo(PyQt5.QtWidgets.QWidget): self.advtitolo.show() pass - class bananaTitoloAvanzate(PyQt5.QtWidgets.QWidget): def __init__(self, confloader=None): PyQt5.QtWidgets.QWidget.__init__(self) @@ -157,12 +161,13 @@ class bananaTitoloAvanzate(PyQt5.QtWidgets.QWidget): self.titoloavui.setupUi(self) self.titoloavui.btn_OK.clicked.connect(self.returnOk) self.titoloavui.btn_annulla.clicked.connect(self.returnKo) + self.conf = confloader + pass + + def returnOk(self): pass - def returnOk(self, conf): - pass - - def returnKo(self, conf): + def returnKo(self): pass diff --git a/bananaSPLIT/libbananasplit/defaults.json b/bananaSPLIT/libbananasplit/defaults.json index 055df03..703cd9f 100644 --- a/bananaSPLIT/libbananasplit/defaults.json +++ b/bananaSPLIT/libbananasplit/defaults.json @@ -10,7 +10,7 @@ "docStruct": { "docSep": "\\s*Copyright [(0-9)]+", "dateFormat": "{month} {day:d}, {year:d}{}", - "language": "placeholder da riempire con le informazioni di languageconf.json" + "language": "scelto da languageconf.json" }, "settings": { "encoding": "utf-8",