From eaa50adf75484d2baf9cb7d31372aa221796b5ad Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 5 Oct 2018 20:08:29 +0300 Subject: [PATCH] Remove irrelevant menu items (support). --- .../platform/mac/main_window_mac.mm | 28 ++++++++------ .../SourceFiles/window/window_main_menu.cpp | 38 +++++++++++-------- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index bfa242ae5..30938c46e 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -602,21 +602,25 @@ void MainWindow::createGlobalMenu() { psSelectAll = edit->addAction(lang(lng_mac_menu_select_all), this, SLOT(psMacSelectAll()), QKeySequence::SelectAll); QMenu *window = psMainMenu.addMenu(lang(lng_mac_menu_window)); - psContacts = window->addAction(lang(lng_mac_menu_contacts)); - connect(psContacts, &QAction::triggered, psContacts, [] { - if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray(); + if (!Auth().supportMode()) { + psContacts = window->addAction(lang(lng_mac_menu_contacts)); + connect(psContacts, &QAction::triggered, psContacts, [] { + if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray(); - if (!AuthSession::Exists()) return; - Ui::show(Box(std::make_unique(), [](not_null box) { - box->addButton(langFactory(lng_close), [box] { box->closeBox(); }); - box->addLeftButton(langFactory(lng_profile_add_contact), [] { App::wnd()->onShowAddContact(); }); - })); - }); + if (!AuthSession::Exists()) return; + Ui::show(Box(std::make_unique(), [](not_null box) { + box->addButton(langFactory(lng_close), [box] { box->closeBox(); }); + box->addLeftButton(langFactory(lng_profile_add_contact), [] { App::wnd()->onShowAddContact(); }); + })); + }); + } psAddContact = window->addAction(lang(lng_mac_menu_add_contact), App::wnd(), SLOT(onShowAddContact())); window->addSeparator(); - psNewGroup = window->addAction(lang(lng_mac_menu_new_group), App::wnd(), SLOT(onShowNewGroup())); - psNewChannel = window->addAction(lang(lng_mac_menu_new_channel), App::wnd(), SLOT(onShowNewChannel())); - window->addSeparator(); + if (!Auth().supportMode()) { + psNewGroup = window->addAction(lang(lng_mac_menu_new_group), App::wnd(), SLOT(onShowNewGroup())); + psNewChannel = window->addAction(lang(lng_mac_menu_new_channel), App::wnd(), SLOT(onShowNewChannel())); + window->addSeparator(); + } psShowTelegram = window->addAction(lang(lng_mac_menu_show), App::wnd(), SLOT(showFromTray())); updateGlobalMenu(); diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index 31e5338b4..4aa7cae5e 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -93,24 +93,30 @@ MainMenu::MainMenu( void MainMenu::refreshMenu() { _menu->clearActions(); - _menu->addAction(lang(lng_create_group_title), [] { - App::wnd()->onShowNewGroup(); - }, &st::mainMenuNewGroup, &st::mainMenuNewGroupOver); - _menu->addAction(lang(lng_create_channel_title), [] { - App::wnd()->onShowNewChannel(); - }, &st::mainMenuNewChannel, &st::mainMenuNewChannelOver); - _menu->addAction(lang(lng_menu_contacts), [] { - Ui::show(Box(std::make_unique(), [](not_null box) { - box->addButton(langFactory(lng_close), [box] { box->closeBox(); }); - box->addLeftButton(langFactory(lng_profile_add_contact), [] { App::wnd()->onShowAddContact(); }); - })); - }, &st::mainMenuContacts, &st::mainMenuContactsOver); - if (Global::PhoneCallsEnabled()) { - _menu->addAction(lang(lng_menu_calls), [] { - Ui::show(Box(std::make_unique(), [](not_null box) { + if (!Auth().supportMode()) { + _menu->addAction(lang(lng_create_group_title), [] { + App::wnd()->onShowNewGroup(); + }, &st::mainMenuNewGroup, &st::mainMenuNewGroupOver); + _menu->addAction(lang(lng_create_channel_title), [] { + App::wnd()->onShowNewChannel(); + }, &st::mainMenuNewChannel, &st::mainMenuNewChannelOver); + _menu->addAction(lang(lng_menu_contacts), [] { + Ui::show(Box(std::make_unique(), [](not_null box) { box->addButton(langFactory(lng_close), [box] { box->closeBox(); }); + box->addLeftButton(langFactory(lng_profile_add_contact), [] { App::wnd()->onShowAddContact(); }); })); - }, &st::mainMenuCalls, &st::mainMenuCallsOver); + }, &st::mainMenuContacts, &st::mainMenuContactsOver); + if (Global::PhoneCallsEnabled()) { + _menu->addAction(lang(lng_menu_calls), [] { + Ui::show(Box(std::make_unique(), [](not_null box) { + box->addButton(langFactory(lng_close), [box] { box->closeBox(); }); + })); + }, &st::mainMenuCalls, &st::mainMenuCallsOver); + } + } else { + _menu->addAction(lang(lng_profile_add_contact), [] { + App::wnd()->onShowAddContact(); + }, &st::mainMenuContacts, &st::mainMenuContactsOver); } _menu->addAction(lang(lng_menu_settings), [] { App::wnd()->showSettings();