rilascio versione 1.3b Windows

.pydevproject

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
+<?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/${PROJECT_DIR_NAME}</path>
+<path>/${PROJECT_DIR_NAME}</path>
-<path>/${PROJECT_DIR_NAME}/bananaSPLIT/libbananasplit</path>
+<path>/${PROJECT_DIR_NAME}/bananaSPLIT/libbananasplit</path>
-<path>/${PROJECT_DIR_NAME}/bananaSPLIT/UserInterface/compiledUI</path>
+<path>/${PROJECT_DIR_NAME}/bananaSPLIT/UserInterface/compiledUI</path>
-</pydev_pathproperty>
+</pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python36</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python37</pydev_property>
-</pydev_project>
+</pydev_project>

TuxBuild/conf/defaults.json

@@ -3,8 +3,8 @@
 	"paths": {
 		"lastUsed": "defaults.json",
 		"configurationPath": "./conf/",
-		"INworkPath": "C://",
+		"INworkPath": "/home/",
-		"OUTworkPath": "C://",
+		"OUTworkPath": "/home/",
 		"fileList": []
 	},
 	"docStruct": {

TuxBuild/conf/linux.json

@@ -1,67 +0,0 @@
-{
-	"version": "v1.3",
-	"paths": {
-		"lastUsed": "linux.json",
-		"configurationPath": "./conf/",
-		"INworkPath": "/home/",
-		"OUTworkPath": "/home/",
-		"fileList": []
-	},
-	"docStruct": {
-		"fileVersNew": false,
-		"language": "English",
-		"languageIdx": 1,
-		"docSep": "\\s*Copyright [(0-9)]+",
-		"beginOfDocument": "\\s*Body",
-		"endOfDocument": "\\s*End of Document",
-		"dateFormat": "{month} {day:d}, {year:d}{}",
-		"outPrefix": "",
-		"outSuffix": "",
-		"outExt": ".txt",
-		"outDateType": "jpn",
-		"outNameFormat": "",
-		"outDate": true,
-		"outTitle": true,
-		"outNumber": true,
-		"numberPos": 1,
-		"datePos": 2,
-		"titlePos": 3,
-		"maxTitleLen": 16,
-		"outNameSep": "-",
-		"customSep": "=",
-		"dateFormats": {
-			"jpn": "{year:04d}{month:02d}{day:02d}",
-			"it": "{day:02d}{month:02d}{year:04d}",
-			"usa": "{month:02d}{year:04d}{day:02d}"
-		}
-	},
-	"settings": {
-		"winW": 800,
-		"winH": 700,
-		"encoding": "windows-1252",
-		"monthPosition": 0,
-		"getNewsPaperName": true,
-		"nameNotFoundStr": "ND",
-		"includeTitle": true,
-		"removeDuplicates": true,
-		"showSkipped": false,
-		"showRemovedDuplicates": false,
-		"loadTXT": true,
-		"loadDOCX": false,
-		"removeOldFiles": true,
-		"saveSeparateFiles": true,
-		"saveBodyFile": true,
-		"saveBodyNumber": true,
-		"delLF": false,
-		"delWordBreak": true,
-		"delChars": [
-			"'",
-			"@",
-			"#",
-			"$",
-			"%",
-			"^",
-			"&"
-		]
-	}
-}

WinBuild/conf/defaults.json

@@ -1,5 +1,5 @@
 {
-	"version": "v1.3",
+	"version": "v1.3b",
 	"paths": {
 		"lastUsed": "defaults.json",
 		"configurationPath": "./conf/",

WinBuild/conf/linux.json

@@ -1,67 +0,0 @@
-{
-	"version": "v1.3",
-	"paths": {
-		"lastUsed": "linux.json",
-		"configurationPath": "./conf/",
-		"INworkPath": "/home/",
-		"OUTworkPath": "/home/",
-		"fileList": []
-	},
-	"docStruct": {
-		"fileVersNew": false,
-		"language": "English",
-		"languageIdx": 1,
-		"docSep": "\\s*Copyright [(0-9)]+",
-		"beginOfDocument": "\\s*Body",
-		"endOfDocument": "\\s*End of Document",
-		"dateFormat": "{month} {day:d}, {year:d}{}",
-		"outPrefix": "",
-		"outSuffix": "",
-		"outExt": ".txt",
-		"outDateType": "jpn",
-		"outNameFormat": "",
-		"outDate": true,
-		"outTitle": true,
-		"outNumber": true,
-		"numberPos": 1,
-		"datePos": 2,
-		"titlePos": 3,
-		"maxTitleLen": 16,
-		"outNameSep": "-",
-		"customSep": "=",
-		"dateFormats": {
-			"jpn": "{year:04d}{month:02d}{day:02d}",
-			"it": "{day:02d}{month:02d}{year:04d}",
-			"usa": "{month:02d}{year:04d}{day:02d}"
-		}
-	},
-	"settings": {
-		"winW": 800,
-		"winH": 700,
-		"encoding": "windows-1252",
-		"monthPosition": 0,
-		"getNewsPaperName": true,
-		"nameNotFoundStr": "ND",
-		"includeTitle": true,
-		"removeDuplicates": true,
-		"showSkipped": false,
-		"showRemovedDuplicates": false,
-		"loadTXT": true,
-		"loadDOCX": false,
-		"removeOldFiles": true,
-		"saveSeparateFiles": true,
-		"saveBodyFile": true,
-		"saveBodyNumber": true,
-		"delLF": false,
-		"delWordBreak": true,
-		"delChars": [
-			"'",
-			"@",
-			"#",
-			"$",
-			"%",
-			"^",
-			"&"
-		]
-	}
-}

bananaSPLIT/UserInterface/compiledUI/mainwindow.py

@@ -205,7 +205,7 @@ class Ui_mainwin(object):
         font = QtGui.QFont()
         font.setPointSize(11)
         self.btn_avanti.setFont(font)
-        self.btn_avanti.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.btn_avanti.setLayoutDirection(QtCore.Qt.LeftToRight)
         icon3 = QtGui.QIcon()
         icon3.addPixmap(QtGui.QPixmap(":/icons/icons8-arrow-80.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.btn_avanti.setIcon(icon3)

bananaSPLIT/UserInterface/compiledUI/titolow.py

@@ -88,7 +88,7 @@ class Ui_titolo(object):
         font = QtGui.QFont()
         font.setPointSize(11)
         self.btn_avanti.setFont(font)
-        self.btn_avanti.setLayoutDirection(QtCore.Qt.RightToLeft)
+        self.btn_avanti.setLayoutDirection(QtCore.Qt.LeftToRight)
         icon2 = QtGui.QIcon()
         icon2.addPixmap(QtGui.QPixmap(":/icons/icons8-arrow-80.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.btn_avanti.setIcon(icon2)

bananaSPLIT/UserInterface/mainwindow.ui

@@ -392,7 +392,7 @@ p, li { white-space: pre-wrap; }
              </font>
             </property>
             <property name="layoutDirection">
-             <enum>Qt::RightToLeft</enum>
+             <enum>Qt::LeftToRight</enum>
             </property>
             <property name="text">
              <string>Avanti</string>

bananaSPLIT/UserInterface/titolow.ui

@@ -181,7 +181,7 @@
           </font>
          </property>
          <property name="layoutDirection">
-          <enum>Qt::RightToLeft</enum>
+          <enum>Qt::LeftToRight</enum>
          </property>
          <property name="text">
           <string>Avanti</string>

bananaSPLIT/guimain.py

@@ -50,7 +50,6 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 		# connetti bottoni avanti
 		self.ui.btn_avanti.clicked.connect(self.nextTab)
 		self.titolo.titoloui.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)
@@ -66,6 +65,10 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 		self.ui.actionCarica_Preset.triggered.connect(self.openLoadPreset)
 		self.ui.actionSalva_Preset.triggered.connect(self.openSavePreset)
 		
+		#connetti i radbutton versione
+		self.ui.rad_fileNew.clicked.connect(self.selezVers)
+		self.ui.rad_fileOld.clicked.connect(self.selezVers)
+		
 		#connetti segnali delle sottointerfacce
 		self.advopt.update.connect(self.fillAllInterfaces)
 		self.logger.sendLog.connect(self.appendLog)
@@ -107,7 +110,6 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 	def nextTab(self):
 		self.ui.wgt_main.setCurrentIndex(self.ui.wgt_main.currentIndex()+1)
 		self.logger.debug("Prossima Tab")
-		print(self.geometry().width(), self.geometry().height())
 		pass
 	
 	def prevTab(self):
@@ -178,12 +180,15 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 			self.logger.info("Selezionata Cartella Destinazione: {}".format(rv+"/"))
 		pass
 	
+	def selezVers(self):
+		self.conf.setParam(('docStruct','fileVersNew'), self.ui.rad_fileNew.isChecked())
+		self.logger.debug(f"Selezionata Versione File")
+	
 	def openFileDialog(self, name, path):
 		self.log.debug("Apro in directory: {}".format(path))
 		return 
 	
 	def applicaTutto(self):
-		self.conf.setParam(('docStruct','fileVersNew'), self.ui.rad_fileNew.isChecked())
 		self.titolo.applica()	
 		self.selezout.applica()