From 291a6b73abe552669337d68dccfd6d4315938ad1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 7 May 2017 12:00:49 +0300
Subject: [PATCH] Show phone instead of "online" in the main menu.
---
.../SourceFiles/window/window_main_menu.cpp | 20 +++++++++++--------
.../SourceFiles/window/window_main_menu.h | 4 ++--
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 3d884f744..c2a2be948 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -31,6 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "boxes/about_box.h"
#include "lang.h"
#include "core/click_handler_types.h"
+#include "observer_peer.h"
#include "auth_session.h"
#include "mainwidget.h"
@@ -74,8 +75,12 @@ MainMenu::MainMenu(QWidget *parent) : TWidget(parent)
_version->setLink(2, MakeShared<LambdaClickHandler>([] { Ui::show(Box<AboutBox>()); }));
subscribe(AuthSession::CurrentDownloaderTaskFinished(), [this] { update(); });
- subscribe(Global::RefConnectionTypeChanged(), [this] { updateConnectionState(); });
- updateConnectionState();
+ subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::UserPhoneChanged, [this](const Notify::PeerUpdate &update) {
+ if (update.peer->isSelf()) {
+ updatePhone();
+ }
+ }));
+ updatePhone();
}
void MainMenu::checkSelf() {
@@ -125,12 +130,11 @@ void MainMenu::updateControlsGeometry() {
_version->moveToLeft(st::mainMenuFooterLeft, height() - st::mainMenuVersionBottom - _version->height());
}
-void MainMenu::updateConnectionState() {
- auto state = MTP::dcstate();
- if (state == MTP::ConnectingState || state == MTP::DisconnectedState || state < 0) {
- _connectionText = lang(lng_status_connecting);
+void MainMenu::updatePhone() {
+ if (auto self = App::self()) {
+ _phoneText = App::formatPhone(self->phone());
} else {
- _connectionText = lang(lng_status_online);
+ _phoneText = QString();
}
update();
}
@@ -146,7 +150,7 @@ void MainMenu::paintEvent(QPaintEvent *e) {
if (auto self = App::self()) {
self->nameText.drawLeftElided(p, st::mainMenuCoverTextLeft, st::mainMenuCoverNameTop, width() - 2 * st::mainMenuCoverTextLeft, width());
p.setFont(st::normalFont);
- p.drawTextLeft(st::mainMenuCoverTextLeft, st::mainMenuCoverStatusTop, width(), _connectionText);
+ p.drawTextLeft(st::mainMenuCoverTextLeft, st::mainMenuCoverStatusTop, width(), _phoneText);
}
if (_cloudButton) {
PainterHighQualityEnabler hq(p);
diff --git a/Telegram/SourceFiles/window/window_main_menu.h b/Telegram/SourceFiles/window/window_main_menu.h
index 3d95c9cb4..a21ddc632 100644
--- a/Telegram/SourceFiles/window/window_main_menu.h
+++ b/Telegram/SourceFiles/window/window_main_menu.h
@@ -48,7 +48,7 @@ protected:
private:
void checkSelf();
void updateControlsGeometry();
- void updateConnectionState();
+ void updatePhone();
object_ptr<Profile::UserpicButton> _userpicButton = { nullptr };
object_ptr<Ui::IconButton> _cloudButton = { nullptr };
@@ -57,7 +57,7 @@ private:
object_ptr<Ui::FlatLabel> _version;
bool _showFinished = false;
- QString _connectionText;
+ QString _phoneText;
};