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

Merge d95b85c16a into 52b300cb3a

Browse source
This commit is contained in:
blankie 2022-09-20 18:21:08 +03:00 • committed by GitHub
commit 9d4b11bf80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Telegram/Resources/langs/rewrites/en.json
View file

@ -273,5 +273,6 @@
"ktg_settings_view_profile_on_top_about": "This option also enables \"Add \"View Profile\"\" from TDesktop's experimental settings.",
"ktg_settings_emoji_sidebar": "Enable emoji sidebar",
"ktg_settings_emoji_sidebar_right_click": "Emoji sidebar on right click",
"ktg_settings_disable_short_info_box": "Disable short info box",
"dummy_last_string": ""
}

3
Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
View file

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "boxes/peers/edit_participants_box.h"
#include "kotato/kotato_settings.h"
#include "kotato/kotato_lang.h"
#include "api/api_chat_participants.h"
#include "boxes/peer_list_controllers.h"
@ -1495,7 +1496,7 @@ void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
showRestricted(user);
} else {
Assert(_navigation != nullptr);
if (_role != Role::Profile) {
if (_role != Role::Profile && !::Kotato::JsonSettings::GetBool("disable_short_info_box")) {
_navigation->parentController()->show(PrepareShortInfoBox(
participant,
_navigation));

5
Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp
View file

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "boxes/peers/edit_peer_requests_box.h"
#include "kotato/kotato_settings.h"
#include "ui/effects/ripple_animation.h"
#include "boxes/peer_list_controllers.h"
#include "boxes/peers/edit_participants_box.h" // SubscribeToMigration
@ -355,6 +356,10 @@ void RequestsBoxController::refreshDescription() {
}
void RequestsBoxController::rowClicked(not_null<PeerListRow*> row) {
if (::Kotato::JsonSettings::GetBool("disable_short_info_box")) {
_navigation->showPeerInfo(row->peer());
return;
}
_navigation->parentController()->show(PrepareShortInfoBox(
row->peer(),
_navigation));

5
Telegram/SourceFiles/history/view/reactions/message_reactions_list.cpp
View file

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "history/view/reactions/message_reactions_list.h"
#include "kotato/kotato_settings.h"
#include "history/view/reactions/message_reactions_selector.h"
#include "boxes/peer_list_box.h"
#include "boxes/peers/prepare_short_info_box.h"
@ -284,6 +285,10 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
const auto window = _window;
const auto peer = row->peer();
crl::on_main(window, [=] {
if (::Kotato::JsonSettings::GetBool("disable_short_info_box")) {
window->showPeerInfo(peer);
return;
}
window->show(PrepareShortInfoBox(peer, window));
});
}

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

@ -471,6 +471,9 @@ const std::map<QString, Definition, std::greater<QString>> DefinitionMap {
{ "emoji_sidebar_right_click", {
.type = SettingType::BoolSetting,
.defaultValue = false, }},
{ "disable_short_info_box", {
.type = SettingType::BoolSetting,
.defaultValue = false, }},
};
using OldOptionKey = QString;

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

@ -770,6 +770,7 @@ void SetupKotatoOther(
});
SettingsMenuJsonSwitch(ktg_settings_call_confirm, confirm_before_calls);
SettingsMenuJsonSwitch(ktg_settings_disable_short_info_box, disable_short_info_box);
SettingsMenuJsonSwitch(ktg_settings_remember_compress_images, remember_compress_images);
AddButton(
container,