RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve custom device name input design.

This commit is contained in:
John Preston 2021-11-25 19:46:37 +04:00
parent 07ba84c857
commit fe4bb19358
3 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -700,7 +700,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_settings_reset_one_sure" = "Do you want to terminate this session?";
"lng_settings_reset_button" = "Terminate";
"lng_settings_rename_device" = "Rename";
"lng_settings_device_name" = "Device name ({device})";
"lng_settings_device_name" = "Device name";
"lng_settings_rename_device_title" = "Rename current device";
"lng_settings_manage_local_storage" = "Manage local storage";
"lng_settings_ask_question" = "Ask a Question";

33
Telegram/SourceFiles/boxes/sessions_box.cpp
View File

@ -16,10 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/boxes/confirm_box.h"
#include "lang/lang_keys.h"
#include "main/main_session.h"
#include "styles/style_boxes.h"
#include "styles/style_info.h"
#include "styles/style_layers.h"
#include "styles/style_settings.h"
#include "ui/widgets/buttons.h"
#include "ui/widgets/input_fields.h"
#include "ui/widgets/labels.h"
@ -30,6 +26,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/application.h"
#include "core/core_settings.h"
#include "window/window_session_controller.h"
#include "styles/style_boxes.h"
#include "styles/style_info.h"
#include "styles/style_layers.h"
#include "styles/style_settings.h"
namespace {
@ -39,13 +39,24 @@ constexpr auto kMaxDeviceModelLength = 32;
void RenameBox(not_null<Ui::GenericBox*> box) {
box->setTitle(tr::lng_settings_rename_device_title());
const auto name = box->addRow(object_ptr<Ui::InputField>(
box,
st::defaultInputField,
tr::lng_settings_device_name(
lt_device,
rpl::single(Platform::DeviceModelPretty())),
Core::App().settings().customDeviceModel()));
const auto skip = st::settingsSubsectionTitlePadding.top();
box->addRow(
object_ptr<Ui::FlatLabel>(
box,
tr::lng_settings_device_name(),
st::settingsSubsectionTitle),
st::boxRowPadding + style::margins(0, skip, 0, 0));
const auto name = box->addRow(
object_ptr<Ui::InputField>(
box,
st::settingsDeviceName,
rpl::single(Platform::DeviceModelPretty()),
Core::App().settings().customDeviceModel()),
st::boxRowPadding - style::margins(
st::settingsDeviceName.textMargins.left(),
0,
st::settingsDeviceName.textMargins.right(),
0));
name->setMaxLength(kMaxDeviceModelLength);
box->setFocusCallback([=] {
name->setFocusFast();

16
Telegram/SourceFiles/settings/settings.style
View File

@ -218,6 +218,22 @@ settingsAccentColorLine: 3px;
settingsFilterIconSkip: 68px;
settingsFilterIconLeft: 17px;
settingsDeviceName: InputField(defaultInputField) {
textBg: transparent;
textMargins: margins(1px, 3px, 1px, 4px);
placeholderFg: placeholderFg;
placeholderFgActive: placeholderFgActive;
placeholderFgError: placeholderFgActive;
placeholderMargins: margins(1px, 0px, 1px, 0px);
placeholderScale: 0.;
placeholderFont: normalFont;
heightMin: 29px;
font: boxTextFont;
}
dictionariesSectionButton: SettingsButton(settingsUpdateToggle) {
font: font(14px semibold);
}