uvos/Aceradio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Improve song edit dialog

Browse source
This commit is contained in:
Carl Philipp Klemm 2026-03-04 19:59:04 +01:00
parent 56660fe0b5
commit 82182425e6
2 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -17,6 +17,8 @@ add_executable(${PROJECT_NAME}
main.cpp main.cpp
MainWindow.ui MainWindow.ui
MainWindow.cpp MainWindow.cpp
SongDialog.ui
SongDialog.cpp
SongListModel.cpp SongListModel.cpp
AudioPlayer.cpp AudioPlayer.cpp
AceStepWorker.cpp AceStepWorker.cpp

22
MainWindow.cpp
View file

@ -1,5 +1,6 @@
#include "MainWindow.h" #include "MainWindow.h"
#include "ui_MainWindow.h" #include "ui_MainWindow.h"
#include "SongDialog.h"
#include <QMessageBox> #include <QMessageBox>
#include <QInputDialog> #include <QInputDialog>
#include <QFileDialog> #include <QFileDialog>
@ -230,13 +231,12 @@ void MainWindow::on_shuffleButton_clicked()
void MainWindow::on_addSongButton_clicked() void MainWindow::on_addSongButton_clicked()
{ {
bool ok; SongDialog dialog(this);
QString caption = QInputDialog::getText(this, "Add Song", "Enter song caption:", QLineEdit::Normal, "", &ok);
if (ok && !caption.isEmpty()) { if (dialog.exec() == QDialog::Accepted) {
QString lyrics = QInputDialog::getMultiLineText(this, "Add Song", "Enter lyrics (optional):", "", &ok); QString caption = dialog.getCaption();
QString lyrics = dialog.getLyrics();
if (ok) {
SongItem newSong(caption, lyrics); SongItem newSong(caption, lyrics);
songModel->addSong(newSong); songModel->addSong(newSong);
@ -245,7 +245,6 @@ void MainWindow::on_addSongButton_clicked()
ui->songListView->setCurrentIndex(newIndex); ui->songListView->setCurrentIndex(newIndex);
} }
} }
}
void MainWindow::on_editSongButton_clicked() void MainWindow::on_editSongButton_clicked()
{ {
@ -255,20 +254,17 @@ void MainWindow::on_editSongButton_clicked()
int row = currentIndex.row(); int row = currentIndex.row();
SongItem song = songModel->getSong(row); SongItem song = songModel->getSong(row);
bool ok; SongDialog dialog(this, song.caption, song.lyrics);
QString caption = QInputDialog::getText(this, "Edit Song", "Enter song caption:", QLineEdit::Normal, song.caption, &ok);
if (ok && !caption.isEmpty()) { if (dialog.exec() == QDialog::Accepted) {
QString lyrics = QInputDialog::getMultiLineText(this, "Edit Song", "Enter lyrics (optional):", song.lyrics, &ok); QString caption = dialog.getCaption();
QString lyrics = dialog.getLyrics();
if (ok) {
SongItem editedSong(caption, lyrics);
// Update the model // Update the model
songModel->setData(songModel->index(row, 0), caption, SongListModel::CaptionRole); songModel->setData(songModel->index(row, 0), caption, SongListModel::CaptionRole);
songModel->setData(songModel->index(row, 0), lyrics, SongListModel::LyricsRole); songModel->setData(songModel->index(row, 0), lyrics, SongListModel::LyricsRole);
} }
} }
}
void MainWindow::on_removeSongButton_clicked() void MainWindow::on_removeSongButton_clicked()
{ {