aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

first fixes

Browse source
This commit is contained in:
Zach H 2015-07-12 11:00:11 -04:00
parent dc05a14f4c
commit 97f298452e
4 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/chatview.cpp
View file

@ -427,11 +427,6 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
cursor.setCharFormat(defaultFormat); cursor.setCharFormat(defaultFormat);
message = message.mid(firstSpace); message = message.mid(firstSpace);
QApplication::alert(this); QApplication::alert(this);
if (settingsCache->getShowMentionPopup() && shouldShowSystemPopup())
{
QString ref = sender.left(sender.length() - 2);
showSystemPopup(ref);
}
} }
else else
{ {

2
cockatrice/src/dlg_settings.cpp
View file

@ -710,7 +710,7 @@ void MessagesSettingsPage::retranslateUi()
messagePopups.setText(tr("Enable desktop notifications for private messages.")); messagePopups.setText(tr("Enable desktop notifications for private messages."));
mentionPopups.setText(tr("Enable desktop notification for mentions.")); mentionPopups.setText(tr("Enable desktop notification for mentions."));
hexLabel.setText(tr("(Color is hexadecimal)")); hexLabel.setText(tr("(Color is hexadecimal)"));
customAlertStringLabel.setText(tr("(Seperate each word with a comma; Words are case insensitive)")); customAlertStringLabel.setText(tr("(Seperate each word with a comma, words are case insensitive)"));
} }

2
cockatrice/src/settingscache.cpp
View file

@ -91,7 +91,7 @@ void SettingsCache::setCardInfoViewMode(const int _viewMode) {
settings->setValue("cards/cardinfoviewmode", cardInfoViewMode); settings->setValue("cards/cardinfoviewmode", cardInfoViewMode);
} }
void SettingsCache::setHighlightWords(const QString _highlightWords) { void SettingsCache::setHighlightWords(const QString &_highlightWords) {
// Words are seperated by a comma and you can not use spaces in words // Words are seperated by a comma and you can not use spaces in words
highlightWords = _highlightWords.simplified().replace(" ", "").split(","); highlightWords = _highlightWords.simplified().replace(" ", "").split(",");
settings->setValue("personal/highlightWords", highlightWords); settings->setValue("personal/highlightWords", highlightWords);

2
cockatrice/src/settingscache.h
View file

@ -196,7 +196,7 @@ public slots:
void setLeftJustified( const int _leftJustified); void setLeftJustified( const int _leftJustified);
void setMasterVolume(const int _masterVolume); void setMasterVolume(const int _masterVolume);
void setCardInfoViewMode(const int _viewMode); void setCardInfoViewMode(const int _viewMode);
void setHighlightWords(const QString _highlightWords); void setHighlightWords(const QString &_highlightWords);
}; };
extern SettingsCache *settingsCache; extern SettingsCache *settingsCache;