Merge pull request #815 from pypeclub/feature/modules_keys_in_settings

Modules keys in settings
This commit is contained in:
Milan Kolar 2020-12-15 10:53:27 +01:00 committed by GitHub
commit 2782baf864
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 33 additions and 33 deletions

View file

@ -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

View file

@ -384,13 +384,13 @@ class ModulesManager:
class TrayModulesManager(ModulesManager):
# Define order of modules in menu
modules_menu_order = (
"User setting",
"Ftrack",
"user",
"ftrack",
"muster",
"Avalon",
"Clockify",
"Standalone Publish",
"Logging",
"avalon",
"clockify",
"standalonepublish_tool",
"log_viewer",
"settings"
)

View file

@ -23,7 +23,7 @@ class ClockifyModule(
IFtrackEventHandlerPaths,
ITimersManager
):
name = "Clockify"
name = "clockify"
def initialize(self, modules_settings):
clockify_settings = modules_settings[self.name]

View file

@ -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]

View file

@ -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]

View file

@ -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]

View file

@ -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]

View file

@ -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"]

View file

@ -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):

View file

@ -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]

View file

@ -1,5 +1,5 @@
{
"Avalon": {
"avalon": {
"AVALON_MONGO": "",
"AVALON_TIMEOUT": 1000,
"AVALON_THUMBNAIL_ROOT": {
@ -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": [],
@ -104,16 +104,16 @@
}
}
},
"Rest Api": {
"rest_api": {
"default_port": 8021,
"exclude_ports": []
},
"Timers Manager": {
"timers_manager": {
"enabled": true,
"full_time": 15.0,
"message_time": 0.5
},
"Clockify": {
"clockify": {
"enabled": false,
"workspace_name": "studio name"
},
@ -138,16 +138,16 @@
"ffmpeg": 48
}
},
"Logging": {
"log_viewer": {
"enabled": true
},
"User setting": {
"user": {
"enabled": true
},
"Standalone Publish": {
"standalonepublish_tool": {
"enabled": true
},
"Idle Manager": {
"idle_manager": {
"enabled": true
}
}

View file

@ -1,6 +1,6 @@
{
"type": "dict",
"key": "Ftrack",
"key": "ftrack",
"label": "Ftrack",
"collapsable": true,
"checkbox_key": "enabled",

View file

@ -6,7 +6,7 @@
"is_file": true,
"children": [{
"type": "dict",
"key": "Avalon",
"key": "avalon",
"label": "Avalon",
"collapsable": true,
"children": [{
@ -40,7 +40,7 @@
},
{
"type": "dict",
"key": "Rest Api",
"key": "rest_api",
"label": "Rest Api",
"collapsable": true,
"children": [{
@ -63,7 +63,7 @@
]
}, {
"type": "dict",
"key": "Timers Manager",
"key": "timers_manager",
"label": "Timers Manager",
"collapsable": true,
"checkbox_key": "enabled",
@ -86,7 +86,7 @@
]
}, {
"type": "dict",
"key": "Clockify",
"key": "clockify",
"label": "Clockify",
"collapsable": true,
"checkbox_key": "enabled",
@ -144,7 +144,7 @@
}]
}, {
"type": "dict",
"key": "Logging",
"key": "log_viewer",
"label": "Logging",
"collapsable": true,
"checkbox_key": "enabled",
@ -155,7 +155,7 @@
}]
}, {
"type": "dict",
"key": "User setting",
"key": "user",
"label": "User setting",
"collapsable": true,
"checkbox_key": "enabled",
@ -166,7 +166,7 @@
}]
}, {
"type": "dict",
"key": "Standalone Publish",
"key": "standalonepublish_tool",
"label": "Standalone Publish",
"collapsable": true,
"checkbox_key": "enabled",
@ -177,7 +177,7 @@
}]
}, {
"type": "dict",
"key": "Idle Manager",
"key": "idle_manager",
"label": "Idle Manager",
"collapsable": true,
"checkbox_key": "enabled",