fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into launcher-log-page

Browse Source
This commit is contained in:
Yihe Li
2025-06-05 23:20:46 +08:00
parent 842662c24f 6eec17e846
commit dea8de01e3
48 changed files with 163 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
launcher/ui/MainWindow.cpp
View File

@@ -283,8 +283,8 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
newsLabel->setFocusPolicy(Qt::NoFocus);
ui->newsToolBar->insertWidget(ui->actionMoreNews, newsLabel);
QObject::connect(newsLabel, &QAbstractButton::clicked, this, &MainWindow::newsButtonClicked);
QObject::connect(m_newsChecker.get(), &NewsChecker::newsLoaded, this, &MainWindow::updateNewsLabel);
connect(newsLabel, &QAbstractButton::clicked, this, &MainWindow::newsButtonClicked);
connect(m_newsChecker.get(), &NewsChecker::newsLoaded, this, &MainWindow::updateNewsLabel);
updateNewsLabel();
}
@@ -563,7 +563,7 @@ void MainWindow::showInstanceContextMenu(const QPoint& pos)
actionCreateInstance->setData(instance_action_data);
}
connect(actionCreateInstance, SIGNAL(triggered(bool)), SLOT(on_actionAddInstance_triggered()));
connect(actionCreateInstance, &QAction::triggered, this, &MainWindow::on_actionAddInstance_triggered);
actions.prepend(actionSep);
actions.prepend(actionVoid);
@@ -693,7 +693,7 @@ void MainWindow::repopulateAccountsMenu()
}
ui->accountsMenu->addAction(action);
connect(action, SIGNAL(triggered(bool)), SLOT(changeActiveAccount()));
connect(action, &QAction::triggered, this, &MainWindow::changeActiveAccount);
}
}
@@ -705,7 +705,7 @@ void MainWindow::repopulateAccountsMenu()
ui->accountsMenu->addAction(ui->actionNoDefaultAccount);
connect(ui->actionNoDefaultAccount, SIGNAL(triggered(bool)), SLOT(changeActiveAccount()));
connect(ui->actionNoDefaultAccount, &QAction::triggered, this, &MainWindow::changeActiveAccount);
ui->accountsMenu->addSeparator();
ui->accountsMenu->addAction(ui->actionManageAccounts);
@@ -1554,8 +1554,8 @@ void MainWindow::taskEnd()
void MainWindow::startTask(Task* task)
{
connect(task, SIGNAL(succeeded()), SLOT(taskEnd()));
connect(task, SIGNAL(failed(QString)), SLOT(taskEnd()));
connect(task, &Task::succeeded, this, &MainWindow::taskEnd);
connect(task, &Task::failed, this, &MainWindow::taskEnd);
task->start();
}