Discontinue the use of qt connect by name slots
Some checks are pending
Build eismuliplexer for linux / Build (push) Waiting to run

This commit is contained in:
Carl Philipp Klemm 2026-04-15 13:00:35 +02:00
parent f85bbb326e
commit c7f5c97e7b
6 changed files with 65 additions and 48 deletions

View file

@ -13,6 +13,12 @@ AdvancedSettingsDialog::AdvancedSettingsDialog(QWidget *parent)
ui(new Ui::AdvancedSettingsDialog) ui(new Ui::AdvancedSettingsDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
// Connect signals and slots explicitly
connect(ui->qwen3BrowseButton, &QPushButton::clicked, this, &AdvancedSettingsDialog::onQwen3BrowseButtonClicked);
connect(ui->textEncoderBrowseButton, &QPushButton::clicked, this, &AdvancedSettingsDialog::onTextEncoderBrowseButtonClicked);
connect(ui->ditBrowseButton, &QPushButton::clicked, this, &AdvancedSettingsDialog::onDiTBrowseButtonClicked);
connect(ui->vaeBrowseButton, &QPushButton::clicked, this, &AdvancedSettingsDialog::onVAEBrowseButtonClicked);
} }
AdvancedSettingsDialog::~AdvancedSettingsDialog() AdvancedSettingsDialog::~AdvancedSettingsDialog()
@ -90,7 +96,7 @@ void AdvancedSettingsDialog::setFlashAttention(bool enabled)
ui->flashAttentionCheckBox->setChecked(enabled); ui->flashAttentionCheckBox->setChecked(enabled);
} }
void AdvancedSettingsDialog::on_qwen3BrowseButton_clicked() void AdvancedSettingsDialog::onQwen3BrowseButtonClicked()
{ {
QString file = QFileDialog::getOpenFileName(this, "Select Qwen3 Model", ui->qwen3ModelEdit->text(), QString file = QFileDialog::getOpenFileName(this, "Select Qwen3 Model", ui->qwen3ModelEdit->text(),
"GGUF Files (*.gguf)"); "GGUF Files (*.gguf)");
@ -100,7 +106,7 @@ void AdvancedSettingsDialog::on_qwen3BrowseButton_clicked()
} }
} }
void AdvancedSettingsDialog::on_textEncoderBrowseButton_clicked() void AdvancedSettingsDialog::onTextEncoderBrowseButtonClicked()
{ {
QString file = QFileDialog::getOpenFileName(this, "Select Text Encoder Model", ui->textEncoderEdit->text(), QString file = QFileDialog::getOpenFileName(this, "Select Text Encoder Model", ui->textEncoderEdit->text(),
"GGUF Files (*.gguf)"); "GGUF Files (*.gguf)");
@ -110,7 +116,7 @@ void AdvancedSettingsDialog::on_textEncoderBrowseButton_clicked()
} }
} }
void AdvancedSettingsDialog::on_ditBrowseButton_clicked() void AdvancedSettingsDialog::onDiTBrowseButtonClicked()
{ {
QString file = QFileDialog::getOpenFileName(this, "Select DiT Model", ui->ditModelEdit->text(), "GGUF Files (*.gguf)"); QString file = QFileDialog::getOpenFileName(this, "Select DiT Model", ui->ditModelEdit->text(), "GGUF Files (*.gguf)");
if (!file.isEmpty()) if (!file.isEmpty())
@ -119,7 +125,7 @@ void AdvancedSettingsDialog::on_ditBrowseButton_clicked()
} }
} }
void AdvancedSettingsDialog::on_vaeBrowseButton_clicked() void AdvancedSettingsDialog::onVAEBrowseButtonClicked()
{ {
QString file = QFileDialog::getOpenFileName(this, "Select VAE Model", ui->vaeModelEdit->text(), "GGUF Files (*.gguf)"); QString file = QFileDialog::getOpenFileName(this, "Select VAE Model", ui->vaeModelEdit->text(), "GGUF Files (*.gguf)");
if (!file.isEmpty()) if (!file.isEmpty())

View file

@ -41,10 +41,10 @@ public:
void setFlashAttention(bool enabled); void setFlashAttention(bool enabled);
private slots: private slots:
void on_qwen3BrowseButton_clicked(); void onQwen3BrowseButtonClicked();
void on_textEncoderBrowseButton_clicked(); void onTextEncoderBrowseButtonClicked();
void on_ditBrowseButton_clicked(); void onDiTBrowseButtonClicked();
void on_vaeBrowseButton_clicked(); void onVAEBrowseButtonClicked();
private: private:
Ui::AdvancedSettingsDialog *ui; Ui::AdvancedSettingsDialog *ui;

View file

@ -49,11 +49,18 @@ MainWindow::MainWindow(QWidget *parent)
autoLoadPlaylist(); autoLoadPlaylist();
// Connect signals and slots // Connect signals and slots
connect(ui->actionAdvancedSettings, &QAction::triggered, this, &MainWindow::on_advancedSettingsButton_clicked); connect(ui->playButton, &QPushButton::clicked, this, &MainWindow::onPlayButtonClicked);
connect(ui->actionSavePlaylist, &QAction::triggered, this, &MainWindow::on_actionSavePlaylist); connect(ui->pauseButton, &QPushButton::clicked, this, &MainWindow::onPauseButtonClicked);
connect(ui->actionLoadPlaylist, &QAction::triggered, this, &MainWindow::on_actionLoadPlaylist); connect(ui->skipButton, &QPushButton::clicked, this, &MainWindow::onSkipButtonClicked);
connect(ui->actionAppendPlaylist, &QAction::triggered, this, &MainWindow::on_actionAppendPlaylist); connect(ui->stopButton, &QPushButton::clicked, this, &MainWindow::onStopButtonClicked);
connect(ui->actionSaveSong, &QAction::triggered, this, &MainWindow::on_actionSaveSong); connect(ui->shuffleButton, &QPushButton::clicked, this, &MainWindow::onShuffleButtonClicked);
connect(ui->addSongButton, &QPushButton::clicked, this, &MainWindow::onAddSongButtonClicked);
connect(ui->removeSongButton, &QPushButton::clicked, this, &MainWindow::onRemoveSongButtonClicked);
connect(ui->actionAdvancedSettings, &QAction::triggered, this, &MainWindow::onAdvancedSettingsButtonClicked);
connect(ui->actionSavePlaylist, &QAction::triggered, this, &MainWindow::onActionSavePlaylist);
connect(ui->actionLoadPlaylist, &QAction::triggered, this, &MainWindow::onActionLoadPlaylist);
connect(ui->actionAppendPlaylist, &QAction::triggered, this, &MainWindow::onActionAppendPlaylist);
connect(ui->actionSaveSong, &QAction::triggered, this, &MainWindow::onActionSaveSong);
connect(ui->actionQuit, &QAction::triggered, this, [this]() connect(ui->actionQuit, &QAction::triggered, this, [this]()
{ {
close(); close();
@ -72,7 +79,7 @@ MainWindow::MainWindow(QWidget *parent)
connect(aceStep, &AceStepWorker::progressUpdate, ui->progressBar, &QProgressBar::setValue); connect(aceStep, &AceStepWorker::progressUpdate, ui->progressBar, &QProgressBar::setValue);
// Connect double-click on song list for editing (works with QTableView too) // Connect double-click on song list for editing (works with QTableView too)
connect(ui->songListView, &QTableView::doubleClicked, this, &MainWindow::on_songListView_doubleClicked); connect(ui->songListView, &QTableView::doubleClicked, this, &MainWindow::onSongListViewDoubleClicked);
// Connect audio player error signal // Connect audio player error signal
connect(audioPlayer, &AudioPlayer::playbackError, this, [this](const QString &error) connect(audioPlayer, &AudioPlayer::playbackError, this, [this](const QString &error)
@ -241,7 +248,7 @@ void MainWindow::updateControls()
ui->removeSongButton->setEnabled(hasSongs && ui->songListView->currentIndex().isValid()); ui->removeSongButton->setEnabled(hasSongs && ui->songListView->currentIndex().isValid());
} }
void MainWindow::on_playButton_clicked() void MainWindow::onPlayButtonClicked()
{ {
if (isPaused) if (isPaused)
{ {
@ -262,7 +269,7 @@ void MainWindow::on_playButton_clicked()
updateControls(); updateControls();
} }
void MainWindow::on_pauseButton_clicked() void MainWindow::onPauseButtonClicked()
{ {
if (isPlaying && !isPaused && audioPlayer->isPlaying()) if (isPlaying && !isPaused && audioPlayer->isPlaying())
{ {
@ -273,7 +280,7 @@ void MainWindow::on_pauseButton_clicked()
} }
} }
void MainWindow::on_skipButton_clicked() void MainWindow::onSkipButtonClicked()
{ {
if (isPlaying) if (isPlaying)
{ {
@ -283,7 +290,7 @@ void MainWindow::on_skipButton_clicked()
} }
} }
void MainWindow::on_stopButton_clicked() void MainWindow::onStopButtonClicked()
{ {
if (isPlaying) if (isPlaying)
{ {
@ -297,7 +304,7 @@ void MainWindow::on_stopButton_clicked()
} }
} }
void MainWindow::on_shuffleButton_clicked() void MainWindow::onShuffleButtonClicked()
{ {
shuffleMode = ui->shuffleButton->isChecked(); shuffleMode = ui->shuffleButton->isChecked();
updateControls(); updateControls();
@ -307,7 +314,7 @@ void MainWindow::on_shuffleButton_clicked()
ensureSongsInQueue(); ensureSongsInQueue();
} }
void MainWindow::on_addSongButton_clicked() void MainWindow::onAddSongButtonClicked()
{ {
SongDialog dialog(this); SongDialog dialog(this);
@ -322,12 +329,12 @@ void MainWindow::on_addSongButton_clicked()
} }
} }
void MainWindow::on_songListView_doubleClicked(const QModelIndex &index) void MainWindow::onSongListViewDoubleClicked(const QModelIndex &index)
{ {
if (!index.isValid()) if (!index.isValid())
return; return;
disconnect(ui->songListView, &QTableView::doubleClicked, this, &MainWindow::on_songListView_doubleClicked); disconnect(ui->songListView, &QTableView::doubleClicked, this, &MainWindow::onSongListViewDoubleClicked);
int row = index.row(); int row = index.row();
@ -359,10 +366,10 @@ void MainWindow::on_songListView_doubleClicked(const QModelIndex &index)
songModel->updateSong(songModel->index(row, 1), dialog.getSong()); songModel->updateSong(songModel->index(row, 1), dialog.getSong());
} }
connect(ui->songListView, &QTableView::doubleClicked, this, &MainWindow::on_songListView_doubleClicked); connect(ui->songListView, &QTableView::doubleClicked, this, &MainWindow::onSongListViewDoubleClicked);
} }
void MainWindow::on_removeSongButton_clicked() void MainWindow::onRemoveSongButtonClicked()
{ {
QModelIndex currentIndex = ui->songListView->currentIndex(); QModelIndex currentIndex = ui->songListView->currentIndex();
if (!currentIndex.isValid()) if (!currentIndex.isValid())
@ -382,7 +389,7 @@ void MainWindow::on_removeSongButton_clicked()
} }
} }
void MainWindow::on_advancedSettingsButton_clicked() void MainWindow::onAdvancedSettingsButtonClicked()
{ {
AdvancedSettingsDialog dialog(this); AdvancedSettingsDialog dialog(this);
@ -532,7 +539,7 @@ void MainWindow::updatePlaybackStatus(bool playing)
updateControls(); updateControls();
} }
void MainWindow::on_positionSlider_sliderMoved(int position) void MainWindow::onPositionSliderSliderMoved(int position)
{ {
if (isPlaying && audioPlayer->isPlaying()) if (isPlaying && audioPlayer->isPlaying())
{ {
@ -582,7 +589,7 @@ void MainWindow::flushGenerationQueue()
} }
// Playlist save/load methods // Playlist save/load methods
void MainWindow::on_actionSavePlaylist() void MainWindow::onActionSavePlaylist()
{ {
QString filePath = QFileDialog::getSaveFileName(this, "Save Playlist", QString filePath = QFileDialog::getSaveFileName(this, "Save Playlist",
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/playlist.json", QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/playlist.json",
@ -594,7 +601,7 @@ void MainWindow::on_actionSavePlaylist()
} }
} }
void MainWindow::on_actionLoadPlaylist() void MainWindow::onActionLoadPlaylist()
{ {
QString filePath = QFileDialog::getOpenFileName(this, "Load Playlist", QString filePath = QFileDialog::getOpenFileName(this, "Load Playlist",
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
@ -607,7 +614,7 @@ void MainWindow::on_actionLoadPlaylist()
} }
} }
void MainWindow::on_actionAppendPlaylist() void MainWindow::onActionAppendPlaylist()
{ {
QString filePath = QFileDialog::getOpenFileName(this, "Load Playlist", QString filePath = QFileDialog::getOpenFileName(this, "Load Playlist",
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
@ -618,7 +625,7 @@ void MainWindow::on_actionAppendPlaylist()
} }
} }
void MainWindow::on_actionSaveSong() void MainWindow::onActionSaveSong()
{ {
QString filePath = QFileDialog::getSaveFileName(this, "Save Playlist", QString filePath = QFileDialog::getSaveFileName(this, "Save Playlist",
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/song.json", QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/song.json",

View file

@ -67,19 +67,19 @@ public slots:
void show(); void show();
private slots: private slots:
void on_playButton_clicked(); void onPlayButtonClicked();
void on_pauseButton_clicked(); void onPauseButtonClicked();
void on_skipButton_clicked(); void onSkipButtonClicked();
void on_stopButton_clicked(); void onStopButtonClicked();
void on_shuffleButton_clicked(); void onShuffleButtonClicked();
void on_positionSlider_sliderMoved(int position); void onPositionSliderSliderMoved(int position);
void updatePosition(int position); void updatePosition(int position);
void updateDuration(int duration); void updateDuration(int duration);
void on_addSongButton_clicked(); void onAddSongButtonClicked();
void on_removeSongButton_clicked(); void onRemoveSongButtonClicked();
void on_advancedSettingsButton_clicked(); void onAdvancedSettingsButtonClicked();
void on_songListView_doubleClicked(const QModelIndex &index); void onSongListViewDoubleClicked(const QModelIndex &index);
void songGenerated(const SongItem& song); void songGenerated(const SongItem& song);
void generationCanceld(const SongItem& song); void generationCanceld(const SongItem& song);
@ -88,10 +88,10 @@ private slots:
void updatePlaybackStatus(bool playing); void updatePlaybackStatus(bool playing);
void generationError(const QString &error); void generationError(const QString &error);
void on_actionSavePlaylist(); void onActionSavePlaylist();
void on_actionLoadPlaylist(); void onActionLoadPlaylist();
void on_actionAppendPlaylist(); void onActionAppendPlaylist();
void on_actionSaveSong(); void onActionSaveSong();
private: private:
void loadSettings(); void loadSettings();

View file

@ -12,6 +12,10 @@ SongDialog::SongDialog(QWidget *parent, const SongItem &song)
{ {
ui->setupUi(this); ui->setupUi(this);
// Connect signals and slots explicitly
connect(ui->okButton, &QPushButton::clicked, this, &SongDialog::onOkButtonClicked);
connect(ui->cancelButton, &QPushButton::clicked, this, &SongDialog::onCancelButtonClicked);
ui->captionEdit->setPlainText(song.caption); ui->captionEdit->setPlainText(song.caption);
ui->lyricsEdit->setPlainText(song.lyrics); ui->lyricsEdit->setPlainText(song.lyrics);
ui->checkBoxEnhanceCaption->setChecked(song.cotCaption); ui->checkBoxEnhanceCaption->setChecked(song.cotCaption);
@ -140,7 +144,7 @@ SongDialog::~SongDialog()
delete ui; delete ui;
} }
void SongDialog::on_okButton_clicked() void SongDialog::onOkButtonClicked()
{ {
// Validate that caption is not empty // Validate that caption is not empty
QString caption = ui->captionEdit->toPlainText(); QString caption = ui->captionEdit->toPlainText();
@ -153,7 +157,7 @@ void SongDialog::on_okButton_clicked()
accept(); accept();
} }
void SongDialog::on_cancelButton_clicked() void SongDialog::onCancelButtonClicked()
{ {
reject(); reject();
} }

View file

@ -28,8 +28,8 @@ public:
const SongItem& getSong(); const SongItem& getSong();
private slots: private slots:
void on_okButton_clicked(); void onOkButtonClicked();
void on_cancelButton_clicked(); void onCancelButtonClicked();
private: private:
Ui::SongDialog *ui; Ui::SongDialog *ui;