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

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

@ -602,6 +602,7 @@ 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));
if (!Auth().supportMode()) {
psContacts = window->addAction(lang(lng_mac_menu_contacts)); psContacts = window->addAction(lang(lng_mac_menu_contacts));
connect(psContacts, &QAction::triggered, psContacts, [] { connect(psContacts, &QAction::triggered, psContacts, [] {
if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray(); if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray();
@ -612,11 +613,14 @@ void MainWindow::createGlobalMenu() {
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();
if (!Auth().supportMode()) {
psNewGroup = window->addAction(lang(lng_mac_menu_new_group), App::wnd(), SLOT(onShowNewGroup())); 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())); psNewChannel = window->addAction(lang(lng_mac_menu_new_channel), App::wnd(), SLOT(onShowNewChannel()));
window->addSeparator(); 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();

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

@ -93,6 +93,7 @@ MainMenu::MainMenu(
void MainMenu::refreshMenu() { void MainMenu::refreshMenu() {
_menu->clearActions(); _menu->clearActions();
if (!Auth().supportMode()) {
_menu->addAction(lang(lng_create_group_title), [] { _menu->addAction(lang(lng_create_group_title), [] {
App::wnd()->onShowNewGroup(); App::wnd()->onShowNewGroup();
}, &st::mainMenuNewGroup, &st::mainMenuNewGroupOver); }, &st::mainMenuNewGroup, &st::mainMenuNewGroupOver);
@ -112,6 +113,11 @@ void MainMenu::refreshMenu() {
})); }));
}, &st::mainMenuCalls, &st::mainMenuCallsOver); }, &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();
}, &st::mainMenuSettings, &st::mainMenuSettingsOver); }, &st::mainMenuSettings, &st::mainMenuSettingsOver);