blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull Requests 3 Actions Releases 10 Wiki Activity

feat/tray_pictogram #70

Open
pavanvo wants to merge 30 commits from pavanvo/squawk:feat/tray_pictogram into settings
pull from: pavanvo/squawk:feat/tray_pictogram
merge into: blue:settings
Conversation 2 Commits 30 Files Changed 82 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2fcc432aef - Show all commits

3
main/application.cpp
View File

@ -220,7 +220,7 @@ void Application::notify(const QString& account, const Shared::Message& msg)
args << QString("mail-message"); //TODO should here better be unknown user icon? args << QString("mail-message"); //TODO should here better be unknown user icon?
} }
if (msg.getType() == Shared::Message::groupChat) { if (msg.getType() == Shared::Message::groupChat) {
args << msg.getFromResource() + " from " + name; args << msg.getFromResource() + tr(" from ") + name;
} else { } else {
args << name; args << name;
} }
@ -239,6 +239,7 @@ void Application::notify(const QString& account, const Shared::Message& msg)
args << QVariantMap({ args << QVariantMap({
{"desktop-entry", qApp->desktopFileName()}, {"desktop-entry", qApp->desktopFileName()},
{"category", QString("message")}, {"category", QString("message")},
{"urgency", 1},
// {"sound-file", "/path/to/macaw/squawk"}, // {"sound-file", "/path/to/macaw/squawk"},
{"sound-name", QString("message-new-instant")} {"sound-name", QString("message-new-instant")}
}); });

2
shared/utils.cpp
View File

@ -40,5 +40,5 @@ QString Shared::processMessageBody(const QString& msg)
{ {
QString processed = msg.toHtmlEscaped(); QString processed = msg.toHtmlEscaped();
processed.replace(urlReg, "<a href=\"\\1\">\\1</a>"); processed.replace(urlReg, "<a href=\"\\1\">\\1</a>");
return "<p style=\"white-space: pre-wrap;\">" + processed + "</p>"; return processed;
} }