RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-03-11 08:48:14 +00:00
Code Issues Projects Releases Wiki Activity

supergroup langs updated, insert text instead of cancelled image sending from clipboard fixed

Browse Source
This commit is contained in:
John Preston 2015-11-24 14:23:14 +03:00
parent cbaf7352c6
commit c80adfc21d
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/Resources/lang.strings
View File

@ -504,16 +504,16 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org
"lng_action_changed_title_channel" = "Channel name was changed to «{title}»";
"lng_action_created_chat" = "{from} created group «{title}»";
"lng_action_created_channel" = "Channel «{title}» created";
"lng_action_group_migrate" = "The group was converted to a supergroup";
"lng_action_group_migrate" = "The group was upgraded to a supergroup";
"lng_profile_migrate_reached" = "{count:_not_used_|# member|# members} limit reached";
"lng_profile_migrate_about" = "If you'd like to go over this limit, you can convert your group to a supergroup. In supergroups:";
"lng_profile_migrate_about" = "If you'd like to go over this limit, you can upgrade your group to a supergroup. In supergroups:";
"lng_profile_migrate_feature1" = "— The members limit is {count:_not_used_|# user|# users}";
"lng_profile_migrate_feature2" = "— New members see the entire chat history";
"lng_profile_migrate_feature3" = "— Admins delete messages for everyone";
"lng_profile_migrate_feature4" = "— Notifications are muted by default";
"lng_profile_migrate_button" = "Upgrade to supergroup";
"lng_profile_migrate_sure" = "Are you sure you want to convert this group to supergroup? This action cannot be undone.";
"lng_profile_migrate_sure" = "Are you sure you want to upgrade this group to supergroup? This action cannot be undone.";
"lng_channel_comments_count" = "{count:_not_used_|# comment|# comments}";
"lng_channel_hide_comments" = "Hide comments";

6
Telegram/SourceFiles/boxes/abstractbox.cpp
View File

@ -79,6 +79,7 @@ void BlueTitleClose::paintEvent(QPaintEvent *e) {
AbstractBox::AbstractBox(int32 w) : LayeredWidget()
, _maxHeight(0)
, _hiding(false)
, _closed(false)
, a_opacity(0, 1)
, _blueTitle(false)
, _blueClose(0)
@ -190,7 +191,10 @@ int32 AbstractBox::countHeight() const {
}
void AbstractBox::onClose() {
closePressed();
if (!_closed) {
_closed = true;
closePressed();
}
emit closed();
}

2
Telegram/SourceFiles/boxes/abstractbox.h
View File

@ -94,7 +94,7 @@ private:
int32 _maxHeight;
int32 countHeight() const;
bool _hiding;
bool _hiding, _closed;
QPixmap _cache;
anim::fvalue a_opacity;

1
Telegram/SourceFiles/layerwidget.cpp
View File

@ -80,6 +80,7 @@ bool BackgroundWidget::onInnerClose() {
onClose();
return true;
}
w->hide();
w->deleteLater();
w = _hidden.back();
_hidden.pop_back();

2
Telegram/SourceFiles/localimageloader.cpp
View File

@ -210,7 +210,7 @@ FileLoadTask::FileLoadTask(const QByteArray &audio, int32 duration, const FileLo
void FileLoadTask::process() {
const QString stickerMime = qsl("image/webp");
_result = FileLoadResultPtr(new FileLoadResult(_id, _to));
_result = FileLoadResultPtr(new FileLoadResult(_id, _to, _originalText));
QString filename, filemime;
qint64 filesize = 0;

7
Telegram/SourceFiles/localimageloader.h
View File

@ -175,7 +175,12 @@ struct FileLoadTo {
};
struct FileLoadResult {
FileLoadResult(const uint64 &id, const FileLoadTo &to) : id(id), to(to), type(PrepareAuto), filesize(0), thumbId(0) {
FileLoadResult(const uint64 &id, const FileLoadTo &to, const QString &originalText) : id(id)
, to(to)
, type(PrepareAuto)
, filesize(0)
, thumbId(0)
, originalText(originalText) {
}
uint64 id;