Removed App:wnd for opening settings.
Removed unused App::showSettings from facades.
This commit is contained in:
parent
019e691fbb
commit
1f80c297ec
9 changed files with 31 additions and 20 deletions
|
@ -346,6 +346,7 @@ bool ResolveSettings(
|
||||||
if (!controller) {
|
if (!controller) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
controller->window().activate();
|
||||||
const auto section = match->captured(1).mid(1).toLower();
|
const auto section = match->captured(1).mid(1).toLower();
|
||||||
if (section.isEmpty()) {
|
if (section.isEmpty()) {
|
||||||
controller->window().showSettings();
|
controller->window().showSettings();
|
||||||
|
|
|
@ -229,12 +229,6 @@ void searchByHashtag(const QString &tag, PeerData *inPeer) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void showSettings() {
|
|
||||||
if (auto w = App::wnd()) {
|
|
||||||
w->showSettings();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace App
|
} // namespace App
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
|
|
@ -48,7 +48,6 @@ void activateBotCommand(
|
||||||
int row,
|
int row,
|
||||||
int column);
|
int column);
|
||||||
void searchByHashtag(const QString &tag, PeerData *inPeer);
|
void searchByHashtag(const QString &tag, PeerData *inPeer);
|
||||||
void showSettings();
|
|
||||||
|
|
||||||
} // namespace App
|
} // namespace App
|
||||||
|
|
||||||
|
|
|
@ -121,8 +121,6 @@ Widget::Widget(
|
||||||
|
|
||||||
_next->entity()->setClickedCallback([=] { getStep()->submit(); });
|
_next->entity()->setClickedCallback([=] { getStep()->submit(); });
|
||||||
|
|
||||||
_settings->entity()->setClickedCallback([] { App::wnd()->showSettings(); });
|
|
||||||
|
|
||||||
if (_changeLanguage) {
|
if (_changeLanguage) {
|
||||||
_changeLanguage->finishAnimating();
|
_changeLanguage->finishAnimating();
|
||||||
}
|
}
|
||||||
|
@ -153,6 +151,10 @@ Widget::Widget(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rpl::producer<> Widget::showSettingsRequested() const {
|
||||||
|
return _settings->entity()->clicks() | rpl::to_empty;
|
||||||
|
}
|
||||||
|
|
||||||
not_null<Media::Player::FloatDelegate*> Widget::floatPlayerDelegate() {
|
not_null<Media::Player::FloatDelegate*> Widget::floatPlayerDelegate() {
|
||||||
return static_cast<Media::Player::FloatDelegate*>(this);
|
return static_cast<Media::Player::FloatDelegate*>(this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,6 +99,8 @@ public:
|
||||||
|
|
||||||
void setInnerFocus();
|
void setInnerFocus();
|
||||||
|
|
||||||
|
[[nodiscard]] rpl::producer<> showSettingsRequested() const;
|
||||||
|
|
||||||
~Widget();
|
~Widget();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -289,6 +289,11 @@ void MainWindow::setupIntro(Intro::EnterPoint point) {
|
||||||
|
|
||||||
destroyLayer();
|
destroyLayer();
|
||||||
auto created = object_ptr<Intro::Widget>(bodyWidget(), &account(), point);
|
auto created = object_ptr<Intro::Widget>(bodyWidget(), &account(), point);
|
||||||
|
created->showSettingsRequested(
|
||||||
|
) | rpl::start_with_next([=] {
|
||||||
|
showSettings();
|
||||||
|
}, created->lifetime());
|
||||||
|
|
||||||
clearWidgets();
|
clearWidgets();
|
||||||
_intro = std::move(created);
|
_intro = std::move(created);
|
||||||
if (_passcodeLock) {
|
if (_passcodeLock) {
|
||||||
|
@ -342,9 +347,6 @@ void MainWindow::setupMain() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::showSettings() {
|
void MainWindow::showSettings() {
|
||||||
if (isHidden()) {
|
|
||||||
showFromTray();
|
|
||||||
}
|
|
||||||
if (_passcodeLock) {
|
if (_passcodeLock) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1043,8 +1043,11 @@ void MainWindow::createGlobalMenu() {
|
||||||
|
|
||||||
auto prefs = edit->addAction(
|
auto prefs = edit->addAction(
|
||||||
tr::lng_mac_menu_preferences(tr::now),
|
tr::lng_mac_menu_preferences(tr::now),
|
||||||
App::wnd(),
|
this,
|
||||||
[=] { App::wnd()->showSettings(); },
|
[=] {
|
||||||
|
ensureWindowShown();
|
||||||
|
controller().showSettings();
|
||||||
|
},
|
||||||
QKeySequence(Qt::ControlModifier | Qt::Key_Comma));
|
QKeySequence(Qt::ControlModifier | Qt::Key_Comma));
|
||||||
|
|
||||||
prefs->setMenuRole(QAction::PreferencesRole);
|
prefs->setMenuRole(QAction::PreferencesRole);
|
||||||
|
|
|
@ -699,10 +699,18 @@ void MainWindow::createGlobalMenu() {
|
||||||
about->setMenuRole(QAction::AboutQtRole);
|
about->setMenuRole(QAction::AboutQtRole);
|
||||||
|
|
||||||
main->addSeparator();
|
main->addSeparator();
|
||||||
QAction *prefs = main->addAction(tr::lng_mac_menu_preferences(tr::now), App::wnd(), [=] {
|
{
|
||||||
App::wnd()->showSettings();
|
auto callback = [=] {
|
||||||
}, QKeySequence(Qt::ControlModifier | Qt::Key_Comma));
|
ensureWindowShown();
|
||||||
prefs->setMenuRole(QAction::PreferencesRole);
|
controller().showSettings();
|
||||||
|
};
|
||||||
|
main->addAction(
|
||||||
|
tr::lng_mac_menu_preferences(tr::now),
|
||||||
|
this,
|
||||||
|
std::move(callback),
|
||||||
|
QKeySequence(Qt::ControlModifier | Qt::Key_Comma))
|
||||||
|
->setMenuRole(QAction::PreferencesRole);
|
||||||
|
}
|
||||||
|
|
||||||
QMenu *file = psMainMenu.addMenu(tr::lng_mac_menu_file(tr::now));
|
QMenu *file = psMainMenu.addMenu(tr::lng_mac_menu_file(tr::now));
|
||||||
psLogout = file->addAction(tr::lng_mac_menu_logout(tr::now));
|
psLogout = file->addAction(tr::lng_mac_menu_logout(tr::now));
|
||||||
|
|
|
@ -930,8 +930,8 @@ void MainMenu::refreshMenu() {
|
||||||
_controller->session().supportTemplates().reload();
|
_controller->session().supportTemplates().reload();
|
||||||
}, &st::mainMenuReload, &st::mainMenuReloadOver);
|
}, &st::mainMenuReload, &st::mainMenuReloadOver);
|
||||||
}
|
}
|
||||||
_menu->addAction(tr::lng_menu_settings(tr::now), [] {
|
_menu->addAction(tr::lng_menu_settings(tr::now), [=] {
|
||||||
App::wnd()->showSettings();
|
controller->showSettings();
|
||||||
}, &st::mainMenuSettings, &st::mainMenuSettingsOver);
|
}, &st::mainMenuSettings, &st::mainMenuSettingsOver);
|
||||||
|
|
||||||
_nightThemeAction = std::make_shared<QPointer<QAction>>();
|
_nightThemeAction = std::make_shared<QPointer<QAction>>();
|
||||||
|
|
Loading…
Reference in a new issue