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

feat(ui): append owner display

Browse Source
This commit is contained in:
Swann Martinez 2019-04-22 12:14:39 +02:00
parent 931dc61d53
commit 33adb26507
No known key found for this signature in database
GPG Key ID: 414CCAFD8DA720E1
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client.py
View File

@ -210,7 +210,12 @@ class RCFClientAgent(object):
if value else umsgpack.packb(''))
elif command == b"LIST":
self.pipe.send(umsgpack.packb(list(self.property_map)))
dump_list = []
for k,v in self.property_map.items():
dump_list.append([k,v.id])
self.pipe.send(umsgpack.packb(dump_list)
if dump_list else umsgpack.packb(''))
def rcf_client_agent(ctx, pipe, queue):
@ -362,6 +367,7 @@ class SyncAgent(object):
pass
def sync_agent(ctx, pipe):
agent = SyncAgent(ctx, pipe)
@ -383,4 +389,4 @@ def sync_agent(ctx, pipe):
agent.control_message()
# Synchronisation

21
ui.py
View File

@ -62,8 +62,6 @@ class SessionSettingsPanel(bpy.types.Panel):
else:
if operators.client_instance.agent.is_alive():
row.label(text="Net frequency:")
row.prop(net_settings, "update_frequency", text="")
row = layout.row()
row.operator("session.stop", icon='QUIT', text="Exit")
# elif operators.client.status is client.RCFStatus.CONNECTING:
@ -97,19 +95,19 @@ class SessionUsersPanel(bpy.types.Panel):
row = layout.row()
if operators.client_keys and len(operators.client_keys) > 0:
for key in operators.client_keys:
if 'Client' in key:
if 'Client' in key[0]:
info = ""
item_box = row.box()
detail_item_box = item_box.row()
username = key.split('/')[1]
username = key[0].split('/')[1]
if username == net_settings.username:
info = "(self)"
# detail_item_box = item_box.row()
detail_item_box.label(
text="{} - {}".format(username, info))
if net_settings.username not in key:
if net_settings.username not in key[0]:
detail_item_box.operator(
"session.snapview", text="", icon='VIEW_CAMERA').target_client = username
row = layout.row()
@ -157,13 +155,22 @@ class SessionPropertiesPanel(bpy.types.Panel):
icon="UV_SYNC_SELECT")
if operators.client_keys and len(operators.client_keys) > 0:
for item in operators.client_keys:
owner = item[1].decode()
item_box = area_msg.box()
detail_item_box = item_box.row()
detail_item_box = item_box.row(align = True)
# detail_item_box = item_box.row()
detail_item_box.label(text="{}".format(item))
detail_item_box.label(text="{} ".format(item[0]))
detail_item_box.label(text="{} ".format(owner))
if owner == net_settings.username:
detail_item_box.label(text="",icon="DECORATE_UNLOCKED")
else:
detail_item_box.label(text="",icon="DECORATE_LOCKED")
# detail_item_box.operator(
# "session.remove_prop", text="", icon="X").property_path = key
else: