Daily commit
This commit is contained in:
parent
053dc94203
commit
b5046e0a5d
Binary file not shown.
@ -25,8 +25,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
|
||||
stackedWidget->setCurrentWidget(m_devicesWindow);
|
||||
|
||||
// FIXME переделать на ленивое создание
|
||||
m_accountsWindow = new AccountWindow(this);
|
||||
stackedWidget->addWidget(m_accountsWindow);
|
||||
// m_accountsWindow = new AccountWindow(this);
|
||||
// stackedWidget->addWidget(m_accountsWindow);
|
||||
// stackedWidget->setCurrentWidget(accountPage);
|
||||
|
||||
resize(800, 600);
|
||||
@ -34,10 +34,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
|
||||
// Работа с меню
|
||||
QMenu *menu = menuBar()->addMenu("Меню");
|
||||
auto *devicesPageAction = new QAction("Активные устройства", this);
|
||||
auto *accountPageAction = new QAction("Аккаунты", this);
|
||||
// auto *accountPageAction = new QAction("Аккаунты", this);
|
||||
auto *tutorialPageAction = new QAction("Инструкция", this);
|
||||
menu->addAction(devicesPageAction);
|
||||
menu->addAction(accountPageAction);
|
||||
// menu->addAction(accountPageAction);
|
||||
menu->addAction(tutorialPageAction);
|
||||
|
||||
connect(devicesPageAction, &QAction::triggered, this, [=]() {
|
||||
@ -47,10 +47,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
|
||||
stackedWidget->setCurrentWidget(m_devicesWindow);
|
||||
});
|
||||
|
||||
connect(accountPageAction, &QAction::triggered, this, [=]() {
|
||||
stackedWidget->setCurrentWidget(m_accountsWindow);
|
||||
deleteDevicePage(); // освобождаем ресурсы
|
||||
});
|
||||
// connect(accountPageAction, &QAction::triggered, this, [=]() {
|
||||
// stackedWidget->setCurrentWidget(m_accountsWindow);
|
||||
// deleteDevicePage(); // освобождаем ресурсы
|
||||
// });
|
||||
|
||||
connect(tutorialPageAction, &QAction::triggered, this, [=]() {
|
||||
if (!m_tutorialWindow) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user