status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix markup stuff

This commit is contained in:
Patrick von Reth 2015-06-26 11:37:34 +02:00
parent 3031723315
commit 711e880dd7
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsnore/notification/notification.cpp
View File

@ -94,20 +94,12 @@ const Application &Notification::application() const
QString Notification::title(Utils::MARKUP_FLAGS flags) const
{
if(!application().constHints().value("use-markup").toBool()) {
return d->m_title.toHtmlEscaped();
} else {
return Utils::normaliseMarkup(d->m_title, flags);
}
return d->resolveMarkup(d->m_title, flags);
}
QString Notification::text(Utils::MARKUP_FLAGS flags) const
{
if(!application().constHints().value("use-markup").toBool()) {
return d->m_text.toHtmlEscaped();
}else {
return Utils::normaliseMarkup(d->m_text, flags);
}
return d->resolveMarkup(d->m_text, flags);
}
const Alert &Notification::alert() const

9
src/libsnore/notification/notification_p.cpp
View File

@ -90,6 +90,15 @@ void NotificationData::setTimeoutTimer(QTimer *timer)
m_timeoutTimer.reset(timer);
}
QString NotificationData::resolveMarkup(const QString &string, Utils::MARKUP_FLAGS flags)
{
if(flags != Utils::NO_MARKUP && !m_application.constHints().value("use-markup").toBool()) {
return string.toHtmlEscaped();
} else {
return Utils::normaliseMarkup(string, flags);
}
}
void NotificationData::initHints()
{
m_hints.setValue("silent", SnoreCore::instance().value("Silent", LOCAL_SETTING));

2
src/libsnore/notification/notification_p.h
View File

@ -48,6 +48,8 @@ public:
void setTimeoutTimer(QTimer *timer);
QString resolveMarkup(const QString &string, Utils::MARKUP_FLAGS flags);
private:
Q_DISABLE_COPY(NotificationData)