procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

This commit is contained in:
John Preston 2016-03-24 17:50:01 +03:00
parent 1f423a6da2 c117f25711
commit 0ed64e7b51
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/Resources/lang.strings
View File

@ -455,6 +455,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_profile_shared_links" = "{count:_not_used_|# shared link|# shared links} »"; "lng_profile_shared_links" = "{count:_not_used_|# shared link|# shared links} »";
"lng_profile_shared_links_header" = "Shared links overview"; "lng_profile_shared_links_header" = "Shared links overview";
"lng_profile_copy_phone" = "Copy phone number"; "lng_profile_copy_phone" = "Copy phone number";
"lng_profile_copy_fullname" = "Copy name";
"lng_channel_add_admins" = "New administrator"; "lng_channel_add_admins" = "New administrator";
"lng_channel_add_members" = "Add members"; "lng_channel_add_members" = "Add members";

10
Telegram/SourceFiles/profilewidget.cpp
View File

@ -1509,10 +1509,13 @@ void ProfileInner::contextMenuEvent(QContextMenuEvent *e) {
_menu->deleteLater(); _menu->deleteLater();
_menu = 0; _menu = 0;
} }
if (!_phoneText.isEmpty() || (_peerUser && !_peerUser->username.isEmpty())) { if (!_phoneText.isEmpty() || _peerUser) {
QRect info(_left + st::profilePhotoSize + st::profilePhoneLeft, st::profilePadding.top(), _width - st::profilePhotoSize - st::profilePhoneLeft, st::profilePhotoSize); QRect info(_left + st::profilePhotoSize + st::profilePhoneLeft, st::profilePadding.top(), _width - st::profilePhotoSize - st::profilePhoneLeft, st::profilePhotoSize);
if (info.contains(mapFromGlobal(e->globalPos()))) { if (info.contains(mapFromGlobal(e->globalPos()))) {
_menu = new PopupMenu(); _menu = new PopupMenu();
if (_peerUser) {
_menu->addAction(lang(lng_profile_copy_fullname), this, SLOT(onCopyFullName()))->setEnabled(true);
}
if (!_phoneText.isEmpty()) { if (!_phoneText.isEmpty()) {
_menu->addAction(lang(lng_profile_copy_phone), this, SLOT(onCopyPhone()))->setEnabled(true); _menu->addAction(lang(lng_profile_copy_phone), this, SLOT(onCopyPhone()))->setEnabled(true);
} }
@ -1532,6 +1535,11 @@ void ProfileInner::onMenuDestroy(QObject *obj) {
} }
} }
void ProfileInner::onCopyFullName() {
if (!_peerUser) return;
QApplication::clipboard()->setText(lng_full_name(lt_first_name, _peerUser->firstName, lt_last_name, _peerUser->lastName));
}
void ProfileInner::onCopyPhone() { void ProfileInner::onCopyPhone() {
QApplication::clipboard()->setText(_phoneText); QApplication::clipboard()->setText(_phoneText);
} }

1
Telegram/SourceFiles/profilewidget.h
View File

@ -109,6 +109,7 @@ public slots:
void onMediaLinks(); void onMediaLinks();
void onMenuDestroy(QObject *obj); void onMenuDestroy(QObject *obj);
void onCopyFullName();
void onCopyPhone(); void onCopyPhone();
void onCopyUsername(); void onCopyUsername();