kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Make restarts optional for Kotatogram settings

Browse source
This commit is contained in:
Eric Kotato 2022-02-17 07:34:44 +03:00
parent 887223bacb
commit 7c376c3a0b
6 changed files with 91 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Telegram/SourceFiles/kotato/boxes/kotato_fonts_box.cpp
View file

@ -257,24 +257,14 @@ void FontsBox::setInnerFocus() {
} }
void FontsBox::save() { void FontsBox::save() {
const auto useSystemFont = _useSystemFont->checked(); ::Kotato::JsonSettings::SetAfterRestart("fonts/main", _mainFontName->getLastText().trimmed());
const auto useOriginalMetrics = _useOriginalMetrics->checked(); ::Kotato::JsonSettings::SetAfterRestart("fonts/semibold", _semiboldFontName->getLastText().trimmed());
const auto mainFont = _mainFontName->getLastText().trimmed(); ::Kotato::JsonSettings::SetAfterRestart("fonts/monospaced", _monospacedFontName->getLastText().trimmed());
const auto semiboldFont = _semiboldFontName->getLastText().trimmed(); ::Kotato::JsonSettings::SetAfterRestart("fonts/semibold_is_bold", _semiboldIsBold->checked());
const auto semiboldIsBold = _semiboldIsBold->checked(); ::Kotato::JsonSettings::SetAfterRestart("fonts/use_system_font", _useSystemFont->checked());
const auto monospacedFont = _monospacedFontName->getLastText().trimmed(); ::Kotato::JsonSettings::SetAfterRestart("fonts/use_original_metrics", _useOriginalMetrics->checked());
::Kotato::JsonSettings::SetAfterRestart("fonts/size", _fontSize);
const auto changeFonts = [=] { ::Kotato::JsonSettings::Write();
::Kotato::JsonSettings::SetAfterRestart("fonts/main", mainFont);
::Kotato::JsonSettings::SetAfterRestart("fonts/semibold", semiboldFont);
::Kotato::JsonSettings::SetAfterRestart("fonts/monospaced", monospacedFont);
::Kotato::JsonSettings::SetAfterRestart("fonts/semibold_is_bold", semiboldIsBold);
::Kotato::JsonSettings::SetAfterRestart("fonts/use_system_font", useSystemFont);
::Kotato::JsonSettings::SetAfterRestart("fonts/use_original_metrics", useOriginalMetrics);
::Kotato::JsonSettings::SetAfterRestart("fonts/size", _fontSize);
::Kotato::JsonSettings::Write();
Core::Restart();
};
const auto box = std::make_shared<QPointer<BoxContent>>(); const auto box = std::make_shared<QPointer<BoxContent>>();
@ -282,22 +272,20 @@ void FontsBox::save() {
Box<Ui::ConfirmBox>( Box<Ui::ConfirmBox>(
tr::lng_settings_need_restart(tr::now), tr::lng_settings_need_restart(tr::now),
tr::lng_settings_restart_now(tr::now), tr::lng_settings_restart_now(tr::now),
tr::lng_cancel(tr::now), tr::lng_settings_restart_later(tr::now),
changeFonts)); [] { Core::Restart(); },
[=] { closeBox(); }));
} }
void FontsBox::resetToDefault() { void FontsBox::resetToDefault() {
const auto resetFonts = [=] { ::Kotato::JsonSettings::ResetAfterRestart("fonts/main");
::Kotato::JsonSettings::ResetAfterRestart("fonts/main"); ::Kotato::JsonSettings::ResetAfterRestart("fonts/semibold");
::Kotato::JsonSettings::ResetAfterRestart("fonts/semibold"); ::Kotato::JsonSettings::ResetAfterRestart("fonts/monospaced");
::Kotato::JsonSettings::ResetAfterRestart("fonts/monospaced"); ::Kotato::JsonSettings::ResetAfterRestart("fonts/semibold_is_bold");
::Kotato::JsonSettings::ResetAfterRestart("fonts/semibold_is_bold"); ::Kotato::JsonSettings::ResetAfterRestart("fonts/size");
::Kotato::JsonSettings::ResetAfterRestart("fonts/size"); ::Kotato::JsonSettings::ResetAfterRestart("fonts/use_system_font");
::Kotato::JsonSettings::ResetAfterRestart("fonts/use_system_font"); ::Kotato::JsonSettings::ResetAfterRestart("fonts/use_original_metrics");
::Kotato::JsonSettings::ResetAfterRestart("fonts/use_original_metrics"); ::Kotato::JsonSettings::Write();
::Kotato::JsonSettings::Write();
Core::Restart();
};
const auto box = std::make_shared<QPointer<BoxContent>>(); const auto box = std::make_shared<QPointer<BoxContent>>();
@ -305,6 +293,7 @@ void FontsBox::resetToDefault() {
Box<Ui::ConfirmBox>( Box<Ui::ConfirmBox>(
tr::lng_settings_need_restart(tr::now), tr::lng_settings_need_restart(tr::now),
tr::lng_settings_restart_now(tr::now), tr::lng_settings_restart_now(tr::now),
tr::lng_cancel(tr::now), tr::lng_settings_restart_later(tr::now),
resetFonts)); [] { Core::Restart(); },
[=] { closeBox(); }));
} }

12
Telegram/SourceFiles/kotato/boxes/kotato_radio_box.cpp
View file

@ -157,22 +157,18 @@ void RadioBox::prepare() {
} }
void RadioBox::save() { void RadioBox::save() {
_saveCallback(_group->value());
if (_warnRestart) { if (_warnRestart) {
const auto saveAfterWarn = [=] {
_saveCallback(_group->value());
Core::Restart();
};
const auto box = std::make_shared<QPointer<BoxContent>>(); const auto box = std::make_shared<QPointer<BoxContent>>();
*box = getDelegate()->show( *box = getDelegate()->show(
Box<Ui::ConfirmBox>( Box<Ui::ConfirmBox>(
tr::lng_settings_need_restart(tr::now), tr::lng_settings_need_restart(tr::now),
tr::lng_settings_restart_now(tr::now), tr::lng_settings_restart_now(tr::now),
tr::lng_cancel(tr::now), tr::lng_settings_restart_later(tr::now),
saveAfterWarn)); [] { Core::Restart(); },
[=] { closeBox(); }));
} else { } else {
_saveCallback(_group->value());
closeBox(); closeBox();
} }
} }

27
Telegram/SourceFiles/kotato/kotato_settings.cpp
View file

@ -51,7 +51,10 @@ public:
const QString &key, const QString &key,
uint64 accountId = 0, uint64 accountId = 0,
bool isTestAccount = false); bool isTestAccount = false);
[[nodiscard]] rpl::producer<bool> restartEvents(); [[nodiscard]] rpl::producer<QString> eventsWithPending(
const QString &key,
uint64 accountId = 0,
bool isTestAccount = false);
void set( void set(
const QString &key, const QString &key,
QVariant value, QVariant value,
@ -71,7 +74,6 @@ public:
uint64 accountId = 0, uint64 accountId = 0,
bool isTestAccount = false); bool isTestAccount = false);
void writeTimeout(); void writeTimeout();
bool needRestart();
private: private:
[[nodiscard]] QVariant getDefault(const QString &key); [[nodiscard]] QVariant getDefault(const QString &key);
@ -84,7 +86,7 @@ private:
base::Timer _jsonWriteTimer; base::Timer _jsonWriteTimer;
rpl::event_stream<QString> _eventStream; rpl::event_stream<QString> _eventStream;
rpl::event_stream<bool> _restartEventStream; rpl::event_stream<QString> _pendingEventStream;
QHash<QString, QVariant> _settingsHashMap; QHash<QString, QVariant> _settingsHashMap;
QHash<QString, QVariant> _defaultSettingsHashMap; QHash<QString, QVariant> _defaultSettingsHashMap;
@ -785,8 +787,9 @@ rpl::producer<QString> Manager::events(const QString &key, uint64 accountId, boo
return _eventStream.events() | rpl::filter(rpl::mappers::_1 == mapKey); return _eventStream.events() | rpl::filter(rpl::mappers::_1 == mapKey);
} }
rpl::producer<bool> Manager::restartEvents() { rpl::producer<QString> Manager::eventsWithPending(const QString &key, uint64 accountId, bool isTestAccount) {
return _restartEventStream.events(); const auto mapKey = MakeMapKey(key, accountId, isTestAccount);
return _pendingEventStream.events() | rpl::filter(rpl::mappers::_1 == mapKey);
} }
void Manager::set(const QString &key, QVariant value, uint64 accountId, bool isTestAccount) { void Manager::set(const QString &key, QVariant value, uint64 accountId, bool isTestAccount) {
@ -797,7 +800,6 @@ void Manager::set(const QString &key, QVariant value, uint64 accountId, bool isT
void Manager::setAfterRestart(const QString &key, QVariant value, uint64 accountId, bool isTestAccount) { void Manager::setAfterRestart(const QString &key, QVariant value, uint64 accountId, bool isTestAccount) {
const auto mapKey = MakeMapKey(key, accountId, isTestAccount); const auto mapKey = MakeMapKey(key, accountId, isTestAccount);
const auto oldNeedRestart = needRestart();
if (!_settingsHashMap.contains(mapKey) if (!_settingsHashMap.contains(mapKey)
|| _settingsHashMap.value(mapKey) != value) { || _settingsHashMap.value(mapKey) != value) {
_defaultSettingsHashMap.insert(mapKey, value); _defaultSettingsHashMap.insert(mapKey, value);
@ -805,10 +807,7 @@ void Manager::setAfterRestart(const QString &key, QVariant value, uint64 account
&& _settingsHashMap.value(mapKey) == value) { && _settingsHashMap.value(mapKey) == value) {
_defaultSettingsHashMap.remove(mapKey); _defaultSettingsHashMap.remove(mapKey);
} }
const auto newNeedRestart = needRestart(); _pendingEventStream.fire_copy(mapKey);
if (oldNeedRestart != newNeedRestart) {
_restartEventStream.fire_copy(newNeedRestart);
}
} }
void Manager::reset(const QString &key, uint64 accountId, bool isTestAccount) { void Manager::reset(const QString &key, uint64 accountId, bool isTestAccount) {
@ -1003,10 +1002,6 @@ void Manager::writeTimeout() {
writeCurrentSettings(); writeCurrentSettings();
} }
bool Manager::needRestart() {
return _defaultSettingsHashMap.size() > 0;
}
void Manager::writing() { void Manager::writing() {
_jsonWriteTimer.cancel(); _jsonWriteTimer.cancel();
} }
@ -1048,8 +1043,8 @@ rpl::producer<QString> Events(const QString &key, uint64 accountId, bool isTestA
return (Data) ? Data->events(key, accountId, isTestAccount) : rpl::single(QString()); return (Data) ? Data->events(key, accountId, isTestAccount) : rpl::single(QString());
} }
rpl::producer<bool> RestartEvents() { rpl::producer<QString> EventsWithPending(const QString &key, uint64 accountId, bool isTestAccount) {
return (Data) ? Data->restartEvents() : rpl::single(false); return (Data) ? Data->eventsWithPending(key, accountId, isTestAccount) : rpl::single(QString());
} }
void Set(const QString &key, QVariant value, uint64 accountId, bool isTestAccount) { void Set(const QString &key, QVariant value, uint64 accountId, bool isTestAccount) {

5
Telegram/SourceFiles/kotato/kotato_settings.h
View file

@ -32,7 +32,10 @@ void Finish();
const QString &key, const QString &key,
uint64 accountId = 0, uint64 accountId = 0,
bool isTestAccount = false); bool isTestAccount = false);
[[nodiscard]] rpl::producer<bool> RestartEvents(); [[nodiscard]] rpl::producer<QString> EventsWithPending(
const QString &key,
uint64 accountId = 0,
bool isTestAccount = false);
void Set( void Set(
const QString &key, const QString &key,
QVariant value, QVariant value,

77
Telegram/SourceFiles/kotato/kotato_settings_menu.cpp
View file

@ -305,20 +305,34 @@ void SetupKotatoChats(
Ui::show(Box<FontsBox>()); Ui::show(Box<FontsBox>());
}); });
AddButtonWithLabel( const auto userpicCornerButton = container->add(
container, object_ptr<Button>(
rktr("ktg_settings_userpic_rounding"), container,
rpl::single(UserpicRoundingLabel(::Kotato::JsonSettings::GetInt("userpic_corner_type"))), rktr("ktg_settings_userpic_rounding"),
st::settingsButton st::settingsButton));
)->addClickHandler([=] { auto userpicCornerText = rpl::single(
UserpicRoundingLabel(::Kotato::JsonSettings::GetIntWithPending("userpic_corner_type"))
) | rpl::then(
::Kotato::JsonSettings::EventsWithPending(
"userpic_corner_type"
) | rpl::map([] {
return UserpicRoundingLabel(::Kotato::JsonSettings::GetIntWithPending("userpic_corner_type"));
})
);
CreateRightLabel(
userpicCornerButton,
std::move(userpicCornerText),
st::settingsButton,
rktr("ktg_settings_userpic_rounding"));
userpicCornerButton->addClickHandler([=] {
Ui::show(Box<::Kotato::RadioBox>( Ui::show(Box<::Kotato::RadioBox>(
ktr("ktg_settings_userpic_rounding"), ktr("ktg_settings_userpic_rounding"),
ktr("ktg_settings_userpic_rounding_desc"), ktr("ktg_settings_userpic_rounding_desc"),
::Kotato::JsonSettings::GetInt("userpic_corner_type"), ::Kotato::JsonSettings::GetIntWithPending("userpic_corner_type"),
4, 4,
UserpicRoundingLabel, UserpicRoundingLabel,
[=] (int value) { [=] (int value) {
::Kotato::JsonSettings::Set("userpic_corner_type", value); ::Kotato::JsonSettings::SetAfterRestart("userpic_corner_type", value);
::Kotato::JsonSettings::Write(); ::Kotato::JsonSettings::Write();
}, true)); }, true));
}); });
@ -541,12 +555,26 @@ void SetupKotatoNetwork(not_null<Ui::VerticalLayout*> container) {
AddSkip(container); AddSkip(container);
AddSubsectionTitle(container, rktr("ktg_settings_network")); AddSubsectionTitle(container, rktr("ktg_settings_network"));
AddButtonWithLabel( const auto netBoostButton = container->add(
container, object_ptr<Button>(
rktr("ktg_settings_net_speed_boost"), container,
rpl::single(NetBoostLabel(::Kotato::JsonSettings::GetIntWithPending("net_speed_boost"))), rktr("ktg_settings_net_speed_boost"),
st::settingsButton st::settingsButton));
)->addClickHandler([=] { auto netBoostText = rpl::single(
NetBoostLabel(::Kotato::JsonSettings::GetIntWithPending("net_speed_boost"))
) | rpl::then(
::Kotato::JsonSettings::EventsWithPending(
"net_speed_boost"
) | rpl::map([] {
return NetBoostLabel(::Kotato::JsonSettings::GetIntWithPending("net_speed_boost"));
})
);
CreateRightLabel(
netBoostButton,
std::move(netBoostText),
st::settingsButton,
rktr("ktg_settings_net_speed_boost"));
netBoostButton->addClickHandler([=] {
Ui::show(Box<::Kotato::RadioBox>( Ui::show(Box<::Kotato::RadioBox>(
ktr("ktg_net_speed_boost_title"), ktr("ktg_net_speed_boost_title"),
ktr("ktg_net_speed_boost_desc"), ktr("ktg_net_speed_boost_desc"),
@ -587,31 +615,24 @@ void SetupKotatoSystem(
AddSubsectionTitle(container, rktr("ktg_settings_system")); AddSubsectionTitle(container, rktr("ktg_settings_system"));
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
const auto qtScaleToggled = Ui::CreateChild<rpl::event_stream<bool>>(
container.get());
AddButton( AddButton(
container, container,
rktr("ktg_settings_qt_scale"), rktr("ktg_settings_qt_scale"),
st::settingsButton st::settingsButton
)->toggleOn( )->toggleOn(
qtScaleToggled->events_starting_with_copy(::Kotato::JsonSettings::GetBool("qt_scale")) rpl::single(::Kotato::JsonSettings::GetBoolWithPending("qt_scale"))
)->toggledValue( )->toggledValue(
) | rpl::filter([](bool enabled) { ) | rpl::filter([](bool enabled) {
return (enabled != ::Kotato::JsonSettings::GetBool("qt_scale")); return (enabled != ::Kotato::JsonSettings::GetBoolWithPending("qt_scale"));
}) | rpl::start_with_next([=](bool enabled) { }) | rpl::start_with_next([=](bool enabled) {
const auto confirmed = [=] { ::Kotato::JsonSettings::SetAfterRestart("qt_scale", enabled);
::Kotato::JsonSettings::Set("qt_scale", enabled); ::Kotato::JsonSettings::Write();
::Kotato::JsonSettings::Write();
Core::Restart();
};
const auto cancelled = [=] {
qtScaleToggled->fire(::Kotato::JsonSettings::GetBool("qt_scale") == true);
};
Ui::show(Box<Ui::ConfirmBox>( Ui::show(Box<Ui::ConfirmBox>(
tr::lng_settings_need_restart(tr::now), tr::lng_settings_need_restart(tr::now),
tr::lng_settings_restart_now(tr::now), tr::lng_settings_restart_now(tr::now),
confirmed, tr::lng_settings_restart_later(tr::now),
cancelled)); [] { Core::Restart(); }));
}, container->lifetime()); }, container->lifetime());
#endif // Qt < 6.0.0 #endif // Qt < 6.0.0

2
Telegram/SourceFiles/settings/settings_common.cpp
View file

@ -255,7 +255,7 @@ void FillMenu(
&st::menuIconSettings); &st::menuIconSettings);
addAction( addAction(
ktr("ktg_settings_restart"), ktr("ktg_settings_restart"),
[=] { Core::Restart(); }, [] { Core::Restart(); },
&st::menuIconRestore); &st::menuIconRestore);
if (type != Type::Kotato) { if (type != Type::Kotato) {
addAction( addAction(