From 31accbd0b85f5ebc7a061d215f5395682496a432 Mon Sep 17 00:00:00 2001
From: Emanuele <ema.trabattoni@gmail.com>
Date: Wed, 1 Apr 2020 12:27:07 +0200
Subject: [PATCH] correzioni interfaccia

---
 bananaSPLIT/guimain.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py
index 2ffa0c9..9bc94e3 100644
--- a/bananaSPLIT/guimain.py
+++ b/bananaSPLIT/guimain.py
@@ -8,6 +8,7 @@ TODO LIST
 '''
 import sys, copy, json
 import PyQt5.QtWidgets
+import PyQt5.QtGui
 
 from mainwindow import Ui_mainwin
 from selezout import Ui_selezout
@@ -19,9 +20,8 @@ from libfancylogger import fancyLogger
 from libconfload import bananaCONF
 from libsplit import bananaSPLITTER
 
-from PyQt5.QtCore import QDir
+from PyQt5.QtCore import QDir, pyqtSlot, pyqtSignal
 from PyQt5.QtWidgets import QMessageBox
-from PyQt5.Qt import pyqtSlot , pyqtSignal
 
 class bananaMain(PyQt5.QtWidgets.QMainWindow):	
 	def __init__(self):
@@ -141,6 +141,7 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 		
 	def openAdvOpt(self):
 		self.logger.debug("Apri Opzioni Avanzate")
+		self.advopt.fillInterface()
 		self.advopt.show()
 		pass
 	
@@ -173,7 +174,6 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 		self.conf.setParam(('docStruct','fileVersNew'), self.ui.rad_fileNew.isChecked())
 		self.titolo.applica()	
 		self.selezout.applica()
-		self.advopt.applica()
 
 #############################################################
 ####################### INTERFACES ##########################
@@ -244,7 +244,8 @@ class bananaTitolo(PyQt5.QtWidgets.QWidget):
 			itm=self.titoloui.lyt_sep.itemAt(itmn).widget()
 			if isinstance(itm, PyQt5.QtWidgets.QRadioButton):
 				if len(itm.text())==1 and itm.isChecked():
-					self.conf.setParam(('docStruct', 'outNameSep'), itm.text())				
+					self.conf.setParam(('docStruct', 'outNameSep'), itm.text())
+		self.advtitolo.applica()			
 	pass
 	
 class bananaTitoloAvanzate(PyQt5.QtWidgets.QWidget):
@@ -486,8 +487,7 @@ class bananaAdvOpt(PyQt5.QtWidgets.QWidget):
 		self.log = logger
 		self.errmsg=None
 		if self.conf is not None:
-			self.fillInterface()
-			self.advoptui.btn_ok.clicked.connect(self.applica)
+			self.advoptui.btn_ok.clicked.connect(self.accetta)
 			self.advoptui.btn_cancel.clicked.connect(self.rifiuta)
 			self.fillInterface()
 		pass
@@ -499,9 +499,13 @@ class bananaAdvOpt(PyQt5.QtWidgets.QWidget):
 			self.log.critical("AdvancedOptions: Configurazione non accettata")
 		pass
 	
-	def applica(self):
+	def accetta(self):
 		self.errmsg = QMessageBox()
 		self.errmsg.setModal(True)
+		self.errmsg.setWindowTitle("Avanzate Globali")
+		icon = PyQt5.QtGui.QIcon()
+		icon.addPixmap(PyQt5.QtGui.QPixmap(":/icons/icons8-smartphone-ram-100.png"), PyQt5.QtGui.QIcon.Normal, PyQt5.QtGui.QIcon.Off)
+		self.errmsg.setWindowIcon(icon)
 		try:
 			self.conf.loads(self.advoptui.txt_confFile.toPlainText())
 			self.log.info("AdvancedOptions: Parametri inseriti validi, configurazione accettata")