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

Revert 'via @bot' tag option

Browse source 
Context menu option is not reverted, because it could be useful, but global option causes confusion.
This commit is contained in:
Eric Kotato 2021-08-23 00:58:01 +03:00
parent 54fa2a9d2a
commit 2975dec8b9
8 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/Resources/langs/lang.strings
View file

@ -2950,8 +2950,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"ktg_settings_external_video_player" = "External video player";
"ktg_settings_external_video_player_about" = "When this option is enabled, autoplay is force-disabled and system video player is used to play videos.";
"ktg_settings_hide_via" = "Send inline results without 'via @bot'";
"ktg_user_status_unaccessible" = "account inaccessible";
"ktg_settings_show_json_settings" = "Show settings file";

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

@ -83,7 +83,6 @@
"ktg_settings_ffmpeg_multithread_about": "When enabled, CPU and RAM consumption is higher, video decodes faster. When disabled, CPU and RAM consumption is lower, video decodes slower. The more CPU cores you have, the more RAM consumption you have when this option is enabled. You can set exact number of threads in the JSON configuration file.",
"ktg_settings_external_video_player": "External video player",
"ktg_settings_external_video_player_about": "When this option is enabled, autoplay is force-disabled and system video player is used to play videos.",
"ktg_settings_hide_via": "Send inline results without 'via @bot'",
"ktg_settings_adaptive_bubbles": "Adaptive bubbles",
"ktg_settings_disable_sound_from_tray": "Disable sound",
"ktg_settings_enable_sound_from_tray": "Enable sound",

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

@ -83,7 +83,6 @@
"ktg_settings_ffmpeg_multithread_about": "Когда включено, расход ЦП и ОЗУ выше, видео декодируется быстрее. Когда выключено, расход ЦП и ОЗУ меньше, видео декодируется медленнее. Чем больше у вас ядер ЦП, тем больше расход ОЗУ, когда эта опция включена. Можно закрепить используемое число потоков в конфигурационном файле JSON.",
"ktg_settings_external_video_player": "Внешний видеоплеер",
"ktg_settings_external_video_player_about": "Когда эта опция включена, автовоспроизведение принудительно отключено и системный видеоплеер используется для проигрывания видео.",
"ktg_settings_hide_via": "Отправлять результаты ботов без 'через @bot'",
"ktg_settings_adaptive_bubbles": "Адаптивная ширина сообщений",
"ktg_settings_disable_sound_from_tray": "Отключить звук",
"ktg_settings_enable_sound_from_tray": "Включить звук",

5
Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
View file

@ -248,7 +248,7 @@ void Inner::mouseReleaseEvent(QMouseEvent *e) {
if (dynamic_cast<SendClickHandler*>(activated.get()) || open) {
const auto row = int(_selected / MatrixRowShift);
const auto column = int(_selected % MatrixRowShift);
selectInlineResult(row, column, { .hideVia = cHideVia() }, !!open);
selectInlineResult(row, column, {}, !!open);
} else {
ActivateClickHandler(window(), activated, e->button());
}
@ -308,9 +308,6 @@ void Inner::contextMenuEvent(QContextMenuEvent *e) {
_menu = base::make_unique_q<Ui::PopupMenu>(this);
const auto send = [=](Api::SendOptions options) {
if (cHideVia()) {
options.hideVia = true;
}
selectInlineResult(row, column, options, false);
};
SendMenu::FillSendMenu(

6
Telegram/SourceFiles/kotato/json_settings.cpp
View file

@ -390,7 +390,6 @@ QByteArray GenerateSettingsJson(bool areDefault = false) {
settings.insert(qsl("forward_retain_selection"), cForwardRetainSelection());
settings.insert(qsl("forward_on_click"), cForwardChatOnClick());
settings.insert(qsl("telegram_sites_autologin"), cTelegramSitesAutologin());
settings.insert(qsl("hide_via"), cHideVia());
settingsFonts.insert(qsl("size"), cFontSize());
settingsFonts.insert(qsl("use_system_font"), cUseSystemFont());
@ -972,11 +971,6 @@ bool Manager::readCustomFile() {
ReadBoolOption(settings, "telegram_sites_autologin", [&](auto v) {
cSetTelegramSitesAutologin(v);
});
ReadBoolOption(settings, "hide_via", [&](auto v) {
cSetHideVia(v);
});
return true;
}

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

@ -267,5 +267,3 @@ bool gAutoScrollUnfocused = false;
LocalFolderVector gLocalFolders;
bool gTelegramSitesAutologin = true;
bool gHideVia = false;

2
Telegram/SourceFiles/kotato/settings.h
View file

@ -179,5 +179,3 @@ using LocalFolderVector = std::vector<LocalFolder>;
DeclareRefSetting(LocalFolderVector, LocalFolders);
DeclareSetting(bool, TelegramSitesAutologin);
DeclareSetting(bool, HideVia);

5
Telegram/SourceFiles/kotato/settings_menu.cpp
View file

@ -682,11 +682,6 @@ void SetupKotatoOther(not_null<Ui::VerticalLayout*> container) {
AddSkip(container);
AddDividerText(container, tr::ktg_settings_external_video_player_about());
AddSkip(container);
SettingsMenuCSwitch(ktg_settings_hide_via, HideVia);
AddSkip(container);
}
Kotato::Kotato(