diff --git a/bananaconfEN.json b/bananaSPLIT/conf/bananaconfEN.json similarity index 100% rename from bananaconfEN.json rename to bananaSPLIT/conf/bananaconfEN.json diff --git a/bananaconfITA.json b/bananaSPLIT/conf/bananaconfITA.json similarity index 100% rename from bananaconfITA.json rename to bananaSPLIT/conf/bananaconfITA.json diff --git a/bananaSPLIT/libbananasplit/defaults.json b/bananaSPLIT/conf/defaults.json similarity index 100% rename from bananaSPLIT/libbananasplit/defaults.json rename to bananaSPLIT/conf/defaults.json diff --git a/bananaSPLIT/libbananasplit/languageconf.json b/bananaSPLIT/conf/languageconf.json similarity index 90% rename from bananaSPLIT/libbananasplit/languageconf.json rename to bananaSPLIT/conf/languageconf.json index 7dc21b2..5b1457d 100644 --- a/bananaSPLIT/libbananasplit/languageconf.json +++ b/bananaSPLIT/conf/languageconf.json @@ -1,5 +1,5 @@ { - "italiano": { + "Italiano": { "dateWords": [ "Gennaio", "Febbraio", @@ -36,7 +36,7 @@ "JOURNAL-CODE:" ] }, - "english": { + "English": { "dateWords": [ "January", "February", diff --git a/bananaSPLIT/libbananasplit/loggerconf.json b/bananaSPLIT/conf/loggerconf.json similarity index 100% rename from bananaSPLIT/libbananasplit/loggerconf.json rename to bananaSPLIT/conf/loggerconf.json diff --git a/bananaSPLIT/libbananasplit/presettone.json b/bananaSPLIT/conf/presettone.json similarity index 86% rename from bananaSPLIT/libbananasplit/presettone.json rename to bananaSPLIT/conf/presettone.json index 31c83b3..6853ae2 100644 --- a/bananaSPLIT/libbananasplit/presettone.json +++ b/bananaSPLIT/conf/presettone.json @@ -1,7 +1,7 @@ { "version": "v1.1a", "paths": { - "lastUsed": "D:/Emanuele/Documenti/workspace/bananaSPLIT/bananaSPLIT/libbananasplit/presettone.json", + "lastUsed": "presettone.json", "configurationPath": "D:\\Emanuele\\Documenti\\workspace\\bananaSPLIT\\", "INworkPath": "D:/Emanuele/Desktop", "OUTworkPath": "D:/Emanuele/Desktop" @@ -12,7 +12,7 @@ "dateFormat": "{month} {day:d}, {year:d}{}", "outPrefix": "123", "outSuffix": "456", - "outDateType": "usa", + "outDateType": "jpn", "outNameFormat": "", "outDate": true, "outNumber": true, diff --git a/bananaSPLIT/libbananasplit/prova2.json b/bananaSPLIT/conf/prova2.json similarity index 100% rename from bananaSPLIT/libbananasplit/prova2.json rename to bananaSPLIT/conf/prova2.json diff --git a/bananaSPLIT/libbananasplit/provawrite.json b/bananaSPLIT/conf/provawrite.json similarity index 100% rename from bananaSPLIT/libbananasplit/provawrite.json rename to bananaSPLIT/conf/provawrite.json diff --git a/test2.json b/bananaSPLIT/conf/test2.json similarity index 100% rename from test2.json rename to bananaSPLIT/conf/test2.json diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py index 37ee6b4..4a9813b 100644 --- a/bananaSPLIT/guimain.py +++ b/bananaSPLIT/guimain.py @@ -27,11 +27,12 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow): def __init__(self): PyQt5.QtWidgets.QMainWindow.__init__(self) try: - self.logger = fancyLogger(filepath=r"./libbananasplit/loggerconf.json",fileLog=False) - self.conf = bananaCONF(workdir=r"./libbananasplit", logger=self.logger) + self.logger = fancyLogger(filepath=r"./conf/loggerconf.json",fileLog=False) + self.conf = bananaCONF(workdir=r"./conf", logger=self.logger) self.conf.open() self.conf.use("defaults.json") self.conf.use(self.conf.getParam('paths', 'lastUsed')) + print(self.conf.inUse) except: sys.exit() @@ -119,7 +120,7 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow): sf.setAcceptMode(PyQt5.QtWidgets.QFileDialog.AcceptSave) sf.setNameFilter("bananaCONF (*.json)") if sf.exec(): - rv=str(sf.selectedFiles()[0]) + rv=str(sf.selectedFiles()[0].split('/')[-1]) self.conf.setParam(('paths','lastUsed'),rv) self.logger.debug("Scrivi il File: {}".format(rv)) self.conf.save(fName=rv)