Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow avoiding a second tray icon via `--single-instance` 

See https://github.com/Martchus/syncthingtray/issues/142
This commit is contained in:
Martchus 2022-06-16 17:37:49 +02:00
parent 7156b68ebb
commit 3bcbd2285d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tray/application/main.cpp
View File

@ -166,7 +166,8 @@ int runApplication(int argc, const char *const *argv)
connectionArg.setRequiredValueCount(Argument::varValueCount);
ConfigValueArgument configPathArg("config-dir-path", '\0', "specifies the path to the configuration directory", { "path" });
configPathArg.setEnvironmentVariable(PROJECT_VARNAME_UPPER "_CONFIG_DIR");
ConfigValueArgument newInstanceArg("new-instance", '\0', "disable the usual single-process behavior");
Argument singleInstance("single-instance", '\0', "does nothing if a tray icon is already shown");
Argument newInstanceArg("new-instance", '\0', "disable the usual single-process behavior");
Argument &widgetsGuiArg = qtConfigArgs.qtWidgetsGuiArg();
widgetsGuiArg.addSubArgument(&windowedArg);
widgetsGuiArg.addSubArgument(&showWebUiArg);
@ -174,6 +175,7 @@ int runApplication(int argc, const char *const *argv)
widgetsGuiArg.addSubArgument(&waitForTrayArg);
widgetsGuiArg.addSubArgument(&connectionArg);
widgetsGuiArg.addSubArgument(&configPathArg);
widgetsGuiArg.addSubArgument(&singleInstance);
widgetsGuiArg.addSubArgument(&newInstanceArg);
parser.setMainArguments({ &qtConfigArgs.qtWidgetsGuiArg(), &parser.noColorArg(), &parser.helpArg() });
@ -225,11 +227,17 @@ int runApplication(int argc, const char *const *argv)
}
// trigger actions if --webui or --trigger is present but don't create a new tray icon
if (!TrayWidget::instances().empty() && (showWebUiArg.isPresent() || triggerArg.isPresent())) {
const auto firstInstance = TrayWidget::instances().empty();
if (!firstInstance && (showWebUiArg.isPresent() || triggerArg.isPresent())) {
trigger(triggerArg.isPresent(), showWebUiArg.isPresent());
return 0;
}
// don't create a new instance if --single-instance has been specified
if (!firstInstance && singleInstance.isPresent()) {
return 0;
}
// create new/additional tray icon
const auto res = initSyncthingTray(windowedArg.isPresent(), waitForTrayArg.isPresent(), connectionArg);
if (!res) {