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