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

feat: ui cleanup

Browse Source 
feat: search filter field
This commit is contained in:
Swann Martinez
2019-08-09 10:58:47 +02:00
parent 2f508b6246
commit cddd629b9a
9 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
__init__.py
View File

@ -106,19 +106,13 @@ class SessionProps(bpy.types.PropertyGroup):
name="add_property_depth", name="add_property_depth",
default=1 default=1
) )
buffer: bpy.props.StringProperty(name="None") outliner_filter: bpy.props.StringProperty(name="None")
is_admin: bpy.props.BoolProperty(name="is_admin", default=False) is_admin: bpy.props.BoolProperty(name="is_admin", default=False)
load_data: bpy.props.BoolProperty(name="load_data", default=True)
init_scene: bpy.props.BoolProperty(name="init_scene", default=True) init_scene: bpy.props.BoolProperty(name="init_scene", default=True)
start_empty: bpy.props.BoolProperty( start_empty: bpy.props.BoolProperty(
name="start_empty", name="start_empty",
default=False, default=False,
update=save_session_config update=save_session_config)
)
update_frequency: bpy.props.FloatProperty(
name="update_frequency",
default=0.008
)
active_object: bpy.props.PointerProperty( active_object: bpy.props.PointerProperty(
name="active_object", type=bpy.types.Object) name="active_object", type=bpy.types.Object)
session_mode: bpy.props.EnumProperty( session_mode: bpy.props.EnumProperty(
@ -136,8 +130,7 @@ class SessionProps(bpy.types.PropertyGroup):
clients: bpy.props.EnumProperty( clients: bpy.props.EnumProperty(
name="clients", name="clients",
description="client enum", description="client enum",
items=client_list_callback items=client_list_callback)
)
enable_presence: bpy.props.BoolProperty( enable_presence: bpy.props.BoolProperty(
name="enable_presence", name="enable_presence",
description='Enable overlay drawing module', description='Enable overlay drawing module',
@ -146,7 +139,6 @@ class SessionProps(bpy.types.PropertyGroup):
) )
supported_datablock: bpy.props.CollectionProperty( supported_datablock: bpy.props.CollectionProperty(
type=ReplicatedDatablock, type=ReplicatedDatablock,
) )
def load(self): def load(self):

6
bl_types/__init__.py
View File

@ -2,6 +2,12 @@ __all__ = [
'bl_user', 'bl_user',
'bl_object', 'bl_object',
'bl_mesh', 'bl_mesh',
'bl_camera',
'bl_collection',
'bl_curve',
'bl_gpencil',
'bl_image',
'bl_light',
] # Order here defines execution order ] # Order here defines execution order
from . import * from . import *

2
bl_types/bl_collection.py
View File

@ -7,7 +7,7 @@ from ..libs.replication.data import ReplicatedDatablock
class BlCollection(ReplicatedDatablock): class BlCollection(ReplicatedDatablock):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.icon = 'CAMERA_DATA' self.icon = 'FILE_FOLDER'
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)

2
bl_types/bl_gpencil.py
View File

@ -32,7 +32,7 @@ def load_gpencil_layer(target=None, data=None, create=False):
class BlGpencil(ReplicatedDatablock): class BlGpencil(ReplicatedDatablock):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.icon = 'CAMERA_DATA' self.icon = 'GREASEPENCIL'
super().__init__( *args, **kwargs) super().__init__( *args, **kwargs)

2
bl_types/bl_image.py
View File

@ -7,7 +7,7 @@ from ..libs.replication.data import ReplicatedDatablock
class BlImage(ReplicatedDatablock): class BlImage(ReplicatedDatablock):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.icon = 'CAMERA_DATA' self.icon = 'IMAGE_DATA'
super().__init__( *args, **kwargs) super().__init__( *args, **kwargs)

0
bl_types/bl_lights.py → bl_types/bl_light.py
View File

2
bl_types/bl_material.py
View File

@ -6,7 +6,7 @@ from ..libs.replication.data import ReplicatedDatablock
class BlMaterial(ReplicatedDatablock): class BlMaterial(ReplicatedDatablock):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.icon = 'CAMERA_DATA' self.icon = 'MATERIAL_DATA'
super().__init__( *args, **kwargs) super().__init__( *args, **kwargs)

1
operators.py
View File

@ -319,7 +319,6 @@ class SessionSnapUserOperator(bpy.types.Operator):
pass pass
class SessionDumpDatabase(bpy.types.Operator, ExportHelper): class SessionDumpDatabase(bpy.types.Operator, ExportHelper):
bl_idname = "session.dump" bl_idname = "session.dump"
bl_label = "dump json data" bl_label = "dump json data"

39
ui.py
View File

@ -26,7 +26,7 @@ class SESSION_PT_settings(bpy.types.Panel):
layout = self.layout layout = self.layout
if hasattr(context.window_manager, 'session'): if hasattr(context.window_manager, 'session'):
net_settings = context.window_manager.session settings = context.window_manager.session
window_manager = context.window_manager window_manager = context.window_manager
row = layout.row() row = layout.row()
@ -54,33 +54,31 @@ class SESSION_PT_settings(bpy.types.Panel):
row = box.row() row = box.row()
row.label(text="draw overlay:") row.label(text="draw overlay:")
row.prop(net_settings, "enable_presence", text="") row.prop(settings, "enable_presence", text="")
row = box.row() row = box.row()
row.label(text="clear blend:") row.label(text="clear blend:")
row.prop(net_settings, "start_empty", text="") row.prop(settings, "start_empty", text="")
row = box.row() row = box.row()
row = box.row() row = box.row()
row.prop(net_settings, "session_mode", expand=True) row.prop(settings, "session_mode", expand=True)
row = box.row() row = box.row()
if window_manager.session.session_mode == 'HOST': if window_manager.session.session_mode == 'HOST':
box = row.box() box = row.box()
row = box.row() row = box.row()
row.label(text="init scene:") row.label(text="init scene:")
row.prop(net_settings, "init_scene", text="") row.prop(settings, "init_scene", text="")
row = box.row() row = box.row()
row.operator("session.start", text="HOST").host = True row.operator("session.start", text="HOST").host = True
else: else:
box = row.box() box = row.box()
row = box.row() row = box.row()
row.prop(net_settings, "ip", text="ip") row.prop(settings, "ip", text="ip")
row = box.row() row = box.row()
row.label(text="port:") row.label(text="port:")
row.prop(window_manager.session, "port", text="") row.prop(window_manager.session, "port", text="")
row = box.row() row = box.row()
row.label(text="load data:")
row.prop(net_settings, "load_data", text="")
row = box.row() row = box.row()
@ -107,9 +105,6 @@ class SESSION_PT_settings(bpy.types.Panel):
row = layout.row() row = layout.row()
row.operator("session.stop", icon='QUIT', text="Exit") row.operator("session.stop", icon='QUIT', text="Exit")
# row = layout.row(align=True)
# row.operator("session.dump", icon='QUIT', text="Dump")
# row.operator("session.dump", icon='QUIT', text="Load")
row = layout.row() row = layout.row()
# STATE SYNCING # STATE SYNCING
@ -125,7 +120,7 @@ class SESSION_PT_settings(bpy.types.Panel):
class SESSION_PT_user(bpy.types.Panel): class SESSION_PT_user(bpy.types.Panel):
bl_idname = "MULTIUSER_USER_PT_panel" bl_idname = "MULTIUSER_USER_PT_panel"
bl_label = "Users online" bl_label = "Users"
bl_space_type = 'VIEW_3D' bl_space_type = 'VIEW_3D'
bl_region_type = 'UI' bl_region_type = 'UI'
bl_category = "Multiuser" bl_category = "Multiuser"
@ -137,7 +132,7 @@ class SESSION_PT_user(bpy.types.Panel):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
net_settings = context.window_manager.session settings = context.window_manager.session
scene = context.window_manager scene = context.window_manager
# Create a simple row. # Create a simple row.
row = layout.row() row = layout.row()
@ -151,13 +146,13 @@ class SESSION_PT_user(bpy.types.Panel):
# detail_item_box = item_box.row() # detail_item_box = item_box.row()
# username = key[0].split('/')[1] # username = key[0].split('/')[1]
# if username == net_settings.username: # if username == settings.username:
# info = "(self)" # info = "(self)"
# # detail_item_box = item_box.row() # # detail_item_box = item_box.row()
# detail_item_box.label( # detail_item_box.label(
# text="{} - {}".format(username, info)) # text="{} - {}".format(username, info))
# if net_settings.username not in key[0]: # if settings.username not in key[0]:
# detail_item_box.operator( # detail_item_box.operator(
# "session.snapview", text="", icon='VIEW_CAMERA').target_client = username # "session.snapview", text="", icon='VIEW_CAMERA').target_client = username
# row = layout.row() # row = layout.row()
@ -172,7 +167,7 @@ def get_client_key(item):
class SESSION_PT_outliner(bpy.types.Panel): class SESSION_PT_outliner(bpy.types.Panel):
bl_idname = "MULTIUSER_PROPERTIES_PT_panel" bl_idname = "MULTIUSER_PROPERTIES_PT_panel"
bl_label = "Replicated properties" bl_label = "Properties"
bl_space_type = 'VIEW_3D' bl_space_type = 'VIEW_3D'
bl_region_type = 'UI' bl_region_type = 'UI'
bl_category = "Multiuser" bl_category = "Multiuser"
@ -188,18 +183,16 @@ class SESSION_PT_outliner(bpy.types.Panel):
layout = self.layout layout = self.layout
if hasattr(context.window_manager,'session'): if hasattr(context.window_manager,'session'):
net_settings = context.window_manager.session settings = context.window_manager.session
scene = context.window_manager scene = context.window_manager
row = layout.row() row = layout.row()
row.prop(settings,'outliner_filter', text="")
row = layout.row(align=True) row = layout.row(align=True)
area_msg = layout.row()
# Property area # Property area
# area_msg = row.box() # area_msg = row.box()
client_keys = operators.client.list() client_keys = operators.client.list()
client_keys = operators.client.list()
if client_keys and len(client_keys) > 0: if client_keys and len(client_keys) > 0:
col = layout.column(align=True) col = layout.column(align=True)
for item in sorted(client_keys, key=get_client_key): for item in sorted(client_keys, key=get_client_key):
@ -207,19 +200,19 @@ class SESSION_PT_outliner(bpy.types.Panel):
item_box = area_msg.box() item_box = area_msg.box()
detail_item_box = item_box.row() detail_item_box = item_box.row()
detail_item_box.label(text="",icon=item.icon) detail_item_box.label(text="",icon=item.icon)
detail_item_box.label(text="{} ".format(item.uuid)) detail_item_box.label(text="{} ".format(item.pointer.name))
detail_item_box.label(text="{} ".format(item.owner)) detail_item_box.label(text="{} ".format(item.owner))
detail_item_box.label(text="{} ".format(PROP_STATES[item.state])) detail_item_box.label(text="{} ".format(PROP_STATES[item.state]))
# right_icon = "DECORATE_UNLOCKED" # right_icon = "DECORATE_UNLOCKED"
# if owner == net_settings.username: # if owner == settings.username:
# right_icon="DECORATE_UNLOCKED" # right_icon="DECORATE_UNLOCKED"
# else: # else:
# right_icon="DECORATE_LOCKED" # right_icon="DECORATE_LOCKED"
# ro = detail_item_box.operator("session.right", text="",emboss=net_settings.is_admin, icon=right_icon) # ro = detail_item_box.operator("session.right", text="",emboss=settings.is_admin, icon=right_icon)
# ro.key = item[0] # ro.key = item[0]
# detail_item_box.operator( # detail_item_box.operator(
# "session.remove_prop", text="", icon="X").property_path = key # "session.remove_prop", text="", icon="X").property_path = key