diff --git a/agkyra.spec b/agkyra.spec index bfe8bf458a084a26b01002d74dfbbc47f5dd5bf1..d6dff5d8ce4035797cc27ff908366a13d1b7a317 100644 --- a/agkyra.spec +++ b/agkyra.spec @@ -40,6 +40,7 @@ def extra_datas(prefix, path): a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'nwjs')) a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'nwgui')) a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'ui_data')) +a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'main.json')) a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'cacert.pem')) a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'defaults.conf')) diff --git a/agkyra/protocol.py b/agkyra/protocol.py index ee7e9bd1d02306e916b394181125e399a8d352e7..0cd4225e169848857edd81e5856cbc697baf9236 100644 --- a/agkyra/protocol.py +++ b/agkyra/protocol.py @@ -46,7 +46,11 @@ SYNCERS = utils.ThreadSafeDict() with open(os.path.join(RESOURCES, 'ui_data/common_en.json')) as f: COMMON = json.load(f) -STATUS = COMMON['STATUS'] + +with open(os.path.join(RESOURCES, 'main.json')) as f: + MAINSETTINGS = json.load(f) + +STATUS = MAINSETTINGS['STATUS'] class SessionDB(database.DB): diff --git a/agkyra/resources/main.json b/agkyra/resources/main.json new file mode 100644 index 0000000000000000000000000000000000000000..645a70d489e8d0932f33a925954758a88fce1525 --- /dev/null +++ b/agkyra/resources/main.json @@ -0,0 +1,18 @@ +{ + "STATUS": { + "UNINITIALIZED": 0, + "INITIALIZING": 1, + "SHUTTING DOWN": 2, + "SETTINGS READY": 5, + "READY": 10, + "SYNCING": 100, + "PAUSING": 101, + "PAUSED": 102, + "SETTINGS MISSING": 200, + "AUTH URL ERROR": 201, + "TOKEN ERROR": 202, + "DIRECTORY ERROR": 203, + "CONTAINER ERROR": 204, + "CRITICAL ERROR": 1000 + } +} diff --git a/agkyra/resources/nwgui/protocol.js b/agkyra/resources/nwgui/protocol.js index 8ccd58dc3ee4b325eb4a994ae1c2bd48d4932ee2..c42ea0e2ba6ae4bb7b2999c0b4a2c020a8037b6d 100644 --- a/agkyra/resources/nwgui/protocol.js +++ b/agkyra/resources/nwgui/protocol.js @@ -30,7 +30,8 @@ function load_common(lang) { return JSON.parse(fs.readFileSync(path.join('..', 'ui_data', common_path))); } var COMMON = load_common(); -var STATUS = COMMON.STATUS; +var MAINSETTINGS = JSON.parse(fs.readFileSync(path.join('..', 'main.json'))); +var STATUS = MAINSETTINGS.STATUS; var globals = { settings: { diff --git a/agkyra/resources/ui_data/common_el.json b/agkyra/resources/ui_data/common_el.json index e843611b45ae8bca0cb09a46d61c1b97a6c4b4d7..882c2e8dbc1510aade4207d63645f7a07d947eff 100644 --- a/agkyra/resources/ui_data/common_el.json +++ b/agkyra/resources/ui_data/common_el.json @@ -1,20 +1,4 @@ { - "STATUS": { - "UNINITIALIZED": 0, - "INITIALIZING": 1, - "SHUTTING DOWN": 2, - "SETTINGS READY": 5, - "READY": 10, - "SYNCING": 100, - "PAUSING": 101, - "PAUSED": 102, - "SETTINGS MISSING": 200, - "AUTH URL ERROR": 201, - "TOKEN ERROR": 202, - "DIRECTORY ERROR": 203, - "CONTAINER ERROR": 204, - "CRITICAL ERROR": 1000 - }, "NOTIFICATION": { "0": "ΞνΡνΡΟΞ³Ο", "1": "ΞΞΊΞΊΞ―Ξ½Ξ·ΟΞ· ...", diff --git a/agkyra/resources/ui_data/common_en.json b/agkyra/resources/ui_data/common_en.json index c44d5864e882fe0d6f9bdbfb06d716bf69839f99..8ac61f6ad598866097892e3b5eca9ea174f02946 100644 --- a/agkyra/resources/ui_data/common_en.json +++ b/agkyra/resources/ui_data/common_en.json @@ -1,20 +1,4 @@ { - "STATUS": { - "UNINITIALIZED": 0, - "INITIALIZING": 1, - "SHUTTING DOWN": 2, - "SETTINGS READY": 5, - "READY": 10, - "SYNCING": 100, - "PAUSING": 101, - "PAUSED": 102, - "SETTINGS MISSING": 200, - "AUTH URL ERROR": 201, - "TOKEN ERROR": 202, - "DIRECTORY ERROR": 203, - "CONTAINER ERROR": 204, - "CRITICAL ERROR": 1000 - }, "NOTIFICATION": { "0": "Not initialized", "1": "Initializing ...",