Skip to content

[pull] master from flameshot-org:master #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
May 24, 2025
Merged

[pull] master from flameshot-org:master #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,10 @@ int main(int argc, char* argv[])
{ "a", "autostart" },
QObject::tr("Enable or disable run at startup"),
QStringLiteral("bool"));
CommandOption notificationOption(
{ "n", "notifications" },
QObject::tr("Enable or disable the notifications"),
QStringLiteral("bool"));
CommandOption checkOption(
"check", QObject::tr("Check the configuration for errors"));
CommandOption showHelpOption(
Expand Down Expand Up @@ -329,6 +333,7 @@ int main(int argc, char* argv[])
pathOption.addChecker(pathChecker, pathErr);
trayOption.addChecker(booleanChecker, booleanErr);
autostartOption.addChecker(booleanChecker, booleanErr);
notificationOption.addChecker(booleanChecker, booleanErr);
showHelpOption.addChecker(booleanChecker, booleanErr);
screenNumberOption.addChecker(numericChecker, numberErr);

Expand Down Expand Up @@ -368,6 +373,7 @@ int main(int argc, char* argv[])
uploadOption },
fullArgument);
parser.AddOptions({ autostartOption,
notificationOption,
filenameOption,
trayOption,
showHelpOption,
Expand Down Expand Up @@ -539,13 +545,14 @@ int main(int argc, char* argv[])
return requestCaptureAndWait(req);
} else if (parser.isSet(configArgument)) { // CONFIG
bool autostart = parser.isSet(autostartOption);
bool notification = parser.isSet(notificationOption);
bool filename = parser.isSet(filenameOption);
bool tray = parser.isSet(trayOption);
bool mainColor = parser.isSet(mainColorOption);
bool contrastColor = parser.isSet(contrastColorOption);
bool check = parser.isSet(checkOption);
bool someFlagSet = (autostart || filename || tray || mainColor ||
contrastColor || check);
bool someFlagSet = (autostart || notification || filename || tray ||
mainColor || contrastColor || check);
if (check) {
AbstractLogger err = AbstractLogger::error(AbstractLogger::Stderr);
bool ok = ConfigHandler().checkForErrors(&err);
Expand All @@ -571,6 +578,10 @@ int main(int argc, char* argv[])
config.setStartupLaunch(parser.value(autostartOption) ==
"true");
}
if (notification) {
config.setShowDesktopNotification(
parser.value(notificationOption) == "true");
}
if (filename) {
QString newFilename(parser.value(filenameOption));
config.setFilenamePattern(newFilename);
Expand Down
Loading