From 3f3875faf3044e5f83547ab1e52e8b9b0d6158b7 Mon Sep 17 00:00:00 2001
From: Emanuele <ema.trabattoni@gmail.com>
Date: Sun, 8 Mar 2020 15:36:27 +0100
Subject: [PATCH] sistemazioni interfaccia, compilazione lista dei file
 automatica

---
 .../UserInterface/compiledUI/titolow.py       |  6 ++--
 bananaSPLIT/UserInterface/titolow.ui          |  6 ++--
 bananaSPLIT/conf/defaults.json                | 32 ++++++++++++++++---
 bananaSPLIT/guimain.py                        | 14 +++++---
 4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/bananaSPLIT/UserInterface/compiledUI/titolow.py b/bananaSPLIT/UserInterface/compiledUI/titolow.py
index 568f9d5..6abfa52 100644
--- a/bananaSPLIT/UserInterface/compiledUI/titolow.py
+++ b/bananaSPLIT/UserInterface/compiledUI/titolow.py
@@ -170,9 +170,9 @@ class Ui_titolo(object):
         _translate = QtCore.QCoreApplication.translate
         titolo.setWindowTitle(_translate("titolo", "Nomi file di Uscita"))
         self.label.setText(_translate("titolo", "Separatore"))
-        self.rad_datajpn.setText(_translate("titolo", "YYYY MM DD, es. 2000 12 31"))
-        self.rad_dataita.setText(_translate("titolo", "DD MM YYYY, es. 31 12 2000"))
-        self.rad_datausa.setText(_translate("titolo", "MM DD YYYY, es. 12 31 2000"))
+        self.rad_datajpn.setText(_translate("titolo", "YYYY MM DD, es. 2000 12 31 (jpn)"))
+        self.rad_dataita.setText(_translate("titolo", "DD MM YYYY, es. 31 12 2000 (ita)"))
+        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"))
diff --git a/bananaSPLIT/UserInterface/titolow.ui b/bananaSPLIT/UserInterface/titolow.ui
index 50c0261..0ca620c 100644
--- a/bananaSPLIT/UserInterface/titolow.ui
+++ b/bananaSPLIT/UserInterface/titolow.ui
@@ -31,7 +31,7 @@
      <item>
       <widget class="QRadioButton" name="rad_datajpn">
        <property name="text">
-        <string>YYYY MM DD, es. 2000 12 31</string>
+        <string>YYYY MM DD, es. 2000 12 31 (jpn)</string>
        </property>
        <property name="checked">
         <bool>true</bool>
@@ -41,14 +41,14 @@
      <item>
       <widget class="QRadioButton" name="rad_dataita">
        <property name="text">
-        <string>DD MM YYYY, es. 31 12 2000</string>
+        <string>DD MM YYYY, es. 31 12 2000 (ita)</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QRadioButton" name="rad_datausa">
        <property name="text">
-        <string>MM DD YYYY, es. 12 31 2000</string>
+        <string>MM DD YYYY, es. 12 31 2000 (us)</string>
        </property>
       </widget>
      </item>
diff --git a/bananaSPLIT/conf/defaults.json b/bananaSPLIT/conf/defaults.json
index fe0d98c..807be6e 100644
--- a/bananaSPLIT/conf/defaults.json
+++ b/bananaSPLIT/conf/defaults.json
@@ -2,9 +2,33 @@
 	"version": "v1.1a",
 	"paths": {
 		"lastUsed": "defaults.json",
-		"configurationPath": "D:\\Emanuele\\Documenti\\workspace\\bananaSPLIT\\",
-		"INworkPath": "D:\\Emanuele\\Documenti\\workspace\\bananaSPLIT\\TestFiles\\",
-		"OUTworkPath": "H:\\"
+		"configurationPath": "D:/Emanuele/Documenti/workspace/bananaSPLIT/bananaSPLIT/conf/",
+		"INworkPath": "D:/Emanuele/Documenti/workspace/bananaSPLIT/TestFiles",
+		"OUTworkPath": "D:/Emanuele/Documenti/workspace/bananaSPLIT/TestFiles",
+		"fileList": [
+			".",
+			"..",
+			"GUARDIAN 1993.txt",
+			"GUARDIAN 1996.txt",
+			"GUARDIAN 1999.txt",
+			"GUARDIAN 2002.txt",
+			"GUARDIAN 2005.txt",
+			"GUARDIAN 2008.txt",
+			"GUARDIAN 2012.txt",
+			"GUARDIAN 2015.txt",
+			"GUARDIAN 2018.txt",
+			"NYT 1990.txt",
+			"NYT 1994.txt",
+			"NYT 1997.txt",
+			"NYT 2000.txt",
+			"NYT 2003.txt",
+			"NYT 2006.txt",
+			"NYT 2009.txt",
+			"NYT 2013.txt",
+			"NYT 2015.txt",
+			"NYT 2017.txt",
+			"README"
+		]
 	},
 	"docStruct": {
 		"language": "scelto da languageconf.json",
@@ -12,7 +36,7 @@
 		"dateFormat": "{month} {day:d}, {year:d}{}",
 		"outPrefix": "123",
 		"outSuffix": "456",
-		"outDateType": "ita",
+		"outDateType": "jpn",
 		"outNameFormat": "",
 		"outDate": true,
 		"outNumber": true,
diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py
index 2671914..63bfa5d 100644
--- a/bananaSPLIT/guimain.py
+++ b/bananaSPLIT/guimain.py
@@ -74,6 +74,7 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 		try:
 			self.ui.lbl_sorg.setText(self.conf.getParam('paths','INworkPath'))
 			self.ui.lbl_dest.setText(self.conf.getParam('paths','OUTworkPath'))
+			self.fillFileList()
 		except:
 			self.log.critical("MainWindow: Configurazione non accettata")
 			
@@ -83,7 +84,14 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 		self.titoloav.fillInterface()
 		self.selezout.fillInterface()
 		self.advopt.fillInterface()
-	
+		
+	def fillFileList(self):
+		fl = QDir(self.conf.getParam('paths','INworkPath')).entryList()
+		self.ui.lst_files.clear()
+		for f in fl:
+			self.ui.lst_files.addItem(PyQt5.QtWidgets.QListWidgetItem(f))
+			self.conf.setParam(('paths', 'fileList'), fl)
+
 	def nextTab(self):
 		self.ui.wgt_main.setCurrentIndex(self.ui.wgt_main.currentIndex()+1)
 		self.logger.debug("Prossima Tab")
@@ -138,9 +146,7 @@ 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))
+			self.fillFileList()
 		pass
 	
 	def selezDest(self):