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

Remove irrelevant menu items (support).

This commit is contained in:
John Preston 2018-10-05 20:08:29 +03:00
parent 052fabcae3
commit eaa50adf75
2 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Telegram/SourceFiles/platform/mac/main_window_mac.mm
View File

@ -602,21 +602,25 @@ void MainWindow::createGlobalMenu() {
psSelectAll = edit->addAction(lang(lng_mac_menu_select_all), this, SLOT(psMacSelectAll()), QKeySequence::SelectAll); psSelectAll = edit->addAction(lang(lng_mac_menu_select_all), this, SLOT(psMacSelectAll()), QKeySequence::SelectAll);
QMenu *window = psMainMenu.addMenu(lang(lng_mac_menu_window)); QMenu *window = psMainMenu.addMenu(lang(lng_mac_menu_window));
psContacts = window->addAction(lang(lng_mac_menu_contacts)); if (!Auth().supportMode()) {
connect(psContacts, &QAction::triggered, psContacts, [] { psContacts = window->addAction(lang(lng_mac_menu_contacts));
if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray(); connect(psContacts, &QAction::triggered, psContacts, [] {
if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray();
if (!AuthSession::Exists()) return; if (!AuthSession::Exists()) return;
Ui::show(Box<PeerListBox>(std::make_unique<ContactsBoxController>(), [](not_null<PeerListBox*> box) { Ui::show(Box<PeerListBox>(std::make_unique<ContactsBoxController>(), [](not_null<PeerListBox*> box) {
box->addButton(langFactory(lng_close), [box] { box->closeBox(); }); box->addButton(langFactory(lng_close), [box] { box->closeBox(); });
box->addLeftButton(langFactory(lng_profile_add_contact), [] { App::wnd()->onShowAddContact(); }); box->addLeftButton(langFactory(lng_profile_add_contact), [] { App::wnd()->onShowAddContact(); });
})); }));
}); });
}
psAddContact = window->addAction(lang(lng_mac_menu_add_contact), App::wnd(), SLOT(onShowAddContact())); psAddContact = window->addAction(lang(lng_mac_menu_add_contact), App::wnd(), SLOT(onShowAddContact()));
window->addSeparator(); window->addSeparator();
psNewGroup = window->addAction(lang(lng_mac_menu_new_group), App::wnd(), SLOT(onShowNewGroup())); if (!Auth().supportMode()) {
psNewChannel = window->addAction(lang(lng_mac_menu_new_channel), App::wnd(), SLOT(onShowNewChannel())); psNewGroup = window->addAction(lang(lng_mac_menu_new_group), App::wnd(), SLOT(onShowNewGroup()));
window->addSeparator(); 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())); psShowTelegram = window->addAction(lang(lng_mac_menu_show), App::wnd(), SLOT(showFromTray()));
updateGlobalMenu(); updateGlobalMenu();

38
Telegram/SourceFiles/window/window_main_menu.cpp
View File

@ -93,24 +93,30 @@ MainMenu::MainMenu(
void MainMenu::refreshMenu() { void MainMenu::refreshMenu() {
_menu->clearActions(); _menu->clearActions();
_menu->addAction(lang(lng_create_group_title), [] { if (!Auth().supportMode()) {
App::wnd()->onShowNewGroup(); _menu->addAction(lang(lng_create_group_title), [] {
}, &st::mainMenuNewGroup, &st::mainMenuNewGroupOver); App::wnd()->onShowNewGroup();
_menu->addAction(lang(lng_create_channel_title), [] { }, &st::mainMenuNewGroup, &st::mainMenuNewGroupOver);
App::wnd()->onShowNewChannel(); _menu->addAction(lang(lng_create_channel_title), [] {
}, &st::mainMenuNewChannel, &st::mainMenuNewChannelOver); App::wnd()->onShowNewChannel();
_menu->addAction(lang(lng_menu_contacts), [] { }, &st::mainMenuNewChannel, &st::mainMenuNewChannelOver);
Ui::show(Box<PeerListBox>(std::make_unique<ContactsBoxController>(), [](not_null<PeerListBox*> box) { _menu->addAction(lang(lng_menu_contacts), [] {
box->addButton(langFactory(lng_close), [box] { box->closeBox(); }); Ui::show(Box<PeerListBox>(std::make_unique<ContactsBoxController>(), [](not_null<PeerListBox*> box) {
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<PeerListBox>(std::make_unique<Calls::BoxController>(), [](not_null<PeerListBox*> box) {
box->addButton(langFactory(lng_close), [box] { box->closeBox(); }); 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<PeerListBox>(std::make_unique<Calls::BoxController>(), [](not_null<PeerListBox*> 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), [] { _menu->addAction(lang(lng_menu_settings), [] {
App::wnd()->showSettings(); App::wnd()->showSettings();