Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: custom panel category

Browse Source
This commit is contained in:
Swann 2020-04-14 17:22:28 +02:00
parent 4f02134b6c
commit 2e60bb985f
No known key found for this signature in database
GPG Key ID: B880407E0F5F413E
2 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
multi_user/preferences.py
View File

@ -20,11 +20,12 @@ import logging
import bpy
import string
from . import utils, bl_types, environment, addon_updater_ops, presence
from .libs.replication.replication.constants import RP_COMMON
from . import utils, bl_types, environment, addon_updater_ops, presence, ui
from .libs.replication.replication.constants import RP_COMMON
logger = logging.getLogger(__name__)
def randomColor():
"""Generate a random color """
r = random.random()
@ -37,7 +38,13 @@ def random_string_digits(stringLength=6):
"""Generate a random string of letters and digits """
lettersAndDigits = string.ascii_letters + string.digits
return ''.join(random.choices(lettersAndDigits, k=stringLength))
def update_panel_category(self, context):
ui.unregister()
ui.SESSION_PT_settings.bl_category = self.panel_category
ui.register()
class ReplicatedDatablock(bpy.types.PropertyGroup):
type_name: bpy.props.StringProperty()
@ -142,6 +149,11 @@ class SessionPrefs(bpy.types.AddonPreferences):
description="cache",
default=False
)
conf_session_ui_expanded: bpy.props.BoolProperty(
name="Interface",
description="Interface",
default=False
)
auto_check_update: bpy.props.BoolProperty(
name="Auto-check for Update",
@ -176,14 +188,20 @@ class SessionPrefs(bpy.types.AddonPreferences):
max=59
)
# Custom panel
panel_category: bpy.props.StringProperty(
description="Choose a name for the category of the panel",
default="Multiuser",
update=update_panel_category)
def draw(self, context):
layout = self.layout
layout.row().prop(self, "category", expand=True)
if self.category == 'CONFIG':
grid = layout.column()
# USER INFORMATIONS
box = grid.box()
box.prop(
@ -215,7 +233,7 @@ class SessionPrefs(bpy.types.AddonPreferences):
self, "conf_session_timing_expanded", text="Refresh rates",
icon='DISCLOSURE_TRI_DOWN' if self.conf_session_timing_expanded
else 'DISCLOSURE_TRI_RIGHT', emboss=False)
if self.conf_session_timing_expanded:
line = table.row()
line.label(text=" ")
@ -224,7 +242,7 @@ class SessionPrefs(bpy.types.AddonPreferences):
line.label(text="apply (sec)")
for item in self.supported_datablocks:
line = table.row(align=True)
line = table.row(align=True)
line.label(text="", icon=item.icon)
line.prop(item, "bl_delay_refresh", text="")
line.prop(item, "bl_delay_apply", text="")
@ -239,7 +257,7 @@ class SessionPrefs(bpy.types.AddonPreferences):
row = box.row()
row.label(text="Start with an empty scene:")
row.prop(self, "start_empty", text="")
# CACHE SETTINGS
box = grid.box()
box.prop(
@ -249,6 +267,15 @@ class SessionPrefs(bpy.types.AddonPreferences):
if self.conf_session_cache_expanded:
box.row().prop(self, "cache_directory", text="Cache directory")
# INTERFACE SETTINGS
box = grid.box()
box.prop(
self, "conf_session_ui_expanded", text="Interface",
icon='DISCLOSURE_TRI_DOWN' if self.conf_session_ui_expanded else 'DISCLOSURE_TRI_RIGHT',
emboss=False)
if self.conf_session_ui_expanded:
box.row().prop(self, "panel_category", text="Panel category", expand=True)
if self.category == 'UPDATE':
from . import addon_updater_ops
addon_updater_ops.update_settings_ui_condensed(self, context)
@ -275,7 +302,7 @@ class SessionPrefs(bpy.types.AddonPreferences):
def client_list_callback(scene, context):
from . import operators
items = [(RP_COMMON, RP_COMMON, "")]
username = utils.get_preferences().username
@ -283,11 +310,11 @@ def client_list_callback(scene, context):
if cli:
client_ids = cli.online_users.keys()
for id in client_ids:
name_desc = id
if id == username:
name_desc += " (self)"
name_desc = id
if id == username:
name_desc += " (self)"
items.append((id, name_desc, ""))
items.append((id, name_desc, ""))
return items
@ -305,7 +332,7 @@ class SessionProps(bpy.types.PropertyGroup):
is_admin: bpy.props.BoolProperty(
name="is_admin",
default=False
)
)
session_mode: bpy.props.EnumProperty(
name='session_mode',
description='session mode',
@ -322,7 +349,7 @@ class SessionProps(bpy.types.PropertyGroup):
description='Enable overlay drawing module',
default=True,
update=presence.update_presence
)
)
presence_show_selected: bpy.props.BoolProperty(
name="Show selected objects",
description='Enable selection overlay ',
@ -334,13 +361,13 @@ class SessionProps(bpy.types.PropertyGroup):
description='Enable user overlay ',
default=True,
update=presence.update_overlay_settings
)
)
presence_show_far_user: bpy.props.BoolProperty(
name="Show different scenes",
description="Show user on different scenes",
default=False,
update=presence.update_overlay_settings
)
)
filter_owned: bpy.props.BoolProperty(
name="filter_owned",
description='Show only owned datablocks',
@ -353,6 +380,7 @@ class SessionProps(bpy.types.PropertyGroup):
default=False
)
classes = (
SessionUser,
SessionProps,

14
multi_user/ui.py
View File

@ -150,7 +150,6 @@ class SESSION_PT_settings_network(bpy.types.Panel):
bl_label = "Network"
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_category = "Multiuser"
bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
@classmethod
@ -199,7 +198,6 @@ class SESSION_PT_settings_user(bpy.types.Panel):
bl_label = "User"
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_category = "Multiuser"
bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
@classmethod
@ -227,7 +225,6 @@ class SESSION_PT_settings_replication(bpy.types.Panel):
bl_label = "Advanced"
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_category = "Multiuser"
bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
bl_options = {'DEFAULT_CLOSED'}
@ -276,7 +273,6 @@ class SESSION_PT_user(bpy.types.Panel):
bl_label = "Online users"
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_category = "Multiuser"
bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
@classmethod
@ -355,7 +351,6 @@ class SESSION_PT_presence(bpy.types.Panel):
bl_label = "Presence overlay"
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_category = "Multiuser"
bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
bl_options = {'DEFAULT_CLOSED'}
@ -385,7 +380,6 @@ class SESSION_PT_services(bpy.types.Panel):
bl_label = "Services"
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_category = "Multiuser"
bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
bl_options = {'DEFAULT_CLOSED'}
@ -404,8 +398,7 @@ class SESSION_PT_services(bpy.types.Panel):
for name, state in operators.client.services_state.items():
row = layout.row()
row.label(text=name)
row.label(text=get_state_str(state))
row.label(text=get_state_str(state))
@ -477,7 +470,7 @@ class SESSION_PT_outliner(bpy.types.Panel):
bl_label = "Properties"
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_category = "Multiuser"
bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
@classmethod
def poll(cls, context):
@ -537,8 +530,9 @@ classes = (
SESSION_PT_presence,
SESSION_PT_settings_replication,
SESSION_PT_user,
SESSION_PT_services,
SESSION_PT_outliner,
SESSION_PT_services
)