Update icon on macOS, allow changing back.

This commit is contained in:
John Preston
2023-02-28 20:49:45 +04:00
parent c575e61853
commit aa9e56c633
35 changed files with 157 additions and 8 deletions
+9 -2
View File
@@ -198,7 +198,8 @@ QByteArray Settings::serialize() const {
+ sizeof(quint64)
+ sizeof(qint32) * 3
+ Serialize::bytearraySize(mediaViewPosition)
+ sizeof(qint32);
+ sizeof(qint32)
+ sizeof(quint64);
auto result = QByteArray();
result.reserve(size);
@@ -331,7 +332,8 @@ QByteArray Settings::serialize() const {
<< qint32(_windowTitleContent.current().hideAccountName ? 1 : 0)
<< qint32(_windowTitleContent.current().hideTotalUnread ? 1 : 0)
<< mediaViewPosition
<< qint32(_ignoreBatterySaving.current() ? 1 : 0);
<< qint32(_ignoreBatterySaving.current() ? 1 : 0)
<< quint64(_macRoundIconDigest.value_or(0));
}
return result;
}
@@ -436,6 +438,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
qint32 hideTotalUnread = _windowTitleContent.current().hideTotalUnread ? 1 : 0;
QByteArray mediaViewPosition;
qint32 ignoreBatterySaving = _ignoreBatterySaving.current() ? 1 : 0;
quint64 macRoundIconDigest = _macRoundIconDigest.value_or(0);
stream >> themesAccentColors;
if (!stream.atEnd()) {
@@ -667,6 +670,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
if (!stream.atEnd()) {
stream >> ignoreBatterySaving;
}
if (!stream.atEnd()) {
stream >> macRoundIconDigest;
}
if (stream.status() != QDataStream::Ok) {
LOG(("App Error: "
"Bad data for Core::Settings::constructFromSerialized()"));
@@ -864,6 +870,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
}
}
_ignoreBatterySaving = (ignoreBatterySaving == 1);
_macRoundIconDigest = macRoundIconDigest ? macRoundIconDigest : std::optional<uint64>();
}
QString Settings::getSoundPath(const QString &key) const {