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

refactor: remove ip from host parameters

Browse Source
This commit is contained in:
Swann 2020-06-16 18:25:49 +02:00
parent bcdefca32c
commit 63a36ad5d4
No known key found for this signature in database
GPG Key ID: 5E0D936BD280E963
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multi_user/libs/replication

@ -1 +1 @@
Subproject commit 6ed4e63b3d2f8afe3f10cad0992c9d4af1b9274a Subproject commit d65c6a6a2af2e53add5c31f7eef1aaaaa9060813

1
multi_user/operators.py
View File

@ -122,7 +122,6 @@ class SessionStartOperator(bpy.types.Operator):
try: try:
client.host( client.host(
id=settings.username, id=settings.username,
address=settings.ip,
port=settings.port, port=settings.port,
ipc_port=settings.ipc_port, ipc_port=settings.ipc_port,
timeout=settings.connection_timeout, timeout=settings.connection_timeout,

3
multi_user/preferences.py
View File

@ -362,7 +362,7 @@ class SessionProps(bpy.types.PropertyGroup):
update=presence.update_overlay_settings update=presence.update_overlay_settings
) )
presence_show_far_user: bpy.props.BoolProperty( presence_show_far_user: bpy.props.BoolProperty(
name="Show different scenes", name="Show users on different scenes",
description="Show user on different scenes", description="Show user on different scenes",
default=False, default=False,
update=presence.update_overlay_settings update=presence.update_overlay_settings
@ -379,6 +379,7 @@ class SessionProps(bpy.types.PropertyGroup):
) )
password: bpy.props.StringProperty( password: bpy.props.StringProperty(
name="password", name="password",
default=random_string_digits(),
description='Session password', description='Session password',
subtype='PASSWORD' subtype='PASSWORD'
) )

16
multi_user/ui.py
View File

@ -176,18 +176,22 @@ class SESSION_PT_settings_network(bpy.types.Panel):
box = row.box() box = row.box()
row = box.row()
row.prop(settings, "ip", text="IP")
row = box.row()
row.label(text="Port:")
row.prop(settings, "port", text="")
row = box.row()
if runtime_settings.session_mode == 'HOST': if runtime_settings.session_mode == 'HOST':
row = box.row()
row.label(text="Port:")
row.prop(settings, "port", text="")
row = box.row()
row.label(text="Admin password:") row.label(text="Admin password:")
row.prop(runtime_settings, "password", text="") row.prop(runtime_settings, "password", 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:
row = box.row()
row.prop(settings, "ip", text="IP")
row = box.row()
row.label(text="Port:")
row.prop(settings, "port", text="")
row = box.row()
row.prop(runtime_settings, "admin", text='Connect as admin', icon='DISCLOSURE_TRI_DOWN' if runtime_settings.admin row.prop(runtime_settings, "admin", text='Connect as admin', icon='DISCLOSURE_TRI_DOWN' if runtime_settings.admin
else 'DISCLOSURE_TRI_RIGHT') else 'DISCLOSURE_TRI_RIGHT')
if runtime_settings.admin: if runtime_settings.admin: