Localizing theme preview

This commit is contained in:
Eric Kotato 2019-10-22 12:53:26 +03:00
parent 59c03bb521
commit 4606e5d5bb
6 changed files with 43 additions and 16 deletions

View file

@ -42,7 +42,8 @@ QImage Prepare(
} else if (type == FileType::AnimatedSticker) { } else if (type == FileType::AnimatedSticker) {
return Lottie::ReadThumbnail(Lottie::ReadContent(data, path)); return Lottie::ReadThumbnail(Lottie::ReadContent(data, path));
} else if (type == FileType::Theme) { } else if (type == FileType::Theme) {
return Window::Theme::GeneratePreview(data, path); auto langStrings = Window::Theme::CollectStrings();
return Window::Theme::GeneratePreview(data, path, langStrings);
} }
const auto validateSize = [](QSize size) { const auto validateSize = [](QSize size) {
return (size.width() + size.height()) < 10'000; return (size.width() + size.height()) < 10'000;

View file

@ -2264,13 +2264,15 @@ void OverlayWidget::initThemePreview() {
const auto path = _doc->location().name(); const auto path = _doc->location().name();
const auto id = _themePreviewId = rand_value<uint64>(); const auto id = _themePreviewId = rand_value<uint64>();
const auto weak = Ui::MakeWeak(this); const auto weak = Ui::MakeWeak(this);
auto langStrings = CollectStrings();
crl::async([=, data = std::move(current)]() mutable { crl::async([=, data = std::move(current)]() mutable {
auto preview = GeneratePreview( auto preview = GeneratePreview(
bytes, bytes,
path, path,
fields, fields,
std::move(data), std::move(data),
Window::Theme::PreviewType::Extended); Window::Theme::PreviewType::Extended,
langStrings);
crl::on_main(weak, [=, result = std::move(preview)]() mutable { crl::on_main(weak, [=, result = std::move(preview)]() mutable {
if (id != _themePreviewId) { if (id != _themePreviewId) {
return; return;

View file

@ -816,7 +816,8 @@ void FileLoadTask::process() {
thumbnail = PrepareFileThumbnail(std::move(video->thumbnail)); thumbnail = PrepareFileThumbnail(std::move(video->thumbnail));
} else if (filemime == qstr("application/x-tdesktop-theme") } else if (filemime == qstr("application/x-tdesktop-theme")
|| filemime == qstr("application/x-tgtheme-tdesktop")) { || filemime == qstr("application/x-tgtheme-tdesktop")) {
goodThumbnail = Window::Theme::GeneratePreview(_content, _filepath); auto langStrings = Window::Theme::CollectStrings();
goodThumbnail = Window::Theme::GeneratePreview(_content, _filepath, langStrings);
if (!goodThumbnail.isNull()) { if (!goodThumbnail.isNull()) {
QBuffer buffer(&goodThumbnailBytes); QBuffer buffer(&goodThumbnailBytes);
goodThumbnail.save(&buffer, "JPG", kThumbnailQuality); goodThumbnail.save(&buffer, "JPG", kThumbnailQuality);

View file

@ -415,7 +415,8 @@ SendMediaReady PrepareThemeMedia(
PreparedPhotoThumbs thumbnails; PreparedPhotoThumbs thumbnails;
QVector<MTPPhotoSize> sizes; QVector<MTPPhotoSize> sizes;
auto thumbnail = GeneratePreview(content, QString()).scaled( auto langStrings = CollectStrings();
auto thumbnail = GeneratePreview(content, QString(), langStrings).scaled(
320, 320,
320, 320,
Qt::KeepAspectRatio, Qt::KeepAspectRatio,

View file

@ -86,7 +86,8 @@ public:
Generator( Generator(
const Instance &theme, const Instance &theme,
CurrentData &&current, CurrentData &&current,
PreviewType type); PreviewType type,
QMap<QString, QString> lang);
[[nodiscard]] QImage generate(); [[nodiscard]] QImage generate();
@ -191,6 +192,8 @@ private:
style::TextPalette _textPalette; style::TextPalette _textPalette;
QMap<QString, QString> _lang;
}; };
bool Generator::extended() const { bool Generator::extended() const {
@ -336,7 +339,7 @@ void Generator::generateData() {
addRow("Davy Jones", 5, "4:00", textcmdLink(1, "Keynote.pdf")); addRow("Davy Jones", 5, "4:00", textcmdLink(1, "Keynote.pdf"));
_topBarName.setText(st::msgNameStyle, "Eva Summer", Ui::NameTextOptions()); _topBarName.setText(st::msgNameStyle, "Eva Summer", Ui::NameTextOptions());
_topBarStatus = "online"; _topBarStatus = _lang.value(qsl("lng_status_online"));
_topBarStatusActive = true; _topBarStatusActive = true;
addPhotoBubble(":/gui/art/sunrise.jpg", "Nearly missed this sunrise", "7:00", Status::None); addPhotoBubble(":/gui/art/sunrise.jpg", "Nearly missed this sunrise", "7:00", Status::None);
@ -362,11 +365,13 @@ void Generator::generateData() {
Generator::Generator( Generator::Generator(
const Instance &theme, const Instance &theme,
CurrentData &&current, CurrentData &&current,
PreviewType type) PreviewType type,
QMap<QString, QString> lang)
: _theme(theme) : _theme(theme)
, _palette(_theme.palette) , _palette(_theme.palette)
, _current(std::move(current)) , _current(std::move(current))
, _type(type) { , _type(type)
, _lang(lang) {
} }
QImage Generator::generate() { QImage Generator::generate() {
@ -542,7 +547,7 @@ void Generator::paintComposeArea() {
field.y() + st::historyComposeField.textMargins.top() + st::historyComposeField.placeholderMargins.top(), field.y() + st::historyComposeField.textMargins.top() + st::historyComposeField.placeholderMargins.top(),
field.width() - st::historyComposeField.textMargins.left() - st::historyComposeField.textMargins.right(), field.width() - st::historyComposeField.textMargins.left() - st::historyComposeField.textMargins.right(),
field.height() - st::historyComposeField.textMargins.top() - st::historyComposeField.textMargins.bottom()); field.height() - st::historyComposeField.textMargins.top() - st::historyComposeField.textMargins.bottom());
_p->drawText(placeholderRect, tr::lng_message_ph(tr::now), QTextOption(st::historyComposeField.placeholderAlign)); _p->drawText(placeholderRect, _lang.value(qsl("lng_message_ph")), QTextOption(st::historyComposeField.placeholderAlign));
_p->restore(); _p->restore();
_p->setClipping(false); _p->setClipping(false);
@ -578,7 +583,7 @@ void Generator::paintDialogs() {
auto phRect = QRect(filter.x() + st::dialogsFilter.textMrg.left() + st::dialogsFilter.phPos.x(), filter.y() + st::dialogsFilter.textMrg.top() + st::dialogsFilter.phPos.y(), filter.width() - st::dialogsFilter.textMrg.left() - st::dialogsFilter.textMrg.right(), filter.height() - st::dialogsFilter.textMrg.top() - st::dialogsFilter.textMrg.bottom());; auto phRect = QRect(filter.x() + st::dialogsFilter.textMrg.left() + st::dialogsFilter.phPos.x(), filter.y() + st::dialogsFilter.textMrg.top() + st::dialogsFilter.phPos.y(), filter.width() - st::dialogsFilter.textMrg.left() - st::dialogsFilter.textMrg.right(), filter.height() - st::dialogsFilter.textMrg.top() - st::dialogsFilter.textMrg.bottom());;
_p->setFont(st::dialogsFilter.font); _p->setFont(st::dialogsFilter.font);
_p->setPen(st::dialogsFilter.phColor[_palette]); _p->setPen(st::dialogsFilter.phColor[_palette]);
_p->drawText(phRect, tr::lng_dlg_filter(tr::now), QTextOption(st::dialogsFilter.phAlign)); _p->drawText(phRect, _lang.value(qsl("lng_dlg_filter")), QTextOption(st::dialogsFilter.phAlign));
_p->restore(); _p->restore();
_p->setClipping(false); _p->setClipping(false);
@ -972,7 +977,8 @@ std::unique_ptr<Preview> GeneratePreview(
const QString &filepath, const QString &filepath,
const Data::CloudTheme &cloud, const Data::CloudTheme &cloud,
CurrentData &&data, CurrentData &&data,
PreviewType type) { PreviewType type,
QMap<QString, QString> lang) {
auto result = PreviewFromFile(bytes, filepath, cloud); auto result = PreviewFromFile(bytes, filepath, cloud);
if (!result) { if (!result) {
return nullptr; return nullptr;
@ -980,23 +986,36 @@ std::unique_ptr<Preview> GeneratePreview(
result->preview = Generator( result->preview = Generator(
result->instance, result->instance,
std::move(data), std::move(data),
type type,
lang
).generate(); ).generate();
return result; return result;
} }
QImage GeneratePreview( QImage GeneratePreview(
const QByteArray &bytes, const QByteArray &bytes,
const QString &filepath) { const QString &filepath,
QMap<QString, QString> lang) {
const auto preview = GeneratePreview( const auto preview = GeneratePreview(
bytes, bytes,
filepath, filepath,
Data::CloudTheme(), Data::CloudTheme(),
CurrentData{ Data::ThemeWallPaper().id() }, CurrentData{ Data::ThemeWallPaper().id() },
PreviewType::Normal); PreviewType::Normal,
lang);
return preview ? preview->preview : QImage(); return preview ? preview->preview : QImage();
} }
QMap<QString, QString> CollectStrings() {
QMap<QString, QString> result;
result.insert(qsl("lng_message_ph"), tr::lng_message_ph(tr::now));
result.insert(qsl("lng_dlg_filter"), tr::lng_dlg_filter(tr::now));
result.insert(qsl("lng_status_online"), tr::lng_status_online(tr::now));
return result;
}
int DefaultPreviewTitleHeight() { int DefaultPreviewTitleHeight() {
return st::defaultWindowTitle.height; return st::defaultWindowTitle.height;
} }

View file

@ -38,10 +38,13 @@ std::unique_ptr<Preview> GeneratePreview(
const QString &filepath, const QString &filepath,
const Data::CloudTheme &cloud, const Data::CloudTheme &cloud,
CurrentData &&data, CurrentData &&data,
PreviewType type); PreviewType type,
QMap<QString, QString> lang);
QImage GeneratePreview( QImage GeneratePreview(
const QByteArray &bytes, const QByteArray &bytes,
const QString &filepath); const QString &filepath,
QMap<QString, QString> lang);
QMap<QString, QString> CollectStrings();
int DefaultPreviewTitleHeight(); int DefaultPreviewTitleHeight();
void DefaultPreviewWindowFramePaint( void DefaultPreviewWindowFramePaint(