From 3ea1c32ae15dca84c04e8585d79c615bd604cd49 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 14 Dec 2020 18:34:16 +0100 Subject: [PATCH 1/9] avalon module has lowered key in settings --- pype/modules/avalon_apps/avalon_app.py | 2 +- pype/modules/base.py | 2 +- pype/settings/defaults/system_settings/modules.json | 2 +- .../settings/gui_schemas/system_schema/schema_modules.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pype/modules/avalon_apps/avalon_app.py b/pype/modules/avalon_apps/avalon_app.py index d80c0afe6f..683d804412 100644 --- a/pype/modules/avalon_apps/avalon_app.py +++ b/pype/modules/avalon_apps/avalon_app.py @@ -9,7 +9,7 @@ from .. import ( class AvalonModule(PypeModule, ITrayModule, IRestApi): - name = "Avalon" + name = "avalon" def initialize(self, modules_settings): # This module is always enabled diff --git a/pype/modules/base.py b/pype/modules/base.py index ed95746f23..ddc6ad5f65 100644 --- a/pype/modules/base.py +++ b/pype/modules/base.py @@ -387,7 +387,7 @@ class TrayModulesManager(ModulesManager): "User setting", "Ftrack", "muster", - "Avalon", + "avalon", "Clockify", "Standalone Publish", "Logging", diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json index bd5b3e8294..b1eeebf322 100644 --- a/pype/settings/defaults/system_settings/modules.json +++ b/pype/settings/defaults/system_settings/modules.json @@ -1,5 +1,5 @@ { - "Avalon": { + "avalon": { "AVALON_MONGO": "", "AVALON_TIMEOUT": 1000, "AVALON_THUMBNAIL_ROOT": { diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json index af4426fd01..5f586f9ee6 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json @@ -6,7 +6,7 @@ "is_file": true, "children": [{ "type": "dict", - "key": "Avalon", + "key": "avalon", "label": "Avalon", "collapsable": true, "children": [{ From 816646a207a56d6b8ac4643614df8f1fa434477d Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 14 Dec 2020 18:35:50 +0100 Subject: [PATCH 2/9] Rest Api module key lowered in settings --- pype/modules/rest_api/rest_api.py | 2 +- pype/settings/defaults/system_settings/modules.json | 2 +- .../settings/gui_schemas/system_schema/schema_modules.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pype/modules/rest_api/rest_api.py b/pype/modules/rest_api/rest_api.py index bd9e7d2a83..2a074fd97a 100644 --- a/pype/modules/rest_api/rest_api.py +++ b/pype/modules/rest_api/rest_api.py @@ -97,7 +97,7 @@ class RestApiModule(PypeModule, ITrayService): `_handle_callback_result` defined in handler. """ label = "Rest API Service" - name = "Rest Api" + name = "rest_api" def initialize(self, modules_settings): rest_api_settings = modules_settings[self.name] diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json index b1eeebf322..83b5db0d30 100644 --- a/pype/settings/defaults/system_settings/modules.json +++ b/pype/settings/defaults/system_settings/modules.json @@ -104,7 +104,7 @@ } } }, - "Rest Api": { + "rest_api": { "default_port": 8021, "exclude_ports": [] }, diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json index 5f586f9ee6..7bc2b17c6d 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json @@ -40,7 +40,7 @@ }, { "type": "dict", - "key": "Rest Api", + "key": "rest_api", "label": "Rest Api", "collapsable": true, "children": [{ From d77d35717737eef065e4d26174dddfb8edc50938 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 14 Dec 2020 18:37:20 +0100 Subject: [PATCH 3/9] "User Settings" module name changed to "user" --- pype/modules/base.py | 2 +- pype/modules/user/user_module.py | 2 +- pype/settings/defaults/system_settings/modules.json | 2 +- .../settings/gui_schemas/system_schema/schema_modules.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pype/modules/base.py b/pype/modules/base.py index ddc6ad5f65..6931f2cf32 100644 --- a/pype/modules/base.py +++ b/pype/modules/base.py @@ -384,7 +384,7 @@ class ModulesManager: class TrayModulesManager(ModulesManager): # Define order of modules in menu modules_menu_order = ( - "User setting", + "user", "Ftrack", "muster", "avalon", diff --git a/pype/modules/user/user_module.py b/pype/modules/user/user_module.py index 240ede947b..21e687c43d 100644 --- a/pype/modules/user/user_module.py +++ b/pype/modules/user/user_module.py @@ -27,7 +27,7 @@ class UserModule(PypeModule, ITrayModule, IRestApi): cred_filename = 'user_info.json' env_name = "PYPE_USERNAME" - name = "User setting" + name = "user" def initialize(self, modules_settings): user_settings = modules_settings[self.name] diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json index 83b5db0d30..5cac15fa47 100644 --- a/pype/settings/defaults/system_settings/modules.json +++ b/pype/settings/defaults/system_settings/modules.json @@ -141,7 +141,7 @@ "Logging": { "enabled": true }, - "User setting": { + "user": { "enabled": true }, "Standalone Publish": { diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json index 7bc2b17c6d..cf58dec1cd 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json @@ -155,7 +155,7 @@ }] }, { "type": "dict", - "key": "User setting", + "key": "user", "label": "User setting", "collapsable": true, "checkbox_key": "enabled", From 63d903e52ad9f587f15c6eef5d9151efa8eb84b3 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 14 Dec 2020 18:38:30 +0100 Subject: [PATCH 4/9] renamed "Ftrack" to "ftrack" --- pype/modules/base.py | 2 +- pype/modules/ftrack/ftrack_module.py | 2 +- pype/settings/defaults/system_settings/modules.json | 2 +- .../system_schema/module_settings/schema_ftrack.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pype/modules/base.py b/pype/modules/base.py index 6931f2cf32..b55949a43f 100644 --- a/pype/modules/base.py +++ b/pype/modules/base.py @@ -385,7 +385,7 @@ class TrayModulesManager(ModulesManager): # Define order of modules in menu modules_menu_order = ( "user", - "Ftrack", + "ftrack", "muster", "avalon", "Clockify", diff --git a/pype/modules/ftrack/ftrack_module.py b/pype/modules/ftrack/ftrack_module.py index 03ea4b96a2..2560f7bc0c 100644 --- a/pype/modules/ftrack/ftrack_module.py +++ b/pype/modules/ftrack/ftrack_module.py @@ -21,7 +21,7 @@ class IFtrackEventHandlerPaths: class FtrackModule( PypeModule, ITrayModule, IPluginPaths, ITimersManager, IUserModule ): - name = "Ftrack" + name = "ftrack" def initialize(self, settings): ftrack_settings = settings[self.name] diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json index 5cac15fa47..a33343f7d4 100644 --- a/pype/settings/defaults/system_settings/modules.json +++ b/pype/settings/defaults/system_settings/modules.json @@ -9,7 +9,7 @@ }, "AVALON_DB_DATA": "{PYPE_SETUP_PATH}/../mongo_db_data" }, - "Ftrack": { + "ftrack": { "enabled": true, "ftrack_server": "https://pype.ftrackapp.com", "ftrack_actions_path": [], diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/module_settings/schema_ftrack.json b/pype/tools/settings/settings/gui_schemas/system_schema/module_settings/schema_ftrack.json index 5459379bcb..1f501cfde3 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/module_settings/schema_ftrack.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/module_settings/schema_ftrack.json @@ -1,6 +1,6 @@ { "type": "dict", - "key": "Ftrack", + "key": "ftrack", "label": "Ftrack", "collapsable": true, "checkbox_key": "enabled", From 9a4fc3b977d9db2ebfc42f866b418312d62faa22 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 14 Dec 2020 18:40:00 +0100 Subject: [PATCH 5/9] "Clockify" changed to "clockify" --- pype/modules/base.py | 2 +- pype/modules/clockify/clockify_module.py | 2 +- pype/settings/defaults/system_settings/modules.json | 2 +- .../settings/gui_schemas/system_schema/schema_modules.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pype/modules/base.py b/pype/modules/base.py index b55949a43f..20bf1143a1 100644 --- a/pype/modules/base.py +++ b/pype/modules/base.py @@ -388,7 +388,7 @@ class TrayModulesManager(ModulesManager): "ftrack", "muster", "avalon", - "Clockify", + "clockify", "Standalone Publish", "Logging", "settings" diff --git a/pype/modules/clockify/clockify_module.py b/pype/modules/clockify/clockify_module.py index 61eaaa5747..a91addb971 100644 --- a/pype/modules/clockify/clockify_module.py +++ b/pype/modules/clockify/clockify_module.py @@ -23,7 +23,7 @@ class ClockifyModule( IFtrackEventHandlerPaths, ITimersManager ): - name = "Clockify" + name = "clockify" def initialize(self, modules_settings): clockify_settings = modules_settings[self.name] diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json index a33343f7d4..f9015cb279 100644 --- a/pype/settings/defaults/system_settings/modules.json +++ b/pype/settings/defaults/system_settings/modules.json @@ -113,7 +113,7 @@ "full_time": 15.0, "message_time": 0.5 }, - "Clockify": { + "clockify": { "enabled": false, "workspace_name": "studio name" }, diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json index cf58dec1cd..59156fe0fe 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json @@ -86,7 +86,7 @@ ] }, { "type": "dict", - "key": "Clockify", + "key": "clockify", "label": "Clockify", "collapsable": true, "checkbox_key": "enabled", From 1996e6f96403ac0edb441a2d394cb50d40ce05e9 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 14 Dec 2020 18:41:40 +0100 Subject: [PATCH 6/9] renamed "Logging" to "log_viewer" --- pype/modules/base.py | 2 +- pype/modules/logging/logging_module.py | 2 +- pype/settings/defaults/system_settings/modules.json | 2 +- .../settings/gui_schemas/system_schema/schema_modules.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pype/modules/base.py b/pype/modules/base.py index 20bf1143a1..35123599bd 100644 --- a/pype/modules/base.py +++ b/pype/modules/base.py @@ -390,7 +390,7 @@ class TrayModulesManager(ModulesManager): "avalon", "clockify", "Standalone Publish", - "Logging", + "log_viewer", "settings" ) diff --git a/pype/modules/logging/logging_module.py b/pype/modules/logging/logging_module.py index 2aa13cc118..06101b51a5 100644 --- a/pype/modules/logging/logging_module.py +++ b/pype/modules/logging/logging_module.py @@ -3,7 +3,7 @@ from .. import PypeModule, ITrayModule class LoggingModule(PypeModule, ITrayModule): - name = "Logging" + name = "log_viewer" def initialize(self, modules_settings): logging_settings = modules_settings[self.name] diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json index f9015cb279..ce74e1fbbd 100644 --- a/pype/settings/defaults/system_settings/modules.json +++ b/pype/settings/defaults/system_settings/modules.json @@ -138,7 +138,7 @@ "ffmpeg": 48 } }, - "Logging": { + "log_viewer": { "enabled": true }, "user": { diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json index 59156fe0fe..32e5f7aae5 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json @@ -144,7 +144,7 @@ }] }, { "type": "dict", - "key": "Logging", + "key": "log_viewer", "label": "Logging", "collapsable": true, "checkbox_key": "enabled", From 68d40ee3cf34378801ebe45c4c5928f5acee8033 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 14 Dec 2020 18:43:09 +0100 Subject: [PATCH 7/9] changed "Standalone Publish" to "standalonepublish_tool" --- pype/modules/base.py | 2 +- pype/modules/standalonepublish/standalonepublish_module.py | 2 +- pype/settings/defaults/system_settings/modules.json | 2 +- .../settings/gui_schemas/system_schema/schema_modules.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pype/modules/base.py b/pype/modules/base.py index 35123599bd..3c2c2e7e21 100644 --- a/pype/modules/base.py +++ b/pype/modules/base.py @@ -389,7 +389,7 @@ class TrayModulesManager(ModulesManager): "muster", "avalon", "clockify", - "Standalone Publish", + "standalonepublish_tool", "log_viewer", "settings" ) diff --git a/pype/modules/standalonepublish/standalonepublish_module.py b/pype/modules/standalonepublish/standalonepublish_module.py index abed6bddd9..5b0cfe14bf 100644 --- a/pype/modules/standalonepublish/standalonepublish_module.py +++ b/pype/modules/standalonepublish/standalonepublish_module.py @@ -7,7 +7,7 @@ from .. import PypeModule, ITrayModule class StandAlonePublishModule(PypeModule, ITrayModule): menu_label = "Publish" - name = "Standalone Publish" + name = "standalonepublish_tool" def initialize(self, modules_settings): self.enabled = modules_settings[self.name]["enabled"] diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json index ce74e1fbbd..348efa130d 100644 --- a/pype/settings/defaults/system_settings/modules.json +++ b/pype/settings/defaults/system_settings/modules.json @@ -144,7 +144,7 @@ "user": { "enabled": true }, - "Standalone Publish": { + "standalonepublish_tool": { "enabled": true }, "Idle Manager": { diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json index 32e5f7aae5..7dfe1acdbe 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json @@ -166,7 +166,7 @@ }] }, { "type": "dict", - "key": "Standalone Publish", + "key": "standalonepublish_tool", "label": "Standalone Publish", "collapsable": true, "checkbox_key": "enabled", From 47f4e2b8275fe2a84c5263e2f50c1afd6d05e5d0 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 14 Dec 2020 18:44:41 +0100 Subject: [PATCH 8/9] changed "Timers Manager" to "timers_manager" --- pype/modules/timers_manager/timers_manager.py | 2 +- pype/settings/defaults/system_settings/modules.json | 2 +- .../settings/gui_schemas/system_schema/schema_modules.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pype/modules/timers_manager/timers_manager.py b/pype/modules/timers_manager/timers_manager.py index f4f5243f13..d5b65a7bd7 100644 --- a/pype/modules/timers_manager/timers_manager.py +++ b/pype/modules/timers_manager/timers_manager.py @@ -35,7 +35,7 @@ class TimersManager(PypeModule, ITrayService, IIdleManager): If IdleManager is imported then is able to handle about stop timers when user idles for a long time (set in presets). """ - name = "Timers Manager" + name = "timers_manager" label = "Timers Service" def initialize(self, modules_settings): diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json index 348efa130d..193f320809 100644 --- a/pype/settings/defaults/system_settings/modules.json +++ b/pype/settings/defaults/system_settings/modules.json @@ -108,7 +108,7 @@ "default_port": 8021, "exclude_ports": [] }, - "Timers Manager": { + "timers_manager": { "enabled": true, "full_time": 15.0, "message_time": 0.5 diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json index 7dfe1acdbe..7594ac27e2 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json @@ -63,7 +63,7 @@ ] }, { "type": "dict", - "key": "Timers Manager", + "key": "timers_manager", "label": "Timers Manager", "collapsable": true, "checkbox_key": "enabled", From 15c2be6ffba192a95ee9b2a1523008404211e7d3 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 14 Dec 2020 18:45:49 +0100 Subject: [PATCH 9/9] changed "Idle Manager" to "idle_manager" --- pype/modules/idle_manager/idle_manager.py | 2 +- pype/settings/defaults/system_settings/modules.json | 2 +- .../settings/gui_schemas/system_schema/schema_modules.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pype/modules/idle_manager/idle_manager.py b/pype/modules/idle_manager/idle_manager.py index 92592f6add..fa6d70d229 100644 --- a/pype/modules/idle_manager/idle_manager.py +++ b/pype/modules/idle_manager/idle_manager.py @@ -41,7 +41,7 @@ class IdleManager(PypeModule, ITrayService): Is able to emit signals at specific time idle. """ label = "Idle Service" - name = "Idle Manager" + name = "idle_manager" def initialize(self, module_settings): idle_man_settings = module_settings[self.name] diff --git a/pype/settings/defaults/system_settings/modules.json b/pype/settings/defaults/system_settings/modules.json index 193f320809..d123beee14 100644 --- a/pype/settings/defaults/system_settings/modules.json +++ b/pype/settings/defaults/system_settings/modules.json @@ -147,7 +147,7 @@ "standalonepublish_tool": { "enabled": true }, - "Idle Manager": { + "idle_manager": { "enabled": true } } \ No newline at end of file diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json index 7594ac27e2..0b22530caa 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/schema_modules.json @@ -177,7 +177,7 @@ }] }, { "type": "dict", - "key": "Idle Manager", + "key": "idle_manager", "label": "Idle Manager", "collapsable": true, "checkbox_key": "enabled",