Skip to content

Commit

Permalink
Experimental settings tab on preferences dialog (#13)
Browse files Browse the repository at this point in the history
* Use new Qt checkbox member name

* Update subproject commit reference

* Add synergy-config.toml to .gitignore

* Add launch configurations

* Update subproject commit reference

* Update subproject commit reference

* Update subproject commit reference

* Update subproject commit reference

* Update subproject commit reference
  • Loading branch information
nbolton authored Jan 9, 2025
1 parent 7b3d1ba commit cd6371b
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ deskflow-config.toml
/scripts/*.egg-info
/*.user
*.ui.autosave
synergy-config.toml
100 changes: 99 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,48 @@
"program": "${workspaceFolder}/build/odin/bin/synergy",
"preLaunchTask": "build"
},
{
"name": "unix - unittests",
"type": "lldb",
"cwd": "${workspaceRoot}",
"request": "launch",
"program": "${workspaceFolder}/build/odin/bin/unittests",
"args": [ "${input:gtest-args}" ],
"preLaunchTask": "build"
},
{
"name": "unix - integtests",
"type": "lldb",
"cwd": "${workspaceRoot}",
"request": "launch",
"program": "${workspaceFolder}/build/odin/bin/integtests",
"args": [ "${input:gtest-args}" ],
"preLaunchTask": "build",
},
{
"name": "unix - server",
"type": "lldb",
"cwd": "${workspaceRoot}",
"request": "launch",
"program": "${workspaceFolder}/build/odin/bin/synergy-server",
"args": ["--config-toml", "synergy-config.toml"],
"preLaunchTask": "build"
},
{
"name": "unix - client",
"type": "lldb",
"cwd": "${workspaceRoot}",
"request": "launch",
"program": "${workspaceFolder}/build/odin/bin/synergy-client",
"args": ["--config-toml", "synergy-config.toml"],
"preLaunchTask": "build"
},
{
"name": "unix - attach",
"type": "lldb",
"request": "attach",
"pid": "${command:pickProcess}"
},
{
"name": "windows - gui",
"type": "cppvsdbg",
Expand All @@ -34,6 +76,62 @@
"program": "${workspaceFolder}/build/odin/bin/synergy",
"internalConsoleOptions": "openOnSessionStart",
"preLaunchTask": "kill-build"
}
},
{
"name": "windows - unittests",
"type": "cppvsdbg",
"cwd": "${workspaceRoot}",
"request": "launch",
"program": "${workspaceFolder}/build/odin/bin/unittests",
"args": [ "${input:gtest-args}" ],
"internalConsoleOptions": "openOnSessionStart",
"preLaunchTask": "build"
},
{
"name": "windows - integtests",
"type": "cppvsdbg",
"cwd": "${workspaceRoot}",
"request": "launch",
"program": "${workspaceFolder}/build/odin/bin/integtests",
"args": [ "${input:gtest-args}" ],
"internalConsoleOptions": "openOnSessionStart",
"preLaunchTask": "build"
},
{
"name": "windows - server",
"type": "cppvsdbg",
"cwd": "${workspaceRoot}",
"request": "launch",
"program": "${workspaceFolder}/build/odin/bin/synergy-server",
"args": ["--config-toml", "synergy-config.toml"],
"internalConsoleOptions": "openOnSessionStart",
"preLaunchTask": "build"
},
{
"name": "windows - client",
"type": "cppvsdbg",
"cwd": "${workspaceRoot}",
"request": "launch",
"program": "${workspaceFolder}/build/odin/bin/synergy-client",
"args": ["--config-toml", "synergy-config.toml"],
"internalConsoleOptions": "openOnSessionStart",
"preLaunchTask": "build"
},
{
"name": "windows - daemon",
"type": "cppvsdbg",
"cwd": "${workspaceRoot}",
"request": "launch",
"program": "${workspaceFolder}/build/odin/bin/synergy-daemon",
"args": ["-f"],
"internalConsoleOptions": "openOnSessionStart",
"preLaunchTask": "build"
},
{
"name": "windows - attach",
"type": "cppvsdbg",
"request": "attach",
"processId": "${command:pickProcess}"
},
]
}
2 changes: 1 addition & 1 deletion cmake/Odin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ macro(configure_gui_hook)
set(DESKFLOW_GUI_HOOK_START
"if (!synergy::hooks::onStart(&mainWindow, &appConfig)) { return 0; }")
set(DESKFLOW_GUI_HOOK_SETTINGS
"synergy::hooks::onSettings(this, m_pCheckBoxEnableTls, m_pInvertConnection);"
"synergy::hooks::onSettings(this, m_pCheckBoxEnableTls, m_pCheckBoxInvertConnection);"
)
set(DESKFLOW_GUI_HOOK_LIB "synergy-gui")

Expand Down

0 comments on commit cd6371b

Please sign in to comment.