Use `addSubArguments()` to set GUI sub arguments

This commit is contained in:
Martchus 2022-08-06 19:14:18 +02:00
parent 6f0c5af8fc
commit 04a4fe89ec
2 changed files with 3 additions and 9 deletions

View File

@ -93,7 +93,7 @@ set(REQUIRED_ICONS
window-close)
# find c++utilities
find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.17.0 REQUIRED)
find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.19.0 REQUIRED)
use_cpp_utilities()
# find qtutilities

View File

@ -168,14 +168,8 @@ int runApplication(int argc, const char *const *argv)
auto singleInstance = Argument("single-instance", '\0', "does nothing if a tray icon is already shown");
auto newInstanceArg = Argument("new-instance", '\0', "disable the usual single-process behavior");
auto &widgetsGuiArg = qtConfigArgs.qtWidgetsGuiArg();
widgetsGuiArg.addSubArgument(&windowedArg);
widgetsGuiArg.addSubArgument(&showWebUiArg);
widgetsGuiArg.addSubArgument(&triggerArg);
widgetsGuiArg.addSubArgument(&waitForTrayArg);
widgetsGuiArg.addSubArgument(&connectionArg);
widgetsGuiArg.addSubArgument(&configPathArg);
widgetsGuiArg.addSubArgument(&singleInstance);
widgetsGuiArg.addSubArgument(&newInstanceArg);
widgetsGuiArg.addSubArguments(
{ &windowedArg, &showWebUiArg, &triggerArg, &waitForTrayArg, &connectionArg, &configPathArg, &singleInstance, &newInstanceArg });
#ifdef SYNCTHINGTRAY_USE_LIBSYNCTHING
auto cliArg = OperationArgument("cli", 'c', "run Syncthing's CLI");
auto cliHelp = ConfigValueArgument("help", 'h', "show help for Syncthing's CLI");