projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging r726:730 from trunk to branches/0.3. This forwardports everything except...
[quassel.git]
/
src
/
client
/
clientsettings.cpp
diff --git
a/src/client/clientsettings.cpp
b/src/client/clientsettings.cpp
index
7cccac6
..
64274a3
100644
(file)
--- a/
src/client/clientsettings.cpp
+++ b/
src/client/clientsettings.cpp
@@
-98,26
+98,30
@@
QHash<int, BufferId> CoreAccountSettings::jumpKeyMap() {
}
return keyMap;
}
}
return keyMap;
}
-
void CoreAccountSettings::removeAccount(AccountId id) {
removeLocalKey(QString("%1").arg(id.toInt()));
}
void CoreAccountSettings::removeAccount(AccountId id) {
removeLocalKey(QString("%1").arg(id.toInt()));
}
+
/***********************************************************************************************/
/***********************************************************************************************/
+// NotificationSettings:
-BufferSettings::BufferSettings(BufferId bufferId)
- : CoreAccountSettings(QString("Buffers/%1").arg(bufferId.toInt()))
-{
+NotificationSettings::NotificationSettings() : ClientSettings("Notification") {
}
}
-void
BufferSettings::setLastSeen(QDateTime seenDate
) {
- set
AccountValue("LastSeen", seenDate
);
+void
NotificationSettings::setHighlightList(const QVariantList &highlightList
) {
+ set
LocalValue("highlightList", highlightList
);
}
}
-Q
DateTime BufferSettings::lastSeen
() {
- return
accountValue("LastSeen", QDateTime()).value<QDateTime>
();
+Q
VariantList NotificationSettings::highlightList
() {
+ return
localValue("highlightList").toList
();
}
}
-/***********************************************************************************************/
+void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickType highlightNickType) {
+ setLocalValue("highlightNick", highlightNickType);
+}
+NotificationSettings::HighlightNickType NotificationSettings::highlightNick() {
+ return (NotificationSettings::HighlightNickType) localValue("highlightNick", CurrentNick).toInt();
+}