every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'copy_and_paste' into develop

Browse Source 
# Conflicts:
#	src-python/config.py
#	src-python/model.py
This commit is contained in:
misyaguziya
2026-01-10 02:19:01 +09:00
parent 718706b2e4 c2a906fca8
commit 2d7f9b35ad
12 changed files with 374 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src-python/controller.py
View File

@@ -422,6 +422,11 @@ class Controller:
)
model.updateOverlayLargeLog(overlay_image)
if config.ENABLE_CLIPBOARD is True:
clipboard_message = self.messageFormatter("SEND", translation, message)
model.setCopyToClipboard(clipboard_message)
model.setPasteFromClipboard()
if model.checkWebSocketServerAlive() is True:
model.websocketSendMessage(
{
@@ -774,6 +779,11 @@ class Controller:
)
model.updateOverlayLargeLog(overlay_image)
if config.ENABLE_CLIPBOARD is True:
clipboard_message = self.messageFormatter("SEND", translation, message)
model.setCopyToClipboard(clipboard_message)
model.setPasteFromClipboard()
if model.checkWebSocketServerAlive() is True:
model.websocketSendMessage(
{
@@ -3068,6 +3078,23 @@ class Controller:
model.stopWebSocketServer()
return {"status":200, "result":config.WEBSOCKET_SERVER}
# Clipboard control
@staticmethod
def getClipboard(*args, **kwargs) -> dict:
return {"status":200, "result":config.ENABLE_CLIPBOARD}
@staticmethod
def setEnableClipboard(*args, **kwargs) -> dict:
if config.ENABLE_CLIPBOARD is False:
config.ENABLE_CLIPBOARD = True
return {"status":200, "result":config.ENABLE_CLIPBOARD}
@staticmethod
def setDisableClipboard(*args, **kwargs) -> dict:
if config.ENABLE_CLIPBOARD is True:
config.ENABLE_CLIPBOARD = False
return {"status":200, "result":config.ENABLE_CLIPBOARD}
def initializationProgress(self, progress):
self.run(200, self.run_mapping["initialization_progress"], progress)